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
This commit is contained in:
+8
-4
@@ -10024,18 +10024,22 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
// Glyph of Shadow Word: Pain
|
|
||||||
case SPELLFAMILY_PRIEST:
|
case SPELLFAMILY_PRIEST:
|
||||||
if (spellProto->SpellFamilyFlags[0] & 0x800000)
|
if (spellProto->SpellFamilyFlags[0] & 0x800000)
|
||||||
{
|
{
|
||||||
// Increase Mind Flay damage
|
// Glyph of Shadow Word: Pain
|
||||||
if (AuraEffect * aurEff = GetAuraEffect(55687, 0))
|
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()))
|
if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID()))
|
||||||
DoneTotalMod *= (aurEff->GetAmount() + 100.0f) / 100.f;
|
DoneTotalMod *= (aurEff->GetAmount() + 100.0f) / 100.f;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SPELLFAMILY_PALADIN:
|
case SPELLFAMILY_PALADIN:
|
||||||
// Judgement of Vengeance/Judgement of Corruption
|
// Judgement of Vengeance/Judgement of Corruption
|
||||||
if ((spellProto->SpellFamilyFlags[1] & 0x400000) && spellProto->SpellIconID == 2292)
|
if ((spellProto->SpellFamilyFlags[1] & 0x400000) && spellProto->SpellIconID == 2292)
|
||||||
|
|||||||
Reference in New Issue
Block a user