From: Mircea Kitsune Date: Mon, 11 Apr 2011 14:19:23 +0000 (+0300) Subject: Add a canhold cvar. When enabled, reaching the maximum number of rockets will allow... X-Git-Tag: xonotic-v0.5.0~263^2~10^2~69 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bde4893d6bfd2dd2e77e88b34523db372067f157;p=xonotic%2Fxonotic-data.pk3dir.git Add a canhold cvar. When enabled, reaching the maximum number of rockets will allow you to hold your hagar without auto-firing it. Else when the hagar is fully loaded, it discharges automatically. Currently disabled by default. --- diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 41ebfcc04..b4de22c89 100644 --- 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 3edb85a90..137cd72b4 100644 --- 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 ba0c56f1b..db0e01306 100644 --- 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);