From 361ffa180aed430baddde7e03f576b9abe3e78cf Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 12 Apr 2011 23:35:08 +0300 Subject: [PATCH] Cvar the feature of releasing loaded rockets upon death --- 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 3f8a1d357..9c0be7f6e 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_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 61f6c32fd..fdc69ec74 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_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 a894d1e80..75bd161d4 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_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 65e0c0244..89bb82470 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_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 13a13c8aa..6d3338b09 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_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 a8007e49f..e6eb9b2c3 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_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 a0658e9f3..24c2613bd 100644 --- 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) -- 2.39.2