From cb296c0d39d86993a1563e636bd0f72ab6cb98fc Mon Sep 17 00:00:00 2001 From: Samual Date: Thu, 5 Jan 2012 14:14:22 -0500 Subject: [PATCH] Fix bug with minstagib not using prepare attack --- balance25.cfg | 2 ++ balanceFruitieX.cfg | 2 ++ balanceXPM.cfg | 2 ++ balanceXonotic.cfg | 2 ++ qcsrc/server/autocvars.qh | 2 ++ qcsrc/server/cl_client.qc | 1 - qcsrc/server/defs.qh | 3 --- qcsrc/server/w_minstanex.qc | 7 ++++--- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index 1a203eb89..8dc874e7f 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -548,6 +548,8 @@ set g_balance_minstanex_refire 1 set g_balance_minstanex_animtime 0.3 set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 +set g_balance_minstanex_laser_animtime 0.3 +set g_balance_minstanex_laser_refire 0.7 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg index f8bdb2a3c..8568cc41a 100644 --- a/balanceFruitieX.cfg +++ b/balanceFruitieX.cfg @@ -548,6 +548,8 @@ set g_balance_minstanex_refire 1 set g_balance_minstanex_animtime 0.50 set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 +set g_balance_minstanex_laser_animtime 0.3 +set g_balance_minstanex_laser_refire 0.6 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} diff --git a/balanceXPM.cfg b/balanceXPM.cfg index 8fc0b1c02..4bc6d041f 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -548,6 +548,8 @@ set g_balance_minstanex_refire 1 set g_balance_minstanex_animtime 0.3 set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 +set g_balance_minstanex_laser_animtime 0.3 +set g_balance_minstanex_laser_refire 0.7 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index dffc9eab6..4bea6c3b1 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -548,6 +548,8 @@ set g_balance_minstanex_refire 1 set g_balance_minstanex_animtime 0.3 set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 +set g_balance_minstanex_laser_animtime 0.3 +set g_balance_minstanex_laser_refire 0.7 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 36e66ff38..0d794da2e 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -480,6 +480,8 @@ float autocvar_g_balance_minelayer_reload_ammo; float autocvar_g_balance_minelayer_reload_time; float autocvar_g_balance_minstanex_ammo; float autocvar_g_balance_minstanex_laser_ammo; +float autocvar_g_balance_minstanex_laser_animtime; +float autocvar_g_balance_minstanex_laser_refire; float autocvar_g_balance_minstanex_animtime; float autocvar_g_balance_minstanex_refire; float autocvar_g_balance_minstanex_reload_ammo; diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 0b583279d..5dda4db34 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -759,7 +759,6 @@ void PutClientInServer (void) } self.items = start_items; - self.jump_interval = time; self.spawnshieldtime = time + autocvar_g_spawnshieldtime; self.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot_spawn; diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index cced98bd2..7aa2fa166 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -263,9 +263,6 @@ float alreadychangedlevel; .float version; -// minstagib vars -.float jump_interval; // laser refire - //swamp .float in_swamp; // bool .entity swampslug; // Uses this to release from swamp ("untouch" fix) diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 1dfc28173..3fb480df4 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -207,10 +207,8 @@ float w_minstanex(float req) } else if (self.BUTTON_ATCK2) { - if (self.jump_interval <= time) + if (weapon_prepareattack(1, autocvar_g_balance_minstanex_laser_refire)) { - self.jump_interval = time + autocvar_g_balance_laser_primary_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); @@ -221,6 +219,9 @@ float w_minstanex(float req) self.weapon = WEP_LASER; W_Laser_Attack(2); self.weapon = w; + + // now do normal refire + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_minstanex_laser_animtime, w_ready); } } } -- 2.39.2