From 5dde9508620c69848a29ad5e2f533a90bc522e7c Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 12 Apr 2011 19:39:49 +0300 Subject: [PATCH] Cvar the abort feature --- balance25.cfg | 1 + balanceLeeStricklin.cfg | 1 + balanceSamual.cfg | 1 + balanceXonotic.cfg | 1 + balancetZork.cfg | 1 + qcsrc/server/autocvars.qh | 1 + qcsrc/server/w_hagar.qc | 2 +- 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/balance25.cfg b/balance25.cfg index 1df9085fe..3f8a1d357 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -542,6 +542,7 @@ set g_balance_hagar_secondary_load 0 set g_balance_hagar_secondary_load_speed 0.6 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 +set g_balance_hagar_secondary_load_abort 1 set g_balance_hagar_secondary_damage 37 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 31aa3d38c..61f6c32fd 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -542,6 +542,7 @@ set g_balance_hagar_secondary_load 0 set g_balance_hagar_secondary_load_speed 0.6 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 +set g_balance_hagar_secondary_load_abort 1 set g_balance_hagar_secondary_damage 43 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 70fc68f02..a59faa67f 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -542,6 +542,7 @@ set g_balance_hagar_secondary_load 0 set g_balance_hagar_secondary_load_speed 0.6 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 +set g_balance_hagar_secondary_load_abort 1 set g_balance_hagar_secondary_damage 35 set g_balance_hagar_secondary_edgedamage 17.5 set g_balance_hagar_secondary_force 100 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 4f954875d..65e0c0244 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -542,6 +542,7 @@ set g_balance_hagar_secondary_load 1 set g_balance_hagar_secondary_load_speed 0.6 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 +set g_balance_hagar_secondary_load_abort 1 set g_balance_hagar_secondary_damage 32 set g_balance_hagar_secondary_edgedamage 6 set g_balance_hagar_secondary_force 160 diff --git a/balancetZork.cfg b/balancetZork.cfg index 6a8b39bfa..13a13c8aa 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -541,6 +541,7 @@ set g_balance_hagar_secondary_load 0 set g_balance_hagar_secondary_load_speed 0.6 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 +set g_balance_hagar_secondary_load_abort 1 set g_balance_hagar_secondary_damage 30 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 50 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 2974b6630..a8007e49f 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -320,6 +320,7 @@ 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_load_abort; float autocvar_g_balance_hagar_secondary_ammo; float autocvar_g_balance_hagar_secondary_damage; float autocvar_g_balance_hagar_secondary_edgedamage; diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index dfe1f1726..025edf927 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -140,7 +140,7 @@ void W_Hagar_Attack2_Load (void) if(self.BUTTON_ATCK2) { - if(self.BUTTON_ATCK) + if(self.BUTTON_ATCK && autocvar_g_balance_hagar_secondary_load_abort) { if(self.hagar_load) { -- 2.39.2