diff options
| author | QAston <none@none> | 2009-06-12 00:02:16 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-06-12 00:02:16 +0200 |
| commit | 9278014f4d1f79306da4d64aa1fca1be091df094 (patch) | |
| tree | 271fece0808d76b1d583925a188c9ec5713f0b19 /src/game/Unit.cpp | |
| parent | bb01747ad181cb07c76d1ea2cbaf0bbeae67004e (diff) | |
*Redefine attribute flag NO_INITIAL_AGGRO to make Mind Soothe and Soothe animal work
*Fix Glyph of Shadow Word: Death.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e6f8a3fd1fe..840a7767d6d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5381,7 +5381,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 56374: RemoveAurasByType(SPELL_AURA_MOD_HASTE, 0, 0, true, false); RemoveAurasByType(SPELL_AURA_MOD_DECREASE_SPEED); - break; + return true; // Ignite case 11119: case 11120: @@ -8967,6 +8967,16 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 DoneTotalMod *= 3.0f; } + // Glyph of Shadow Word: Pain + if (spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && spellProto->SpellFamilyFlags[0] & 0x800000) + { + // Increase Mind Flay damage + if (AuraEffect * aurEff = GetDummyAura(55687)) + // if Shadow Word: Pain present + if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) + DoneTotalMod *= (aurEff->GetAmount() + 100.0f) / 100.f; + } + // Torment the weak if (spellProto->SpellFamilyName== SPELLFAMILY_MAGE && (spellProto->SpellFamilyFlags[0]&0x20200021 || spellProto->SpellFamilyFlags[1]& 0x9000)) { |