fix(Scripts/Steamvault): Rework Kalithresh (#15883)

data/sql/updates/pending_db_world/rev_1680984695073809300.sql

@@ -0,0 +1,21 @@
+--
+UPDATE `creature_template` SET `unit_flags` = `unit_flags` |33554432, `ScriptName` = '' WHERE `entry` IN (17954, 20631);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (17954, 20631);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(17954, 0, 0, 0, 0, 0, 0, '25900'),
+(20631, 0, 0, 0, 0, 0, 0, '25900');
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId` IN (17954, 20631);
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Rooted`) VALUES
+(17954, 1, 1), (20631, 1, 1);
+
+SELECT * FROM creature_template_movement WHERE creatureid = 17954;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_warlords_rage';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(31543, 'spell_warlords_rage');
+
+DELETE FROM `creature_text` WHERE `CreatureId` = 17798 AND `GroupID` = 5;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17798, 5, 0, '%s begins to channel from the nearby distiller...', 16, 0, 100, 0, 0, 0, 19166, 0, 'kalithresh EMOTE_DISTILLER');

src/server/game/Instances/InstanceScript.cpp

@@ -208,7 +208,10 @@ void InstanceScript::UpdateMinionState(Creature* minion, EncounterState state)
                 minion->Respawn();
             else
             {
-                minion->AI()->DoZoneInCombat(nullptr, 100.0f);
+                if (minion->GetReactState() == REACT_AGGRESSIVE)
+                {
+                    minion->AI()->DoZoneInCombat(nullptr, 100.0f);
+                }
             }
             break;
         default:
@@ -362,6 +365,20 @@ void InstanceScript::StorePersistentData(uint32 index, uint32 data)
     persistentData[index] = data;
 }
 
+void InstanceScript::DoForAllMinions(uint32 id, std::function<void(Creature*)> exec)
+{
+    BossInfo* bossInfo = &bosses[id];
+    MinionSet listCopy = bossInfo->minion;
+
+    for (auto const& minion : listCopy)
+    {
+        if (minion)
+        {
+            exec(minion);
+        }
+    }
+}
+
 void InstanceScript::Load(const char* data)
 {
     if (!data)

src/server/game/Instances/InstanceScript.h

@@ -260,6 +260,9 @@ public:
 
     // Allows to perform particular actions
     virtual void DoAction(int32 /*action*/) {}
+
+    // Allows executing code using all creatures registered in the instance script as minions
+    void DoForAllMinions(uint32 id, std::function<void(Creature*)> exec);
 protected:
     void SetHeaders(std::string const& dataHeaders);
     void SetBossNumber(uint32 number) { bosses.resize(number); }

src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp

@@ -17,44 +17,110 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "SpellInfo.h"
+#include "SpellScript.h"
+#include "SpellAuras.h"
 #include "steam_vault.h"
 
-enum NagaDistiller
+enum Texts
 {
-    SAY_INTRO                   = 0,
+    SAY_INTRO       = 0,
-    SAY_REGEN                   = 1,
+    SAY_REGEN       = 1,
-    SAY_AGGRO                   = 2,
+    SAY_AGGRO       = 2,
-    SAY_SLAY                    = 3,
+    SAY_SLAY        = 3,
-    SAY_DEATH                   = 4,
+    SAY_DEATH       = 4,
+    EMOTE_DISTILLER = 5
+};
 
-    SPELL_SPELL_REFLECTION      = 31534,
+enum Spells
-    SPELL_IMPALE                = 39061,
+{
-    SPELL_HEAD_CRACK            = 16172,
+    SPELL_SPELL_REFLECTION        = 31534,
-    SPELL_WARLORDS_RAGE         = 37081,
+    SPELL_IMPALE                  = 39061,
-    SPELL_WARLORDS_RAGE_NAGA    = 31543,
+    SPELL_HEAD_CRACK              = 16172,
-    SPELL_WARLORDS_RAGE_PROC    = 36453,
+    SPELL_WARLORDS_RAGE           = 37081,
+    SPELL_WARLORDS_RAGE_DISTILLER = 31543,
+    SPELL_WARLORDS_RAGE_PROC      = 36453
+};
 
-    NPC_NAGA_DISTILLER          = 17954,
+enum Misc
-
+{
-    EVENT_SPELL_REFLECTION      = 1,
+    POINT_DISTILLER = 1
-    EVENT_SPELL_IMPALE          = 2,
-    EVENT_SPELL_HEAD_CRACK      = 3,
-    EVENT_SPELL_RAGE            = 4
 };
 
 struct boss_warlord_kalithresh : public BossAI
 {
-    boss_warlord_kalithresh(Creature* creature) : BossAI(creature, DATA_WARLORD_KALITHRESH) { }
+    boss_warlord_kalithresh(Creature* creature) : BossAI(creature, DATA_WARLORD_KALITHRESH), _introDone(false) { }
+
+    void Reset() override
+    {
+        _Reset();
+        instance->DoForAllMinions(DATA_WARLORD_KALITHRESH, [&](Creature* minion) {
+            minion->SetReactState(REACT_PASSIVE);
+            minion->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+        });
+    }
+
+    void MoveInLineOfSight(Unit* who) override
+    {
+        if (!_introDone && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 35.0f))
+        {
+            Talk(SAY_INTRO);
+            _introDone = true;
+        }
+
+        ScriptedAI::MoveInLineOfSight(who);
+    }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
         Talk(SAY_AGGRO);
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_SPELL_REFLECTION, 20000, 36000);
+
-        events.ScheduleEvent(EVENT_SPELL_IMPALE, 7000, 14000);
+        scheduler.Schedule(20s, 36s, [this](TaskContext context)
-        events.ScheduleEvent(EVENT_SPELL_HEAD_CRACK, 15000);
+        {
-        events.ScheduleEvent(EVENT_SPELL_RAGE, 20000);
+            DoCastSelf(SPELL_SPELL_REFLECTION);
+            context.Repeat();
+        }).Schedule(7s, 14s, [this](TaskContext context)
+        {
+            DoCastRandomTarget(SPELL_IMPALE, 0, 10.0f);
+            context.Repeat(7500ms, 12500ms);
+        }).Schedule(15s, [this](TaskContext context)
+        {
+            DoCastVictim(SPELL_HEAD_CRACK);
+            context.Repeat(45s, 55s);
+        }).Schedule(20s, [this](TaskContext context)
+        {
+            Talk(SAY_REGEN);
+            Talk(EMOTE_DISTILLER);
+
+            if (Creature* distiller = me->FindNearestCreature(NPC_NAGA_DISTILLER, 8.0f))
+            {
+                distiller->AI()->DoCast(me, SPELL_WARLORDS_RAGE_DISTILLER, true);
+                distiller->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+            }
+            else
+            {
+                if (Creature* distiller = me->FindNearestCreature(NPC_NAGA_DISTILLER, 100.0f))
+                {
+                    me->GetMotionMaster()->MoveFollow(distiller, 8.0f, 0.0f);
+
+                    scheduler.Schedule(1s, [this](TaskContext chaseContext)
+                    {
+                        if (Creature* distiller = me->FindNearestCreature(NPC_NAGA_DISTILLER, 8.0f))
+                        {
+                            distiller->AI()->DoCast(me, SPELL_WARLORDS_RAGE_DISTILLER, true);
+                            distiller->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+                            me->ResumeChasingVictim();
+                        }
+                        else
+                        {
+                            chaseContext.Repeat();
+                        }
+                    });
+                }
+            }
+
+            context.Repeat(45s);
+        });
     }
 
     void KilledUnit(Unit* victim) override
@@ -69,85 +135,39 @@ struct boss_warlord_kalithresh : public BossAI
     {
         Talk(SAY_DEATH);
         _JustDied();
+        instance->DoForAllMinions(DATA_WARLORD_KALITHRESH, [&](Creature* minion) {
+            minion->KillSelf();
+        });
     }
 
-    void UpdateAI(uint32 diff) override
+private:
-    {
+    bool _introDone;
-        if (!UpdateVictim())
-            return;
-
-        events.Update(diff);
-        switch (events.ExecuteEvent())
-        {
-        case EVENT_SPELL_REFLECTION:
-            me->CastSpell(me, SPELL_SPELL_REFLECTION, false);
-            events.Repeat(20s, 36s);
-            break;
-        case EVENT_SPELL_IMPALE:
-            if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true))
-                me->CastSpell(target, SPELL_IMPALE, false);
-            events.Repeat(7500ms, 12500ms);
-            break;
-        case EVENT_SPELL_HEAD_CRACK:
-            DoCastVictim(SPELL_HEAD_CRACK);
-            events.Repeat(45s, 55s);
-            break;
-        case EVENT_SPELL_RAGE:
-            if (Creature* distiller = me->FindNearestCreature(NPC_NAGA_DISTILLER, 100.0f))
-            {
-                Talk(SAY_REGEN);
-                //me->CastSpell(me, SPELL_WARLORDS_RAGE, false);
-                distiller->AI()->DoAction(1);
-            }
-            events.RepeatEvent(45000);
-            break;
-        }
-
-        DoMeleeAttackIfReady();
-    }
 };
 
-struct npc_naga_distiller : public NullCreatureAI
+// 31543 - Warlord's Rage
+class spell_warlords_rage : public AuraScript
 {
-    npc_naga_distiller(Creature* creature) : NullCreatureAI(creature) { }
+    PrepareAuraScript(spell_warlords_rage);
 
-    uint32 spellTimer;
+    void HandleAfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-
-    void Reset() override
     {
-        spellTimer = 0;
+        if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
-        me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-        me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
-    }
-
-    void DoAction(int32 param) override
-    {
-        if (param != 1)
-            return;
-
-        me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-        me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
-        me->CastSpell(me, SPELL_WARLORDS_RAGE_NAGA, true);
-        spellTimer = 1;
-    }
-
-    void UpdateAI(uint32 diff) override
-    {
-        if (spellTimer)
         {
-            spellTimer += diff;
+            if (GetTarget())
-            if (spellTimer >= 12000)
             {
-                if (Creature* kali = me->FindNearestCreature(NPC_WARLORD_KALITHRESH, 100.0f))
+                GetTarget()->CastSpell(GetTarget(), SPELL_WARLORDS_RAGE_PROC, true);
-                    kali->CastSpell(kali, SPELL_WARLORDS_RAGE_PROC, true);
-                me->KillSelf();
             }
         }
     }
+
+    void Register() override
+    {
+        AfterEffectRemove += AuraEffectRemoveFn(spell_warlords_rage::HandleAfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+    }
 };
 
 void AddSC_boss_warlord_kalithresh()
 {
     RegisterSteamvaultCreatureAI(boss_warlord_kalithresh);
-    RegisterSteamvaultCreatureAI(npc_naga_distiller);
+    RegisterSpellScript(spell_warlords_rage);
 }

src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp

@@ -25,6 +25,12 @@ enum MainChambersAccessPanelSays
     SAY_LOUD_RUMBLE = 1
 };
 
+MinionData const minionData[] =
+{
+    { NPC_NAGA_DISTILLER, DATA_WARLORD_KALITHRESH },
+    { 0,                  0                       }
+};
+
 class go_main_chambers_access_panel : public GameObjectScript
 {
 public:
@@ -91,14 +97,16 @@ public:
 ObjectData const creatureData[] =
 {
     { NPC_MEKGINEER_STEAMRIGGER,    DATA_MEKGINEER_STEAMRIGGER  },
-    { NPC_DOOR_CONTROLLER,          DATA_DOOR_CONTROLLER        }
+    { NPC_DOOR_CONTROLLER,          DATA_DOOR_CONTROLLER        },
+    { 0,                            0                           }
 };
 
 ObjectData const objectData[] =
 {
     { GO_ACCESS_PANEL_HYDRO, DATA_ACCESS_PANEL_HYDROMANCER },
     { GO_ACCESS_PANEL_MEK,   DATA_ACCESS_PANEL_MEKGINEER   },
-    { GO_MAIN_CHAMBERS_DOOR, DATA_MAIN_CHAMBERS_DOOR       }
+    { GO_MAIN_CHAMBERS_DOOR, DATA_MAIN_CHAMBERS_DOOR       },
+    { 0,                     0,                            }
 };
 
 class instance_steam_vault : public InstanceMapScript
@@ -113,6 +121,7 @@ public:
             SetHeaders(DataHeaders);
             SetBossNumber(EncounterCount);
             LoadObjectData(creatureData, objectData);
+            LoadMinionData(minionData);
         }
 
         void OnGameObjectCreate(GameObject* go) override

src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h

@@ -51,6 +51,11 @@ enum steamVaultNPCGO
     NPC_DOOR_CONTROLLER                 = 20926
 };
 
+enum NagaDistiller
+{
+    NPC_NAGA_DISTILLER                  = 17954
+};
+
 template <class AI, class T>
 inline AI* GetSteamVaultAI(T* obj)
 {