From: Mircea Kitsune Date: Mon, 11 Apr 2011 20:03:52 +0000 (+0300) Subject: Use a different cvar for rocket loading speed than refire. So the delay after the... X-Git-Tag: xonotic-v0.5.0~263^2~10^2~54 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34f7830b54f9eae3cfbf778284835f6a3c21e03b;p=xonotic%2Fxonotic-data.pk3dir.git Use a different cvar for rocket loading speed than refire. So the delay after the weapon fires (and may fire again) is different than the speed rockets are loaded with. --- diff --git a/balance25.cfg b/balance25.cfg index 72f79008a..b6c3ae2a9 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.15 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 +set g_balance_hagar_secondary_load_speed 1 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 37 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index e43ce3f1f..45c6f7b71 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.15 set g_balance_hagar_primary_ammo 2 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 +set g_balance_hagar_secondary_load_speed 1 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 43 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 6652472cb..e1dfd787b 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.15 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 +set g_balance_hagar_secondary_load_speed 1 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 35 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index a6b4c710f..23a434a8f 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.12 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 1 +set g_balance_hagar_secondary_load_speed 1 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 22 diff --git a/balancetZork.cfg b/balancetZork.cfg index c6e29ee1b..e6b9d17df 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -538,6 +538,7 @@ set g_balance_hagar_primary_refire 0.2 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 +set g_balance_hagar_secondary_load_speed 1 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 30 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index a76417da8..2974b6630 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -317,6 +317,7 @@ float autocvar_g_balance_hagar_primary_refire; float autocvar_g_balance_hagar_primary_speed; float autocvar_g_balance_hagar_secondary; float autocvar_g_balance_hagar_secondary_load; +float autocvar_g_balance_hagar_secondary_load_speed; float autocvar_g_balance_hagar_secondary_load_max; float autocvar_g_balance_hagar_secondary_load_hold; float autocvar_g_balance_hagar_secondary_ammo; diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index ff2c46095..0feac0c2d 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -147,7 +147,7 @@ void W_Hagar_Attack2_Load (void) self.hagar_load += 1; sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM); - self.hagarload_refire = time + autocvar_g_balance_hagar_secondary_refire; + self.hagarload_refire = time + autocvar_g_balance_hagar_secondary_load_speed; } } else if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_hold)))