From 4375c41c19f427395c5f563cbb8283b8ae15ffb4 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Tue, 10 Dec 2013 15:45:04 -0500 Subject: [PATCH] Fix that last one, plus update the config- now we have spawn weapons again --- bal-wep-xonotic.cfg | 83 ++++++++++++++++++++++++++++++-- qcsrc/server/weapons/spawning.qc | 20 ++++++-- 2 files changed, 94 insertions(+), 9 deletions(-) diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index a3c5d2c4b..c0ea368dd 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -26,6 +26,9 @@ set g_balance_blaster_secondary_speed 6000 set g_balance_blaster_secondary_spread 0 set g_balance_blaster_switchdelay_drop 0.15 set g_balance_blaster_switchdelay_raise 0.15 +set g_balance_blaster_weaponreplace "" +set g_balance_blaster_weaponstart 1 +set g_balance_blaster_weaponstartoverride 0 // }}} // {{{ #2: Shockwave set g_balance_shockwave_blast_damage 20 @@ -78,11 +81,15 @@ set g_balance_shockwave_pellets_force 15 set g_balance_shockwave_pellets_refire 0.75 set g_balance_shockwave_pellets_speed 8000 set g_balance_shockwave_pellets_spread 0.12 +set g_balance_shockwave_primary 1 set g_balance_shockwave_reload_ammo 0 set g_balance_shockwave_reload_time 0 -set g_balance_shockwave_secondary 0 +set g_balance_shockwave_secondary 1 set g_balance_shockwave_switchdelay_drop 0.2 set g_balance_shockwave_switchdelay_raise 0.2 +set g_balance_shockwave_weaponreplace "" +set g_balance_shockwave_weaponstart 1 +set g_balance_shockwave_weaponstartoverride 0 // }}} // {{{ #3: Machine Gun set g_balance_uzi_bulletconstant 115 @@ -112,6 +119,9 @@ set g_balance_uzi_sustained_refire 0.1 set g_balance_uzi_sustained_spread 0.03 set g_balance_uzi_switchdelay_drop 0.2 set g_balance_uzi_switchdelay_raise 0.2 +set g_balance_uzi_weaponreplace "" +set g_balance_uzi_weaponstart 0 +set g_balance_uzi_weaponstartoverride 0 // }}} // {{{ #4: Mortar set g_balance_mortar_bouncefactor 0.5 @@ -127,10 +137,11 @@ set g_balance_mortar_primary_lifetime 5 set g_balance_mortar_primary_lifetime_stick 0 set g_balance_mortar_primary_radius 120 set g_balance_mortar_primary_refire 0.8 -set g_balance_mortar_secondary_remote_detonateprimary 0 set g_balance_mortar_primary_remote_minbouncecnt 0 set g_balance_mortar_primary_speed 1900 set g_balance_mortar_primary_speed_up 225 +set g_balance_mortar_primary_speed_z 0 +set g_balance_mortar_primary_spread 0 set g_balance_mortar_primary_type 0 set g_balance_mortar_reload_ammo 0 set g_balance_mortar_reload_time 2 @@ -146,11 +157,17 @@ set g_balance_mortar_secondary_lifetime_bounce 0.5 set g_balance_mortar_secondary_lifetime_stick 0 set g_balance_mortar_secondary_radius 120 set g_balance_mortar_secondary_refire 0.7 +set g_balance_mortar_secondary_remote_detonateprimary 0 set g_balance_mortar_secondary_speed 1400 set g_balance_mortar_secondary_speed_up 150 +set g_balance_mortar_secondary_speed_z 0 +set g_balance_mortar_secondary_spread 0 set g_balance_mortar_secondary_type 1 set g_balance_mortar_switchdelay_drop 0.2 set g_balance_mortar_switchdelay_raise 0.2 +set g_balance_mortar_weaponreplace "" +set g_balance_mortar_weaponstart 0 +set g_balance_mortar_weaponstartoverride 0 // }}} // {{{ #5: Mine Layer set g_balance_minelayer_ammo 4 @@ -178,6 +195,9 @@ set g_balance_minelayer_speed 1000 set g_balance_minelayer_switchdelay_drop 0.2 set g_balance_minelayer_switchdelay_raise 0.2 set g_balance_minelayer_time 0.5 +set g_balance_minelayer_weaponreplace "" +set g_balance_minelayer_weaponstart 0 +set g_balance_minelayer_weaponstartoverride 0 // }}} // {{{ #6: Electro set g_balance_electro_combo_comboradius 300 @@ -226,6 +246,9 @@ set g_balance_electro_secondary_spread 0.04 set g_balance_electro_secondary_touchexplode 0 set g_balance_electro_switchdelay_drop 0.2 set g_balance_electro_switchdelay_raise 0.2 +set g_balance_electro_weaponreplace "" +set g_balance_electro_weaponstart 0 +set g_balance_electro_weaponstartoverride 0 // }}} // {{{ #7: Arc set g_balance_arc_primary_ammo 0 @@ -242,6 +265,9 @@ set g_balance_arc_reload_time 0 set g_balance_arc_secondary_ammo 0 set g_balance_arc_switchdelay_drop 0 set g_balance_arc_switchdelay_raise 0 +set g_balance_arc_weaponreplace "" +set g_balance_arc_weaponstart 0 +set g_balance_arc_weaponstartoverride 0 // }}} // {{{ #8: Crylink set g_balance_crylink_primary_ammo 3 @@ -297,8 +323,11 @@ set g_balance_crylink_secondary_spread 0.01 set g_balance_crylink_secondary_spreadtype 1 set g_balance_crylink_switchdelay_drop 0.2 set g_balance_crylink_switchdelay_raise 0.2 +set g_balance_crylink_weaponreplace "" +set g_balance_crylink_weaponstart 0 +set g_balance_crylink_weaponstartoverride 0 // }}} -// {{{ #9: Nex +// {{{ #9: Vortex set g_balance_nex_charge 1 set g_balance_nex_charge_animlimit 0.5 set g_balance_nex_charge_limit 1 @@ -337,6 +366,9 @@ set g_balance_nex_secondary_force 0 set g_balance_nex_secondary_refire 0 set g_balance_nex_switchdelay_drop 0.3 set g_balance_nex_switchdelay_raise 0.25 +set g_balance_nex_weaponreplace "" +set g_balance_nex_weaponstart 0 +set g_balance_nex_weaponstartoverride 0 // }}} // {{{ #10: Hagar set g_balance_hagar_primary_ammo 1 @@ -349,6 +381,7 @@ set g_balance_hagar_primary_lifetime 5 set g_balance_hagar_primary_radius 65 set g_balance_hagar_primary_refire 0.16667 set g_balance_hagar_primary_speed 2500 +set g_balance_hagar_primary_spread 0 set g_balance_hagar_reload_ammo 0 set g_balance_hagar_reload_time 2 set g_balance_hagar_secondary 1 @@ -376,6 +409,9 @@ set g_balance_hagar_secondary_speed 2500 set g_balance_hagar_secondary_spread 0.05 set g_balance_hagar_switchdelay_drop 0.2 set g_balance_hagar_switchdelay_raise 0.2 +set g_balance_hagar_weaponreplace "" +set g_balance_hagar_weaponstart 0 +set g_balance_hagar_weaponstartoverride 0 // }}} // {{{ #11: Devastator set g_balance_devastator_ammo 4 @@ -405,6 +441,9 @@ set g_balance_devastator_speedaccel 1300 set g_balance_devastator_speedstart 1000 set g_balance_devastator_switchdelay_drop 0.3 set g_balance_devastator_switchdelay_raise 0.2 +set g_balance_devastator_weaponreplace "" +set g_balance_devastator_weaponstart 0 +set g_balance_devastator_weaponstartoverride 0 // }}} // {{{ #12: Port-O-Launch set g_balance_porto_primary_animtime 0.3 @@ -420,8 +459,11 @@ set g_balance_porto_secondary_refire 1.5 set g_balance_porto_secondary_speed 1000 set g_balance_porto_switchdelay_drop 0.2 set g_balance_porto_switchdelay_raise 0.2 +set g_balance_porto_weaponreplace "" +set g_balance_porto_weaponstart 0 +set g_balance_porto_weaponstartoverride 0 // }}} -// {{{ #13: MinstaNex +// {{{ #13: Vaporizer set g_balance_minstanex_primary_ammo 10 set g_balance_minstanex_primary_animtime 0.3 set g_balance_minstanex_primary_refire 1 @@ -441,6 +483,9 @@ set g_balance_minstanex_secondary_speed 6000 set g_balance_minstanex_secondary_spread 0 set g_balance_minstanex_switchdelay_drop 0.2 set g_balance_minstanex_switchdelay_raise 0.2 +set g_balance_minstanex_weaponreplace "" +set g_balance_minstanex_weaponstart 0 +set g_balance_minstanex_weaponstartoverride 0 // }}} // {{{ #14: Grappling Hook set g_balance_hook_primary_ammo 5 @@ -467,6 +512,9 @@ set g_balance_hook_secondary_refire 3 set g_balance_hook_secondary_speed 0 set g_balance_hook_switchdelay_drop 0.2 set g_balance_hook_switchdelay_raise 0.2 +set g_balance_hook_weaponreplace "" +set g_balance_hook_weaponstart 0 +set g_balance_hook_weaponstartoverride 0 // }}} // {{{ #15: Heavy Laser Assault Cannon set g_balance_hlac_primary_ammo 1 @@ -499,6 +547,9 @@ set g_balance_hlac_secondary_spread 0.15 set g_balance_hlac_secondary_spread_crouchmod 0.5 set g_balance_hlac_switchdelay_drop 0.2 set g_balance_hlac_switchdelay_raise 0.2 +set g_balance_hlac_weaponreplace "" +set g_balance_hlac_weaponstart 0 +set g_balance_hlac_weaponstartoverride 0 // }}} // {{{ #16: @!#%'n Tuba set g_balance_tuba_animtime 0.05 @@ -512,6 +563,9 @@ set g_balance_tuba_reload_ammo 0 set g_balance_tuba_reload_time 0 set g_balance_tuba_switchdelay_drop 0.2 set g_balance_tuba_switchdelay_raise 0.2 +set g_balance_tuba_weaponreplace "" +set g_balance_tuba_weaponstart 0 +set g_balance_tuba_weaponstartoverride 0 // }}} // {{{ #17: Rifle set g_balance_rifle_bursttime 0 @@ -547,6 +601,9 @@ set g_balance_rifle_secondary_spread 0.04 set g_balance_rifle_secondary_tracer 0 set g_balance_rifle_switchdelay_drop 0.2 set g_balance_rifle_switchdelay_raise 0.2 +set g_balance_rifle_weaponreplace "" +set g_balance_rifle_weaponstart 0 +set g_balance_rifle_weaponstartoverride 0 // }}} // {{{ #18: Fireball set g_balance_fireball_primary_animtime 0.2 @@ -567,6 +624,7 @@ set g_balance_fireball_primary_radius 200 set g_balance_fireball_primary_refire 2 set g_balance_fireball_primary_refire2 0 set g_balance_fireball_primary_speed 1200 +set g_balance_fireball_primary_spread 0 set g_balance_fireball_reload_ammo 0 set g_balance_fireball_reload_time 0 set g_balance_fireball_secondary_animtime 0.3 @@ -581,8 +639,13 @@ set g_balance_fireball_secondary_lifetime 7 set g_balance_fireball_secondary_refire 1.5 set g_balance_fireball_secondary_speed 900 set g_balance_fireball_secondary_speed_up 100 +set g_balance_fireball_secondary_speed_z 0 +set g_balance_fireball_secondary_spread 0 set g_balance_fireball_switchdelay_drop 0.2 set g_balance_fireball_switchdelay_raise 0.2 +set g_balance_fireball_weaponreplace "" +set g_balance_fireball_weaponstart 0 +set g_balance_fireball_weaponstartoverride 0 // }}} // {{{ #19: T.A.G. Seeker set g_balance_seeker_flac_ammo 1 @@ -594,6 +657,10 @@ set g_balance_seeker_flac_lifetime 0.1 set g_balance_seeker_flac_lifetime_rand 0.05 set g_balance_seeker_flac_radius 100 set g_balance_seeker_flac_refire 0.1 +set g_balance_seeker_flac_speed 3000 +set g_balance_seeker_flac_speed_up 1000 +set g_balance_seeker_flac_speed_z 0 +set g_balance_seeker_flac_spread 0.4 set g_balance_seeker_missile_accel 1400 set g_balance_seeker_missile_ammo 2 set g_balance_seeker_missile_animtime 0.2 @@ -615,7 +682,11 @@ set g_balance_seeker_missile_smart 1 set g_balance_seeker_missile_smart_mindist 800 set g_balance_seeker_missile_smart_trace_max 2500 set g_balance_seeker_missile_smart_trace_min 1000 +set g_balance_seeker_missile_speed 700 set g_balance_seeker_missile_speed_max 1300 +set g_balance_seeker_missile_speed_up 300 +set g_balance_seeker_missile_speed_z 0 +set g_balance_seeker_missile_spread 0 set g_balance_seeker_missile_turnrate 0.65 set g_balance_seeker_reload_ammo 0 set g_balance_seeker_reload_time 2 @@ -628,6 +699,10 @@ set g_balance_seeker_tag_health 5 set g_balance_seeker_tag_lifetime 15 set g_balance_seeker_tag_refire 0.75 set g_balance_seeker_tag_speed 5000 +set g_balance_seeker_tag_spread 0 set g_balance_seeker_tag_tracker_lifetime 10 set g_balance_seeker_type 0 +set g_balance_seeker_weaponreplace "" +set g_balance_seeker_weaponstart 0 +set g_balance_seeker_weaponstartoverride 0 // }}} diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 0e03013a3..95e8b9129 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -1,21 +1,31 @@ string W_Apply_Weaponreplace(string in) { float n = tokenize_console(in); - string out = "", replacement = ""; + string out = "", s, replacement; float i, j; + entity e; for(i = 0; i < n; ++i) { + replacement = ""; + s = argv(i); + for(j = WEP_FIRST; j <= WEP_LAST; ++j) { e = get_weaponinfo(j); - if(e.netname == argv(i)) + if(e.netname == s) { replacement = e.weaponreplace; } } - if(replacement != "") { out = sprintf("%s %s", out, replacement); } - else if(replacement != "0") { out = sprintf("%s %s", out, replacement); } - else { out = sprintf("%s %s", out, argv(i)); } + + //if(replacement != "") { out = sprintf("%s %s", out, replacement); } + //else if(replacement != "0") { out = sprintf("%s %s", out, replacement); } + //else { out = sprintf("%s %s", out, argv(i)); } + + if(replacement == "") + out = strcat(out, " ", s); + else if(replacement != "0") + out = strcat(out, " ", replacement); } return substring(out, 1, -1); } -- 2.39.2