From 05547ce591f34ad8661f15432a07223a581e59db Mon Sep 17 00:00:00 2001 From: Samual Date: Sun, 8 Jan 2012 16:32:08 -0500 Subject: [PATCH] Bring back jump_interval to handle refire, this way primary and secondary are separate with ATTACK_FINISHED, but secondary still has the benefits of prepare_attack. --- qcsrc/server/w_minstanex.qc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 3fb480df4..34c71cf50 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -3,6 +3,7 @@ REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_ #else #ifdef SVQC .float minstanex_lasthit; +.float jump_interval; void W_MinstaNex_Attack (void) { @@ -207,8 +208,12 @@ float w_minstanex(float req) } else if (self.BUTTON_ATCK2) { - if (weapon_prepareattack(1, autocvar_g_balance_minstanex_laser_refire)) + if (self.jump_interval <= time) + if (weapon_prepareattack(1, -1)) { + // handle refire manually, so that primary and secondary can be fired without conflictions (important for minstagib) + self.jump_interval = time + autocvar_g_balance_minstanex_laser_refire * W_WeaponRateFactor(); + // decrease ammo for the laser? if(autocvar_g_balance_minstanex_laser_ammo) W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_laser_ammo, autocvar_g_balance_minstanex_reload_ammo); -- 2.39.2