From 4e7a9df98c335ef22684e81b0a2a6091ba60c462 Mon Sep 17 00:00:00 2001 From: Samual Date: Thu, 29 Sep 2011 18:20:59 -0400 Subject: [PATCH] Add animtime cvars to hagar primary and secondary (specifically useful for hagar secondary) --- balance25.cfg | 2 ++ balanceFruit.cfg | 2 ++ balanceLeeStricklin.cfg | 2 ++ balanceXonotic.cfg | 2 ++ balancetZork.cfg | 2 ++ qcsrc/server/autocvars.qh | 2 ++ qcsrc/server/w_hagar.qc | 6 +++--- 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index 62dd2d855..e64025e63 100644 --- 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 7777868a6..948c04aec 100644 --- 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 db3cc7efe..d1951cd39 100644 --- 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 ee0213030..58ccde304 100644 --- 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 3fc066b73..e6917804d 100644 --- 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 993ebcc34..de0a07139 100644 --- 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 1fd51af20..4c8bca3b0 100644 --- 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); } } } -- 2.39.2