Add proper support for weaponstart and weaponstartoverride

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index c0ea368ddbe67aac7696e4bef34185f32d6ddb94..c3874d45a7821261e33ac980295c5f7b265fbc49 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -28,7 +28,7 @@ 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
+set g_balance_blaster_weaponstartoverride -1
 // }}}
 // {{{ #2: Shockwave
 set g_balance_shockwave_blast_damage 20
@@ -89,7 +89,7 @@ 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
+set g_balance_shockwave_weaponstartoverride -1
 // }}}
 // {{{ #3: Machine Gun
 set g_balance_uzi_bulletconstant 115
@@ -121,7 +121,7 @@ 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
+set g_balance_uzi_weaponstartoverride -1
 // }}}
 // {{{ #4: Mortar
 set g_balance_mortar_bouncefactor 0.5
@@ -167,7 +167,7 @@ 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
+set g_balance_mortar_weaponstartoverride -1
 // }}}
 // {{{ #5: Mine Layer
 set g_balance_minelayer_ammo 4
@@ -197,7 +197,7 @@ 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
+set g_balance_minelayer_weaponstartoverride -1
 // }}}
 // {{{ #6: Electro
 set g_balance_electro_combo_comboradius 300
@@ -248,7 +248,7 @@ 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
+set g_balance_electro_weaponstartoverride -1
 // }}}
 // {{{ #7: Arc
 set g_balance_arc_primary_ammo 0
@@ -267,7 +267,7 @@ 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
+set g_balance_arc_weaponstartoverride -1
 // }}}
 // {{{ #8: Crylink
 set g_balance_crylink_primary_ammo 3
@@ -325,7 +325,7 @@ 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
+set g_balance_crylink_weaponstartoverride -1
 // }}}
 // {{{ #9: Vortex
 set g_balance_nex_charge 1
@@ -368,7 +368,7 @@ 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
+set g_balance_nex_weaponstartoverride -1
 // }}}
 // {{{ #10: Hagar
 set g_balance_hagar_primary_ammo 1
@@ -411,7 +411,7 @@ 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
+set g_balance_hagar_weaponstartoverride -1
 // }}}
 // {{{ #11: Devastator
 set g_balance_devastator_ammo 4
@@ -443,7 +443,7 @@ 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
+set g_balance_devastator_weaponstartoverride -1
 // }}}
 // {{{ #12: Port-O-Launch
 set g_balance_porto_primary_animtime 0.3
@@ -461,7 +461,7 @@ 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
+set g_balance_porto_weaponstartoverride -1
 // }}}
 // {{{ #13: Vaporizer
 set g_balance_minstanex_primary_ammo 10
@@ -485,7 +485,7 @@ 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
+set g_balance_minstanex_weaponstartoverride -1
 // }}}
 // {{{ #14: Grappling Hook
 set g_balance_hook_primary_ammo 5
@@ -514,7 +514,7 @@ 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
+set g_balance_hook_weaponstartoverride -1
 // }}}
 // {{{ #15: Heavy Laser Assault Cannon
 set g_balance_hlac_primary_ammo 1
@@ -549,7 +549,7 @@ 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
+set g_balance_hlac_weaponstartoverride -1
 // }}}
 // {{{ #16: @!#%'n Tuba
 set g_balance_tuba_animtime 0.05
@@ -565,7 +565,7 @@ 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
+set g_balance_tuba_weaponstartoverride -1
 // }}}
 // {{{ #17: Rifle
 set g_balance_rifle_bursttime 0
@@ -603,7 +603,7 @@ 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
+set g_balance_rifle_weaponstartoverride -1
 // }}}
 // {{{ #18: Fireball
 set g_balance_fireball_primary_animtime 0.2
@@ -645,7 +645,7 @@ 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
+set g_balance_fireball_weaponstartoverride -1
 // }}}
 // {{{ #19: T.A.G. Seeker
 set g_balance_seeker_flac_ammo 1
@@ -704,5 +704,5 @@ 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
+set g_balance_seeker_weaponstartoverride -1
 // }}}

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 77758d1d576021aa823236c143ad33930e2a1cac..a12cb9a6b550ed3c1ee48e17bf37406e5846ebb9 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -644,14 +644,14 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO
        else if (g_nexball)
                d = 0; // weapon is set a few lines later
        else
-               d = (i == WEP_BLASTER || i == WEP_SHOCKWAVE); // WEAPONTODO: add spawnflag for hard coded spawn weapons
+               d = !(!weaponinfo.weaponstart);
 
        if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
                d |= (i == WEP_HOOK);
        if(weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED) // never default mutator blocked guns
                d = 0;
 
-       var float t = weaponinfo.weaponstart;
+       var float t = weaponinfo.weaponstartoverride;
 
        //print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n"));