Add a canhold cvar. When enabled, reaching the maximum number of rockets will allow...

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 41ebfcc0452a3934d902fd264344869a1555c032..b4de22c89f4f667bcdfa342a294bb4d090df3828 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -541,6 +541,7 @@ set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 1
 set g_balance_hagar_secondary_load_maxload 4
 set g_balance_hagar_secondary_load_spread 0.05
+set g_balance_hagar_secondary_load_canhold 0
 set g_balance_hagar_secondary_damage 5
 set g_balance_hagar_secondary_edgedamage 6
 set g_balance_hagar_secondary_force 70

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 3edb85a90bba137dd604c1bbc3e54ef6cb8c417c..137cd72b4f1efe81f0a4f6774736264c87959cc3 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -319,6 +319,7 @@ float autocvar_g_balance_hagar_secondary;
 float autocvar_g_balance_hagar_secondary_load;
 float autocvar_g_balance_hagar_secondary_load_maxload;
 float autocvar_g_balance_hagar_secondary_load_spread;
+float autocvar_g_balance_hagar_secondary_load_canhold;
 float autocvar_g_balance_hagar_secondary_ammo;
 float autocvar_g_balance_hagar_secondary_damage;
 float autocvar_g_balance_hagar_secondary_edgedamage;

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index ba0c56f1bad09ebcccf0bdf75ccd7fe2dced002a..db0e01306243b45e19324402695f7f69354082e0 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -140,7 +140,8 @@ void W_Hagar_Attack2_Load (void)
                        self.hagarload_refire = time + autocvar_g_balance_hagar_secondary_refire;
                }
        }
-       else if(self.hagar_load)
+
+       if(self.hagar_load && (!self.BUTTON_ATCK2 || (self.hagarload_loaded && !autocvar_g_balance_hagar_secondary_load_canhold)))
        {
                W_SetupShot (self, FALSE, 2, "weapons/hagar_fire.wav", CHAN_WEAPON, autocvar_g_balance_hagar_secondary_damage);
                pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);