From: Mario <mario@smbclan.net>
Date: Fri, 15 Jan 2016 14:58:19 +0000 (+1000)
Subject: Fire inflicts no damage to inferno buff carriers, also lava damage is halved
X-Git-Tag: xonotic-v0.8.2~1240
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=523309a723f4c4d877b1d1a66f7f55857b7b1167;p=xonotic%2Fxonotic-data.pk3dir.git

Fire inflicts no damage to inferno buff carriers, also lava damage is halved
---

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qc b/qcsrc/common/mutators/mutator/buffs/buffs.qc
index f3632cbaf..ae786657b 100644
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qc
@@ -577,6 +577,14 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerDamage_Calculate)
 	if(frag_target != frag_attacker)
 		frag_target.buff_disability_time = time + autocvar_g_buffs_disability_slowtime;
 
+	if(frag_target.buffs & BUFF_INFERNO.m_itemid)
+	{
+		if(frag_deathtype == DEATH_FIRE.m_id)
+			frag_damage = 0;
+		if(frag_deathtype == DEATH_LAVA.m_id)
+			frag_damage *= 0.5; // TODO: cvarize?
+	}
+
 	if(frag_attacker.buffs & BUFF_INFERNO.m_itemid)
 	if(frag_target != frag_attacker) {
 		float btime = buff_Inferno_CalculateTime(