Cvar the feature of releasing loaded rockets upon death

diff --git a/balance25.cfg b/balance25.cfg
index 3f8a1d3570cfbf7e8bc95f050f4c21ccc76ab2b1..9c0be7f6e9fa20caff8a21484ebe888921a6ad32 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_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_damage 37
 set g_balance_hagar_secondary_edgedamage 15

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 61f6c32fd16b388967ab4ddfa61f40762cb322f5..fdc69ec7452b082790ebf1112268b7d77929e498 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_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_damage 43
 set g_balance_hagar_secondary_edgedamage 15

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index a894d1e802708326fc2a0e784ae7fe3a15186103..75bd161d44f6be8241ef52ff743959c92a01b567 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_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_damage 35
 set g_balance_hagar_secondary_edgedamage 17.5

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 65e0c0244252d4bc1e0c719713313d6c0d9d0010..89bb82470177443c1691feacbccf5c8880a17463 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_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_damage 32
 set g_balance_hagar_secondary_edgedamage 6

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 13a13c8aafe3b48d8050e242e96f5d0da33ab88d..6d3338b096bb535bd5fc1feec67391d7aa189e03 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_releasedeath 1
 set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_damage 30
 set g_balance_hagar_secondary_edgedamage 15

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index a8007e49f2ce45c7db88e2d1ab01e11c9b137d56..e6eb9b2c387756159bba29f35c86edda66957f8b 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_releasedeath;
 float autocvar_g_balance_hagar_secondary_load_abort;
 float autocvar_g_balance_hagar_secondary_ammo;
 float autocvar_g_balance_hagar_secondary_damage;

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index a0658e9f32269152f84a1214227676384e0bb4a6..24c2613bd57ee29560c2b0652d3a2854c74c1cbe 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -325,7 +325,7 @@ float w_hagar(float req)
        else if (req == WR_PLAYERDEATH)
        {
                // if we have any rockets loaded when we die, release them
-               if(self.hagar_load)
+               if(self.hagar_load && autocvar_g_balance_hagar_secondary_load_releasedeath)
                        W_Hagar_Attack2_Load_Release();
        }
        else if (req == WR_RELOAD)