Merge f41462035f01add1fd536888dc144340dd6b270a into 5bef92d5eaca3e2ecc317f9d599312bc23eb71aa

Referenced commit(s): 723aae903999e84f8cbfc9de263462d64f3aadf0

data/sql/updates/db_world/2025_11_09_04.sql

@@ -0,0 +1,6 @@
+-- DB update 2025_11_09_03 -> 2025_11_09_04
+--
+DELETE FROM `spell_custom_attr` WHERE `spell_id` IN (52671, 59834);
+INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES
+(52671, 0x00400000),
+(59834, 0x00400000);

data/sql/updates/db_world/2025_11_09_05.sql

@@ -0,0 +1,79 @@
+-- DB update 2025_11_09_04 -> 2025_11_09_05
+--
+-- v11_2_5_63906
+SET @VBUILD := 63906;
+
+DELETE FROM `creature_template_addon` WHERE (`entry` = 28503);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(28503, 0, 0, 0, 0, 0, 0, '58837');
+
+DELETE FROM `creature_template_addon` WHERE (`entry` = 28998);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(28998, 0, 0, 0, 0, 0, 0, '58837');
+
+DELETE FROM `creature` WHERE (`id1` = 28998) AND (`guid` IN (1974609));
+INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `Comment`, `VerifiedBuild`) VALUES
+(1974609, 28998, 0, 0, 571, 0, 0, 1, 1, 0, 6175.2456, -2017.6545, 590.9613, 3.0019662, 300, 0, 0, 550001, 0, 0, 0, 0, 0, '', NULL, @VBUILD);
+
+DELETE FROM `creature_template_addon` WHERE (`entry` = 28998);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(28998, 0, 0, 0, 1, 0, 0, '');
+
+UPDATE `spell_target_position` SET `PositionX`=6161.15, `PositionY`=-2015.36, `PositionZ`=590.878, `Orientation`=6.283189773559570312, `VerifiedBuild`=@VBUILD WHERE `ID`=52863 AND `EffectIndex`=0;
+
+UPDATE `creature_template_addon` SET `bytes2` = 1 WHERE (`entry` = 28717);
+
+-- Update comments
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 28498) AND (`source_type` = 0) AND (`id` IN (0, 1, 2, 3, 4));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(28498, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 0, 0, 53, 1, 28498, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'The Lich King - On Just Summoned - Start Waypoint Path 28498'),
+(28498, 0, 1, 2, 40, 0, 100, 512, 2, 0, 0, 0, 0, 0, 54, 83000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'The Lich King - On Point 2 of Path Any Reached - Pause Waypoint'),
+(28498, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 2849800, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'The Lich King - On Point 2 of Path Any Reached - Run Script'),
+(28498, 0, 3, 4, 40, 0, 100, 512, 3, 0, 0, 0, 0, 0, 45, 0, 2, 0, 0, 0, 0, 10, 127495, 0, 0, 0, 0, 0, 0, 0, 'The Lich King - On Point 3 of Path Any Reached - Set Data 0 2'),
+(28498, 0, 4, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'The Lich King - On Point 3 of Path Any Reached - Despawn Instant');
+
+-- Disable gravity
+DELETE FROM `creature_template_movement` WHERE (`CreatureId` = 29100);
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`, `InteractionPauseTimer`) VALUES
+(29100, 0, 0, 1, 0, 0, 0, 0);
+
+-- Idle
+UPDATE `creature` SET `MovementType` = 0, `wander_distance` = 0 WHERE `id1` = 29100 AND `guid` IN (112307, 112308, 112309, 112310);
+
+UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 202357;
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 202357) AND (`source_type` = 1) AND (`id` IN (0));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(202357, 1, 0, 0, 62, 0, 100, 0, 11091, 0, 0, 0, 0, 0, 11, 57553, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Drakuru\'s Last Wish - On Gossip Option 0 Selected - Cast \'Escape Voltarus\'');
+
+-- Drakuru's Last Wish
+UPDATE `gameobject_template_addon` SET `flags` = 32 WHERE (`entry` = 202357);
+
+-- Skull and Portal spells target 'Totally Generic Bunny (JSB)'
+DELETE FROM `creature` WHERE (`id1` = 28960) and `guid` IN (98914, 98920);
+INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `Comment`, `VerifiedBuild`) VALUES
+(98914, 28960, 0, 0, 571, 0, 0, 1, 1, 0, 6144.01, -2011.8, 590.963, 6.16101, 300, 0, 0, 4979, 0, 0, 0, 0, 0, '', '\'Throw Portal Crystal\' guid target', @VBUILD),
+(98920, 28960, 0, 0, 571, 0, 0, 1, 1, 0, 6181.5137, -2032.4258, 590.96124, 1.01229, 300, 0, 0, 4979, 0, 0, 0, 0, 0, '', '\'Drakuru\'s Skull Missile\' guid target', @VBUILD);
+
+UPDATE `conditions` SET `ConditionValue3` = 98914, `Comment` = 'target Totally Generic Bunny (JSB)' WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` = 54209) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 31) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 3) AND (`ConditionValue2` = 28960) AND (`ConditionValue3` = 0);
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` = 54250) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 31) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 3) AND (`ConditionValue2` = 28960);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 54250, 0, 0, 31, 0, 3, 28960, 98920, 0, 0, 0, '', 'target Totally Generic Bunny (JSB)');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` = 54089) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 1) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 51966) AND (`ConditionValue2` = 0) AND (`ConditionValue3` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 54089, 0, 0, 1, 0, 51966, 0, 0, 0, 0, 0, '', 'Has Aura \'Scourge Disguise\'');
+
+-- 54104 Blight Fog
+UPDATE `creature_template_addon` SET `auras` = '54104' WHERE (`entry` = 28998);
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = 28998 and `summonerType` = 0 AND `groupId` = 1;
+INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`, `Comment`) VALUES
+(28998, 0, 1, 28931, 6184.1455, -1970.1699, 586.84186, 4.5902, 8, 0, 'Overlord Drakuru - Group 1 - Blightblood Troll'),
+(28998, 0, 1, 28931, 6222.855, -2026.6315, 586.84186, 3.00197, 8, 0, 'Overlord Drakuru - Group 1 - Blightblood Troll'),
+(28998, 0, 1, 28931, 6166.278, -2065.3123, 586.84186, 1.44862, 8, 0, 'Overlord Drakuru - Group 1 - Blightblood Troll'),
+(28998, 0, 1, 28931, 6127.5117, -2008.6506, 586.84186, 6.16101, 8, 0, 'Overlord Drakuru - Group 1 - Blightblood Troll');
+
+-- 54105 Blight Fog
+DELETE FROM `spell_script_names` WHERE (`spell_id` = 54105);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(54105, 'spell_blight_fog');

src/server/game/Spells/SpellInfoCorrections.cpp

@@ -2187,12 +2187,6 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(1);
     });
 
-    // Halls of Lightning, Arcing Burn
-    ApplySpellFix({ 52671, 59834 }, [](SpellInfo* spellInfo)
-    {
-        spellInfo->AttributesEx3 |= SPELL_ATTR3_DOT_STACKING_RULE;
-    });
-
     // Trial of the Champion, Death's Respite
     ApplySpellFix({ 68306 }, [](SpellInfo* spellInfo)
     {

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp

@@ -30,6 +30,7 @@ enum LokenSpells
     SPELL_LIGHTNING_NOVA_THUNDERS   = 52663,
 
     SPELL_PULSING_SHOCKWAVE         = 52961,
+    SPELL_PULSING_SHOCKWAVE_AURA    = 59414,
 
     // Achievement
     ACHIEVEMENT_TIMELY_DEATH        = 20384
@@ -49,15 +50,6 @@ enum Yells
     EMOTE_NOVA                      = 9
 };
 
-enum LokenEvents
-{
-    EVENT_LIGHTNING_NOVA            = 1,
-    EVENT_SHOCKWAVE                 = 2,
-    EVENT_ARC_LIGHTNING             = 3,
-    EVENT_CHECK_HEALTH              = 4,
-    EVENT_AURA_REMOVE               = 5
-};
-
 struct boss_loken : public BossAI
 {
     boss_loken(Creature* creature) : BossAI(creature, DATA_LOKEN), _introDone(false) { }
@@ -94,18 +86,42 @@ struct boss_loken : public BossAI
         _introDone = true;
     }
 
+    void OnAuraRemove(AuraApplication* auraApp, AuraRemoveMode /*mode*/) override
+    {
+        if (auraApp->GetBase()->GetId() == SPELL_LIGHTNING_NOVA_VISUAL)
+            me->RemoveAura(SPELL_LIGHTNING_NOVA_THUNDERS);
+    }
+
+    void ScheduleTasks() override
+    {
+        me->m_Events.AddEventAtOffset([&] {
+            DoCastAOE(SPELL_PULSING_SHOCKWAVE_AURA, true);
+            me->ClearUnitState(UNIT_STATE_CASTING); // the aura above is a channeled spell, so we need this
+            DoCastSelf(SPELL_PULSING_SHOCKWAVE);
+        }, 3s);
+
+        ScheduleTimedEvent(15s, [&] {
+            Talk(SAY_NOVA);
+            DoCastSelf(SPELL_LIGHTNING_NOVA_VISUAL, true);
+            DoCastSelf(SPELL_LIGHTNING_NOVA_THUNDERS, true);
+            DoCastAOE(SPELL_LIGHTNING_NOVA);
+        }, 15s);
+
+        if (IsHeroic())
+        {
+            ScheduleTimedEvent(10s, [&] {
+                DoCastRandomTarget(SPELL_ARC_LIGHTNING, 0, 100.0f, false);
+            }, 12s);
+
+            instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_TIMELY_DEATH);
+        }
+    }
+
     void JustEngagedWith(Unit*) override
     {
         me->m_Events.KillAllEvents(false);
         _JustEngagedWith();
         Talk(SAY_AGGRO);
-
-        events.ScheduleEvent(EVENT_ARC_LIGHTNING, 10s);
-        events.ScheduleEvent(EVENT_SHOCKWAVE, 3s);
-        events.ScheduleEvent(EVENT_LIGHTNING_NOVA, 15s);
-
-        if (IsHeroic())
-            instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_TIMELY_DEATH);
     }
 
     void JustDied(Unit*) override
@@ -122,46 +138,6 @@ struct boss_loken : public BossAI
         Talk(SAY_SLAY);
     }
 
-    void UpdateAI(uint32 diff) override
-    {
-        //Return since we have no target
-        if (!UpdateVictim())
-            return;
-
-        events.Update(diff);
-
-        if (me->HasUnitState(UNIT_STATE_CASTING))
-            return;
-
-        switch (events.ExecuteEvent())
-        {
-            case EVENT_LIGHTNING_NOVA:
-                Talk(SAY_NOVA);
-                events.Repeat(15s);
-                me->CastSpell(me, SPELL_LIGHTNING_NOVA_VISUAL, true);
-                me->CastSpell(me, SPELL_LIGHTNING_NOVA_THUNDERS, true);
-
-                events.DelayEvents(5s);
-                events.ScheduleEvent(EVENT_AURA_REMOVE, me->GetMap()->IsHeroic() ? 4s : 5s);
-
-                me->CastSpell(me, SPELL_LIGHTNING_NOVA, false);
-                break;
-            case EVENT_SHOCKWAVE:
-                me->CastSpell(me, SPELL_PULSING_SHOCKWAVE, false);
-                break;
-            case EVENT_ARC_LIGHTNING:
-                if (Unit* target = SelectTargetFromPlayerList(100, SPELL_ARC_LIGHTNING))
-                    me->CastSpell(target, SPELL_ARC_LIGHTNING, false);
-
-                events.Repeat(12s);
-                break;
-            case EVENT_AURA_REMOVE:
-                me->RemoveAura(SPELL_LIGHTNING_NOVA_THUNDERS);
-                break;
-        }
-
-        DoMeleeAttackIfReady();
-    }
     private:
         bool _introDone;
 };

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp

@@ -41,6 +41,7 @@ enum VolkhanOther
     NPC_VOLKHAN_ANVIL                   = 28823,
     NPC_MOLTEN_GOLEM                    = 28695,
     NPC_BRITTLE_GOLEM                   = 28681,
+    NPC_SLAG                            = 28585,
 
     // Misc
     ACTION_SHATTER                      = 1,
@@ -77,7 +78,7 @@ enum Yells
 
 struct boss_volkhan : public BossAI
 {
-    boss_volkhan(Creature* creature) : BossAI(creature, DATA_VOLKHAN), summons(creature) { }
+    boss_volkhan(Creature* creature) : BossAI(creature, DATA_VOLKHAN) { }
 
     void Reset() override
     {
@@ -104,6 +105,18 @@ struct boss_volkhan : public BossAI
     {
         _JustDied();
         Talk(SAY_DEATH);
+
+        std::list<Creature*> slags;
+        GetCreatureListWithEntryInGrid(slags, me, NPC_SLAG, 100.0f);
+
+        if (!slags.empty())
+        {
+            for (Creature* slag : slags)
+            {
+                if (slag)
+                    slag->DespawnOrUnsummon();
+            }
+        }
     }
 
     void GetNextPos()
@@ -286,8 +299,6 @@ struct boss_volkhan : public BossAI
     }
 
     private:
-        EventMap events;
-        SummonList summons;
         float x, y, z;
         uint8 PointID;
         uint8 ShatteredCount;

src/server/scripts/Northrend/zone_zuldrak.cpp

@@ -17,6 +17,7 @@
 
 #include "CreatureScript.h"
 #include "GameObjectScript.h"
+#include "GridNotifiers.h"
 #include "PassiveAI.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
@@ -26,6 +27,7 @@
 #include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "Vehicle.h"
+#include <algorithm>
 
 enum AlchemistItemRequirements
 {
@@ -234,297 +236,376 @@ public:
     }
 };
 
-enum overlordDrakuru
+enum OverlordDrakuru
 {
-    SPELL_SHADOW_BOLT                   = 54113,
-    SPELL_SCOURGE_DISGUISE_EXPIRING     = 52010,
-    SPELL_THROW_BRIGHT_CRYSTAL          = 54087,
-    SPELL_TELEPORT_EFFECT               = 52096,
-    SPELL_SCOURGE_DISGUISE              = 51966,
-    SPELL_SCOURGE_DISGUISE_INSTANT_CAST = 52192,
-    SPELL_BLIGHT_FOG                    = 54104,
-    SPELL_THROW_PORTAL_CRYSTAL          = 54209,
-    SPELL_ARTHAS_PORTAL                 = 51807,
-    SPELL_TOUCH_OF_DEATH                = 54236,
-    SPELL_DRAKURU_DEATH                 = 54248,
-    SPELL_SUMMON_SKULL                  = 54253,
+    SPELL_SHADOW_BOLT                     = 54113,
+    SPELL_SCOURGE_DISGUISE_EXPIRING       = 52010,
+    SPELL_DROP_DISGUISE                   = 54089,
+    SPELL_THROW_BRIGHT_CRYSTAL            = 54087,
+    SPELL_TELEPORT_EFFECT                 = 52096,
+    SPELL_SCOURGE_SPOTLIGHT               = 53104,
+    SPELL_SCOURGE_DISGUISE                = 51966,
+    SPELL_SCOURGE_DISGUISE_INSTANT_CAST   = 52192,
+    SPELL_BLIGHT_FOG                      = 54104,
+    SPELL_THROW_PORTAL_CRYSTAL            = 54209,
+    SPELL_ARTHAS_PORTAL                   = 51807,
+    SPELL_TOUCH_OF_DEATH                  = 54236,
+    SPELL_DRAKURU_DEATH                   = 54248,
+    SPELL_SUMMON_SKULL                    = 54253,
+    SPELL_BLOATED_ABOMINATION_FEIGN_DEATH = 52593,
+    SPELL_EXPLODE_ABOMINATION_BLOODY_MEAT = 52523,
+    SPELL_EXPLODE_ABOMINATION_MEAT        = 52520,
+    SPELL_DRAKURUS_SKULL_MISSILE          = 54250,
+    SPELL_BURST_AT_THE_SEAMS_BONE         = 52516,
 
-    QUEST_BETRAYAL                      = 12713,
+    QUEST_BETRAYAL                        = 12713,
 
-    NPC_BLIGHTBLOOD_TROLL               = 28931,
-    NPC_LICH_KING                       = 28498,
+    NPC_BLIGHTBLOOD_TROLL                 = 28931,
+    NPC_LICH_KING                         = 28498,
+    NPC_TOTALLY_GENERIC_BUNNY             = 29100,
+    NPC_TOTALLY_GENERIC_BUNNY_JSB         = 28960,
+    GO_DRAKURUS_LAST_WISH                 = 202357,
 
-    EVENT_BETRAYAL_1                    = 1,
-    EVENT_BETRAYAL_2                    = 2,
-    EVENT_BETRAYAL_3                    = 3,
-    EVENT_BETRAYAL_4                    = 4,
-    EVENT_BETRAYAL_5                    = 5,
-    EVENT_BETRAYAL_6                    = 6,
-    EVENT_BETRAYAL_7                    = 7,
-    EVENT_BETRAYAL_8                    = 8,
-    EVENT_BETRAYAL_9                    = 9,
-    EVENT_BETRAYAL_10                   = 10,
-    EVENT_BETRAYAL_11                   = 11,
-    EVENT_BETRAYAL_12                   = 12,
-    EVENT_BETRAYAL_13                   = 13,
-    EVENT_BETRAYAL_14                   = 14,
-    EVENT_BETRAYAL_SHADOW_BOLT          = 20,
-    EVENT_BETRAYAL_CRYSTAL              = 21,
-    EVENT_BETRAYAL_COMBAT_TALK          = 22,
+    ACTION_SUMMON_DRAKURU_LAST_WISH       = 1,
+    ACTION_DESTROY_DRAKURU_LAST_WISH      = 2,
+    ACTION_REMOVE_SPOTLIGHTS              = 3,
 
-    SAY_DRAKURU_0                       = 0,
-    SAY_DRAKURU_1                       = 1,
-    SAY_DRAKURU_2                       = 2,
-    SAY_DRAKURU_3                       = 3,
-    SAY_DRAKURU_4                       = 4,
-    SAY_DRAKURU_5                       = 5,
-    SAY_DRAKURU_6                       = 6,
-    SAY_DRAKURU_7                       = 7,
-    SAY_LICH_7                          = 7,
-    SAY_LICH_8                          = 8,
-    SAY_LICH_9                          = 9,
-    SAY_LICH_10                         = 10,
-    SAY_LICH_11                         = 11,
-    SAY_LICH_12                         = 12,
+    SUMMON_GROUP_BLIGHTBLOOD_TROLL        = 1,
+
+    EVENT_BETRAYAL_INTRO_1                = 1,
+    EVENT_BETRAYAL_INTRO_2                = 2,
+    EVENT_BETRAYAL_INTRO_3                = 3,
+    EVENT_BETRAYAL_INTRO_4                = 4,
+    EVENT_BETRAYAL_EVADE_CHECK            = 5,
+    EVENT_BETRAYAL_EPILOGUE_1             = 6,
+    EVENT_BETRAYAL_EPILOGUE_2             = 7,
+    EVENT_BETRAYAL_EPILOGUE_3             = 8,
+    EVENT_BETRAYAL_EPILOGUE_4             = 9,
+    EVENT_BETRAYAL_EPILOGUE_5             = 10,
+    EVENT_BETRAYAL_EPILOGUE_6             = 11,
+    EVENT_BETRAYAL_EPILOGUE_7             = 12,
+    EVENT_BETRAYAL_EPILOGUE_8             = 13,
+    EVENT_BETRAYAL_EPILOGUE_9             = 14,
+    EVENT_BETRAYAL_EPILOGUE_10            = 15,
+
+    SAY_DRAKURU_0                         = 0,
+    SAY_DRAKURU_1                         = 1,
+    SAY_DRAKURU_2                         = 2,
+    SAY_DRAKURU_3                         = 3,
+    SAY_DRAKURU_4                         = 4,
+    SAY_DRAKURU_5                         = 5,
+    SAY_DRAKURU_6                         = 6,
+    SAY_DRAKURU_7                         = 7,
+    SAY_LICH_7                            = 7,
+    SAY_LICH_8                            = 8,
+    SAY_LICH_9                            = 9,
+    SAY_LICH_10                           = 10,
+    SAY_LICH_11                           = 11,
+    SAY_LICH_12                           = 12,
 };
 
-class npc_overlord_drakuru_betrayal : public CreatureScript
+enum BetrayalState
 {
-public:
-    npc_overlord_drakuru_betrayal() : CreatureScript("npc_overlord_drakuru_betrayal") { }
+    BETRAYAL_NOT_STARTED,
+    BETRAYAL_IN_PROGRESS,
+    BETRAYAL_EPILOGUE,
+    BETRAYAL_EVADE,
+};
 
-    CreatureAI* GetAI(Creature* creature) const override
+struct npc_overlord_drakuru_betrayal : public ScriptedAI
+{
+    npc_overlord_drakuru_betrayal(Creature* creature) : ScriptedAI(creature), _summons(me), _state(BETRAYAL_NOT_STARTED)
     {
-        return new npc_overlord_drakuru_betrayalAI(creature);
+        me->SetCombatMovement(false);
     }
 
-    struct npc_overlord_drakuru_betrayalAI : public ScriptedAI
+    void EnterEvadeMode(EvadeReason why) override
     {
-        npc_overlord_drakuru_betrayalAI(Creature* creature) : ScriptedAI(creature), summons(me)
-        {
-        }
+        if (_state != BETRAYAL_EVADE)
+            return;
+        me->SetFaction(FACTION_UNDEAD_SCOURGE);
+        me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+        ScriptedAI::EnterEvadeMode(why);
+    }
 
-        EventMap events;
-        SummonList summons;
-        ObjectGuid playerGUID;
-        ObjectGuid lichGUID;
+    void Reset() override
+    {
+        events.Reset();
+        scheduler.CancelAll();
+        _summons.DespawnAll();
+        _playerGUID.Clear();
+        _lichGUID.Clear();
+        me->SetFaction(FACTION_UNDEAD_SCOURGE);
+        me->SetVisible(false);
+        DoAction(ACTION_SUMMON_DRAKURU_LAST_WISH);
+        me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+        me->SetImmuneToPC(true);
+        _state = BETRAYAL_NOT_STARTED;
+        DoAction(ACTION_REMOVE_SPOTLIGHTS);
+    }
 
-        void EnterEvadeMode(EvadeReason why) override
+    void DoAction(int32 action) override
+    {
+        switch (action)
         {
-            if (playerGUID)
-                if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
-                    if (player->IsWithinDistInMap(me, 80))
-                        return;
-            me->SetFaction(FACTION_UNDEAD_SCOURGE);
-            me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
-            ScriptedAI::EnterEvadeMode(why);
-        }
-
-        void Reset() override
-        {
-            events.Reset();
-            summons.DespawnAll();
-            playerGUID.Clear();
-            lichGUID.Clear();
-            me->SetFaction(FACTION_UNDEAD_SCOURGE);
-            me->SetVisible(false);
-            me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
-        }
-
-        void MoveInLineOfSight(Unit* who) override
-        {
-            if (who->IsPlayer())
+            case ACTION_SUMMON_DRAKURU_LAST_WISH:
+                if (!me->FindNearestGameObject(GO_DRAKURUS_LAST_WISH, 80.0f))
+                    me->SummonGameObject(GO_DRAKURUS_LAST_WISH, 6185.989, -2029.6979, 590.87787, 0, 0, 0, 0, 0, 0, true, GO_SUMMON_TIMED_DESPAWN);
+                break;
+            case ACTION_DESTROY_DRAKURU_LAST_WISH:
+                if (GameObject* go = me->FindNearestGameObject(GO_DRAKURUS_LAST_WISH, 80.0f))
+                    go->Delete();
+                break;
+            case ACTION_REMOVE_SPOTLIGHTS:
             {
-                if (playerGUID)
+                std::list<Creature*> creatures;
+                me->GetCreatureListWithEntryInGrid(creatures, NPC_TOTALLY_GENERIC_BUNNY, 55.0f);
+                for (Creature* creature : creatures)
+                    creature->RemoveAurasDueToSpell(SPELL_SCOURGE_SPOTLIGHT);
+            }
+        }
+    }
+
+    bool IsPlayerOnQuest(Player* player)
+    {
+        return player->GetQuestStatus(QUEST_BETRAYAL) == QUEST_STATUS_INCOMPLETE;
+    }
+
+    void MoveInLineOfSight(Unit* who) override
+    {
+        if (Player* player = who->ToPlayer())
+        {
+            bool shouldStartEvent = (_state == BETRAYAL_NOT_STARTED) && IsPlayerOnQuest(player) && player->HasAura(SPELL_SCOURGE_DISGUISE) && player->IsWithinDistInMap(me, 80.0f);
+            if (shouldStartEvent)
+            {
+                me->SetVisible(true);
+                _state = BETRAYAL_IN_PROGRESS;
+                DoAction(ACTION_DESTROY_DRAKURU_LAST_WISH);
+                _playerGUID = who->GetGUID();
+                events.ScheduleEvent(EVENT_BETRAYAL_INTRO_1, 6s);
+                events.ScheduleEvent(EVENT_BETRAYAL_EVADE_CHECK, 10s);
+            }
+        }
+        else
+            ScriptedAI::MoveInLineOfSight(who);
+    }
+
+    void JustSummoned(Creature* summon) override
+    {
+        _summons.Summon(summon);
+        switch (summon->GetEntry())
+        {
+            case NPC_BLIGHTBLOOD_TROLL:
+                if (Creature* target = summon->FindNearestCreature(NPC_TOTALLY_GENERIC_BUNNY, 10.0f, true))
+                    target->CastSpell(target, SPELL_TELEPORT_EFFECT, true);
+                break;
+            case NPC_LICH_KING:
+                me->SetFacingToObject(summon);
+                _lichGUID = summon->GetGUID();
+                summon->GetMotionMaster()->MovePoint(0, 6164.2695, -2016.8978, 590.8636);
+                break;
+            default:
+                break;
+        }
+    }
+
+    void JustEngagedWith(Unit* /*who*/) override
+    {
+        scheduler.Schedule(0s, [this](TaskContext context)
+        {
+            if (!me->IsWithinMeleeRange(me->GetVictim()))
+                DoCastVictim(SPELL_SHADOW_BOLT);
+            context.Repeat(2s);
+        }).Schedule(5s, [this](TaskContext context)
+        {
+            if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
+                DoCast(target, SPELL_THROW_BRIGHT_CRYSTAL);
+            context.Repeat(6s, 15s);
+        }).Schedule(20s, [this](TaskContext context)
+        {
+            Talk(SAY_DRAKURU_4);
+            context.Repeat(10s, 20s);
+        });
+    }
+
+    void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*dmgType*/, SpellSchoolMask /*school*/) override
+    {
+        if (damage >= me->GetHealth() && !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
+        {
+            damage = 0;
+            me->RemoveAllAuras();
+            me->CombatStop();
+            me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+            me->SetFaction(2082);
+            me->SetImmuneToPC(true);
+            events.Reset();
+            scheduler.CancelAll();
+            events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_1, 4200ms);
+            _state = BETRAYAL_EPILOGUE;
+        }
+    }
+
+    void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override
+    {
+        switch (spellInfo->Id)
+        {
+            case SPELL_THROW_PORTAL_CRYSTAL:
+                if (Aura* aura = target->AddAura(SPELL_ARTHAS_PORTAL, target))
+                    aura->SetDuration(77'000);
+                break;
+            case SPELL_DRAKURUS_SKULL_MISSILE:
+                target->CastSpell(target, SPELL_SUMMON_SKULL, true);
+                break;
+            case SPELL_DROP_DISGUISE:
+                target->CastSpell(target, SPELL_SCOURGE_DISGUISE_EXPIRING, true);
+                break;
+        }
+    }
+
+    void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override
+    {
+        if (spellInfo->Id == SPELL_TOUCH_OF_DEATH)
+        {
+            DoCastAOE(SPELL_DRAKURUS_SKULL_MISSILE, true);
+            DoCastSelf(SPELL_BLOATED_ABOMINATION_FEIGN_DEATH, true);
+            DoCastSelf(SPELL_BURST_AT_THE_SEAMS_BONE, true);
+            DoCastSelf(SPELL_BURST_AT_THE_SEAMS_BONE, true);
+            DoCastSelf(SPELL_BURST_AT_THE_SEAMS_BONE, true);
+            DoCastSelf(SPELL_EXPLODE_ABOMINATION_MEAT, true);
+            DoCastSelf(SPELL_EXPLODE_ABOMINATION_BLOODY_MEAT, true);
+            DoCastSelf(SPELL_EXPLODE_ABOMINATION_BLOODY_MEAT, true);
+            DoCastSelf(SPELL_EXPLODE_ABOMINATION_BLOODY_MEAT, true);
+            DoCastSelf(SPELL_DRAKURU_DEATH, true);
+            DoAction(ACTION_SUMMON_DRAKURU_LAST_WISH);
+            me->SetImmuneToPC(true);
+        }
+    }
+
+    void UpdateAI(uint32 diff) override
+    {
+        events.Update(diff);
+        switch (events.ExecuteEvent())
+        {
+            case EVENT_BETRAYAL_EVADE_CHECK:
+            {
+                if (_state == BETRAYAL_IN_PROGRESS)
                 {
-                    if (who->GetGUID() != playerGUID)
+                    float radius = 80.0f;
+                    std::list<Player*> players;
+                    Acore::AnyPlayerInObjectRangeCheck checker(me, radius, true, true);
+                    Acore::PlayerListSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(me, players, checker);
+                    Cell::VisitObjects(me, searcher, radius);
+                    if (std::ranges::any_of(players, [this](Player* player)
                     {
-                        Player* player = ObjectAccessor::GetPlayer(*me, playerGUID);
-                        if (player && player->IsWithinDistInMap(me, 80))
-                            who->ToPlayer()->NearTeleportTo(6143.76f, -1969.7f, 417.57f, 2.08f);
-                        else
-                        {
-                            EnterEvadeMode(EVADE_REASON_OTHER);
-                            return;
-                        }
+                        return IsPlayerOnQuest(player);
+                    }))
+                    {
+                        events.Repeat(10s);
                     }
                     else
-                        ScriptedAI::MoveInLineOfSight(who);
+                    {
+                        _state = BETRAYAL_EVADE;
+                        EnterEvadeMode(EVADE_REASON_OTHER);
+                    }
                 }
-                else if (who->ToPlayer()->GetQuestStatus(QUEST_BETRAYAL) == QUEST_STATUS_INCOMPLETE && who->HasAura(SPELL_SCOURGE_DISGUISE))
+                break;
+            }
+            case EVENT_BETRAYAL_INTRO_1:
+                Talk(SAY_DRAKURU_0);
+                events.ScheduleEvent(EVENT_BETRAYAL_INTRO_2, 4s);
+                events.ScheduleEvent(EVENT_BETRAYAL_INTRO_3, 6600ms);
+                break;
+            case EVENT_BETRAYAL_INTRO_2:
+                me->SummonCreatureGroup(SUMMON_GROUP_BLIGHTBLOOD_TROLL);
+                break;
+            case EVENT_BETRAYAL_INTRO_3:
+                Talk(SAY_DRAKURU_1);
+                DoCastAOE(SPELL_DROP_DISGUISE);
+                events.ScheduleEvent(EVENT_BETRAYAL_INTRO_4, 9600ms);
+                break;
+            case EVENT_BETRAYAL_INTRO_4:
+            {
+                Talk(SAY_DRAKURU_2);
+                Talk(SAY_DRAKURU_3);
+                me->SetImmuneToPC(false);
+                std::list<Creature*> creatures;
+                me->GetCreatureListWithEntryInGrid(creatures, NPC_TOTALLY_GENERIC_BUNNY, 55.0f);
+                for (Creature* creature : creatures)
+                    creature->CastSpell(creature, SPELL_SCOURGE_SPOTLIGHT, true);
+                break;
+            }
+            case EVENT_BETRAYAL_EPILOGUE_1:
+            {
+                Talk(SAY_DRAKURU_5);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_2, 4800ms);
+                DoAction(ACTION_REMOVE_SPOTLIGHTS);
+                break;
+            }
+            case EVENT_BETRAYAL_EPILOGUE_2:
+                Talk(SAY_DRAKURU_6);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_3, 1800ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_3:
+                DoCastSelf(SPELL_THROW_PORTAL_CRYSTAL, true);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_4, 3600ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_4:
+                me->SummonCreature(NPC_LICH_KING, 6140.4233, -2010.9938, 589.1911, 6.126106, TEMPSUMMON_TIMED_DESPAWN, 77'000);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_5, 8400ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_5:
+                Talk(SAY_DRAKURU_7);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_6, 9600ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_6:
+                if (Creature* lich = ObjectAccessor::GetCreature(*me, _lichGUID))
                 {
-                    me->SetVisible(true);
-                    playerGUID = who->GetGUID();
-                    events.ScheduleEvent(EVENT_BETRAYAL_1, 5s);
+                    lich->AI()->Talk(SAY_LICH_7);
+                    lich->AI()->Talk(SAY_LICH_8, 5400ms);
                 }
-            }
-            else
-                ScriptedAI::MoveInLineOfSight(who);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_7, 7800ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_7:
+                if (Creature* lich = ObjectAccessor::GetCreature(*me, _lichGUID))
+                    lich->CastSpell(me, SPELL_TOUCH_OF_DEATH, false);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_8, 4200ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_8:
+                me->SetVisible(false);
+                if (Creature* lich = ObjectAccessor::GetCreature(*me, _lichGUID))
+                {
+                    lich->AI()->Talk(SAY_LICH_9, 3600ms);
+                    lich->AI()->Talk(SAY_LICH_10, 8400ms);
+                    lich->AI()->Talk(SAY_LICH_11, 22800ms);
+                    lich->AI()->Talk(SAY_LICH_12, 27600ms);
+                }
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_9, 32600ms);
+                events.ScheduleEvent(EVENT_BETRAYAL_EPILOGUE_10, 37200ms);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_9:
+                if (Creature* lich = ObjectAccessor::GetCreature(*me, _lichGUID))
+                    lich->GetMotionMaster()->MovePoint(0, 6141.2393, -2011.2728, 589.8653);
+                break;
+            case EVENT_BETRAYAL_EPILOGUE_10:
+                EnterEvadeMode(EVADE_REASON_OTHER);
+                break;
         }
 
-        void JustSummoned(Creature* cr) override
-        {
-            summons.Summon(cr);
-            if (cr->GetEntry() == NPC_BLIGHTBLOOD_TROLL)
-                cr->CastSpell(cr, SPELL_TELEPORT_EFFECT, true);
-            else
-            {
-                me->SetFacingToObject(cr);
-                lichGUID = cr->GetGUID();
-                float o = me->GetAngle(cr);
-                cr->GetMotionMaster()->MovePoint(0, me->GetPositionX() + cos(o) * 6.0f, me->GetPositionY() + std::sin(o) * 6.0f, me->GetPositionZ());
-            }
-        }
+        if (me->GetFaction() == 2082 || me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))
+            return;
 
-        void JustEngagedWith(Unit*) override
-        {
-            Talk(SAY_DRAKURU_3);
-            events.ScheduleEvent(EVENT_BETRAYAL_SHADOW_BOLT, 2s);
-            events.ScheduleEvent(EVENT_BETRAYAL_CRYSTAL, 5s);
-            events.ScheduleEvent(EVENT_BETRAYAL_COMBAT_TALK, 20s);
-        }
+        if (!UpdateVictim())
+            return;
 
-        void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
-        {
-            if (damage >= me->GetHealth() && !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
-            {
-                damage = 0;
-                me->RemoveAllAuras();
-                me->CombatStop();
-                me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
-                me->SetFaction(FACTION_FRIENDLY);
-                events.Reset();
-                events.ScheduleEvent(EVENT_BETRAYAL_4, 1s);
-            }
-        }
+        scheduler.Update(diff);
+        DoMeleeAttackIfReady();
+    }
 
-        void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override
-        {
-            if (spellInfo->Id == SPELL_THROW_PORTAL_CRYSTAL)
-                if (Aura* aura = target->AddAura(SPELL_ARTHAS_PORTAL, target))
-                    aura->SetDuration(48000);
-        }
-
-        void SpellHit(Unit*  /*caster*/, SpellInfo const* spellInfo) override
-        {
-            if (spellInfo->Id == SPELL_TOUCH_OF_DEATH)
-            {
-                me->CastSpell(me, SPELL_DRAKURU_DEATH, true);
-                me->CastSpell(me, SPELL_SUMMON_SKULL, true);
-            }
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            events.Update(diff);
-            switch (events.ExecuteEvent())
-            {
-                case EVENT_BETRAYAL_1:
-                    Talk(SAY_DRAKURU_0);
-                    events.ScheduleEvent(EVENT_BETRAYAL_2, 5s);
-                    break;
-                case EVENT_BETRAYAL_2:
-                    me->SummonCreature(NPC_BLIGHTBLOOD_TROLL, 6184.1f, -1969.9f, 586.76f, 4.5f);
-                    me->SummonCreature(NPC_BLIGHTBLOOD_TROLL, 6222.9f, -2026.5f, 586.76f, 2.9f);
-                    me->SummonCreature(NPC_BLIGHTBLOOD_TROLL, 6166.2f, -2065.4f, 586.76f, 1.4f);
-                    me->SummonCreature(NPC_BLIGHTBLOOD_TROLL, 6127.5f, -2008.7f, 586.76f, 0.0f);
-                    events.ScheduleEvent(EVENT_BETRAYAL_3, 5s);
-                    break;
-                case EVENT_BETRAYAL_3:
-                    Talk(SAY_DRAKURU_1);
-                    Talk(SAY_DRAKURU_2);
-                    if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
-                        player->CastSpell(player, SPELL_SCOURGE_DISGUISE_EXPIRING, true);
-                    if (Aura* aur = me->AddAura(SPELL_BLIGHT_FOG, me))
-                        aur->SetDuration(22000);
-                    break;
-                case EVENT_BETRAYAL_4:
-                    Talk(SAY_DRAKURU_5);
-                    events.ScheduleEvent(EVENT_BETRAYAL_5, 6s);
-                    break;
-                case EVENT_BETRAYAL_5:
-                    Talk(SAY_DRAKURU_6);
-                    me->CastSpell(me, SPELL_THROW_PORTAL_CRYSTAL, true);
-                    events.ScheduleEvent(EVENT_BETRAYAL_6, 8s);
-                    break;
-                case EVENT_BETRAYAL_6:
-                    me->SummonCreature(NPC_LICH_KING, 6142.9f, -2011.6f, 590.86f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 41000);
-                    events.ScheduleEvent(EVENT_BETRAYAL_7, 8s);
-                    break;
-                case EVENT_BETRAYAL_7:
-                    Talk(SAY_DRAKURU_7);
-                    events.ScheduleEvent(EVENT_BETRAYAL_8, 5s);
-                    break;
-                case EVENT_BETRAYAL_8:
-                    if (Creature* lich = ObjectAccessor::GetCreature(*me, lichGUID))
-                        lich->AI()->Talk(SAY_LICH_7);
-                    events.ScheduleEvent(EVENT_BETRAYAL_9, 6s);
-                    break;
-                case EVENT_BETRAYAL_9:
-                    if (Creature* lich = ObjectAccessor::GetCreature(*me, lichGUID))
-                    {
-                        lich->AI()->Talk(SAY_LICH_8);
-                        lich->CastSpell(me, SPELL_TOUCH_OF_DEATH, false);
-                    }
-                    events.ScheduleEvent(EVENT_BETRAYAL_10, 4s);
-                    break;
-                case EVENT_BETRAYAL_10:
-                    me->SetVisible(false);
-                    if (Creature* lich = ObjectAccessor::GetCreature(*me, lichGUID))
-                        lich->AI()->Talk(SAY_LICH_9);
-                    events.ScheduleEvent(EVENT_BETRAYAL_11, 4s);
-                    break;
-                case EVENT_BETRAYAL_11:
-                    if (Creature* lich = ObjectAccessor::GetCreature(*me, lichGUID))
-                        lich->AI()->Talk(SAY_LICH_10);
-                    events.ScheduleEvent(EVENT_BETRAYAL_12, 6s);
-                    break;
-                case EVENT_BETRAYAL_12:
-                    if (Creature* lich = ObjectAccessor::GetCreature(*me, lichGUID))
-                        lich->AI()->Talk(SAY_LICH_11);
-                    events.ScheduleEvent(EVENT_BETRAYAL_13, 3s);
-                    break;
-                case EVENT_BETRAYAL_13:
-                    if (Creature* lich = ObjectAccessor::GetCreature(*me, lichGUID))
-                    {
-                        lich->AI()->Talk(SAY_LICH_12);
-                        lich->GetMotionMaster()->MovePoint(0, 6143.8f, -2011.5f, 590.9f);
-                    }
-                    events.ScheduleEvent(EVENT_BETRAYAL_14, 7s);
-                    break;
-                case EVENT_BETRAYAL_14:
-                    playerGUID.Clear();
-                    EnterEvadeMode(EVADE_REASON_OTHER);
-                    break;
-            }
-
-            if (me->GetFaction() == FACTION_FRIENDLY || me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))
-                return;
-
-            if (!UpdateVictim())
-                return;
-
-            switch (events.ExecuteEvent())
-            {
-                case EVENT_BETRAYAL_SHADOW_BOLT:
-                    if (!me->IsWithinMeleeRange(me->GetVictim()))
-                        me->CastSpell(me->GetVictim(), SPELL_SHADOW_BOLT, false);
-                    events.Repeat(2s);
-                    break;
-                case EVENT_BETRAYAL_CRYSTAL:
-                    if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
-                        me->CastSpell(player, SPELL_THROW_BRIGHT_CRYSTAL, true);
-                    events.Repeat(6s, 15s);
-                    break;
-                case EVENT_BETRAYAL_COMBAT_TALK:
-                    Talk(SAY_DRAKURU_4);
-                    events.Repeat(20s);
-                    break;
-            }
-
-            DoMeleeAttackIfReady();
-        }
-    };
+private:
+    SummonList _summons;
+    ObjectGuid _playerGUID;
+    ObjectGuid _lichGUID;
+    BetrayalState _state;
 };
 
 /*####
@@ -864,11 +945,32 @@ class spell_scourge_disguise_instability : public AuraScript
     }
 };
 
+// 54105 - Blight Fog
+class spell_blight_fog : public SpellScript
+{
+    PrepareSpellScript(spell_blight_fog);
+
+    void FilterTargets(std::list<WorldObject*>& targets)
+    {
+        targets.remove_if([](WorldObject* target) -> bool
+        {
+            float z = target->GetPositionZ();
+            bool isInBlightFog = (582.0f <= z && z <= 583.0f) || (586.0f <= z && z <= 587.0f);
+            return !isInBlightFog;
+        });
+    }
+
+    void Register() override
+    {
+        OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blight_fog::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
+    }
+};
+
 void AddSC_zuldrak()
 {
     new npc_finklestein();
     new go_finklestein_cauldron();
-    new npc_overlord_drakuru_betrayal();
+    RegisterCreatureAI(npc_overlord_drakuru_betrayal);
     new npc_drakuru_shackles();
     new npc_captured_rageclaw();
     new npc_released_offspring_harkoa();
@@ -876,4 +978,5 @@ void AddSC_zuldrak()
     new go_scourge_enclosure();
 
     RegisterSpellScript(spell_scourge_disguise_instability);
+    RegisterSpellScript(spell_blight_fog);
 }