diff options
| -rw-r--r-- | sql/updates/1026_world.sql | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp | 8 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 9 |
3 files changed, 8 insertions, 11 deletions
diff --git a/sql/updates/1026_world.sql b/sql/updates/1026_world.sql index bbba20bb81e..90ff7d23120 100644 --- a/sql/updates/1026_world.sql +++ b/sql/updates/1026_world.sql @@ -1,4 +1,4 @@ -DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN ('-33711','-38794','33686'); +DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN ('33686', '31705'); INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES ('-33711','33686','0','Murmur\'s Shockwave (Normal)'), ('-38794','33686','0','Murmur\'s Shockwave (Heroic)'), diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp index 195f93532aa..d2dfce16577 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp @@ -29,7 +29,6 @@ EndScriptData */ #define SPELL_SONIC_BOOM_EFFECT (HeroicMode?38795:33666) #define SPELL_RESONANCE 33657 #define SPELL_MURMURS_TOUCH (HeroicMode?38794:33711) -#define SPELL_MURMURS_TOUCH_VISUAL 33760 #define SPELL_MAGNETIC_PULL 33689 #define SPELL_SONIC_SHOCK 38797 #define SPELL_THUNDERING_STORM 39365 @@ -40,13 +39,6 @@ struct TRINITY_DLL_DECL boss_murmurAI : public Scripted_NoMovementAI { HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); - - // need core fix - if(SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_MURMURS_TOUCH)) - { - TempSpell->EffectTriggerSpell[0] = SPELL_MURMURS_TOUCH_VISUAL; - TempSpell->MaxAffectedTargets = 1; - } } uint32 SonicBoom_Timer; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 2863e19fe9d..36d1cf391d4 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -509,7 +509,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; } @@ -2186,7 +2187,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 @@ -2218,6 +2219,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; } |