From 3810bcd171c80eca222779bbcaa0ce35d6ecdb91 Mon Sep 17 00:00:00 2001 From: Samual Date: Wed, 28 Sep 2011 01:00:08 -0400 Subject: [PATCH] Linkexplode feature for hagar secondary (so that you can toggle between damaging its own projectiles or not) --- balance25.cfg | 1 + balanceFruit.cfg | 1 + balanceLeeStricklin.cfg | 1 + balanceXonotic.cfg | 1 + balancetZork.cfg | 1 + qcsrc/server/w_hagar.qc | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/balance25.cfg b/balance25.cfg index c63433476..017805c4e 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -559,6 +559,7 @@ 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_load_linkexplode 0 set g_balance_hagar_secondary_damage 37 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 diff --git a/balanceFruit.cfg b/balanceFruit.cfg index c22982034..86fb6b10b 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -559,6 +559,7 @@ 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_load_linkexplode 0 set g_balance_hagar_secondary_damage 14 // default for _load: 32 set g_balance_hagar_secondary_edgedamage 6 // default for _load: 10 set g_balance_hagar_secondary_force 70 // default for _load: 160 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index ad040273a..345bc919a 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -559,6 +559,7 @@ 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_load_linkexplode 0 set g_balance_hagar_secondary_damage 43 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 92cb68912..fda8de4dc 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -559,6 +559,7 @@ set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 2.5 set g_balance_hagar_secondary_load_releasedeath 0 set g_balance_hagar_secondary_load_abort 1 +set g_balance_hagar_secondary_load_linkexplode 0 set g_balance_hagar_secondary_damage 40 set g_balance_hagar_secondary_edgedamage 20 set g_balance_hagar_secondary_force 75 diff --git a/balancetZork.cfg b/balancetZork.cfg index 72934fdb2..d7dd843c8 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -559,6 +559,7 @@ 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_load_linkexplode 0 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/w_hagar.qc b/qcsrc/server/w_hagar.qc index e7eede175..1fd51af20 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -25,7 +25,7 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat if (self.health <= 0) return; - if ((attacker.realowner == self.realowner) && !autocvar_g_balance_hagar_secondary_load_linkexplode) + if ((inflictor.realowner == self.realowner) && !autocvar_g_balance_hagar_secondary_load_linkexplode) return; self.health = self.health - damage; -- 2.39.2