Add animtime cvars to hagar primary and secondary (specifically useful for hagar...

diff --git a/balance25.cfg b/balance25.cfg
index 62dd2d8559cea89d96deb2d2c820941466555bfa..e64025e635435f0f51d1d7c972a39dcd5ad10bbd 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -551,6 +551,7 @@ 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
@@ -573,6 +574,7 @@ 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 7777868a60fb6732dd529acf63bdc2c67ee8999a..948c04aecafb519fde660ef69b35244a1c580b12 100644 (file)
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -551,6 +551,7 @@ 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
@@ -573,6 +574,7 @@ 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 db3cc7efe7b4027eb23175c6600f7215f2b89cd8..d1951cd39ac9aee812a8d3d0d53d802065296545 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -551,6 +551,7 @@ 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
@@ -573,6 +574,7 @@ 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 ee02130308344ca29d0a0f4ee25e80092b5d6e37..58ccde304d9f5bf72c713888ded434907358ce73 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -551,6 +551,7 @@ 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
@@ -573,6 +574,7 @@ 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 3fc066b7369d6b82b7779cd08a650f7b9ca62c34..e6917804d031a909877d8ad410f33cf7b3a928ce 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -551,6 +551,7 @@ 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
@@ -573,6 +574,7 @@ 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 993ebcc344417a7670274eacff2f0ed1a0a567cb..de0a0713969f0bba9ad608e4db94d4d2e6b4c13b 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -322,6 +322,7 @@ 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;
@@ -342,6 +343,7 @@ 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_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 1fd51af20c8f1a73a5170ea06f620da2e7473c43..4c8bca3b062586b3d8092bdd1b729d3d7a182a32 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_refire, w_ready);
+       weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_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_refire, w_ready);
+                               weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hagar_primary_animtime, 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_refire, w_ready);
+                               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_animtime, w_ready);
                        }
                }
        }