Simple edit to add an animtime cvar for the uzi burst secondary, this is so that...

diff --git a/balance25.cfg b/balance25.cfg
index f50eb7e290b70ac7635499a0cdb6ca6c1cb35681..7dddf11f998e1b14c11d998d496f7ebe60cdf3e2 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -269,6 +269,7 @@ set g_balance_uzi_spread_max 0.6
 set g_balance_uzi_spread_add 0.012
 
 set g_balance_uzi_burst 0                              // # of bullets in a burst (if set to 2 or more)
+set g_balance_uzi_burst_animtime 0.75
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.75   // refire after burst
 set g_balance_uzi_burst_spread 0.04

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index dd1a2022ad500f852ce2c9d5e285c5613278754a..01965cdf2f7b52c4e2e78617df5db3fd00cd1721 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -269,6 +269,7 @@ set g_balance_uzi_spread_max 0.6
 set g_balance_uzi_spread_add 0.012
 
 set g_balance_uzi_burst 0                              // # of bullets in a burst (if set to 2 or more)
+set g_balance_uzi_burst_animtime 0.75
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.75   // refire after burst
 set g_balance_uzi_burst_spread 0.04

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index bfe331b151860f02269de54245f3b32f542af4d6..a3978f5920781329f20b0f35bd8ee7d601955da1 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -269,6 +269,7 @@ set g_balance_uzi_spread_max 0.6
 set g_balance_uzi_spread_add 0.012
 
 set g_balance_uzi_burst 0                              // # of bullets in a burst (if set to 2 or more)
+set g_balance_uzi_burst_animtime 0.75
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.75   // refire after burst
 set g_balance_uzi_burst_spread 0.04

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index b66ef86bd6682d916cb3850f50cbd46414ef41b6..3cf4aa1f6b6649034f343417286261ca7a1d9977 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -269,6 +269,7 @@ set g_balance_uzi_spread_max 0.6
 set g_balance_uzi_spread_add 0.008
 
 set g_balance_uzi_burst 3                              // # of bullets in a burst (if set to 2 or more)
+set g_balance_uzi_burst_animtime 0.45
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.45   // refire after burst
 set g_balance_uzi_burst_spread 0.05

diff --git a/balancetZork.cfg b/balancetZork.cfg
index e7f5431d045aefcd0946461e388ab07b0922ec62..f4ae1c0074aea275af554202ef4b50886db7b0c1 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -269,6 +269,7 @@ set g_balance_uzi_spread_max 0.6
 set g_balance_uzi_spread_add 0.008
 
 set g_balance_uzi_burst 3                              // # of bullets in a burst (if set to 2 or more)
+set g_balance_uzi_burst_animtime 0.4
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.4    // refire after burst
 set g_balance_uzi_burst_spread 0.03

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 427a60c5ec1366929d56d72f158b646aa3254730..5051e44273fcd98ec9dd92e988b6f207d19e66f0 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -621,6 +621,7 @@ float autocvar_g_balance_tuba_refire;
 float autocvar_g_balance_uzi_bulletconstant;
 float autocvar_g_balance_uzi_burst;
 float autocvar_g_balance_uzi_burst_ammo;
+float autocvar_g_balance_uzi_burst_animtime;
 float autocvar_g_balance_uzi_burst_refire;
 float autocvar_g_balance_uzi_burst_refire2;
 float autocvar_g_balance_uzi_burst_spread;

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 50f59ff01e74cbce9010c7ca8b00446bf13612a8..f3dc51ce832cba3c280d30265aec11f6e28eb56d 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -168,7 +168,10 @@ void uzi_mode1_fire_burst()
 
        self.misc_bulletcounter = self.misc_bulletcounter + 1;
        if (self.misc_bulletcounter == 0)
-               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_uzi_burst_refire2, w_ready);
+       {
+               ATTACK_FINISHED(self) = time + autocvar_g_balance_uzi_burst_refire2 * W_WeaponRateFactor();
+               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_uzi_burst_animtime, w_ready);
+       }
        else
        {
                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_uzi_burst_refire, uzi_mode1_fire_burst);