From cf34b23692a6894f27d030a1bd9adb931aa393e3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 29 May 2010 21:00:30 +0200 Subject: Fixed Twisted Faith not increasing damage of Mind Flay while Shadow Word: Pain was present on target, thx maxdestroyer for pointing that EffectSpellClassMask doesn't match Fixes issue #1085. --HG-- branch : trunk --- src/game/Unit.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f259728a88f..f493d1bbae5 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10024,18 +10024,22 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 } } break; - // Glyph of Shadow Word: Pain case SPELLFAMILY_PRIEST: if (spellProto->SpellFamilyFlags[0] & 0x800000) { - // Increase Mind Flay damage + // Glyph of Shadow Word: Pain if (AuraEffect * aurEff = GetAuraEffect(55687, 0)) - // if Shadow Word: Pain present + // Increase Mind Flay damage if Shadow Word: Pain present on target + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) + DoneTotalMod *= (aurEff->GetAmount() + 100.0f) / 100.f; + + // Twisted Faith - Mind Flay part + if (AuraEffect * aurEff = GetAuraEffect(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS, SPELLFAMILY_PRIEST, 2848, 1)) + // Increase Mind Flay damage if Shadow Word: Pain present on target if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) DoneTotalMod *= (aurEff->GetAmount() + 100.0f) / 100.f; } break; - case SPELLFAMILY_PALADIN: // Judgement of Vengeance/Judgement of Corruption if ((spellProto->SpellFamilyFlags[1] & 0x400000) && spellProto->SpellIconID == 2292) -- cgit v1.2.3