Fix bug with minstagib not using prepare attack

diff --git a/balance25.cfg b/balance25.cfg
index 1a203eb89003e036db6bd4594253f611d0ba68a6..8dc874e7fe4796394c197b71f44a9f8576ebfcf3 100644 (file)
--- 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 f8bdb2a3c87ebb822c6b386ccdeee4c11faa8c20..8568cc41aaa8bc9bad4688c5843ebe2251417e61 100644 (file)
--- 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 8fc0b1c0220e2a0efd4d0eb110a70249bef242a7..4bc6d041fb2494801f2cb91f5d87a5d4d0ad446e 100644 (file)
--- 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 dffc9eab65c6386f97ef2fb830c13a2d58ae7c0e..4bea6c3b189e8127f5d6344ccf57482e0edaae35 100644 (file)
--- 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 36e66ff38d35f5e6c7c7a7e4ef730294ceeffcb7..0d794da2ec92acb88326d16ca561e2a88e53545a 100644 (file)
--- 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 0b583279d6d6dbc5a92bc5e4c4629ac53a5a4904..5dda4db34d6779bab18c60325c2c7ee3b57ed19e 100644 (file)
--- 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 cced98bd2a734c5815545c88c0d27b92b17b5ff4..7aa2fa1664d0ef60ddf4f9dc08afd11e9efafbcd 100644 (file)
--- 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 1dfc281732e88925f33887d24969700bb98d30d8..3fb480df4c8c396351f2499694bfc07c8636597f 100644 (file)
--- 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);
                        }
                }
        }