From 3cfb1d3bf627c50208ac32bb1db60d1b8673bb3f Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Tue, 19 Sep 2023 21:38:41 -0300
Subject: [PATCH] fix(Scripts/Karazhan): Move Aran's elemental AI to SAI
 (#17312)

---
 .../rev_1695168508123583100.sql               |  6 +++
 .../Karazhan/boss_shade_of_aran.cpp           | 38 -------------------
 2 files changed, 6 insertions(+), 38 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1695168508123583100.sql

diff --git a/data/sql/updates/pending_db_world/rev_1695168508123583100.sql b/data/sql/updates/pending_db_world/rev_1695168508123583100.sql
new file mode 100644
index 000000000..500a18e7e
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1695168508123583100.sql
@@ -0,0 +1,6 @@
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 17167;
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 17167) AND (`source_type` = 0) 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`, `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
+(17167, 0, 0, 0, 0, 0, 100, 0, 2000, 2000, 2000, 2000, 2000, 11, 31012, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Conjured Elemental - In Combat - Cast \'Water Bolt\'');
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index b96bd58d7..8bb6de119 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -55,7 +55,6 @@ enum ShadeOfAran
 
     //Creature Spells
     SPELL_CIRCULAR_BLIZZARD = 29951,
-    SPELL_WATERBOLT = 31012,
     SPELL_SHADOW_PYRO = 29978,
 
     //Creatures
@@ -491,44 +490,7 @@ private:
     uint32 _currentHealth;
 };
 
-struct npc_aran_elemental : public ScriptedAI
-{
-    npc_aran_elemental(Creature* creature) : ScriptedAI(creature)
-    {
-        SetCombatMovement(false);
-        _scheduler.SetValidator([this]
-        {
-            return !me->HasUnitState(UNIT_STATE_CASTING);
-        });
-    }
-
-    void Reset() override
-    {
-        _scheduler.CancelAll();
-    }
-
-    void JustEngagedWith(Unit* /*who*/) override
-    {
-        _scheduler.Schedule(2s, [this](TaskContext context)
-        {
-            DoCastVictim(SPELL_WATERBOLT);
-            context.Repeat(2s);
-        });
-    }
-
-    void UpdateAI(uint32 diff) override
-    {
-        if (!UpdateVictim())
-            return;
-
-        _scheduler.Update(diff);
-    }
-private:
-    TaskScheduler _scheduler;
-};
-
 void AddSC_boss_shade_of_aran()
 {
     RegisterKarazhanCreatureAI(boss_shade_of_aran);
-    RegisterKarazhanCreatureAI(npc_aran_elemental);
 }