Merge remote branch 'origin/samual/uzianimtime'

diff --git a/balance25.cfg b/balance25.cfg
index 95c2f2f1f53180cda4e7073c5b13a7402f58f3b8..361c45d616bac822990aa3d2144611c091fbf105 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -271,6 +271,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 d1b959c3337af32ef860fbc3c0fcd7f1f572d0ea..03f58bf366724d0e7150ef7b375537197ef6e9aa 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -271,6 +271,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 600f7fb5e276150915c9732d110c45715aa117db..718376c127e07cbf169600ee472e6be6e8c57ec1 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -271,6 +271,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 8ca152f1cb3baccdecb7a7e80cf3475d7eafe3ae..be945fa6703c6b65d53a43540604cb2084f62b49 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -271,6 +271,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.07

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 174a5c3dad8c55a8b5aea0d93e8732b67cda2777..87612d234899abf1d94ac1aa441f6e52de5eeb57 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -271,6 +271,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 f1f8a5940633198388afde493285e21075efb65f..8ce09a3b66b68bebed0a3fab4ad43782e3902039 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -624,6 +624,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);