diff options
| author | Shauren <none@none> | 2010-05-29 21:00:30 +0200 |
|---|---|---|
| committer | Shauren <none@none> | 2010-05-29 21:00:30 +0200 |
| commit | cf34b23692a6894f27d030a1bd9adb931aa393e3 (patch) | |
| tree | 0743eb62694773bce8ffe6c454c77694f75766c8 /src/game/Unit.cpp | |
| parent | 29e891a02f1225a4067fb9f6289cb96c9d82f4d7 (diff) | |
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
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
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) |