On second thought, only add animtime to secondary_load function -- other way caused...

diff --git a/balance25.cfg b/balance25.cfg
index a123eabe19cf0ff06b7f9ebcdf4db0eec4c706c9..edaa785121be27831af16e695efb603384a0e6fc 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -552,7 +552,6 @@ set g_balance_hagar_primary_spread 0.010
 set g_balance_hagar_primary_speed 3000
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
-set g_balance_hagar_primary_animtime 0.2
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
@@ -564,6 +563,7 @@ set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_load_linkexplode 0
+set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_damage 37
 set g_balance_hagar_secondary_edgedamage 15
 set g_balance_hagar_secondary_force 100
@@ -575,7 +575,6 @@ set g_balance_hagar_secondary_speed 1400
 set g_balance_hagar_secondary_lifetime_min 30
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.15
-set g_balance_hagar_secondary_animtime 0.2
 set g_balance_hagar_secondary_ammo 1
 set g_balance_hagar_reload_ammo 0 //default: 25
 set g_balance_hagar_reload_time 2

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 44599ba310663a6f27cc3762b8ea56712ba2b93e..84bfea542b8448c9aaa7bc6f1dc1658ddc05d45c 100644 (file)
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -552,7 +552,6 @@ set g_balance_hagar_primary_spread 0.1
 set g_balance_hagar_primary_speed 1800
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.12
-set g_balance_hagar_primary_animtime 0.2
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
@@ -564,6 +563,7 @@ set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_load_linkexplode 0
+set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_damage 14 // default for _load: 32
 set g_balance_hagar_secondary_edgedamage 6 // default for _load: 10
 set g_balance_hagar_secondary_force 70 // default for _load: 160
@@ -575,7 +575,6 @@ set g_balance_hagar_secondary_speed 1800
 set g_balance_hagar_secondary_lifetime_min 5
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.12 // default for _load: 0.8
-set g_balance_hagar_secondary_animtime 0.2
 set g_balance_hagar_secondary_ammo 1
 set g_balance_hagar_reload_ammo 0 //default: 25
 set g_balance_hagar_reload_time 2

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index a2e24a33637551b0a069fb503f074420308333fc..121853d25ddf45b91fb35bc1c4229ee9ada5cb3e 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -552,7 +552,6 @@ set g_balance_hagar_primary_spread 0.010
 set g_balance_hagar_primary_speed 3000
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
-set g_balance_hagar_primary_animtime 0.2
 set g_balance_hagar_primary_ammo 2
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
@@ -564,6 +563,7 @@ set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_load_linkexplode 0
+set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_damage 43
 set g_balance_hagar_secondary_edgedamage 15
 set g_balance_hagar_secondary_force 100
@@ -575,7 +575,6 @@ set g_balance_hagar_secondary_speed 1400
 set g_balance_hagar_secondary_lifetime_min 5
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.15
-set g_balance_hagar_secondary_animtime 0.2
 set g_balance_hagar_secondary_ammo 2
 set g_balance_hagar_reload_ammo 0 //default: 25
 set g_balance_hagar_reload_time 2

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index cc177e0b7be7cd0b4cda903e4ad53a412c19fcab..583ebdc80c250cc552d1fde3955ffe921b247a91 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -552,7 +552,6 @@ set g_balance_hagar_primary_spread 0.04
 set g_balance_hagar_primary_speed 2000
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.15
-set g_balance_hagar_primary_animtime 0.2
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 1
@@ -564,6 +563,7 @@ set g_balance_hagar_secondary_load_hold 2.5
 set g_balance_hagar_secondary_load_releasedeath 0
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_load_linkexplode 0
+set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_damage 40
 set g_balance_hagar_secondary_edgedamage 20
 set g_balance_hagar_secondary_force 75
@@ -575,7 +575,6 @@ set g_balance_hagar_secondary_speed 2000
 set g_balance_hagar_secondary_lifetime_min 10
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.5
-set g_balance_hagar_secondary_animtime 0.2
 set g_balance_hagar_secondary_ammo 1
 set g_balance_hagar_reload_ammo 0 //default: 25
 set g_balance_hagar_reload_time 2

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 13e4af6cbd7d4adbb9f85933b4d51f170cbeb0d7..4a8e32410b80ef3c2171d4ce6d4fa59ed7a1cd67 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -552,7 +552,6 @@ set g_balance_hagar_primary_spread 0.010
 set g_balance_hagar_primary_speed 2500
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.2
-set g_balance_hagar_primary_animtime 0.2
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
@@ -564,6 +563,7 @@ set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_load_linkexplode 0
+set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_damage 30
 set g_balance_hagar_secondary_edgedamage 15
 set g_balance_hagar_secondary_force 50
@@ -575,7 +575,6 @@ set g_balance_hagar_secondary_speed 1400
 set g_balance_hagar_secondary_lifetime_min 30
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.15
-set g_balance_hagar_secondary_animtime 0.2
 set g_balance_hagar_secondary_ammo 1
 set g_balance_hagar_reload_ammo 0 //default: 25
 set g_balance_hagar_reload_time 2

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index db65669ee038a57fbcf7684485dcaca37dc81af9..9be4bd39216215ce40d72c354ec7b9b60ef58966 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -323,7 +323,6 @@ float autocvar_g_balance_grenadelauncher_secondary_type;
 float autocvar_g_balance_grenadelauncher_reload_ammo;
 float autocvar_g_balance_grenadelauncher_reload_time;
 float autocvar_g_balance_hagar_primary_ammo;
-float autocvar_g_balance_hagar_primary_animtime;
 float autocvar_g_balance_hagar_primary_damage;
 float autocvar_g_balance_hagar_primary_edgedamage;
 float autocvar_g_balance_hagar_primary_force;
@@ -343,8 +342,8 @@ float autocvar_g_balance_hagar_secondary_load_hold;
 float autocvar_g_balance_hagar_secondary_load_releasedeath;
 float autocvar_g_balance_hagar_secondary_load_abort;
 float autocvar_g_balance_hagar_secondary_load_linkexplode;
+float autocvar_g_balance_hagar_secondary_load_animtime;
 float autocvar_g_balance_hagar_secondary_ammo;
-float autocvar_g_balance_hagar_secondary_animtime;
 float autocvar_g_balance_hagar_secondary_damage;
 float autocvar_g_balance_hagar_secondary_edgedamage;
 float autocvar_g_balance_hagar_secondary_force;

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 4c8bca3b062586b3d8092bdd1b729d3d7a182a32..855a4a04cf66d48cee69663a5f919926dcf14514 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -220,7 +220,7 @@ void W_Hagar_Attack2_Load_Release (void)
                counter = counter + 1;
        }
 
-       weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_animtime, w_ready);
+       weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_load_animtime, w_ready);
        self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_refire * W_WeaponRateFactor();
        self.hagar_load = 0;
 }
@@ -341,7 +341,7 @@ float w_hagar(float req)
                        if (weapon_prepareattack(0, autocvar_g_balance_hagar_primary_refire))
                        {
                                W_Hagar_Attack();
-                               weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hagar_primary_animtime, w_ready);
+                               weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hagar_primary_refire, w_ready);
                        }
                }
                else if (self.BUTTON_ATCK2 && !loadable_secondary && autocvar_g_balance_hagar_secondary)
@@ -349,7 +349,7 @@ float w_hagar(float req)
                        if (weapon_prepareattack(1, autocvar_g_balance_hagar_secondary_refire))
                        {
                                W_Hagar_Attack2();
-                               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_animtime, w_ready);
+                               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_refire, w_ready);
                        }
                }
        }