diff options
| author | megamage <none@none> | 2009-02-08 21:58:49 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-08 21:58:49 -0600 |
| commit | 94dd949c23be2992e7e763aacbfda3239cd9ec10 (patch) | |
| tree | bafd17901df5bdcc2881f9479145320877bbfafb /src/game | |
| parent | 709f3c4130f675b29055fa51a75abb7b1d6763a1 (diff) | |
| parent | 0058e7c20a48e24ed11ece1c7fd2a94289d9aea5 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/SpellEffects.cpp | 8 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 11af74f7f86..74edc89f854 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -338,6 +338,14 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) switch(m_spellInfo->Id) // better way to check unknown { + case 35354://hand of death + { + if(unitTarget && unitTarget->HasAura(38528,0))//protection of elune + { + damage = 0; + } + break; + } // percent from health with min case 25599: // Thundercrash { diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index eaa63ef417f..e03d544c7e4 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -499,7 +499,8 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex) case 37675: // Chaos Blast case 41519: // Mark of Stormrage case 34877: // Custodian of Time - case 34700: + case 34700: // Allergic Reaction + case 31719: // Suspension return false; } @@ -2268,7 +2269,7 @@ void SpellMgr::LoadSpellCustomAttr() case 41635: // Prayer of Mending case 44869: // Spectral Blast case 45027: // Revitalize - case 45976: // Muru Portal Channel + case 45976: // Muru Portal Channel spellInfo->MaxAffectedTargets = 1; break; case 41376: // Spite @@ -2300,6 +2301,10 @@ void SpellMgr::LoadSpellCustomAttr() case 12494: // Frostbite spellInfo->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE; break; + case 38794: case 33711: //Murmur's Touch + spellInfo->MaxAffectedTargets = 1; + spellInfo->EffectTriggerSpell[0] = 33760; + break; default: break; } |