From 3c056273b87eaa09a23db2730db3aaeb7d2ae306 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Sat, 25 Mar 2023 19:33:22 -0300
Subject: [PATCH 01/15] fix(Scripts/Mechanar): Fix Mechano-Lord Nether Charges
 not spawning (#15575)

init

Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com>
---
 data/sql/updates/pending_db_world/rev_1679709753237572800.sql   | 2 ++
 .../TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679709753237572800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679709753237572800.sql b/data/sql/updates/pending_db_world/rev_1679709753237572800.sql
new file mode 100644
index 000000000..f0520ffae
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679709753237572800.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 0 WHERE `ID` IN (35153, 35904, 35905, 35906);
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index 0293b2804..87956f1f3 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -77,7 +77,7 @@ struct boss_mechano_lord_capacitus : public BossAI
                 SPELL_SUMMON_NETHER_CHARGE_SE,
                 SPELL_SUMMON_NETHER_CHARGE_SW);
             DoCastAOE(spellId);
-            IsHeroic() ? context.Repeat(2s, 5s) : context.Repeat(9s, 11s);
+            context.Repeat(2400ms, 3600ms);
         }).Schedule(3min, [this](TaskContext /*context*/)
         {
             DoCastSelf(SPELL_BERSERK, true);

From 85311fa5598387ef6c1c40781bd68b624caf7940 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 25 Mar 2023 22:36:05 +0000
Subject: [PATCH 02/15] chore(DB): import pending files

Referenced commit(s): 3c056273b87eaa09a23db2730db3aaeb7d2ae306
---
 .../rev_1679709753237572800.sql => db_world/2023_03_25_00.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1679709753237572800.sql => db_world/2023_03_25_00.sql} (75%)

diff --git a/data/sql/updates/pending_db_world/rev_1679709753237572800.sql b/data/sql/updates/db_world/2023_03_25_00.sql
similarity index 75%
rename from data/sql/updates/pending_db_world/rev_1679709753237572800.sql
rename to data/sql/updates/db_world/2023_03_25_00.sql
index f0520ffae..8fc5e48e3 100644
--- a/data/sql/updates/pending_db_world/rev_1679709753237572800.sql
+++ b/data/sql/updates/db_world/2023_03_25_00.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_03_24_08 -> 2023_03_25_00
 --
 UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 0 WHERE `ID` IN (35153, 35904, 35905, 35906);

From a959942d82bec352c9b37d9f068c619f71bd77e6 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Mon, 27 Mar 2023 03:43:38 -0300
Subject: [PATCH 03/15] =?UTF-8?q?fix(Scripts/IcecrownCitadel):=20Sindragos?=
 =?UTF-8?q?a=20shouldn't=20kill=20everything=20on=E2=80=A6=20(#15602)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Scripts/IcecrownCitadel): Sindragosa shouldn't kill everything on evade
---
 .../scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index c8374e34f..bce65ffa0 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -371,14 +371,6 @@ public:
 
         void EnterEvadeMode(EvadeReason why) override
         {
-            if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) // this flag is removed after she lands and can be engaged
-            {
-                const Map::PlayerList& pl = me->GetMap()->GetPlayers();
-                for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
-                    if (Player* p = itr->GetSource())
-                        if (p->IsAlive() && !p->IsGameMaster() && p->GetExactDist(&SindragosaLandPos) < 200.0f && !p->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL))
-                            Unit::Kill(me, p);
-            }
             me->DisableRotate(false);
             me->SetControlled(false, UNIT_STATE_ROOT);
             BossAI::EnterEvadeMode(why);

From 5ea6e250a647d0c9e12301ad062d79ac69701517 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Mon, 27 Mar 2023 03:48:15 -0300
Subject: [PATCH 04/15] fix(Scripts/Arcatraz): Fix Soccothrates fel flame
 charge (#15600)

---
 .../boss_wrath_scryer_soccothrates.cpp        | 351 +++++++++---------
 1 file changed, 172 insertions(+), 179 deletions(-)

diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 33cb9ee41..151cc66e7 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -51,9 +51,6 @@ enum Spells
 
 enum Events
 {
-    EVENT_FELFIRE_SHOCK             = 1,
-    EVENT_KNOCK_AWAY                = 2,
-
     EVENT_PREFIGHT_1                = 3,
     EVENT_PREFIGHT_2                = 4,
     EVENT_PREFIGHT_3                = 5,
@@ -62,198 +59,194 @@ enum Events
     EVENT_PREFIGHT_6                = 8,
     EVENT_PREFIGHT_7                = 9,
     EVENT_PREFIGHT_8                = 10,
-    EVENT_PREFIGHT_9                = 11,
-    EVENT_ME_FIRST                  = 12,
-    EVENT_CHECK_HEALTH              = 13,
-    EVENT_SPELL_CHARGE              = 14,
-    EVENT_FELFIRE                   = 15,
+    EVENT_PREFIGHT_9                = 11
 };
 
-class boss_wrath_scryer_soccothrates : public CreatureScript
+struct boss_wrath_scryer_soccothrates : public BossAI
 {
-public:
-    boss_wrath_scryer_soccothrates() : CreatureScript("boss_wrath_scryer_soccothrates") { }
-
-    struct boss_wrath_scryer_soccothratesAI : public BossAI
+    boss_wrath_scryer_soccothrates(Creature* creature) : BossAI(creature, DATA_SOCCOTHRATES)
     {
-        boss_wrath_scryer_soccothratesAI(Creature* creature) : BossAI(creature, DATA_SOCCOTHRATES)
-        {
-            preFight = instance->GetBossState(DATA_DALLIAH) == DONE;
-        }
+        preFight = instance->GetBossState(DATA_DALLIAH) == DONE;
 
-        void Reset() override
+        scheduler.SetValidator([this]
         {
-            _Reset();
-            events2.Reset();
-            me->CastSpell(me, SPELL_FEL_IMMOLATION, true);
-            me->SetImmuneToAll(false);
-        }
+            return !me->HasUnitState(UNIT_STATE_CASTING);
+        });
+    }
 
-        void InitializeAI() override
+    void Reset() override
+    {
+        _Reset();
+        events2.Reset();
+        me->CastSpell(me, SPELL_FEL_IMMOLATION, true);
+        me->SetImmuneToAll(false);
+
+        ScheduleHealthCheckEvent(25, [&]
         {
-            BossAI::InitializeAI();
-            if (!preFight)
-                me->SetImmuneToAll(true);
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            _JustDied();
-            Talk(SAY_DEATH);
-
             if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
             {
-                if (dalliah->IsAlive() && !dalliah->IsInCombat())
+                if (dalliah->IsAlive())
                 {
-                    dalliah->AI()->Talk(SAY_RIVAL_DIED + 1, 6s);
+                    dalliah->AI()->Talk(SAY_SOCCOTHRATES_25_PERCENT);
                 }
             }
-        }
-
-        void JustEngagedWith(Unit* /*who*/) override
-        {
-            _JustEngagedWith();
-            events2.Reset();
-            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
-            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
-            events.ScheduleEvent(EVENT_ME_FIRST, 6000);
-            events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000);
-            Talk(SAY_AGGRO);
-        }
-
-        void KilledUnit(Unit* victim) override
-        {
-            if (victim->GetTypeId() == TYPEID_PLAYER)
-                Talk(SAY_SLAY);
-        }
-
-        void MoveInLineOfSight(Unit* who) override
-        {
-            if (!preFight && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 70.0f))
-            {
-                Talk(SAY_SOCCOTHRATES_CONVO_1);
-                events2.ScheduleEvent(EVENT_PREFIGHT_1, 2000);
-                preFight = true;
-            }
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            events2.Update(diff);
-            switch (events2.ExecuteEvent())
-            {
-                case EVENT_PREFIGHT_1:
-                    if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                        dalliah->AI()->Talk(SAY_DALLIAH_CONVO_1);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_2, 3000);
-                    break;
-                case EVENT_PREFIGHT_2:
-                    Talk(SAY_SOCCOTHRATES_CONVO_2);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_3, 3000);
-                    break;
-                case EVENT_PREFIGHT_3:
-                    if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                        dalliah->AI()->Talk(SAY_DALLIAH_CONVO_2);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_4, 6000);
-                    break;
-                case EVENT_PREFIGHT_4:
-                    Talk(SAY_SOCCOTHRATES_CONVO_3);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_5, 2000);
-                    break;
-                case EVENT_PREFIGHT_5:
-                    if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                        dalliah->AI()->Talk(SAY_DALLIAH_CONVO_3);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_6, 3000);
-                    break;
-                case EVENT_PREFIGHT_6:
-                    Talk(SAY_SOCCOTHRATES_CONVO_4);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_7, 2000);
-                    break;
-                case EVENT_PREFIGHT_7:
-                    if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                        dalliah->GetMotionMaster()->MovePoint(0, 118.6048f, 96.84852f, 22.44115f);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_8, 4000);
-                    break;
-                case EVENT_PREFIGHT_8:
-                    me->GetMotionMaster()->MovePoint(0, 122.1035f, 192.7203f, 22.44115f);
-                    events2.ScheduleEvent(EVENT_PREFIGHT_9, 4000);
-                    break;
-                case EVENT_PREFIGHT_9:
-                    if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                    {
-                        dalliah->SetFacingToObject(me);
-                        dalliah->SetImmuneToAll(false);
-                        me->SetFacingToObject(dalliah);
-                        me->SetImmuneToAll(false);
-                        dalliah->SetHomePosition(dalliah->GetPositionX(), dalliah->GetPositionY(), dalliah->GetPositionZ(), 1.51737f);
-                        me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 4.725722f);
-                    }
-                    break;
-            }
-
-            if (!UpdateVictim())
-                return;
-
-            events.Update(diff);
-            if (me->HasUnitState(UNIT_STATE_CASTING))
-                return;
-
-            switch (events.ExecuteEvent())
-            {
-                case EVENT_FELFIRE_SHOCK:
-                    me->CastSpell(me->GetVictim(), SPELL_FELFIRE_SHOCK, false);
-                    events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
-                    break;
-                case EVENT_KNOCK_AWAY:
-                    me->CastSpell(me, SPELL_KNOCK_AWAY, false);
-                    Talk(SAY_KNOCK_AWAY);
-                    events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
-                    events.ScheduleEvent(EVENT_SPELL_CHARGE, 4600);
-                    break;
-                case EVENT_SPELL_CHARGE:
-                    me->CastSpell(me, SPELL_CHARGE, true);
-                    me->CastSpell(me, SPELL_FELFIRE, true);
-                    events.ScheduleEvent(EVENT_FELFIRE, 300);
-                    events.ScheduleEvent(EVENT_FELFIRE, 600);
-                    events.ScheduleEvent(EVENT_FELFIRE, 900);
-                    events.ScheduleEvent(EVENT_FELFIRE, 1200);
-                    events.ScheduleEvent(EVENT_FELFIRE, 1500);
-                    events.ScheduleEvent(EVENT_FELFIRE, 1800);
-                    break;
-                case EVENT_FELFIRE:
-                    me->CastSpell(me, SPELL_FELFIRE, true);
-                    break;
-                case EVENT_ME_FIRST:
-                    if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                        if (dalliah->IsAlive() && !dalliah->IsInCombat())
-                            dalliah->AI()->Talk(SAY_AGGRO_SOCCOTHRATES_FIRST);
-                    break;
-                case EVENT_CHECK_HEALTH:
-                    if (HealthBelowPct(25))
-                    {
-                        if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
-                            dalliah->AI()->Talk(SAY_SOCCOTHRATES_25_PERCENT);
-                        break;
-                    }
-                    events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000);
-                    break;
-            }
-
-            DoMeleeAttackIfReady();
-        }
-
-    private:
-        bool preFight;
-        EventMap events2;
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetArcatrazAI<boss_wrath_scryer_soccothratesAI>(creature);
+        });
     }
+
+    void InitializeAI() override
+    {
+        BossAI::InitializeAI();
+        if (!preFight)
+            me->SetImmuneToAll(true);
+    }
+
+    void JustDied(Unit* /*killer*/) override
+    {
+        _JustDied();
+        Talk(SAY_DEATH);
+
+        if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+        {
+            if (dalliah->IsAlive() && !dalliah->IsInCombat())
+            {
+                dalliah->AI()->Talk(SAY_RIVAL_DIED + 1, 6s);
+            }
+        }
+    }
+
+    void JustEngagedWith(Unit* /*who*/) override
+    {
+        _JustEngagedWith();
+        events2.Reset();
+
+        Talk(SAY_AGGRO);
+
+        if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+        {
+            if (dalliah->IsAlive() && !dalliah->IsInCombat())
+            {
+                dalliah->AI()->Talk(SAY_AGGRO_SOCCOTHRATES_FIRST, 6s);
+            }
+        }
+
+        scheduler.Schedule(11s, 12s, [this](TaskContext context)
+        {
+            me->CastSpell(me, SPELL_KNOCK_AWAY, false);
+            Talk(SAY_KNOCK_AWAY);
+
+            scheduler.Schedule(4600ms, [this](TaskContext)
+            {
+                DoCastAOE(SPELL_CHARGE);
+                DoCastSelf(SPELL_FELFIRE, true);
+
+                scheduler.Schedule(300ms, [this](TaskContext context2)
+                {
+                    if (me->GetVictim() && !me->IsWithinMeleeRange(me->GetVictim()))
+                    {
+                        DoCastAOE(SPELL_FELFIRE, true);
+                    }
+
+                    if (context2.GetRepeatCounter() <= 6)
+                    {
+                        context2.Repeat();
+                    }
+                });
+            });
+
+            context.Repeat();
+        }).Schedule(12s, 14s, [this](TaskContext context)
+        {
+            DoCastVictim(SPELL_FELFIRE_SHOCK);
+            context.Repeat();
+        });
+    }
+
+    void KilledUnit(Unit* victim) override
+    {
+        if (victim->IsPlayer())
+        {
+            Talk(SAY_SLAY);
+        }
+    }
+
+    void MoveInLineOfSight(Unit* who) override
+    {
+        if (!preFight && who->IsPlayer() && me->IsWithinDistInMap(who, 70.0f))
+        {
+            Talk(SAY_SOCCOTHRATES_CONVO_1);
+            events2.ScheduleEvent(EVENT_PREFIGHT_1, 2000);
+            preFight = true;
+        }
+    }
+
+    void UpdateAI(uint32 diff) override
+    {
+        events2.Update(diff);
+        switch (events2.ExecuteEvent())
+        {
+        case EVENT_PREFIGHT_1:
+            if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+                dalliah->AI()->Talk(SAY_DALLIAH_CONVO_1);
+            events2.ScheduleEvent(EVENT_PREFIGHT_2, 3000);
+            break;
+        case EVENT_PREFIGHT_2:
+            Talk(SAY_SOCCOTHRATES_CONVO_2);
+            events2.ScheduleEvent(EVENT_PREFIGHT_3, 3000);
+            break;
+        case EVENT_PREFIGHT_3:
+            if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+                dalliah->AI()->Talk(SAY_DALLIAH_CONVO_2);
+            events2.ScheduleEvent(EVENT_PREFIGHT_4, 6000);
+            break;
+        case EVENT_PREFIGHT_4:
+            Talk(SAY_SOCCOTHRATES_CONVO_3);
+            events2.ScheduleEvent(EVENT_PREFIGHT_5, 2000);
+            break;
+        case EVENT_PREFIGHT_5:
+            if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+                dalliah->AI()->Talk(SAY_DALLIAH_CONVO_3);
+            events2.ScheduleEvent(EVENT_PREFIGHT_6, 3000);
+            break;
+        case EVENT_PREFIGHT_6:
+            Talk(SAY_SOCCOTHRATES_CONVO_4);
+            events2.ScheduleEvent(EVENT_PREFIGHT_7, 2000);
+            break;
+        case EVENT_PREFIGHT_7:
+            if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+                dalliah->GetMotionMaster()->MovePoint(0, 118.6048f, 96.84852f, 22.44115f);
+            events2.ScheduleEvent(EVENT_PREFIGHT_8, 4000);
+            break;
+        case EVENT_PREFIGHT_8:
+            me->GetMotionMaster()->MovePoint(0, 122.1035f, 192.7203f, 22.44115f);
+            events2.ScheduleEvent(EVENT_PREFIGHT_9, 4000);
+            break;
+        case EVENT_PREFIGHT_9:
+            if (Creature* dalliah = instance->GetCreature(DATA_DALLIAH))
+            {
+                dalliah->SetFacingToObject(me);
+                dalliah->SetImmuneToAll(false);
+                me->SetFacingToObject(dalliah);
+                me->SetImmuneToAll(false);
+                dalliah->SetHomePosition(dalliah->GetPositionX(), dalliah->GetPositionY(), dalliah->GetPositionZ(), 1.51737f);
+                me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 4.725722f);
+            }
+            break;
+        }
+
+        if (!UpdateVictim())
+            return;
+
+        scheduler.Update(diff);
+
+        DoMeleeAttackIfReady();
+    }
+
+private:
+    bool preFight;
+    EventMap events2;
 };
 
 void AddSC_boss_wrath_scryer_soccothrates()
 {
-    new boss_wrath_scryer_soccothrates();
+    RegisterArcatrazCreatureAI(boss_wrath_scryer_soccothrates);
 }

From fee8b999deaaabd124848e0da9a365fcc20ce4c3 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 27 Mar 2023 14:24:01 -0300
Subject: [PATCH 05/15] fix(DB/Creature): Correct faction of Time-Lost Skettis
 NPCs (#15608)

Create time_lost.sql
---
 data/sql/updates/pending_db_world/time_lost.sql | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/time_lost.sql

diff --git a/data/sql/updates/pending_db_world/time_lost.sql b/data/sql/updates/pending_db_world/time_lost.sql
new file mode 100644
index 000000000..2b12691b2
--- /dev/null
+++ b/data/sql/updates/pending_db_world/time_lost.sql
@@ -0,0 +1,6 @@
+-- Verified in Build: 47213
+UPDATE `creature_template` SET `faction` = 1860 WHERE `entry` IN (
+21651, -- Time-Lost Skettis Reaver
+21763, -- Time-Lost Skettis Worshipper
+21787  -- Time-Lost Skettis High Priest
+);

From 92adb937bc89ad5376d345b5179e567daccd4f1b Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 27 Mar 2023 14:25:11 -0300
Subject: [PATCH 06/15] fix(DB/SAI): Correct timers for Arcane Servant's Arcane
 Volley (#15572)

Create rev_1679697224834675700.sql
---
 data/sql/updates/pending_db_world/rev_1679697224834675700.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679697224834675700.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679697224834675700.sql b/data/sql/updates/pending_db_world/rev_1679697224834675700.sql
new file mode 100644
index 000000000..26784c59a
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679697224834675700.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `smart_scripts` SET `event_param1`=3600, `event_param2`=10800, `event_param3`=16900, `event_param4`=26500 WHERE `entryorguid`=20478 AND `source_type`=0 AND `id`=1;

From ddd6c14456c6fdb6d968e743004ef130dbb842ff Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 27 Mar 2023 14:25:19 -0300
Subject: [PATCH 07/15] fix(DB/Creature): Add Knockback immunity to Raging
 Flames (#15570)

* Create rev_1679692788793844600.sql

* Update rev_1679692788793844600.sql
---
 data/sql/updates/pending_db_world/rev_1679692788793844600.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679692788793844600.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679692788793844600.sql b/data/sql/updates/pending_db_world/rev_1679692788793844600.sql
new file mode 100644
index 000000000..663c27d56
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679692788793844600.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64|1073741824 WHERE (`entry` IN (20481, 21538));

From e18aec9e5d729c2e8bbaaf6eb6082da4e7941bd7 Mon Sep 17 00:00:00 2001
From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com>
Date: Mon, 27 Mar 2023 12:25:34 -0500
Subject: [PATCH 08/15] fix(db/loot): Repair Pathaleon the Calculator Loot
 (#15574)

* fix(db/loot): Repair Pathaleon the Calculator Loot

* Update data/sql/updates/pending_db_world/rev_1679709941852342200.sql

* Update data/sql/updates/pending_db_world/rev_1679709941852342200.sql

* Update data/sql/updates/pending_db_world/rev_1679709941852342200.sql
---
 data/sql/updates/pending_db_world/rev_1679709941852342200.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679709941852342200.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679709941852342200.sql b/data/sql/updates/pending_db_world/rev_1679709941852342200.sql
new file mode 100644
index 000000000..9596e866a
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679709941852342200.sql
@@ -0,0 +1,4 @@
+-- Repair Pathaleon the Calculator Loot Table
+UPDATE `reference_loot_template` SET `GroupId`=5 WHERE `Entry`=35005 AND `Item` IN (28285, 28278, 28286, 28288, 28275, 27899);
+DELETE FROM `creature_loot_template` WHERE `Entry`=19220 AND `Item`=35005 AND `Reference`=35005 AND `GroupId`=5;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES (19220, 35005, 35005, 100, 0, 1, 5, 1, 1, 'Pathaleon the Calculator - High Value Table (ReferenceTable)');

From fc4a2f42de3628fb1f3535c1535df8335a55de24 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 27 Mar 2023 17:28:13 +0000
Subject: [PATCH 09/15] chore(DB): import pending files

Referenced commit(s): e18aec9e5d729c2e8bbaaf6eb6082da4e7941bd7
---
 .../rev_1679692788793844600.sql => db_world/2023_03_27_00.sql}   | 1 +
 .../rev_1679697224834675700.sql => db_world/2023_03_27_01.sql}   | 1 +
 .../rev_1679709941852342200.sql => db_world/2023_03_27_02.sql}   | 1 +
 .../time_lost.sql => db_world/2023_03_27_03.sql}                 | 1 +
 4 files changed, 4 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1679692788793844600.sql => db_world/2023_03_27_00.sql} (71%)
 rename data/sql/updates/{pending_db_world/rev_1679697224834675700.sql => db_world/2023_03_27_01.sql} (79%)
 rename data/sql/updates/{pending_db_world/rev_1679709941852342200.sql => db_world/2023_03_27_02.sql} (92%)
 rename data/sql/updates/{pending_db_world/time_lost.sql => db_world/2023_03_27_03.sql} (82%)

diff --git a/data/sql/updates/pending_db_world/rev_1679692788793844600.sql b/data/sql/updates/db_world/2023_03_27_00.sql
similarity index 71%
rename from data/sql/updates/pending_db_world/rev_1679692788793844600.sql
rename to data/sql/updates/db_world/2023_03_27_00.sql
index 663c27d56..2c84473c7 100644
--- a/data/sql/updates/pending_db_world/rev_1679692788793844600.sql
+++ b/data/sql/updates/db_world/2023_03_27_00.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_03_25_00 -> 2023_03_27_00
 --
 UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64|1073741824 WHERE (`entry` IN (20481, 21538));
diff --git a/data/sql/updates/pending_db_world/rev_1679697224834675700.sql b/data/sql/updates/db_world/2023_03_27_01.sql
similarity index 79%
rename from data/sql/updates/pending_db_world/rev_1679697224834675700.sql
rename to data/sql/updates/db_world/2023_03_27_01.sql
index 26784c59a..8c84a0ba0 100644
--- a/data/sql/updates/pending_db_world/rev_1679697224834675700.sql
+++ b/data/sql/updates/db_world/2023_03_27_01.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_03_27_00 -> 2023_03_27_01
 --
 UPDATE `smart_scripts` SET `event_param1`=3600, `event_param2`=10800, `event_param3`=16900, `event_param4`=26500 WHERE `entryorguid`=20478 AND `source_type`=0 AND `id`=1;
diff --git a/data/sql/updates/pending_db_world/rev_1679709941852342200.sql b/data/sql/updates/db_world/2023_03_27_02.sql
similarity index 92%
rename from data/sql/updates/pending_db_world/rev_1679709941852342200.sql
rename to data/sql/updates/db_world/2023_03_27_02.sql
index 9596e866a..51ac458bb 100644
--- a/data/sql/updates/pending_db_world/rev_1679709941852342200.sql
+++ b/data/sql/updates/db_world/2023_03_27_02.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_03_27_01 -> 2023_03_27_02
 -- Repair Pathaleon the Calculator Loot Table
 UPDATE `reference_loot_template` SET `GroupId`=5 WHERE `Entry`=35005 AND `Item` IN (28285, 28278, 28286, 28288, 28275, 27899);
 DELETE FROM `creature_loot_template` WHERE `Entry`=19220 AND `Item`=35005 AND `Reference`=35005 AND `GroupId`=5;
diff --git a/data/sql/updates/pending_db_world/time_lost.sql b/data/sql/updates/db_world/2023_03_27_03.sql
similarity index 82%
rename from data/sql/updates/pending_db_world/time_lost.sql
rename to data/sql/updates/db_world/2023_03_27_03.sql
index 2b12691b2..ede56a764 100644
--- a/data/sql/updates/pending_db_world/time_lost.sql
+++ b/data/sql/updates/db_world/2023_03_27_03.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_03_27_02 -> 2023_03_27_03
 -- Verified in Build: 47213
 UPDATE `creature_template` SET `faction` = 1860 WHERE `entry` IN (
 21651, -- Time-Lost Skettis Reaver

From 8dced9fcf17bace8a808d8d7031db91372698fc9 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Mon, 27 Mar 2023 22:52:18 -0300
Subject: [PATCH 10/15] =?UTF-8?q?fix(Scripts/IcecrownCitadel):=20Fix=20Blo?=
 =?UTF-8?q?od-Queen=20Lana`thel=20reset=20and=20fli=E2=80=A6=20(#15601)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Scripts/IcecrownCitadel): Fix Blood-Queen Lana`thel reset and flickering animation
---
 .../rev_1679896171803644000.sql               |  2 ++
 .../boss_blood_queen_lana_thel.cpp            | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679896171803644000.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679896171803644000.sql b/data/sql/updates/pending_db_world/rev_1679896171803644000.sql
new file mode 100644
index 000000000..63be9c10f
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679896171803644000.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 512 WHERE `entry` IN (37955, 38434, 38435, 38436);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index a966f27bc..87447c1a9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -164,6 +164,17 @@ public:
 
             events.Reset();
             summons.DespawnAll();
+
+            me->SetCanFly(false);
+            me->SetDisableGravity(false);
+
+            if (bEnteredCombat)
+            {
+                bEnteredCombat = false;
+                if (me->IsAlive() && instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
+                    instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, FAIL);
+            }
+
             if (instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
                 instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, NOT_STARTED);
         }
@@ -253,20 +264,6 @@ public:
                 GoToMinchar();
         }
 
-        void JustReachedHome() override
-        {
-            me->SetCanFly(false);
-            me->SetDisableGravity(false);
-
-            _JustReachedHome();
-            if (bEnteredCombat)
-            {
-                bEnteredCombat = false;
-                if (me->IsAlive() && instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
-                    instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, FAIL);
-            }
-        }
-
         void KilledUnit(Unit* victim) override
         {
             if (victim->GetTypeId() == TYPEID_PLAYER)

From c4a1bd5cf166775bc6b70e033a75743567630e0c Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Tue, 28 Mar 2023 01:54:55 +0000
Subject: [PATCH 11/15] chore(DB): import pending files

Referenced commit(s): 8dced9fcf17bace8a808d8d7031db91372698fc9
---
 .../rev_1679896171803644000.sql => db_world/2023_03_28_00.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1679896171803644000.sql => db_world/2023_03_28_00.sql} (72%)

diff --git a/data/sql/updates/pending_db_world/rev_1679896171803644000.sql b/data/sql/updates/db_world/2023_03_28_00.sql
similarity index 72%
rename from data/sql/updates/pending_db_world/rev_1679896171803644000.sql
rename to data/sql/updates/db_world/2023_03_28_00.sql
index 63be9c10f..5f9aa8170 100644
--- a/data/sql/updates/pending_db_world/rev_1679896171803644000.sql
+++ b/data/sql/updates/db_world/2023_03_28_00.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_03_27_03 -> 2023_03_28_00
 --
 UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 512 WHERE `entry` IN (37955, 38434, 38435, 38436);

From b29c9be31955ccb99c103da0e61cbea7e0c1da42 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Tue, 28 Mar 2023 09:54:37 -0300
Subject: [PATCH 12/15] fix(DB/Gameobject): Rebuild The Steamvault ores and
 herbs (#15556)

* Create rev_1679620675628266300.sql

* Update rev_1679620675628266300.sql
---
 .../rev_1679620675628266300.sql               | 184 ++++++++++++++++++
 1 file changed, 184 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679620675628266300.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679620675628266300.sql b/data/sql/updates/pending_db_world/rev_1679620675628266300.sql
new file mode 100644
index 000000000..8d402775e
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679620675628266300.sql
@@ -0,0 +1,184 @@
+--
+SET @OGUID := 105242;
+SET @POOL := 13421;
+SET @POOLMOTHER := 8354;
+
+DELETE FROM `gameobject` WHERE `map`=545 AND `id` IN (181555, 181556, 181557, 181569, 181278, 181275, 181276, 181270);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+-- Felweed
+(@OGUID+0 , 181270, 545, 3715, 3715, 3, 1, -205.817, -103.243, -7.75556, 3.49067, 0, 0, -0.984807, 0.173652, 86400, 255, 1, 47871),
+(@OGUID+1 , 181270, 545, 3715, 3715, 3, 1, -64.5367, -152.412, -19.9231, 5.65487, 0, 0, -0.309016, 0.951057, 86400, 255, 1, 47871),
+-- Ragveil
+(@OGUID+2 , 181275, 545, 3715, 3715, 3, 1, 58.5667, -204.123, -22.6133, 3.3685, 0, 0, -0.993571, 0.113208, 86400, 255, 1, 47871),
+(@OGUID+4 , 181275, 545, 3715, 3715, 3, 1, -310.216, -206.72, -7.75556, 4.90438, 0, 0, -0.636078, 0.771625, 86400, 255, 1, 47871),
+-- Flame Cap
+(@OGUID+3 , 181275, 545, 3715, 3715, 3, 1, 58.5667, -204.123, -22.6133, 3.3685, 0, 0, -0.993571, 0.113208, 86400, 255, 1, 47871),
+(@OGUID+5 , 181275, 545, 3715, 3715, 3, 1, -310.216, -206.72, -7.75556, 4.90438, 0, 0, -0.636078, 0.771625, 86400, 255, 1, 47871),
+-- Ancient Lichen Group 1
+(@OGUID+6 , 181278, 545, 3715, 3715, 3, 1, 6.92143, -271.444, -18.8318, 1.72787, 0, 0, 0.760406, 0.649449, 86400, 255, 1, 47871),
+(@OGUID+7 , 181278, 545, 3715, 3715, 3, 1, -49.1663, -143.161, -20.2431, 1.93731, 0, 0, 0.824125, 0.566408, 86400, 255, 1, 47871),
+(@OGUID+8 , 181278, 545, 3715, 3715, 3, 1, 68.2781, -149.73, -19.6815, 0.95993, 0, 0, 0.461748, 0.887011, 86400, 255, 1, 47871),
+-- Ancient Lichen Group 2
+(@OGUID+9 , 181278, 545, 3715, 3715, 3, 1, -245.752, -163.171, -2.66641, 5.55015, 0, 0, -0.358368, 0.93358, 86400, 255, 1, 47871),
+(@OGUID+10, 181278, 545, 3715, 3715, 3, 1, -220.607, -186.447, -5.3461, 4.92183, 0, 0, -0.62932, 0.777146, 86400, 255, 1, 47871),
+(@OGUID+11, 181278, 545, 3715, 3715, 3, 1, -237.348, -182.727, -5.58116, 4.53786, 0, 0, -0.766044, 0.642789, 86400, 255, 1, 47871),
+-- Ancient Lichen Group 3
+(@OGUID+12, 181278, 545, 3715, 3715, 3, 1, -354.513, -136.025, -7.75556, 2.84488, 0, 0, 0.989016, 0.147811, 86400, 255, 1, 47871),
+(@OGUID+13, 181278, 545, 3715, 3715, 3, 1, -313.275, -107.529, -7.75556, 5.60251, 0, 0, -0.333807, 0.942641, 86400, 255, 1, 47871),
+(@OGUID+14, 181278, 545, 3715, 3715, 3, 1, -328.184, -180.729, -7.75556, 4.60767, 0, 0, -0.743144, 0.669131, 86400, 255, 1, 47871),
+-- Ancient Lichen Group 4
+(@OGUID+15, 181278, 545, 3715, 3715, 3, 1, -238.252, -133.886, -65.1628, 0.174532, 0, 0, 0.0871553, 0.996195, 86400, 255, 1, 47871),
+(@OGUID+16, 181278, 545, 3715, 3715, 3, 1, -131.431, -328.561, -67.6411, 4.20625, 0, 0, -0.861629, 0.507539, 86400, 255, 1, 47871),
+(@OGUID+17, 181278, 545, 3715, 3715, 3, 1, -271.318, -206.749, -67.6411, 0.942477, 0, 0, 0.45399, 0.891007, 86400, 255, 1, 47871),
+-- Fel Iron Deposit Group 1
+(@OGUID+18, 181555, 545, 3715, 3715, 3, 1, 44.922, -270.041, -21.8391, 0.575957, 0, 0, 0.284015, 0.95882, 86400, 255, 1, 47871),
+(@OGUID+20, 181555, 545, 3715, 3715, 3, 1, 6.10486, -229.526, -22.172, 5.34071, 0, 0, -0.45399, 0.891007, 86400, 255, 1, 47871),
+(@OGUID+22, 181555, 545, 3715, 3715, 3, 1, 86.1048, -183.557, -22.0548, 0.95993, 0, 0, 0.461748, 0.887011, 86400, 255, 1, 47871),
+-- Khorium
+(@OGUID+19, 181555, 545, 3715, 3715, 3, 1, 44.922, -270.041, -21.8391, 0.575957, 0, 0, 0.284015, 0.95882, 86400, 255, 1, 47871),
+(@OGUID+21, 181555, 545, 3715, 3715, 3, 1, 6.10486, -229.526, -22.172, 5.34071, 0, 0, -0.45399, 0.891007, 86400, 255, 1, 47871),
+(@OGUID+23, 181555, 545, 3715, 3715, 3, 1, 86.1048, -183.557, -22.0548, 0.95993, 0, 0, 0.461748, 0.887011, 86400, 255, 1, 47871),
+-- Fel Iron Deposit Group 2
+(@OGUID+24, 181555, 545, 3715, 3715, 3, 1, -363.759, -135.723, -7.75556, 3.68265, 0, 0, -0.96363, 0.267241, 86400, 255, 1, 47871),
+(@OGUID+26, 181555, 545, 3715, 3715, 3, 1, -339.412, -196.926, -5.72056, 2.54818, 0, 0, 0.956305, 0.292372, 86400, 255, 1, 47871),
+(@OGUID+28, 181555, 545, 3715, 3715, 3, 1, -200.885, -121.075, -6.02453, 0.750491, 0, 0, 0.366501, 0.930418, 86400, 255, 1, 47871),
+-- Khorium
+(@OGUID+25, 181555, 545, 3715, 3715, 3, 1, -363.759, -135.723, -7.75556, 3.68265, 0, 0, -0.96363, 0.267241, 86400, 255, 1, 47871),
+(@OGUID+27, 181555, 545, 3715, 3715, 3, 1, -339.412, -196.926, -5.72056, 2.54818, 0, 0, 0.956305, 0.292372, 86400, 255, 1, 47871),
+(@OGUID+29, 181555, 545, 3715, 3715, 3, 1, -200.885, -121.075, -6.02453, 0.750491, 0, 0, 0.366501, 0.930418, 86400, 255, 1, 47871),
+-- Adamantite Deposit Group 1
+(@OGUID+30, 181556, 545, 3715, 3715, 3, 1, -53.296, -175.588, -20.0281, 2.61799, 0, 0, 0.965925, 0.258821, 86400, 255, 1, 47871),
+(@OGUID+33, 181556, 545, 3715, 3715, 3, 1, 4.75688, -278.016, -8.36647, 5.88176, 0, 0, -0.199368, 0.979925, 86400, 255, 1, 47871),
+(@OGUID+36, 181556, 545, 3715, 3715, 3, 1, 84.6738, -148.302, -21.0814, 4.59022, 0, 0, -0.748956, 0.66262, 86400, 255, 1, 47871),
+-- Rich Adamantite
+(@OGUID+31, 181556, 545, 3715, 3715, 3, 1, -53.296, -175.588, -20.0281, 2.61799, 0, 0, 0.965925, 0.258821, 86400, 255, 1, 47871),
+(@OGUID+34, 181556, 545, 3715, 3715, 3, 1, 4.75688, -278.016, -8.36647, 5.88176, 0, 0, -0.199368, 0.979925, 86400, 255, 1, 47871),
+(@OGUID+37, 181556, 545, 3715, 3715, 3, 1, 84.6738, -148.302, -21.0814, 4.59022, 0, 0, -0.748956, 0.66262, 86400, 255, 1, 47871),
+-- Khorium
+(@OGUID+32, 181556, 545, 3715, 3715, 3, 1, -53.296, -175.588, -20.0281, 2.61799, 0, 0, 0.965925, 0.258821, 86400, 255, 1, 47871),
+(@OGUID+35, 181556, 545, 3715, 3715, 3, 1, 4.75688, -278.016, -8.36647, 5.88176, 0, 0, -0.199368, 0.979925, 86400, 255, 1, 47871),
+(@OGUID+38, 181556, 545, 3715, 3715, 3, 1, 84.6738, -148.302, -21.0814, 4.59022, 0, 0, -0.748956, 0.66262, 86400, 255, 1, 47871),
+-- Adamantite Deposit Group 2
+(@OGUID+39, 181556, 545, 3715, 3715, 3, 1, -388.828, -157.54, -7.75556, 5.32326, 0, 0, -0.461748, 0.887011, 86400, 255, 1, 47871),
+(@OGUID+42, 181556, 545, 3715, 3715, 3, 1, -364.504, -85.856, -7.75556, 0.925024, 0, 0, 0.446198, 0.894935, 86400, 255, 1, 47871),
+(@OGUID+45, 181556, 545, 3715, 3715, 3, 1, -287.925, -192.021, -7.75556, 6.14356, 0, 0, -0.0697556, 0.997564, 86400, 255, 1, 47871),
+(@OGUID+48, 181556, 545, 3715, 3715, 3, 1, -262.357, -186.123, -7.60742, 3.927, 0, 0, -0.923879, 0.382686, 86400, 255, 1, 47871),
+-- Rich Adamantite
+(@OGUID+40, 181556, 545, 3715, 3715, 3, 1, -388.828, -157.54, -7.75556, 5.32326, 0, 0, -0.461748, 0.887011, 86400, 255, 1, 47871),
+(@OGUID+43, 181556, 545, 3715, 3715, 3, 1, -364.504, -85.856, -7.75556, 0.925024, 0, 0, 0.446198, 0.894935, 86400, 255, 1, 47871),
+(@OGUID+46, 181556, 545, 3715, 3715, 3, 1, -287.925, -192.021, -7.75556, 6.14356, 0, 0, -0.0697556, 0.997564, 86400, 255, 1, 47871),
+(@OGUID+49, 181556, 545, 3715, 3715, 3, 1, -262.357, -186.123, -7.60742, 3.927, 0, 0, -0.923879, 0.382686, 86400, 255, 1, 47871),
+-- Khorium
+(@OGUID+41, 181556, 545, 3715, 3715, 3, 1, -388.828, -157.54, -7.75556, 5.32326, 0, 0, -0.461748, 0.887011, 86400, 255, 1, 47871),
+(@OGUID+44, 181556, 545, 3715, 3715, 3, 1, -364.504, -85.856, -7.75556, 0.925024, 0, 0, 0.446198, 0.894935, 86400, 255, 1, 47871),
+(@OGUID+47, 181556, 545, 3715, 3715, 3, 1, -287.925, -192.021, -7.75556, 6.14356, 0, 0, -0.0697556, 0.997564, 86400, 255, 1, 47871),
+(@OGUID+50, 181556, 545, 3715, 3715, 3, 1, -262.357, -186.123, -7.60742, 3.927, 0, 0, -0.923879, 0.382686, 86400, 255, 1, 47871);
+
+DELETE FROM `pool_template` WHERE `description` LIKE 'The Steamvault%' AND `entry` BETWEEN @POOLMOTHER+0 AND @POOLMOTHER+9;
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(@POOLMOTHER+0, 1, 'The Steamvault - Felweed'),
+(@POOLMOTHER+1, 1, 'The Steamvault - Ragveil / Flame Cap'),
+(@POOLMOTHER+2, 1, 'The Steamvault - Ancient Lichen - Group 1'),
+(@POOLMOTHER+3, 1, 'The Steamvault - Ancient Lichen - Group 2'),
+(@POOLMOTHER+4, 1, 'The Steamvault - Ancient Lichen - Group 3'),
+(@POOLMOTHER+5, 1, 'The Steamvault - Ancient Lichen - Group 4'),
+(@POOLMOTHER+6, 1, 'The Steamvault - Fel Iron - Group 1'),
+(@POOLMOTHER+7, 1, 'The Steamvault - Fel Iron - Group 2'),
+(@POOLMOTHER+8, 1, 'The Steamvault - Adamantite - Group 1'),
+(@POOLMOTHER+9, 1, 'The Steamvault - Adamantite - Group 2');
+
+DELETE FROM `pool_gameobject` WHERE `description`='Felweed - The Steamvault' AND `guid` BETWEEN @OGUID+0 AND @OGUID+1 AND `pool_entry` = @POOLMOTHER+0;
+INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(@OGUID+0 , @POOLMOTHER+0, 0, 'Felweed - The Steamvault'),
+(@OGUID+1 , @POOLMOTHER+0, 0, 'Felweed - The Steamvault');
+
+DELETE FROM `pool_gameobject` WHERE `description`='Ancient Lichen - The Steamvault' AND `guid` BETWEEN @OGUID+6 AND @OGUID+17 AND `pool_entry` BETWEEN @POOLMOTHER+2 AND @POOLMOTHER+5;
+INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(@OGUID+6 , @POOLMOTHER+2, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+7 , @POOLMOTHER+2, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+8 , @POOLMOTHER+2, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+9 , @POOLMOTHER+3, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+10, @POOLMOTHER+3, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+11, @POOLMOTHER+3, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+12, @POOLMOTHER+4, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+13, @POOLMOTHER+4, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+14, @POOLMOTHER+4, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+15, @POOLMOTHER+5, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+16, @POOLMOTHER+5, 0, 'Ancient Lichen - The Steamvault'),
+(@OGUID+17, @POOLMOTHER+5, 0, 'Ancient Lichen - The Steamvault');
+
+DELETE FROM `pool_template` WHERE `description` LIKE 'The Steamvault%' AND `entry` BETWEEN @POOL+0 AND @POOL+14;
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(@POOL+0 , 1, 'The Steamvault - Ragveil / Flame Cap'),
+(@POOL+1 , 1, 'The Steamvault - Ragveil / Flame Cap'),
+(@POOL+2 , 1, 'The Steamvault - Fel Iron Deposit / Khorium Vein'),
+(@POOL+3 , 1, 'The Steamvault - Fel Iron Deposit / Khorium Vein'),
+(@POOL+4 , 1, 'The Steamvault - Fel Iron Deposit / Khorium Vein'),
+(@POOL+5 , 1, 'The Steamvault - Fel Iron Deposit / Khorium Vein'),
+(@POOL+6 , 1, 'The Steamvault - Fel Iron Deposit / Khorium Vein'),
+(@POOL+7 , 1, 'The Steamvault - Fel Iron Deposit / Khorium Vein'),
+(@POOL+8 , 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein'),
+(@POOL+9 , 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein'),
+(@POOL+10, 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein'),
+(@POOL+11, 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein'),
+(@POOL+12, 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein'),
+(@POOL+13, 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein'),
+(@POOL+14, 1, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein');
+
+DELETE FROM `pool_pool` WHERE `description` LIKE 'The Steamvault%' AND `pool_id` BETWEEN @POOL+0 AND @POOL+14 AND `mother_pool` BETWEEN @POOLMOTHER+1 AND @POOLMOTHER+9;
+INSERT INTO `pool_pool` (`pool_id`, `mother_pool`, `chance`, `description`) VALUES
+(@POOL+0 , @POOLMOTHER+1, 0, 'The Steamvault - Ragveil / Flame Cap'),
+(@POOL+1 , @POOLMOTHER+1, 0, 'The Steamvault - Ragveil / Flame Cap'),
+(@POOL+2 , @POOLMOTHER+6, 0, 'The Steamvault - Fel Iron Deposit / Khorium Vein - Group 1'),
+(@POOL+3 , @POOLMOTHER+6, 0, 'The Steamvault - Fel Iron Deposit / Khorium Vein - Group 1'),
+(@POOL+4 , @POOLMOTHER+6, 0, 'The Steamvault - Fel Iron Deposit / Khorium Vein - Group 1'),
+(@POOL+5 , @POOLMOTHER+7, 0, 'The Steamvault - Fel Iron Deposit / Khorium Vein - Group 2'),
+(@POOL+6 , @POOLMOTHER+7, 0, 'The Steamvault - Fel Iron Deposit / Khorium Vein - Group 2'),
+(@POOL+7 , @POOLMOTHER+7, 0, 'The Steamvault - Fel Iron Deposit / Khorium Vein - Group 2'),
+(@POOL+8 , @POOLMOTHER+8, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 1'),
+(@POOL+9 , @POOLMOTHER+8, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 1'),
+(@POOL+10, @POOLMOTHER+8, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 1'),
+(@POOL+11, @POOLMOTHER+9, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 2'),
+(@POOL+12, @POOLMOTHER+9, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 2'),
+(@POOL+13, @POOLMOTHER+9, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 2'),
+(@POOL+14, @POOLMOTHER+9, 0, 'The Steamvault - Adamantite Deposit / Rich Adamantite Deposit / Khorium Vein - Group 2');
+
+DELETE FROM `pool_gameobject` WHERE `description` LIKE 'The Steamvault%' AND `guid` BETWEEN @OGUID+2 AND @OGUID+50 AND `pool_entry` BETWEEN @POOL+0 AND @POOL+14;
+INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(@OGUID+2 , @POOL+0, 0 , 'The Steamvault - Ragveil'),
+(@OGUID+4 , @POOL+0, 40, 'The Steamvault - Flame Cap'),
+(@OGUID+3 , @POOL+1, 0 , 'The Steamvault - Ragveil'),
+(@OGUID+5 , @POOL+1, 40, 'The Steamvault - Flame Cap'),
+(@OGUID+18, @POOL+2, 0 , 'The Steamvault - Fel Iron Deposit'),
+(@OGUID+20, @POOL+3, 0 , 'The Steamvault - Fel Iron Deposit'),
+(@OGUID+22, @POOL+4, 0 , 'The Steamvault - Fel Iron Deposit'),
+(@OGUID+19, @POOL+2, 5 , 'The Steamvault - Khorium for Fel Iron Deposit'),
+(@OGUID+21, @POOL+3, 5 , 'The Steamvault - Khorium for Fel Iron Deposit'),
+(@OGUID+23, @POOL+4, 5 , 'The Steamvault - Khorium for Fel Iron Deposit'),
+(@OGUID+24, @POOL+5, 0 , 'The Steamvault - Fel Iron Deposit'),
+(@OGUID+26, @POOL+6, 0 , 'The Steamvault - Fel Iron Deposit'),
+(@OGUID+28, @POOL+7, 0 , 'The Steamvault - Fel Iron Deposit'),
+(@OGUID+25, @POOL+5, 5 , 'The Steamvault - Khorium for Fel Iron Deposit'),
+(@OGUID+27, @POOL+6, 5 , 'The Steamvault - Khorium for Fel Iron Deposit'),
+(@OGUID+29, @POOL+7, 5 , 'The Steamvault - Khorium for Fel Iron Deposit'),
+(@OGUID+30, @POOL+8 , 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+33, @POOL+9 , 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+36, @POOL+10, 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+31, @POOL+8 , 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+34, @POOL+9 , 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+37, @POOL+10, 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+32, @POOL+8 , 5 , 'The Steamvault - Khorium for Adamantite Deposit'),
+(@OGUID+35, @POOL+9 , 5 , 'The Steamvault - Khorium for Adamantite Deposit'),
+(@OGUID+38, @POOL+10, 5 , 'The Steamvault - Khorium for Adamantite Deposit'),
+(@OGUID+39, @POOL+11, 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+42, @POOL+12, 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+45, @POOL+13, 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+48, @POOL+14, 0 , 'The Steamvault - Adamantite Deposit'),
+(@OGUID+40, @POOL+11, 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+43, @POOL+12, 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+46, @POOL+13, 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+49, @POOL+14, 40, 'The Steamvault - Rich Adamantite Deposit'),
+(@OGUID+41, @POOL+11, 5 , 'The Steamvault - Khorium for Adamantite Deposit'),
+(@OGUID+44, @POOL+12, 5 , 'The Steamvault - Khorium for Adamantite Deposit'),
+(@OGUID+47, @POOL+13, 5 , 'The Steamvault - Khorium for Adamantite Deposit'),
+(@OGUID+50, @POOL+14, 5 , 'The Steamvault - Khorium for Adamantite Deposit');

From b57c729f4c4b55863b1a9e4f31ab12dc3d451492 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Tue, 28 Mar 2023 09:55:12 -0300
Subject: [PATCH 13/15] fix(DB/Gameobject): Nethermancer Sepethrea door should
 not be useable by players (#15568)

Create rev_1679690789861656800.sql
---
 data/sql/updates/pending_db_world/rev_1679690789861656800.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679690789861656800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679690789861656800.sql b/data/sql/updates/pending_db_world/rev_1679690789861656800.sql
new file mode 100644
index 000000000..32a80f95a
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679690789861656800.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `gameobject_template_addon` SET `faction` = 1375, `flags` = 32 WHERE (`entry` = 184449);

From 80b7784b3434b80ea7da885b501670cc9247862c Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Tue, 28 Mar 2023 09:55:59 -0300
Subject: [PATCH 14/15] fix(DB/Steamvault): Rebuild Steamvault creature spawns
 and implement RP events (#15548)

* Create rev_1679503572800829900.sql

* Update rev_1679503572800829900.sql

* Update rev_1679503572800829900.sql
---
 .../rev_1679503572800829900.sql               | 760 ++++++++++++++++++
 1 file changed, 760 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679503572800829900.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679503572800829900.sql b/data/sql/updates/pending_db_world/rev_1679503572800829900.sql
new file mode 100644
index 000000000..99e8cf8a1
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679503572800829900.sql
@@ -0,0 +1,760 @@
+--
+DELETE FROM `creature` WHERE `id1` IN (1420,2914,6827,13321,17721,17722,17796,17797,17798,17799,17800,17801,17802,17803,17805,17917,17954,20926,21338,21694,21695,21696) AND `map`=545 AND `guid` IN (116,118,120,308,317,320,425,452,502,1550,1552,1554,1555,1557,1559,1560,1561,1723,1741,1742,2080,2090,2093,3453,3641,6439,12396,12573,12574,12575,12576,12577,12578,12579,12580,12581,12584,12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12597,12598,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695,12696,12697,12698,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710,12711,12712,12713,12714,12715,12716);
+DELETE FROM `linked_respawn` WHERE `linkType`=0 AND `linkedGuid` IN (3453, 12597, 12613) AND `guid` IN (118,120,308,317,320,452,502,1550,1552,1554,1557,1559,1560,1741,1742,2080,2090,2093,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695,12696,12697,12698,12699,12700,12702,12703,12704,12706,12709,12710,12711,12714,12715,12716,116,1561,1723,3641,6439,12396,12573,12574,12575,12576,12577,12578,12579,12580,12581,12584,12585,12586,12587,12588,12589,12590,12591,12592,12593,12608,12609,12610,12612,12614,12615,12616,12618,12619,12620,12621,12622,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12635,12636,12637,12638,12660,12661,12662,12663,12667,12668,12669,12641,12642,12643,12646,12647,12648,12649,12650,12651,12652,12653);
+
+SET @CGUID := 142000;
+
+DELETE FROM `creature` WHERE `id1` IN (1420, 2914, 6827, 13321, 17721, 17722, 17796, 17797, 17798, 17799, 17800, 17801, 17802, 17803, 17805, 17917, 17951, 17954, 20926, 21338, 21694, 21695, 21696) AND `map`=545 AND `guid` BETWEEN @CGUID AND @CGUID+174;
+INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `VerifiedBuild`) VALUES
+(@CGUID+0  , 1420, 545, 3715, 3715, 3, 0, -267.548, -112.525, -8.6097, 0.280339, 86400, 9, 1, 46924),
+(@CGUID+1  , 1420, 545, 3715, 3715, 3, 0, -219.725, -192.519, -6.4509, 5.14644, 86400, 9, 1, 46924),
+(@CGUID+2  , 1420, 545, 3715, 3715, 3, 0, -225.143, -260.073, -7.92899, 5.32764, 86400, 9, 1, 46924),
+(@CGUID+3  , 2914, 545, 3715, 3715, 3, 0, -76.6433, -232.424, -19.0862, 3.72182, 86400, 7.5, 1, 46924),
+(@CGUID+4  , 6827, 545, 3715, 3715, 3, 0, 56.9337, -101.48, -22.5299, 5.46035, 86400, 8, 1, 46924),
+(@CGUID+5  , 6827, 545, 3715, 3715, 3, 0, -26.1574, -214.287, -16.627, 5.21369, 86400, 8, 1, 46924),
+(@CGUID+6  , 6827, 545, 3715, 3715, 3, 0, -46.8175, -110.903, -21.7872, 4.36777, 86400, 8, 1, 46924),
+(@CGUID+7  , 6827, 545, 3715, 3715, 3, 0, 9.50253, -129.903, -21.0928, 1.71362, 86400, 8, 1, 43400),
+(@CGUID+8  , 6827, 545, 3715, 3715, 3, 0, 10.676, -138.063, -21.7372, 3.51784, 86400, 8, 1, 46924),
+(@CGUID+9  , 6827, 545, 3715, 3715, 3, 0, 28.6864, -288.618, -15.609, 1.74771, 86400, 8, 1, 46924),
+(@CGUID+10 , 6827, 545, 3715, 3715, 3, 0, -7.52859, -198.422, -21.983, 4.6971, 86400, 8, 1, 46924),
+(@CGUID+11 , 6827, 545, 3715, 3715, 3, 0, -154.167, -296.423, -7.66443, 1.57834, 86400, 8, 1, 46924),
+(@CGUID+12 , 6827, 545, 3715, 3715, 3, 0, -105.229, -372.19, -7.76734, 3.09709, 86400, 8, 1, 46924),
+(@CGUID+13 , 6827, 545, 3715, 3715, 3, 0, -313.946, -120.788, -8.11231, 6.14168, 86400, 8, 1, 46924),
+(@CGUID+14 , 6827, 545, 3715, 3715, 3, 0, -327.464, -170.203, -7.75556, 1.43326, 86400, 8, 1, 46924),
+(@CGUID+15 , 13321, 545, 3715, 3715, 3, 0, 44.5837, -204.285, -22.5299, 0.397274, 86400, 9, 1, 46924),
+(@CGUID+16 , 13321, 545, 3715, 3715, 3, 0, -40.1172, -145.925, -21.4245, 3.20114, 86400, 9, 1, 46924),
+(@CGUID+17 , 13321, 545, 3715, 3715, 3, 0, 46.7816, -114.852, -22.5346, 1.97281, 86400, 9, 1, 46924),
+(@CGUID+18 , 13321, 545, 3715, 3715, 3, 0, 61.5226, -151.272, -20.673, 1.22794, 86400, 9, 1, 46924),
+(@CGUID+19 , 13321, 545, 3715, 3715, 3, 0, -100.499, -296.163, -7.76734, 2.22405, 86400, 9, 1, 46924),
+(@CGUID+20 , 13321, 545, 3715, 3715, 3, 0, -57.8504, -347.177, -7.76734, 3.47024, 86400, 9, 1, 46924),
+(@CGUID+21 , 17721, 545, 3715, 3715, 3, 1, -5.29896, -131.391, -21.1734, 4.93928, 86400, 0, 0, 46924),
+(@CGUID+22 , 17721, 545, 3715, 3715, 3, 1, 59.8831, -131.581, -22.6599, 5.8294, 86400, 0, 0, 46924),
+(@CGUID+23 , 17721, 545, 3715, 3715, 3, 1, 45.6033, -236.226, -22.5299, 4.90438, 86400, 0, 0, 46924),
+(@CGUID+24 , 17721, 545, 3715, 3715, 3, 1, 29.0264, -239.563, -22.6156, 5.27089, 86400, 0, 0, 46924),
+(@CGUID+25 , 17721, 545, 3715, 3715, 3, 1, -21.9336, -126.73, -21.7157, 4.81711, 86400, 0, 0, 46924),
+(@CGUID+26 , 17721, 545, 3715, 3715, 3, 1, -13.8918, -179.746, -22.5681, 3.19395, 86400, 0, 0, 46924),
+(@CGUID+27 , 17721, 545, 3715, 3715, 3, 1, -24.6203, -186.644, -20.855, 1.6057, 86400, 0, 0, 46924),
+(@CGUID+28 , 17721, 545, 3715, 3715, 3, 1, 8.37782, -204.823, -22.3658, 4.27606, 86400, 0, 0, 46924),
+(@CGUID+29 , 17721, 545, 3715, 3715, 3, 1, 14.2811, -213.334, -22.3567, 3.4383, 86400, 0, 0, 46924),
+(@CGUID+30 , 17721, 545, 3715, 3715, 3, 1, 8.40569, -147.05, -21.8826, 3.87463, 86400, 0, 0, 46924),
+(@CGUID+31 , 17721, 545, 3715, 3715, 3, 2, -42.0492, -372.102, -7.41123, 6.07375, 86400, 0, 0, 46924),
+(@CGUID+32 , 17721, 545, 3715, 3715, 3, 2, -50.1679, -382.556, -7.40377, 4.41568, 86400, 0, 0, 46924),
+(@CGUID+33 , 17722, 545, 3715, 3715, 3, 1, -85.8321, -276.48, -7.67224, 1.5708, 86400, 0, 0, 46924),
+(@CGUID+34 , 17722, 545, 3715, 3715, 3, 1, -94.5917, -277.669, -7.67224, 1.39626, 86400, 0, 0, 46924),
+(@CGUID+35 , 17722, 545, 3715, 3715, 3, 1, -49.2924, -211.491, -18.5854, 4.69494, 86400, 0, 0, 46924),
+(@CGUID+36 , 17722, 545, 3715, 3715, 3, 1, -60.7232, -318.851, -7.67224, 2.80998, 86400, 0, 0, 46924),
+(@CGUID+37 , 17722, 545, 3715, 3715, 3, 1, -110.899, -330.512, -7.6599, 6.16101, 86400, 0, 0, 46924),
+(@CGUID+38 , 17722, 545, 3715, 3715, 3, 1, -45.0691, -361.249, -7.3868, 2.40855, 86400, 0, 0, 46924),
+(@CGUID+39 , 17722, 545, 3715, 3715, 3, 1, -91.4764, -357.48, -7.76734, 1.78121, 86400, 0, 0, 46924),
+(@CGUID+40 , 17722, 545, 3715, 3715, 3, 1, -92.9006, -445.31, 5.99149, 1.55334, 86400, 0, 0, 46924),
+(@CGUID+41 , 17722, 545, 3715, 3715, 3, 1, -82.8905, -510.07, 8.35653, 1.88496, 86400, 0, 0, 46924),
+(@CGUID+42 , 17722, 545, 3715, 3715, 3, 1, -106.786, -505.77, 8.31102, 1.3439, 86400, 0, 0, 46924),
+(@CGUID+43 , 17796, 545, 3715, 3715, 3, 0, -330.083, -121.506, -7.98511, 5.06145, 86400, 0, 0, 46924),
+(@CGUID+44 , 17797, 545, 3715, 3715, 3, 1, 88.3971, -316.111, -7.78743, 3.03687, 86400, 0, 0, 46924),
+(@CGUID+45 , 17798, 545, 3715, 3715, 3, 1, -95.4188, -552.031, 8.27027, 1.44862, 86400, 0, 0, 46924),
+(@CGUID+46 , 17799, 545, 3715, 3715, 3, 1, -235.776, -189.595, -6.33245, 3.01942, 86400, 0, 0, 46924),
+(@CGUID+47 , 17799, 545, 3715, 3715, 3, 1, -218.676, -239.394, -7.91659, 0.523599, 86400, 0, 0, 46924),
+(@CGUID+48 , 17799, 545, 3715, 3715, 3, 1, -223.27, -232.322, -7.94317, 0.191986, 86400, 0, 0, 46924),
+(@CGUID+49 , 17799, 545, 3715, 3715, 3, 1, -213.91, -241.29, -7.94406, 1.98968, 86400, 0, 0, 46924),
+(@CGUID+50 , 17799, 545, 3715, 3715, 3, 1, -219.655, -234.762, -7.94058, 1.97222, 86400, 0, 0, 46924),
+(@CGUID+51 , 17799, 545, 3715, 3715, 3, 1, -209.454, -266.228, -8.00466, 5.63741, 86400, 0, 0, 46924),
+(@CGUID+52 , 17799, 545, 3715, 3715, 3, 1, -206.161, -268.93, -7.9983, 2.60054, 86400, 0, 0, 46924),
+(@CGUID+53 , 17799, 545, 3715, 3715, 3, 1, -251.138, -230.641, -7.94669, 2.86234, 86400, 0, 0, 46924),
+(@CGUID+54 , 17799, 545, 3715, 3715, 3, 1, -233.483, -264.914, -7.73545, 2.82743, 86400, 0, 0, 46924),
+(@CGUID+55 , 17799, 545, 3715, 3715, 3, 1, -255.897, -235.144, -7.85494, 2.6529, 86400, 0, 0, 46924),
+(@CGUID+56 , 17799, 545, 3715, 3715, 3, 1, -256.31, -238.535, -7.77721, 2.1293, 86400, 0, 0, 46924),
+(@CGUID+57 , 17799, 545, 3715, 3715, 3, 1, -236.979, -263.096, -7.71984, 5.67232, 86400, 0, 0, 46924),
+(@CGUID+58 , 17799, 545, 3715, 3715, 3, 1, -253.681, -233.512, -7.88687, 1.71042, 86400, 0, 0, 46924),
+(@CGUID+59 , 17799, 545, 3715, 3715, 3, 1, -235.532, -268.635, -7.70069, 3.59538, 86400, 0, 0, 46924),
+(@CGUID+60 , 17799, 545, 3715, 3715, 3, 1, -240.237, -267.888, -7.68922, 5.00909, 86400, 0, 0, 46924),
+(@CGUID+61 , 17800, 545, 3715, 3715, 3, 1, -36.6156, -216.919, -18.2239, 0.907571, 86400, 0, 0, 46924),
+(@CGUID+62 , 17800, 545, 3715, 3715, 3, 1, -40.8796, -207.862, -18.2856, 0.15708, 86400, 0, 0, 46924),
+(@CGUID+63 , 17800, 545, 3715, 3715, 3, 1, -159.623, -283.371, -8.04492, 4.43314, 86400, 0, 0, 46924),
+(@CGUID+64 , 17800, 545, 3715, 3715, 3, 1, -52.6073, -324.759, -7.67224, 5.72468, 86400, 0, 0, 46924),
+(@CGUID+65 , 17800, 545, 3715, 3715, 3, 1, -169.915, -285.368, -8.07741, 5.16617, 86400, 0, 0, 46924),
+(@CGUID+66 , 17800, 545, 3715, 3715, 3, 1, -104.194, -325.127, -7.63158, 6.17847, 86400, 0, 0, 46924),
+(@CGUID+67 , 17800, 545, 3715, 3715, 3, 1, -102.674, -342.241, -7.29451, 0.0174533, 86400, 0, 0, 46924),
+(@CGUID+68 , 17800, 545, 3715, 3715, 3, 1, -86.0637, -361.034, -7.76734, 2.62466, 86400, 0, 0, 46924),
+(@CGUID+69 , 17800, 545, 3715, 3715, 3, 1, -85.6725, -353.766, -7.76734, 3.11757, 86400, 0, 0, 46924),
+(@CGUID+70 , 17800, 545, 3715, 3715, 3, 1, -57.5115, -376.588, -7.28116, 2.46091, 86400, 0, 0, 46924),
+(@CGUID+71 , 17800, 545, 3715, 3715, 3, 1, -97.0274, -442.69, 4.8904, 1.62316, 86400, 0, 0, 46924),
+(@CGUID+72 , 17800, 545, 3715, 3715, 3, 1, -92.6836, -442.745, 4.92121, 1.5708, 86400, 0, 0, 46924),
+(@CGUID+73 , 17800, 545, 3715, 3715, 3, 1, -98.2649, -465.493, 7.94481, 1.48353, 86400, 0, 0, 46924),
+(@CGUID+74 , 17800, 545, 3715, 3715, 3, 1, -92.7277, -465.559, 7.94653, 1.53589, 86400, 0, 0, 46924),
+(@CGUID+75 , 17800, 545, 3715, 3715, 3, 1, -82.7854, -499.969, 8.34669, 2.07694, 86400, 0, 0, 46924),
+(@CGUID+76 , 17800, 545, 3715, 3715, 3, 1, -106.787, -497.928, 8.27913, 1.09956, 86400, 0, 0, 46924),
+(@CGUID+77 , 17801, 545, 3715, 3715, 3, 1, 35.8755, -157.314, -22.5641, 3.50811, 86400, 0, 0, 46924),
+(@CGUID+78 , 17801, 545, 3715, 3715, 3, 1, 37.9577, -236.915, -22.5962, 2.94961, 86400, 1.5, 1, 46924),
+(@CGUID+79 , 17801, 545, 3715, 3715, 3, 1, 29.8738, -165.19, -22.3645, 1.32645, 86400, 0, 0, 46924),
+(@CGUID+80 , 17801, 545, 3715, 3715, 3, 1, 29.0596, -256.632, -23.2494, 3.38594, 86400, 0, 0, 46924),
+(@CGUID+81 , 17801, 545, 3715, 3715, 3, 1, -21.8271, -101.033, -22.342, 0.488702, 86400, 0, 0, 46924),
+(@CGUID+82 , 17801, 545, 3715, 3715, 3, 1, 27.0156, -260.473, -22.8049, 2.44346, 86400, 0, 0, 46924),
+(@CGUID+83 , 17801, 545, 3715, 3715, 3, 1, 9.52063, -150.597, -22.0447, 0.191986, 86400, 0, 0, 46924),
+(@CGUID+84 , 17801, 545, 3715, 3715, 3, 1, 60.9442, -126.396, -22.7092, 0.870719, 86400, 1.5, 1, 46924),
+(@CGUID+85 , 17801, 545, 3715, 3715, 3, 1, 28.6017, -279.259, -21.3723, 4.5204, 86400, 0, 0, 46924),
+(@CGUID+86 , 17801, 545, 3715, 3715, 3, 1, 1.51287, -250.445, -21.5411, 6.14356, 86400, 0, 0, 46924),
+(@CGUID+87 , 17801, 545, 3715, 3715, 3, 1, 6.76641, -257, -21.9015, 1.50098, 86400, 0, 0, 46924),
+(@CGUID+88 , 17801, 545, 3715, 3715, 3, 1, 21.9975, -276.271, -21.4064, 4.39823, 86400, 0, 0, 46924),
+(@CGUID+89 , 17801, 545, 3715, 3715, 3, 1, -53.8197, -334.368, -6.27059, 3.22886, 86400, 0, 0, 46924),
+(@CGUID+90 , 17801, 545, 3715, 3715, 3, 1, -60.4984, -326.608, -7.67224, 3.08923, 86400, 0, 0, 46924),
+(@CGUID+91 , 17801, 545, 3715, 3715, 3, 1, -109.493, -336.353, -7.54947, 5.91667, 86400, 0, 0, 46924),
+(@CGUID+92 , 17801, 545, 3715, 3715, 3, 1, -87.0215, -471.123, 8.09123, 1.72788, 86400, 0, 0, 46924),
+(@CGUID+93 , 17801, 545, 3715, 3715, 3, 1, -77.0849, -503.804, 8.39567, 2.04204, 86400, 0, 0, 46924),
+(@CGUID+94 , 17801, 545, 3715, 3715, 3, 1, -113.321, -494.133, 8.28791, 0.715585, 86400, 0, 0, 46924),
+(@CGUID+95 , 17802, 545, 3715, 3715, 3, 1, 14.1778, -154.926, -22.4435, 1.32075, 86400, 0, 0, 46924),
+(@CGUID+96 , 17802, 545, 3715, 3715, 3, 1, -11.0343, -181.738, -23.6401, 4.29007, 86400, 0, 0, 46924),
+(@CGUID+97 , 17802, 545, 3715, 3715, 3, 1, -21.7799, -102.849, -22.4891, 1.4331, 86400, 0, 0, 46924),
+(@CGUID+98 , 17802, 545, 3715, 3715, 3, 1, 20.2046, -262.345, -21.9761, 1.31347, 86400, 0, 0, 46924),
+(@CGUID+99 , 17802, 545, 3715, 3715, 3, 1, 59.7183, -122.646, -22.6066, 3.93482, 86400, 0, 0, 46924),
+(@CGUID+100, 17802, 545, 3715, 3715, 3, 1, 18.3958, -210.618, -22.3953, 1.81985, 86400, 0, 0, 46924),
+(@CGUID+101, 17802, 545, 3715, 3715, 3, 1, 26.3097, -236.885, -22.4249, 0.549, 86400, 0, 0, 46924),
+(@CGUID+102, 17802, 545, 3715, 3715, 3, 1, -89.8517, -279.44, -7.67224, 1.62316, 86400, 0, 0, 46924),
+(@CGUID+103, 17802, 545, 3715, 3715, 3, 1, -2.80521, -128.083, -20.4961, 2.78933, 86400, 0, 0, 46924),
+(@CGUID+104, 17802, 545, 3715, 3715, 3, 1, 2.06713, -64.1362, -19.8397, 2.05949, 86400, 0, 0, 46924),
+(@CGUID+105, 17802, 545, 3715, 3715, 3, 1, -6.48203, -63.7094, -19.8397, 1.29154, 86400, 0, 0, 46924),
+(@CGUID+106, 17802, 545, 3715, 3715, 3, 1, 8.90898, -252.515, -22.599, 2.87548, 86400, 0, 0, 46924),
+(@CGUID+107, 17802, 545, 3715, 3715, 3, 1, -48.8471, -217.029, -18.5902, 2.1076, 86400, 0, 0, 46924),
+(@CGUID+108, 17802, 545, 3715, 3715, 3, 1, 25.2417, -280.826, -20.1926, 4.41568, 86400, 0, 0, 46924),
+(@CGUID+109, 17802, 545, 3715, 3715, 3, 1, -50.3858, -215.252, -18.5967, 5.85866, 86400, 0, 0, 46924),
+(@CGUID+110, 17803, 545, 3715, 3715, 3, 1, 33.4427, -161.195, -22.4778, 2.33874, 86400, 0, 0, 46924),
+(@CGUID+111, 17803, 545, 3715, 3715, 3, 1, 13.201, -208.052, -22.3482, 6.0542, 86400, 2, 1, 46924),
+(@CGUID+112, 17803, 545, 3715, 3715, 3, 1, -17.0931, -186.131, -22.1681, 5.23599, 86400, 2, 1, 46924),
+(@CGUID+113, 17803, 545, 3715, 3715, 3, 1, 24.7643, -263.618, -22.2272, 1.69297, 86400, 0, 0, 46924),
+(@CGUID+114, 17803, 545, 3715, 3715, 3, 1, 10.7306, -154.933, -22.2425, 6.10865, 86400, 0, 0, 46924),
+(@CGUID+115, 17803, 545, 3715, 3715, 3, 1, 2.57794, -255.504, -21.6858, 0.785398, 86400, 0, 0, 46924),
+(@CGUID+116, 17803, 545, 3715, 3715, 3, 1, -98.0899, -445.534, 6.08102, 1.22173, 86400, 0, 0, 46924),
+(@CGUID+117, 17803, 545, 3715, 3715, 3, 1, -102.606, -472.039, 8.11505, 1.5708, 86400, 0, 0, 46924),
+(@CGUID+118, 17803, 545, 3715, 3715, 3, 1, -75.2059, -496.923, 8.35148, 2.32129, 86400, 0, 0, 46924),
+(@CGUID+119, 17803, 545, 3715, 3715, 3, 1, -114.302, -503.693, 8.30481, 0.855211, 86400, 0, 0, 46924),
+(@CGUID+120, 17805, 545, 3715, 3715, 3, 1, -238.007, -193.135, -6.90072, 1.09956, 86400, 0, 0, 46924),
+(@CGUID+121, 17805, 545, 3715, 3715, 3, 1, -234.582, -198.175, -7.86628, 0.959931, 86400, 0, 0, 46924),
+(@CGUID+122, 17805, 545, 3715, 3715, 3, 1, -232.861, -192.246, -6.54962, 2.46091, 86400, 0, 0, 46924),
+(@CGUID+123, 17805, 545, 3715, 3715, 3, 1, -201.189, -261.506, -7.93338, 3.1765, 86400, 0, 0, 46924),
+(@CGUID+124, 17917, 545, 3715, 3715, 3, 0, 91.3224, -306.508, -7.78735, 3.21141, 86400, 0, 0, 46924),
+(@CGUID+125, 17917, 545, 3715, 3715, 3, 0, 90.0419, -326.115, -7.78746, 3.00197, 86400, 0, 0, 46924),
+(@CGUID+126, 17951, 545, 3715, 3715, 3, 1, -328.561, -126.069, -8.01361, 1.8675, 86400, 0, 0, 46924),
+(@CGUID+127, 17951, 545, 3715, 3715, 3, 1, -325.385, -120.199, -7.97289, 3.83972, 86400, 0, 0, 46924),
+(@CGUID+128, 17951, 545, 3715, 3715, 3, 1, -335.545, -122.596, -7.93522, 0.506145, 86400, 0, 0, 46924),
+(@CGUID+129, 17954, 545, 3715, 3715, 3, 0, -83.6271, -461.426, 7.83904, 5.91667, 86400, 0, 0, 46924),
+(@CGUID+130, 17954, 545, 3715, 3715, 3, 0, -106.371, -459.976, 7.80132, 0.296706, 86400, 0, 0, 46924),
+(@CGUID+131, 17954, 545, 3715, 3715, 3, 0, -77.5747, -488.595, 8.29564, 0.0698132, 86400, 0, 0, 46924),
+(@CGUID+132, 17954, 545, 3715, 3715, 3, 0, -112.472, -486.254, 8.27487, 5.28835, 86400, 0, 0, 46924),
+(@CGUID+133, 17954, 545, 3715, 3715, 3, 0, -75.9159, -522.248, 8.32067, 5.65487, 86400, 0, 0, 46924),
+(@CGUID+134, 17954, 545, 3715, 3715, 3, 0, -114.718, -519.863, 8.28457, 4.36332, 86400, 0, 0, 46924),
+(@CGUID+135, 17954, 545, 3715, 3715, 3, 0, -80.7551, -550.946, 8.27027, 3.80482, 86400, 0, 0, 46924),
+(@CGUID+136, 17954, 545, 3715, 3715, 3, 0, -107.059, -543.903, 8.27027, 5.89921, 86400, 0, 0, 46924),
+(@CGUID+137, 17954, 545, 3715, 3715, 3, 0, -96.2409, -571.375, 8.27027, 2.3911, 86400, 0, 0, 46924),
+(@CGUID+138, 20926, 545, 3715, 3715, 3, 0, -95.6283, -434.863, 17.8886, 0.959931, 86400, 0, 0, 46924),
+(@CGUID+139, 21338, 545, 3715, 3715, 3, 1, -303.702, -153.038, -8.05633, 5.77011, 86400, 4.5, 1, 46924),
+(@CGUID+140, 21338, 545, 3715, 3715, 3, 1, -295.617, -122.404, -7.74461, 0.738108, 86400, 4.5, 1, 46924),
+(@CGUID+141, 21338, 545, 3715, 3715, 3, 1, -297.086, -114.824, -7.75813, 2.93215, 86400, 4.5, 1, 46924),
+(@CGUID+142, 21338, 545, 3715, 3715, 3, 1, -306.254, -126.52, -8.15857, 1.09522, 86400, 4.5, 1, 46924),
+(@CGUID+143, 21338, 545, 3715, 3715, 3, 1, -299.613, -144.559, -8.09161, 0.334969, 86400, 4.5, 1, 46924),
+(@CGUID+144, 21338, 545, 3715, 3715, 3, 1, -299.213, -157.054, -7.67222, 6.25279, 86400, 4.5, 1, 46924),
+(@CGUID+145, 21338, 545, 3715, 3715, 3, 1, -287.952, -150.158, -7.67466, 1.33847, 86400, 4.5, 1, 46924),
+(@CGUID+146, 21338, 545, 3715, 3715, 3, 1, -292.293, -145.534, -7.84829, 3.03753, 86400, 4.5, 1, 46924),
+(@CGUID+147, 21338, 545, 3715, 3715, 3, 1, -296.479, -150.198, -7.96978, 0.977384, 86400, 4.5, 1, 46924),
+(@CGUID+148, 21338, 545, 3715, 3715, 3, 1, -290.483, -115.984, -7.67222, 4.30182, 86400, 4.5, 1, 46924),
+(@CGUID+149, 21338, 545, 3715, 3715, 3, 1, -292.529, -154.867, -7.67222, 5.37133, 86400, 4.5, 1, 46924),
+(@CGUID+150, 21338, 545, 3715, 3715, 3, 1, -303.121, -115.169, -7.78756, 6.0342, 86400, 4.5, 1, 46924),
+(@CGUID+151, 21338, 545, 3715, 3715, 3, 1, -306.618, -105.933, -7.67222, 0.727516, 86400, 4.5, 1, 46924),
+(@CGUID+152, 21338, 545, 3715, 3715, 3, 1, -299.779, -127.778, -8.00607, 5.6863, 86400, 4.5, 1, 46924),
+(@CGUID+153, 21338, 545, 3715, 3715, 3, 1, -309.181, -121.268, -8.0113, 0.730187, 86400, 4.5, 1, 46924),
+(@CGUID+154, 21338, 545, 3715, 3715, 3, 1, -286.721, -156.33, -7.29489, 0.0862546, 86400, 4.5, 1, 46924),
+(@CGUID+155, 21694, 545, 3715, 3715, 3, 0, 71.1122, -149.022, -19.1876, 3.56505, 86400, 2, 1, 46924),
+(@CGUID+156, 21694, 545, 3715, 3715, 3, 0, -61.7824, -147.368, -19.8397, 4.3544, 86400, 2, 1, 46924),
+(@CGUID+157, 21694, 545, 3715, 3715, 3, 0, 55.4944, -97.7868, -22.531, 6.14571, 86400, 4, 1, 46924),
+(@CGUID+158, 21694, 545, 3715, 3715, 3, 0, -44.6525, -109.419, -22.0305, 0.541052, 86400, 2, 1, 46924),
+(@CGUID+159, 21694, 545, 3715, 3715, 3, 0, 55.7596, -198.188, -22.5299, 3.31613, 86400, 5, 1, 46924),
+(@CGUID+160, 21695, 545, 3715, 3715, 3, 0, -12.7369, -160.167, -22.7181, 5.12529, 86400, 0, 0, 46924),
+(@CGUID+161, 21695, 545, 3715, 3715, 3, 0, 70.3712, -111.211, -22.5573, 3.41711, 86400, 0, 0, 46924),
+(@CGUID+162, 21695, 545, 3715, 3715, 3, 0, 8.7572, -248.263, -23.2361, 1.00228, 86400, 0, 0, 46924),
+(@CGUID+163, 21696, 545, 3715, 3715, 3, 0, 73.4094, -114.409, -22.6316, 2.14001, 86400, 0, 0, 46924),
+(@CGUID+164, 21696, 545, 3715, 3715, 3, 0, 74.4689, -108.936, -22.6274, 3.9642, 86400, 0, 0, 46924),
+(@CGUID+165, 21696, 545, 3715, 3715, 3, 0, 5.14908, -246.223, -22.82, 3.7001, 86400, 0, 0, 46924),
+(@CGUID+166, 21696, 545, 3715, 3715, 3, 0, 69.2109, -108.247, -22.627, 3.99889, 86400, 0, 0, 46924),
+(@CGUID+167, 21696, 545, 3715, 3715, 3, 0, -17.0296, -160.479, -22.4084, 5.35455, 86400, 0, 0, 46924),
+(@CGUID+168, 21696, 545, 3715, 3715, 3, 0, -12.5588, -155.507, -22.4722, 4.68552, 86400, 0, 0, 46924),
+(@CGUID+169, 21696, 545, 3715, 3715, 3, 0, 69.5912, -110.844, -22.629, 2.39144, 86400, 0, 0, 46924),
+(@CGUID+170, 21696, 545, 3715, 3715, 3, 0, 5.33942, -248.285, -22.9987, 3.89208, 86400, 0, 0, 46924),
+(@CGUID+171, 21696, 545, 3715, 3715, 3, 0, 6.63035, -250.682, -22.928, 5.00909, 86400, 0, 0, 46924),
+(@CGUID+172, 21696, 545, 3715, 3715, 3, 0, 7.75879, -252.229, -22.653, 0.0523599, 86400, 0, 0, 46924),
+(@CGUID+173, 21696, 545, 3715, 3715, 3, 0, -14.2905, -155.495, -22.5557, 5.43264, 86400, 0, 0, 46924),
+(@CGUID+174, 21696, 545, 3715, 3715, 3, 0, -12.0575, -161.064, -22.6888, 5.07313, 86400, 0, 0, 46924);
+
+-- Coilfang Engineer Equipment (Formerly Item 2023)
+DELETE FROM `creature_equip_template` WHERE (`CreatureID` = 17721);
+INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `VerifiedBuild`) VALUES
+(17721, 1, 1903, 46924),
+(17721, 2, 2023, 46924);
+
+-- Stealth Detection Auras
+UPDATE `creature_template_addon` SET `bytes2` = 1 WHERE (`entry` IN (17798, 20633));
+UPDATE `creature_template_addon` SET `bytes2` = 1, `auras` = '18950' WHERE (`entry` IN (17797, 20629));
+UPDATE `creature_template_addon` SET `auras` = '18950' WHERE (`entry` IN (17796, 20630));
+UPDATE `creature_template_addon` SET `auras` = '18950 37266' WHERE (`entry` = 21694);
+UPDATE `creature_template_addon` SET `auras` = '18950 37863' WHERE (`entry` = 21914);
+
+-- EmoteStates
+DELETE FROM `creature_addon` WHERE (`guid` IN (@CGUID+25,@CGUID+21,@CGUID+30,@CGUID+26,@CGUID+27,@CGUID+28,@CGUID+29,@CGUID+23,@CGUID+24,@CGUID+22,@CGUID+54,@CGUID+57,@CGUID+46,@CGUID+120,@CGUID+53,@CGUID+58,@CGUID+55,@CGUID+56,@CGUID+48,@CGUID+50,@CGUID+47,@CGUID+49,@CGUID+60,@CGUID+59,@CGUID+126,@CGUID+127,@CGUID+128,@CGUID+40,@CGUID+71,@CGUID+72,@CGUID+116));
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(@CGUID+25 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+21 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+30 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+26 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+27 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+28 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+29 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+23 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+24 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+22 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+54 , 0, 0, 0, 1, 378, 0, ''), -- These 2 have Talk EmoteState
+(@CGUID+57 , 0, 0, 0, 1, 378, 0, ''),
+(@CGUID+46 , 0, 0, 0, 1, 64, 0, ''), -- This is the one being beaten
+(@CGUID+120, 0, 0, 0, 1, 333, 0, ''),
+(@CGUID+53 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+58 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+55 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+56 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+48 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+50 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+47 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+49 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+60 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+59 , 0, 0, 0, 1, 173, 0, ''),
+(@CGUID+126, 0, 0, 0, 1, 69, 0, ''),
+(@CGUID+127, 0, 0, 0, 1, 69, 0, ''),
+(@CGUID+128, 0, 0, 0, 1, 69, 0, ''),
+-- Sally Out Event
+(@CGUID+40 , 0, 0, 0, 1, 375, 0, ''),
+(@CGUID+71 , 0, 0, 0, 1, 375, 0, ''),
+(@CGUID+72 , 0, 0, 0, 1, 375, 0, ''),
+(@CGUID+116, 0, 0, 0, 1, 375, 0, '');
+
+-- Patrol Formations
+DELETE FROM `creature_formations` WHERE `leaderGUID` IN (@CGUID+81,@CGUID+161,@CGUID+160,@CGUID+162,@CGUID+108,@CGUID+35,@CGUID+39) AND `memberGUID` IN (@CGUID+81,@CGUID+97,@CGUID+161,@CGUID+169,@CGUID+163,@CGUID+164,@CGUID+166,@CGUID+160,@CGUID+174,@CGUID+168,@CGUID+173,@CGUID+167,@CGUID+162,@CGUID+165,@CGUID+170,@CGUID+171,@CGUID+172,@CGUID+108,@CGUID+85,@CGUID+88,@CGUID+35,@CGUID+107,@CGUID+109,@CGUID+39,@CGUID+68,@CGUID+69);
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(@CGUID+81 , @CGUID+81 , 0, 0, 3),
+(@CGUID+81 , @CGUID+97 , 4, 90, 515),
+(@CGUID+161, @CGUID+161, 0, 0, 3), -- These should respawn
+(@CGUID+161, @CGUID+169, 3, 0, 523),
+(@CGUID+161, @CGUID+163, 3, 90, 523),
+(@CGUID+161, @CGUID+164, 3, 180, 523),
+(@CGUID+161, @CGUID+166, 3, 270, 523),
+(@CGUID+160, @CGUID+160, 0, 0, 3),
+(@CGUID+160, @CGUID+174, 3, 0, 523),
+(@CGUID+160, @CGUID+168, 3, 90, 523),
+(@CGUID+160, @CGUID+173, 3, 180, 523),
+(@CGUID+160, @CGUID+167, 3, 270, 523),
+(@CGUID+162, @CGUID+162, 0, 0, 3),
+(@CGUID+162, @CGUID+165, 3, 0, 523),
+(@CGUID+162, @CGUID+170, 3, 90, 523),
+(@CGUID+162, @CGUID+171, 3, 180, 523),
+(@CGUID+162, @CGUID+172, 3, 270, 523),
+(@CGUID+108, @CGUID+108, 0, 0, 3),
+(@CGUID+108, @CGUID+85 , 4, 135, 515),
+(@CGUID+108, @CGUID+88 , 4, 225, 515),
+(@CGUID+35 , @CGUID+35 , 0, 0, 3),
+(@CGUID+35 , @CGUID+107, 4, 90, 515),
+(@CGUID+35 , @CGUID+109, 4, 270, 515),
+(@CGUID+39 , @CGUID+39 , 0, 0, 3),
+(@CGUID+39 , @CGUID+68 , 4, 90, 515),
+(@CGUID+39 , @CGUID+69 , 4, 270, 515);
+
+-- Pathing for Coilfang Sorceress Entry: 17722
+SET @NPC := @CGUID+39;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-91.39205,`position_y`=-357.87564,`position_z`=-7.7673373 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-91.39205,-357.87564,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,2,-94.1074,-345.16232,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,3,-93.58572,-326.24854,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,4,-93.20531,-311.05127,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,5,-93.599785,-296.32315,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,6,-83.39314,-293.8334,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,7,-73.73996,-310.9025,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,8,-70.752014,-327.96936,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,9,-65.850624,-344.17862,-7.7673373,NULL,0,0,0,100,0),
+(@PATH,10,-70.46632,-361.62686,-7.7673407,NULL,0,0,0,100,0),
+(@PATH,11,-81.76927,-369.32306,-7.7673373,NULL,0,0,0,100,0);
+-- 0x203CA84420114E8000157B00010E1AD8 .go xyz -91.39205 -357.87564 -7.7673373
+
+-- Pathing for Coilfang Sorceress Entry: 17722
+SET @NPC := @CGUID+35;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-40.760025,`position_y`=-213.22351,`position_z`=-18.498798 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-40.760025,-213.22351,-18.498798,NULL,0,0,0,100,0),
+(@PATH,2,-62.77602,-221.39828,-18.515923,NULL,0,0,0,100,0),
+(@PATH,3,-74.92898,-229.57784,-18.909721,NULL,0,0,0,100,0),
+(@PATH,4,-86.678955,-246.64375,-15.4666815,NULL,0,0,0,100,0),
+(@PATH,5,-90.98924,-265.70905,-9.550582,NULL,0,0,0,100,0),
+(@PATH,6,-85.73293,-247.05574,-15.418641,NULL,0,0,0,100,0),
+(@PATH,7,-74.37394,-230.1419,-18.92191,NULL,0,0,0,100,0),
+(@PATH,8,-62.476406,-221.98744,-18.458496,NULL,0,0,0,100,0);
+-- 0x203CA84420114E8000157B00018E1AD9 .go xyz -40.760025 -213.22351 -18.498798
+
+-- Pathing for Coilfang Siren Entry: 17801
+SET @NPC := @CGUID+81;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-21.152357,`position_y`=-102.50681,`position_z`=-22.623154 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-21.152357,-102.50681,-22.623154,NULL,0,0,0,100,0),
+(@PATH,2,-11.117714,-95.33835,-21.338488,NULL,0,0,0,100,0),
+(@PATH,3,5.809313,-97.299416,-22.554895,NULL,0,0,0,100,0),
+(@PATH,4,13.625943,-107.37473,-22.068163,NULL,0,0,0,100,0),
+(@PATH,5,10.61573,-119.68263,-21.674156,NULL,0,0,0,100,0),
+(@PATH,6,-4.742761,-116.86002,-20.737574,NULL,0,0,0,100,0),
+(@PATH,7,-18.111202,-111.55076,-22.492619,NULL,0,0,0,100,0);
+-- 0x203CA8442011624000157B00010E1AD9 .go xyz -21.152357 -102.50681 -22.623154
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+100;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=18.968351,`position_y`=-212.37872,`position_z`=-22.475307 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,18.968351,-212.37872,-22.475307,NULL,0,0,0,100,0),
+(@PATH,2,16.102142,-201.59984,-22.42243,NULL,0,0,0,100,0),
+(@PATH,3,6.908176,-199.48088,-22.445473,NULL,0,0,0,100,0),
+(@PATH,4,16.102142,-201.59984,-22.42243,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00000E1AD8 .go xyz 18.968351 -212.37872 -22.475307
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+99;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=60.84472,`position_y`=-121.46467,`position_z`=-22.63287 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,60.84472,-121.46467,-22.63287,NULL,0,0,0,100,0),
+(@PATH,2,56.425083,-125.99086,-22.71687,NULL,0,0,0,100,0),
+(@PATH,3,56.080364,-133.79596,-22.796968,NULL,0,0,0,100,0),
+(@PATH,4,56.425083,-125.99086,-22.71687,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00008E1AD8 .go xyz 60.84472 -121.46467 -22.63287
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+96;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-11.075411,`position_y`=-181.28865,`position_z`=-23.693241 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-11.075411,-181.28865,-23.693241,NULL,0,0,0,100,0),
+(@PATH,2,-14.542336,-189.54443,-22.95425,NULL,0,0,0,100,0),
+(@PATH,3,-26.578821,-191.54744,-20.489792,NULL,0,0,0,100,0),
+(@PATH,4,-14.542336,-189.54443,-22.95425,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00008E1AD9 .go xyz -11.075411 -181.28865 -23.693241
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+98;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=19.741114,`position_y`=-264.3494,`position_z`=-22.031923 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,19.741114,-264.3494,-22.031923,NULL,0,0,0,100,0),
+(@PATH,2,21.14762,-258.76144,-22.28909,NULL,0,0,0,100,0),
+(@PATH,3,27.51846,-255.12863,-23.413267,NULL,0,0,0,100,0),
+(@PATH,4,21.14762,-258.76144,-22.28909,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00010E1AD8 .go xyz 19.741114 -264.3494 -22.031923
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+108;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=23.565224,`position_y`=-274.07584,`position_z`=-22.648148 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,23.565224,-274.07584,-22.648148,NULL,0,0,0,100,0),
+(@PATH,2,21.919817,-282.32028,-19.062641,NULL,0,0,0,100,0),
+(@PATH,3,25.20531,-290.68213,-14.989609,NULL,0,0,0,100,0),
+(@PATH,4,31.940006,-299.07193,-11.075828,NULL,0,0,0,100,0),
+(@PATH,5,42.50777,-309.3481,-8.581169,NULL,0,0,0,100,0),
+(@PATH,6,50.684578,-313.20782,-7.8758006,NULL,0,0,0,100,0),
+(@PATH,7,58.87572,-312.87286,-7.8382745,NULL,0,0,0,100,0),
+(@PATH,8,54.342773,-305.77542,-8.016985,NULL,0,0,0,100,0),
+(@PATH,9,46.51864,-300.70828,-9.331282,NULL,0,0,0,100,0),
+(@PATH,10,39.009525,-296.1325,-11.29513,NULL,0,0,0,100,0),
+(@PATH,11,32.261616,-289.734,-14.999209,NULL,0,0,0,100,0),
+(@PATH,12,30.141489,-280.44644,-20.453438,NULL,0,0,0,100,0),
+(@PATH,13,28.143122,-273.47678,-22.714317,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00010E1AD9 .go xyz 23.565224 -274.07584 -22.648148
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+101;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=22.998953,`position_y`=-237.74913,`position_z`=-22.410423 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,22.998953,-237.74913,-22.410423,NULL,0,0,0,100,0),
+(@PATH,2,35.259468,-231.41054,-22.649641,NULL,0,0,0,100,0),
+(@PATH,3,46.501812,-231.68512,-22.648172,NULL,0,0,0,100,0),
+(@PATH,4,35.259468,-231.41054,-22.649641,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00018E1AD9 .go xyz 22.998953 -237.74913 -22.410423
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+95;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=12.814334,`position_y`=-155.52187,`position_z`=-22.466923 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,12.814334,-155.52187,-22.466923,NULL,0,0,0,100,0),
+(@PATH,2,15.228804,-150.81071,-22.494623,NULL,0,0,0,100,0),
+(@PATH,3,12.746358,-145.28133,-22.2508,NULL,0,0,0,100,0),
+(@PATH,4,15.228804,-150.81071,-22.494623,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00020E1AD9 .go xyz 12.814334 -155.52187 -22.466923
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+103;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-4.640467,`position_y`=-127.206,`position_z`=-20.80397 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4.640467,-127.206,-20.80397,NULL,0,0,0,100,0),
+(@PATH,2,-13.544088,-124.13506,-22.186905,NULL,0,0,0,100,0),
+(@PATH,3,-22.13617,-122.873795,-21.95291,NULL,0,0,0,100,0),
+(@PATH,4,-13.544088,-124.13506,-22.186905,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00028E1AD9 .go xyz -4.640467 -127.206 -20.80397
+
+-- Pathing for Coilfang Warrior Entry: 17802
+SET @NPC := @CGUID+106;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=10.129042,`position_y`=-253.12064,`position_z`=-22.365854 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,10.129042,-253.12064,-22.365854,NULL,0,0,0,100,0),
+(@PATH,2,4.971299,-246.3245,-22.852245,NULL,0,0,0,100,0),
+(@PATH,3,6.269298,-251.79593,-22.847532,NULL,0,0,0,100,0);
+-- 0x203CA8442011628000157B00040E1AD9 .go xyz 10.129042 -253.12064 -22.365854
+
+-- Pathing for Tidal Surger Entry: 21695
+SET @NPC := @CGUID+161;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=74.02218,`position_y`=-109.2243,`position_z`=-22.627672 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,74.02218,-109.2243,-22.627672,NULL,0,0,0,100,0),
+(@PATH,2,57.948982,-114.72305,-22.61207,NULL,0,0,0,100,0),
+(@PATH,3,47.457386,-117.81651,-22.616959,NULL,0,0,0,100,0),
+(@PATH,4,49.124054,-130.7106,-22.783794,NULL,0,0,0,100,0),
+(@PATH,5,32.35119,-129.22713,-22.444157,NULL,0,0,0,100,0),
+(@PATH,6,31.37296,-147.21597,-22.541405,NULL,0,0,0,100,0),
+(@PATH,7,18.65977,-169.44081,-22.41369,NULL,0,0,0,100,0),
+(@PATH,8,28.451773,-183.30582,-22.477484,NULL,0,0,0,100,0),
+(@PATH,9,18.65977,-169.44081,-22.41369,NULL,0,0,0,100,0),
+(@PATH,10,31.37296,-147.21597,-22.541405,NULL,0,0,0,100,0),
+(@PATH,11,32.35119,-129.22713,-22.444157,NULL,0,0,0,100,0),
+(@PATH,12,49.124054,-130.7106,-22.783794,NULL,0,0,0,100,0),
+(@PATH,13,47.457386,-117.81651,-22.616959,NULL,0,0,0,100,0),
+(@PATH,14,57.948982,-114.72305,-22.61207,NULL,0,0,0,100,0);
+-- 0x203CA84420152FC000157B00000E1AD8 .go xyz 74.02218 -109.2243 -22.627672
+
+-- Pathing for Tidal Surger Entry: 21695
+SET @NPC := @CGUID+160;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-13.092999,`position_y`=-158.90938,`position_z`=-22.758324 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-13.092999,-158.90938,-22.758324,NULL,0,0,0,100,0),
+(@PATH,2,-7.079567,-173.08127,-23.894531,NULL,0,0,0,100,0),
+(@PATH,3,2.950016,-181.21527,-22.511261,NULL,0,0,0,100,0),
+(@PATH,4,17.594118,-181.13298,-22.42181,NULL,0,0,0,100,0),
+(@PATH,5,18.493568,-203.59416,-22.401865,NULL,0,0,0,100,0),
+(@PATH,6,17.594118,-181.13298,-22.42181,NULL,0,0,0,100,0),
+(@PATH,7,2.950016,-181.21527,-22.511261,NULL,0,0,0,100,0),
+(@PATH,8,-7.079567,-173.08127,-23.894531,NULL,0,0,0,100,0);
+-- 0x203CA84420152FC000157B00000E1AD9 .go xyz -13.092999 -158.90938 -22.758324
+
+-- Pathing for Tidal Surger Entry: 21695
+SET @NPC := @CGUID+162;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=8.4541445,`position_y`=-247.87244,`position_z`=-23.351183 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,8.4541445,-247.87244,-23.351183,NULL,0,0,0,100,0),
+(@PATH,2,18.289186,-233.34319,-22.514954,NULL,0,0,0,100,0),
+(@PATH,3,32.239754,-218.6089,-22.641357,NULL,0,0,0,100,0),
+(@PATH,4,39.663795,-206.20955,-22.631807,NULL,0,0,0,100,0),
+(@PATH,5,32.239754,-218.6089,-22.641357,NULL,0,0,0,100,0),
+(@PATH,6,18.289186,-233.34319,-22.514954,NULL,0,0,0,100,0);
+-- 0x203CA84420152FC000157B00008E1AD9 .go xyz 8.4541445 -247.87244 -23.351183
+
+-- Pathing for Coilfang Slavemaster Entry: 17805
+SET @NPC := @CGUID+121;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-232.3906,`position_y`=-242.79652,`position_z`=-7.8933663 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-232.3906,-242.79652,-7.8933663,NULL,0,0,0,100,0),
+(@PATH,2,-235.14708,-228.56622,-8.121222,NULL,0,0,0,100,0),
+(@PATH,3,-234.9421,-210.61797,-8.096731,NULL,0,0,0,100,0),
+(@PATH,4,-234.89098,-197.94981,-7.905258,NULL,0,0,0,100,0),
+(@PATH,5,-234.9421,-210.61797,-8.096731,NULL,0,0,0,100,0),
+(@PATH,6,-235.14708,-228.56622,-8.121222,NULL,0,0,0,100,0);
+-- 0x203CA8442011634000157B00000E1AD8 .go xyz -232.3906 -242.79652 -7.8933663
+
+-- Pathing for Coilfang Slavemaster Entry: 17805
+SET @NPC := @CGUID+123;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-202.29913,`position_y`=-261.68796,`position_z`=-7.97055 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-202.29913,-261.68796,-7.97055,NULL,0,0,0,100,0),
+(@PATH,2,-208.79207,-261.67252,-8.07919,NULL,0,0,0,100,0),
+(@PATH,3,-219.23512,-260.51917,-7.9879956,NULL,0,0,0,100,0),
+(@PATH,4,-225.14133,-256.872,-7.927412,NULL,0,0,0,100,0),
+(@PATH,5,-230.4902,-249.17448,-7.8637495,NULL,0,0,0,100,0),
+(@PATH,6,-225.14133,-256.872,-7.927412,NULL,0,0,0,100,0),
+(@PATH,7,-219.23512,-260.51917,-7.9879956,NULL,0,0,0,100,0),
+(@PATH,8,-208.79207,-261.67252,-8.07919,NULL,0,0,0,100,0);
+-- 0x203CA8442011634000157B00008E1AD9 .go xyz -202.29913 -261.68796 -7.97055
+
+/*
+	Scripted Movement
+*/
+
+-- Pathing for Dreghood Slave Entry: 17799
+DELETE FROM `waypoints` WHERE `entry`=1779900 AND `point_comment`='Dreghood Slave - Escape';
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `point_comment`) VALUES
+(1779900,1,-184.5388,-261.0958,-7.75556,NULL,'Dreghood Slave - Escape'),
+(1779900,2,-171.8678,-266.1311,-7.7555656,NULL,'Dreghood Slave - Escape'),
+(1779900,3,-164.47981,-285.26175,-8.204482,NULL,'Dreghood Slave - Escape'),
+(1779900,4,-158.7778,-305.79614,-7.4857154,NULL,'Dreghood Slave - Escape'),
+(1779900,5,-142.62102,-316.04434,-7.413147,NULL,'Dreghood Slave - Escape'),
+(1779900,6,-116.59666,-327.73846,-7.406979,NULL,'Dreghood Slave - Escape'),
+(1779900,7,-98.12532,-330.5687,-7.8259435,NULL,'Dreghood Slave - Escape'),
+(1779900,8,-90.69756,-316.37994,-7.7673373,NULL,'Dreghood Slave - Escape'),
+(1779900,9,-90.356445,-283.37686,-7.7673373,NULL,'Dreghood Slave - Escape');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17799 AND `GroupID`=0;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17799, 0, 0, 'Free at last!', 14, 0, 100, 5, 0, 0, 18707, 0, 'Dreghood Slave'),
+(17799, 0, 1, 'We have waited forever for this day to come!', 14, 0, 100, 5, 0, 0, 18711, 0, 'Dreghood Slave'),
+(17799, 0, 2, 'The pain is finally over.', 14, 0, 100, 5, 0, 0, 18712, 0, 'Dreghood Slave'),
+(17799, 0, 3, 'How can we ever repay you for this?', 14, 0, 100, 5, 0, 0, 18710, 0, 'Dreghood Slave'),
+(17799, 0, 4, 'I spit on the corpse of these filthy naga.', 14, 0, 100, 5, 0, 0, 18713, 0, 'Dreghood Slave'),
+(17799, 0, 5, 'Thank you!', 14, 0, 100, 5, 0, 0, 18709, 0, 'Dreghood Slave');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17805 AND `GroupID`=1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17805, 1, 0, 'Assist me slaves!', 14, 0, 100, 0, 0, 0, 18972, 0, 'Coilfang Slavemaster - Aggro');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (17799, 17805));
+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
+(17805, 0, 0, 0, 0, 0, 100, 0, 8000, 12000, 12000, 15000, 0, 11, 10987, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - In Combat - Cast \'Geyser\''),
+(17805, 0, 1, 0, 0, 0, 100, 0, 4100, 7100, 11000, 15000, 0, 11, 6713, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - In Combat - Cast \'Disarm\''),
+(17805, 0, 2, 3, 4, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 9, 17799, 0, 15, 1, 0, 0, 0, 0, 'Coilfang Slavemaster - On Aggro - Store Targetlist (Store Nearby Slaves)'),
+(17805, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - On Aggro - Set Data 1 1 (Call Slaves for Help)'),
+(17805, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - On Aggro - Say Line \'Assist me slaves!\''),
+(17805, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - On Just Died - Set Data 2 2 (Free Stored Slaves)'),
+(17799, 0, 0, 0, 2, 0, 100, 1, 0, 20, 0, 0, 0, 11, 8269, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Between 0-20% Health - Cast \'Frenzy\' (No Repeat)'),
+(17799, 0, 1, 2, 38, 0, 100, 0, 1, 1, 0, 0, 0, 2, 16, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - On Data Set 1 1 (Coilfang Slavemaster) - Set Faction 16'),
+(17799, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 20, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Linked - Start Attacking Closest Player'),
+(17799, 0, 3, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 80, 1779900, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - On Data Set 2 2 (Coilfang Slavemaster) - Run Script (Escape)');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 1779900);
+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
+(1779900, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Actionlist - Stop Combat'),
+(1779900, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 190, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Actionlist - Set Faction 190'),
+(1779900, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Actionlist - Set Reactstate Passive'),
+(1779900, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Actionlist - Say Line 0'),
+(1779900, 9, 4, 0, 0, 0, 100, 0, 1200, 1200, 0, 0, 0, 53, 1, 1779900, 0, 0, 1000, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Actionlist - Start Waypoint');
+
+-- Script for the 2 Slavemasters beating the Slave
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (-(@CGUID+46), -(@CGUID+120), -(@CGUID+122)));
+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
+(-(@CGUID+46), 0, 0, 0, 2, 0, 100, 1, 0, 20, 0, 0, 0, 11, 8269, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Between 0-20% Health - Cast \'Frenzy\' (No Repeat)'),
+(-(@CGUID+46), 0, 1, 0, 1, 0, 100, 0, 30000, 40000, 30000, 40000, 0, 45, 1, 1, 0, 0, 0, 0, 10, @CGUID+120, 17805, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Out of Combat - Set Data 1 1 (Start Emotes)'),
+(-(@CGUID+46), 0, 2, 0, 1, 0, 100, 0, 40000, 50000, 40000, 50000, 0, 45, 1, 1, 0, 0, 0, 0, 10, @CGUID+122, 17805, 0, 0, 0, 0, 0, 0, 'Dreghood Slave - Out of Combat - Set Data 1 1 (Start Emotes)'),
+(-(@CGUID+120), 0, 0, 0, 0, 0, 100, 0, 8000, 12000, 12000, 15000, 0, 11, 10987, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - In Combat - Cast \'Geyser\''),
+(-(@CGUID+120), 0, 1, 0, 0, 0, 100, 0, 4100, 7100, 11000, 15000, 0, 11, 6713, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - In Combat - Cast \'Disarm\''),
+(-(@CGUID+120), 0, 2, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 80, 1780500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - On Data Set 1 1 - Run Script for Emotes'),
+(-(@CGUID+122), 0, 0, 0, 0, 0, 100, 0, 8000, 12000, 12000, 15000, 0, 11, 10987, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - In Combat - Cast \'Geyser\''),
+(-(@CGUID+122), 0, 1, 0, 0, 0, 100, 0, 4100, 7100, 11000, 15000, 0, 11, 6713, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - In Combat - Cast \'Disarm\''),
+(-(@CGUID+122), 0, 2, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 80, 1780501, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - On Data Set 1 1 - Run Script for Emotes');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` IN (1780500, 1780501));
+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
+(1780500, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 5, 36, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - Actionlist - Play Emote 36 (OneShotAttack1H)'),
+(1780500, 9, 1, 0, 0, 0, 100, 0, 3600, 4800, 0, 0, 0, 5, 36, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - Actionlist - Play Emote 36 (OneShotAttack1H)'),
+(1780501, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 5, 45, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - Actionlist - Play Emote 45 (OneShotReady1H)'),
+(1780501, 9, 1, 0, 0, 0, 100, 0, 6000, 8400, 0, 0, 0, 5, 36, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - Actionlist - Play Emote 36 (OneShotAttack1H)'),
+(1780501, 9, 2, 0, 0, 0, 100, 0, 6000, 8400, 0, 0, 0, 5, 36, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - Actionlist - Play Emote 36 (OneShotAttack1H)'),
+(1780501, 9, 3, 0, 0, 0, 100, 0, 6000, 8400, 0, 0, 0, 5, 36, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Slavemaster - Actionlist - Play Emote 36 (OneShotAttack1H)');
+
+-- Door Emote
+DELETE FROM `creature_template_addon` WHERE (`entry` = 20926);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(20926, 0, 0, 0, 0, 0, 5, '');
+
+-- Main Chambers Door RP
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (-(@CGUID+71),-(@CGUID+72),-(@CGUID+116),-(@CGUID+40)));
+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
+(-(@CGUID+71), 0, 0, 0, 4, 0, 15, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon Sally Left - On Aggro - Say Line 0'),
+(-(@CGUID+71), 0, 1, 0, 0, 0, 100, 0, 3000, 5000, 5000, 7000, 0, 11, 15496, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon Sally Left - In Combat - Cast \'Cleave\''),
+(-(@CGUID+71), 0, 2, 0, 12, 0, 100, 0, 0, 20, 10000, 10000, 0, 11, 7160, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon Sally Left - Target Between 0-20% Health - Cast \'Execute\''),
+(-(@CGUID+71), 0, 3, 0, 0, 0, 100, 0, 15000, 30000, 30000, 30000, 0, 11, 18765, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon Sally Left - In Combat - Cast \'Sweeping Strikes\''),
+(-(@CGUID+71), 0, 1001, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 29, 4, 90, 0, 0, 0, 2, 10, @CGUID+72, 17800, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon Sally Left - On Data Set 1 1 - Start Follow - Sally Out Event'),
+(-(@CGUID+72), 0, 0, 0, 4, 0, 15, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon - On Aggro - Say Line 0'),
+(-(@CGUID+72), 0, 1, 0, 0, 0, 100, 0, 3000, 5000, 5000, 7000, 0, 11, 15496, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon - In Combat - Cast \'Cleave\''),
+(-(@CGUID+72), 0, 2, 0, 12, 0, 100, 0, 0, 20, 10000, 10000, 0, 11, 7160, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon - Target Between 0-20% Health - Cast \'Execute\''),
+(-(@CGUID+72), 0, 1001, 1002, 10, 0, 100, 1, 0, 90, 0, 0, 1, 69, 1, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, -94.9473, -410.061, -7.62566, 0, 'Coilfang Myrmidon - Within 0-90 Range Out of Combat LoS - Move To Position (No Repeat)'),
+(-(@CGUID+72), 0, 1002, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 9, 0, 0, 15, 1, 0, 0, 0, 0, 'Coilfang Myrmidon - Within 0-90 Range Out of Combat LoS - Set Data 1 1 (No Repeat)'), -- This is hacked, they should move immediately once the door opens. Not only I think moving in sight of players is better, though, I also didn't manage to trigger from the gob using only SAI
+(-(@CGUID+72), 0, 1003, 0, 34, 0, 100, 0, 0, 1, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon - On Reached Point 1 - Set Home Position'),
+(-(@CGUID+72), 0, 1004, 0, 11, 0, 100, 512, 0, 0, 0, 0, 0, 121, 90, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Myrmidon - On Respawn - Set Sight Distance to 90y'),
+(-(@CGUID+116), 0, 0, 0, 0, 0, 100, 2, 5000, 8000, 13000, 16000, 0, 11, 22582, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - In Combat - Cast \'Frost Shock\' (Normal Dungeon)'),
+(-(@CGUID+116), 0, 1, 0, 0, 0, 100, 4, 5000, 8000, 13000, 16000, 0, 11, 37865, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - In Combat - Cast \'Frost Shock\' (Heroic Dungeon)'),
+(-(@CGUID+116), 0, 2, 0, 74, 0, 100, 2, 0, 40, 9000, 14000, 40, 11, 22883, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - On Friendly Between 0-40% Health - Cast \'Heal\' (Normal Dungeon)'),
+(-(@CGUID+116), 0, 3, 0, 74, 0, 100, 4, 0, 40, 9000, 14000, 40, 11, 31730, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - On Friendly Between 0-40% Health - Cast \'Heal\' (Heroic Dungeon)'),
+(-(@CGUID+116), 0, 4, 0, 0, 0, 100, 0, 9000, 12000, 14000, 18000, 0, 11, 8281, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - In Combat - Cast \'Sonic Burst\''),
+(-(@CGUID+116), 0, 5, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - On Aggro - Say Line 0'),
+(-(@CGUID+116), 0, 1001, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 29, 4, 270, 0, 0, 0, 2, 10, @CGUID+72, 17800, 0, 0, 0, 0, 0, 0, 'Coilfang Oracle Sally Left - On Data Set 1 1 - Start Follow - Sally Out Event'),
+(-(@CGUID+40), 0, 0, 0, 4, 0, 15, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - On Aggro - Say Line 0'),
+(-(@CGUID+40), 0, 1, 0, 0, 0, 100, 2, 0, 0, 2400, 3800, 0, 11, 12675, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - In Combat - Cast \'Frostbolt\' (Normal Dungeon)'),
+(-(@CGUID+40), 0, 2, 0, 0, 0, 100, 4, 0, 0, 2400, 3800, 0, 11, 37930, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - In Combat - Cast \'Frostbolt\' (Heroic Dungeon)'),
+(-(@CGUID+40), 0, 3, 0, 9, 0, 100, 2, 0, 8, 13000, 18000, 1, 11, 15063, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - Within 0-8 Range - Cast \'Frost Nova\' (Normal Dungeon)'),
+(-(@CGUID+40), 0, 4, 0, 9, 0, 100, 4, 0, 8, 13000, 18000, 1, 11, 15531, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - Within 0-8 Range - Cast \'Frost Nova\' (Heroic Dungeon)'),
+(-(@CGUID+40), 0, 5, 0, 0, 0, 100, 2, 18000, 20000, 25000, 27000, 0, 11, 39416, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - In Combat - Cast \'Blizzard\' (Normal Dungeon)'),
+(-(@CGUID+40), 0, 6, 0, 0, 0, 100, 4, 18000, 20000, 25000, 27000, 0, 11, 31581, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - In Combat - Cast \'Blizzard\' (Heroic Dungeon)'),
+(-(@CGUID+40), 0, 1001, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 29, 8, 90, 0, 0, 0, 2, 10, @CGUID+72, 17800, 0, 0, 0, 0, 0, 0, 'Coilfang Sorceress Sally Right - On Data Set 1 1 - Start Follow - Sally Out Event');
+
+-- Non-Gatherable Gobs
+SET @OGUID := 830;
+
+DELETE FROM `gameobject` WHERE `id` IN (183049, 184125, 184126, 182197) AND `map`=545;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(@OGUID+0, 183049, 545, 3715, 3715, 3, 1, -95.5583724975585937, -437.624664306640625, 4.946238040924072265, 3.141592741012573242, 0, 0, -1, 0, 86400, 255, 1, 43400),
+(@OGUID+1, 184125, 545, 3715, 3715, 3, 1, 98.8156890869140625, -316.336395263671875, -6.68396186828613281, 4.799657344818115234, 0, 0, -0.67558956146240234, 0.737277925014495849, 86400, 255, 1, 43400),
+(@OGUID+2, 184126, 545, 3715, 3715, 3, 1, -332.350006103515625, -117.158683776855468, -6.70766210556030273, 0.261798173189163208, 0, 0, 0.130525588989257812, 0.991444945335388183, 86400, 255, 1, 43400),
+(@OGUID+3, 182197, 545, 3715, 3715, 3, 1, 19.60387611389160156, -304.913726806640625, -66.1715011596679687, 6.108653545379638671, 0, 0, -0.08715534210205078, 0.996194720268249511, 86400, 255, 1, 43400);
+
+-- Static Linking
+DELETE FROM `creature_formations` WHERE `groupAI` IN (3, 27) AND `leaderGUID` IN (@CGUID+22,@CGUID+23,@CGUID+26,@CGUID+28,@CGUID+30,@CGUID+31,@CGUID+36,@CGUID+37,@CGUID+41,@CGUID+42,@CGUID+43,@CGUID+44,@CGUID+61,@CGUID+63,@CGUID+72,@CGUID+80,@CGUID+86,@CGUID+102,@CGUID+103,@CGUID+110,@CGUID+117,@CGUID+120,@CGUID+139,@CGUID+140) AND `memberGUID` IN (@CGUID+21,@CGUID+22,@CGUID+23,@CGUID+24,@CGUID+25,@CGUID+26,@CGUID+27,@CGUID+28,@CGUID+29,@CGUID+30,@CGUID+31,@CGUID+32,@CGUID+33,@CGUID+34,@CGUID+36,@CGUID+37,@CGUID+38,@CGUID+40,@CGUID+41,@CGUID+42,@CGUID+43,@CGUID+44,@CGUID+61,@CGUID+62,@CGUID+63,@CGUID+64,@CGUID+65,@CGUID+66,@CGUID+67,@CGUID+70,@CGUID+71,@CGUID+72,@CGUID+73,@CGUID+74,@CGUID+75,@CGUID+76,@CGUID+77,@CGUID+78,@CGUID+79,@CGUID+80,@CGUID+82,@CGUID+83,@CGUID+84,@CGUID+86,@CGUID+87,@CGUID+89,@CGUID+90,@CGUID+91,@CGUID+92,@CGUID+93,@CGUID+94,@CGUID+95,@CGUID+96,@CGUID+98,@CGUID+99,@CGUID+100,@CGUID+101,@CGUID+102,@CGUID+103,@CGUID+106,@CGUID+110,@CGUID+111,@CGUID+112,@CGUID+113,@CGUID+114,@CGUID+115,@CGUID+116,@CGUID+117,@CGUID+118,@CGUID+119,@CGUID+120,@CGUID+122,@CGUID+124,@CGUID+125,@CGUID+126,@CGUID+127,@CGUID+128,@CGUID+139,@CGUID+140,@CGUID+141,@CGUID+142,@CGUID+143,@CGUID+144,@CGUID+145,@CGUID+146,@CGUID+147,@CGUID+148,@CGUID+149,@CGUID+150,@CGUID+151,@CGUID+152,@CGUID+153,@CGUID+154);
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `groupAI`) VALUES
+(@CGUID+103, @CGUID+103, 3),
+(@CGUID+103, @CGUID+21, 3),
+(@CGUID+103, @CGUID+25, 3),
+(@CGUID+30, @CGUID+30, 3),
+(@CGUID+30, @CGUID+95, 3),
+(@CGUID+30, @CGUID+114, 3),
+(@CGUID+30, @CGUID+83, 3),
+(@CGUID+110, @CGUID+110, 3),
+(@CGUID+110, @CGUID+77, 3),
+(@CGUID+110, @CGUID+79, 3),
+(@CGUID+22, @CGUID+22, 3),
+(@CGUID+22, @CGUID+84, 3),
+(@CGUID+22, @CGUID+99, 3),
+(@CGUID+26, @CGUID+26, 3),
+(@CGUID+26, @CGUID+96, 3),
+(@CGUID+26, @CGUID+112, 3),
+(@CGUID+26, @CGUID+27, 3),
+(@CGUID+28, @CGUID+28, 3),
+(@CGUID+28, @CGUID+29, 3),
+(@CGUID+28, @CGUID+100, 3),
+(@CGUID+28, @CGUID+111, 3),
+(@CGUID+23, @CGUID+23, 3),
+(@CGUID+23, @CGUID+78, 3),
+(@CGUID+23, @CGUID+101, 3),
+(@CGUID+23, @CGUID+24, 3),
+(@CGUID+86, @CGUID+86, 3),
+(@CGUID+86, @CGUID+87, 3),
+(@CGUID+86, @CGUID+115, 3),
+(@CGUID+86, @CGUID+106, 3),
+(@CGUID+80, @CGUID+80, 3),
+(@CGUID+80, @CGUID+98, 3),
+(@CGUID+80, @CGUID+82, 3),
+(@CGUID+80, @CGUID+113, 3),
+(@CGUID+44, @CGUID+44, 27),
+(@CGUID+44, @CGUID+124, 27),
+(@CGUID+44, @CGUID+125, 27),
+(@CGUID+61, @CGUID+61, 3),
+(@CGUID+61, @CGUID+62, 3),
+(@CGUID+102, @CGUID+102, 3),
+(@CGUID+102, @CGUID+33, 3),
+(@CGUID+102, @CGUID+34, 3),
+(@CGUID+37, @CGUID+37, 3),
+(@CGUID+37, @CGUID+91, 3),
+(@CGUID+37, @CGUID+67, 3),
+(@CGUID+37, @CGUID+66, 3),
+(@CGUID+36, @CGUID+36, 3),
+(@CGUID+36, @CGUID+90, 3),
+(@CGUID+36, @CGUID+89, 3),
+(@CGUID+36, @CGUID+64, 3),
+(@CGUID+31, @CGUID+31, 3),
+(@CGUID+31, @CGUID+32, 3),
+(@CGUID+31, @CGUID+38, 3),
+(@CGUID+31, @CGUID+70, 3),
+(@CGUID+63, @CGUID+63, 3),
+(@CGUID+63, @CGUID+65, 3),
+(@CGUID+120, @CGUID+120, 3),
+(@CGUID+120, @CGUID+122, 3),
+(@CGUID+139, @CGUID+139, 3),
+(@CGUID+139, @CGUID+146, 3),
+(@CGUID+139, @CGUID+143, 3),
+(@CGUID+139, @CGUID+145, 3),
+(@CGUID+139, @CGUID+147, 3),
+(@CGUID+139, @CGUID+149, 3),
+(@CGUID+139, @CGUID+154, 3),
+(@CGUID+139, @CGUID+144, 3),
+(@CGUID+140, @CGUID+140, 3),
+(@CGUID+140, @CGUID+152, 3),
+(@CGUID+140, @CGUID+142, 3),
+(@CGUID+140, @CGUID+150, 3),
+(@CGUID+140, @CGUID+153, 3),
+(@CGUID+140, @CGUID+151, 3),
+(@CGUID+140, @CGUID+141, 3),
+(@CGUID+140, @CGUID+148, 3),
+(@CGUID+43, @CGUID+43, 3),
+(@CGUID+43, @CGUID+127, 3),
+(@CGUID+43, @CGUID+126, 3),
+(@CGUID+43, @CGUID+128, 3),
+(@CGUID+72, @CGUID+72, 3),
+(@CGUID+72, @CGUID+116, 3),
+(@CGUID+72, @CGUID+71, 3),
+(@CGUID+72, @CGUID+40, 3),
+(@CGUID+117, @CGUID+117, 3),
+(@CGUID+117, @CGUID+74, 3),
+(@CGUID+117, @CGUID+73, 3),
+(@CGUID+117, @CGUID+92, 3),
+(@CGUID+41, @CGUID+41, 3),
+(@CGUID+41, @CGUID+75, 3),
+(@CGUID+41, @CGUID+118, 3),
+(@CGUID+41, @CGUID+93, 3),
+(@CGUID+42, @CGUID+42, 3),
+(@CGUID+42, @CGUID+76, 3),
+(@CGUID+42, @CGUID+94, 3),
+(@CGUID+42, @CGUID+119, 3);

From 03495b773735d68566460b4b665bb6b36e5cf4b3 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Tue, 28 Mar 2023 12:58:50 +0000
Subject: [PATCH 15/15] chore(DB): import pending files

Referenced commit(s): 80b7784b3434b80ea7da885b501670cc9247862c
---
 .../rev_1679503572800829900.sql => db_world/2023_03_28_01.sql}   | 1 +
 .../rev_1679620675628266300.sql => db_world/2023_03_28_02.sql}   | 1 +
 .../rev_1679690789861656800.sql => db_world/2023_03_28_03.sql}   | 1 +
 3 files changed, 3 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1679503572800829900.sql => db_world/2023_03_28_01.sql} (99%)
 rename data/sql/updates/{pending_db_world/rev_1679620675628266300.sql => db_world/2023_03_28_02.sql} (99%)
 rename data/sql/updates/{pending_db_world/rev_1679690789861656800.sql => db_world/2023_03_28_03.sql} (69%)

diff --git a/data/sql/updates/pending_db_world/rev_1679503572800829900.sql b/data/sql/updates/db_world/2023_03_28_01.sql
similarity index 99%
rename from data/sql/updates/pending_db_world/rev_1679503572800829900.sql
rename to data/sql/updates/db_world/2023_03_28_01.sql
index 99e8cf8a1..6f2f4553d 100644
--- a/data/sql/updates/pending_db_world/rev_1679503572800829900.sql
+++ b/data/sql/updates/db_world/2023_03_28_01.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_03_28_00 -> 2023_03_28_01
 --
 DELETE FROM `creature` WHERE `id1` IN (1420,2914,6827,13321,17721,17722,17796,17797,17798,17799,17800,17801,17802,17803,17805,17917,17954,20926,21338,21694,21695,21696) AND `map`=545 AND `guid` IN (116,118,120,308,317,320,425,452,502,1550,1552,1554,1555,1557,1559,1560,1561,1723,1741,1742,2080,2090,2093,3453,3641,6439,12396,12573,12574,12575,12576,12577,12578,12579,12580,12581,12584,12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12597,12598,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695,12696,12697,12698,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710,12711,12712,12713,12714,12715,12716);
 DELETE FROM `linked_respawn` WHERE `linkType`=0 AND `linkedGuid` IN (3453, 12597, 12613) AND `guid` IN (118,120,308,317,320,452,502,1550,1552,1554,1557,1559,1560,1741,1742,2080,2090,2093,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695,12696,12697,12698,12699,12700,12702,12703,12704,12706,12709,12710,12711,12714,12715,12716,116,1561,1723,3641,6439,12396,12573,12574,12575,12576,12577,12578,12579,12580,12581,12584,12585,12586,12587,12588,12589,12590,12591,12592,12593,12608,12609,12610,12612,12614,12615,12616,12618,12619,12620,12621,12622,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12635,12636,12637,12638,12660,12661,12662,12663,12667,12668,12669,12641,12642,12643,12646,12647,12648,12649,12650,12651,12652,12653);
diff --git a/data/sql/updates/pending_db_world/rev_1679620675628266300.sql b/data/sql/updates/db_world/2023_03_28_02.sql
similarity index 99%
rename from data/sql/updates/pending_db_world/rev_1679620675628266300.sql
rename to data/sql/updates/db_world/2023_03_28_02.sql
index 8d402775e..d108cc0a5 100644
--- a/data/sql/updates/pending_db_world/rev_1679620675628266300.sql
+++ b/data/sql/updates/db_world/2023_03_28_02.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_03_28_01 -> 2023_03_28_02
 --
 SET @OGUID := 105242;
 SET @POOL := 13421;
diff --git a/data/sql/updates/pending_db_world/rev_1679690789861656800.sql b/data/sql/updates/db_world/2023_03_28_03.sql
similarity index 69%
rename from data/sql/updates/pending_db_world/rev_1679690789861656800.sql
rename to data/sql/updates/db_world/2023_03_28_03.sql
index 32a80f95a..19ddf563a 100644
--- a/data/sql/updates/pending_db_world/rev_1679690789861656800.sql
+++ b/data/sql/updates/db_world/2023_03_28_03.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_03_28_02 -> 2023_03_28_03
 --
 UPDATE `gameobject_template_addon` SET `faction` = 1375, `flags` = 32 WHERE (`entry` = 184449);