Cvar the abort feature

diff --git a/balance25.cfg b/balance25.cfg
index 1df9085fe08c6abf4914ae7d6ef35e26be960779..3f8a1d3570cfbf7e8bc95f050f4c21ccc76ab2b1 100644 (file)
--- 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 31aa3d38cc42552920a446269db4e2698d5921a0..61f6c32fd16b388967ab4ddfa61f40762cb322f5 100644 (file)
--- 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 70fc68f02a1d545e599f01b7306c842f1e9ce555..a59faa67ff3b28ff4da29002b0fcd9deb7981822 100644 (file)
--- 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 4f954875d22547908f25798a0484675358da8ff7..65e0c0244252d4bc1e0c719713313d6c0d9d0010 100644 (file)
--- 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 6a8b39bfa354b9051519d2259b9825264ca574d9..13a13c8aafe3b48d8050e242e96f5d0da33ab88d 100644 (file)
--- 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 2974b66300cfc9a231fa585a95919c36440f8c9a..a8007e49f2ce45c7db88e2d1ab01e11c9b137d56 100644 (file)
--- 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 dfe1f17260d9a998b7365834e00895732c3dae68..025edf927e59c7ec825a1298198f71c3ebafaeae 100644 (file)
--- 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)
                        {