From 1723f6fdc329a322ba588482fcba25cc44008fe0 Mon Sep 17 00:00:00 2001 From: Samual Date: Wed, 1 Jun 2011 04:15:51 -0400 Subject: [PATCH] Update the hold cvar so that it now actually represents the amount of time you can hold the rockets after charging.. -1 for infinite time to hold. --- balanceXonotic.cfg | 2 +- qcsrc/server/w_hagar.qc | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index a8719766f..5c3138a61 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -542,7 +542,7 @@ set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 1 set g_balance_hagar_secondary_load_speed 0.5 set g_balance_hagar_secondary_load_max 4 -set g_balance_hagar_secondary_load_hold 1 +set g_balance_hagar_secondary_load_hold 2.5 set g_balance_hagar_secondary_load_releasedeath 0 set g_balance_hagar_secondary_load_abort 1 set g_balance_hagar_secondary_damage 40 diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index 7dfd44613..cca71f7d4 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -221,9 +221,12 @@ void W_Hagar_Attack2_Load (void) { W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo, autocvar_g_balance_hagar_reload_ammo); self.hagar_load += 1; - sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM); + sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE * 0.8, ATTN_NORM); // sound is too loud according to most - self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_speed; + if (self.hagar_load >= autocvar_g_balance_hagar_secondary_load_max) + self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_hold; + else + self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_speed; } } else if(!self.hagar_loadbeep && self.hagar_load) // prevents the beep from playing each frame @@ -243,7 +246,7 @@ void W_Hagar_Attack2_Load (void) if(self.hagar_load) { self.weapon_forbidchange = TRUE; - if(!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && self.hagar_loadstep < time && !autocvar_g_balance_hagar_secondary_load_hold)) + if(!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && self.hagar_loadstep < time && autocvar_g_balance_hagar_secondary_load_hold >= 0)) W_Hagar_Attack2_Load_Release(); } else -- 2.39.2