Use a different cvar for rocket loading speed than refire. So the delay after the...

diff --git a/balance25.cfg b/balance25.cfg
index 72f79008a477331dff0d352c7b2259bb91b3ecc1..b6c3ae2a9bd1fc0288b04f77bbd731efe2dc6b13 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
+set g_balance_hagar_secondary_load_speed 1
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_damage 37

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index e43ce3f1f2be958438b4944b18bf062db2257224..45c6f7b711b89c3fae7303198551d49ef13d9e5b 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 2
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
+set g_balance_hagar_secondary_load_speed 1
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_damage 43

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 6652472cbc1214232bb3527b2d182687af77fd58..e1dfd787b2d61951ae255e0e5f2ebd73bfd16b0b 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
+set g_balance_hagar_secondary_load_speed 1
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_damage 35

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index a6b4c710f98625cf17078ed790f9e7ddd4d84ff1..23a434a8fcbe72de2830fccaeb2da5303474b96d 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -539,6 +539,7 @@ set g_balance_hagar_primary_refire 0.12
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 1
+set g_balance_hagar_secondary_load_speed 1
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_damage 22

diff --git a/balancetZork.cfg b/balancetZork.cfg
index c6e29ee1b7d485176d2251bd932dbe71c16d155c..e6b9d17df91c5c38d37f0e9b2549b21ac786149b 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -538,6 +538,7 @@ set g_balance_hagar_primary_refire 0.2
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
+set g_balance_hagar_secondary_load_speed 1
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_damage 30

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index a76417da81a671b61903f6e31bd7a416923e12d3..2974b66300cfc9a231fa585a95919c36440f8c9a 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -317,6 +317,7 @@ float autocvar_g_balance_hagar_primary_refire;
 float autocvar_g_balance_hagar_primary_speed;
 float autocvar_g_balance_hagar_secondary;
 float autocvar_g_balance_hagar_secondary_load;
+float autocvar_g_balance_hagar_secondary_load_speed;
 float autocvar_g_balance_hagar_secondary_load_max;
 float autocvar_g_balance_hagar_secondary_load_hold;
 float autocvar_g_balance_hagar_secondary_ammo;

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index ff2c46095aea1b9da6d709871d32090061de9316..0feac0c2d2a24271af66437b847134b2a9a81c09 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -147,7 +147,7 @@ void W_Hagar_Attack2_Load (void)
                        self.hagar_load += 1;
                        sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM);
 
-                       self.hagarload_refire = time + autocvar_g_balance_hagar_secondary_refire;
+                       self.hagarload_refire = time + autocvar_g_balance_hagar_secondary_load_speed;
                }
        }
        else if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_hold)))