Linkexplode feature for hagar secondary (so that you can toggle between damaging...

diff --git a/balance25.cfg b/balance25.cfg
index c6343347672f39ed9597d794b9bc08e1425ccb73..017805c4e25fbe98c1f6ac3effebca39691cc14c 100644 (file)
--- 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 c22982034efd73db6f8700f99477baf7f3f8ad68..86fb6b10b67524a6a6c0b3eccd5c1c0935c3d94f 100644 (file)
--- 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 ad040273a58b661048c6cbcce8e8015f4cd638ca..345bc919a23398061e7eeba6dd1e0cfd14ddd537 100644 (file)
--- 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 92cb68912130de3429a7f9501bfea99b9b55043e..fda8de4dc609eccc36b6f1fcd09d0970a7cc7d26 100644 (file)
--- 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 72934fdb289cbb2cb1f13aef3240df4c770b87b7..d7dd843c8f91839565ec3676d7be5f033c242e39 100644 (file)
--- 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 e7eede1758794b193038043974b06913e4a4ef40..1fd51af20c8f1a73a5170ea06f620da2e7473c43 100644 (file)
--- 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;