diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 5187331e2..2b9a71217 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1714,8 +1714,10 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& case 45976: // Open Portal case 47669: // Awaken Subboss case 48278: // Paralyze (Utgarde Pinnacle) + case 50742: // Ooze Combine (Halls of Stone) case 50988: // Glare of the Tribunal (Halls of Stone) - case 51146: // Searching Gaze (Halls Of Stone) + case 51003: // Summon Dark Matter Target (Halls of Stone) + case 51146: // Summon Searing Gaze Target (Halls Of Stone) case 52438: // Summon Skittering Swarmer (Azjol Nerub, Krik'thir the Gatewatcher) case 53457: // Impale (Azjol Nerub, Anub'arak) case 54148: // Ritual of the Sword (Utgarde Pinnacle, Svala) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index bbe193b19..48c6f53cd 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -7895,6 +7895,28 @@ void Spell::EffectScriptEffect(SpellEffectEntry const* effect) ((Player*)caster)->RemoveSpellCategoryCooldown(82, true); return; } + case 50742: // Ooze Combine + { + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) + return; + + m_caster->CastSpell(unitTarget, 50747, true); + ((Creature*)m_caster)->ForcedDespawn(); + return; + } + case 50810: // Shatter + case 61546: // Shatter (h) + { + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) + return; + + if (!unitTarget->HasAura(50812)) + return; + + unitTarget->RemoveAurasDueToSpell(50812); + unitTarget->CastSpell(unitTarget, m_spellInfo->Id == 50810 ? 50811 : 61547 , true, NULL, NULL, m_caster->GetObjectGuid()); + return; + } case 50894: // Zul'Drak Rat { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4f2ae7451..67d77e0f9 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12533" + #define REVISION_NR "12534" #endif // __REVISION_NR_H__