Merge branch 'master' into Playerbot

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "azjol_nerub.h"
 
 enum Spells
@@ -299,3 +300,4 @@ void AddSC_boss_anub_arak()
     RegisterSpellScript(spell_azjol_nerub_pound);
     RegisterSpellScript(spell_azjol_nerub_impale_summon);
 }
+

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp

@@ -15,9 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "azjol_nerub.h"
 
 enum Spells
@@ -426,3 +428,4 @@ void AddSC_boss_hadronox()
     new spell_hadronox_leech_poison();
     new achievement_hadronox_denied();
 }
+

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp

@@ -15,7 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "azjol_nerub.h"
 

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp

@@ -16,8 +16,10 @@
  */
 
 #include "AreaBoundary.h"
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "azjol_nerub.h"
 
 DoorData const doorData[] =
@@ -87,7 +89,7 @@ public:
                 case GO_ANUBARAK_DOORS1:
                 case GO_ANUBARAK_DOORS2:
                 case GO_ANUBARAK_DOORS3:
-                    AddDoor(go, true);
+                    AddDoor(go);
                     break;
             }
         }
@@ -100,7 +102,7 @@ public:
                 case GO_ANUBARAK_DOORS1:
                 case GO_ANUBARAK_DOORS2:
                 case GO_ANUBARAK_DOORS3:
-                    AddDoor(go, false);
+                    RemoveDoor(go);
                     break;
             }
         }

src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h

@@ -33,8 +33,6 @@ enum AhnkahetData
     // Other data
     // Teldram encounter related
     DATA_PRINCE_TALDARAM_PLATFORM,
-    DATA_TELDRAM_SPHERE1,
-    DATA_TELDRAM_SPHERE2,
 };
 
 enum AhnKahetCreatures
@@ -66,6 +64,18 @@ enum AhnKahetActions
     ACTION_REMOVE_PRISON            = -1
 };
 
+enum AhnKahetTexts
+{
+    SAY_SPHERE_ACTIVATED            = 0
+};
+
+enum AhnKahetPersistentData
+{
+    DATA_TELDRAM_SPHERE1,
+    DATA_TELDRAM_SPHERE2,
+    MAX_PERSISTENT_DATA
+};
+
 template <class AI, class T>
 inline AI* GetAhnKahetAI(T* obj)
 {

src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "ahnkahet.h"
 
 enum Spells
@@ -349,3 +350,4 @@ void AddSC_boss_amanitar()
     // Spells
     RegisterSpellScript(spell_amanitar_remove_mushroom_power);
 }
+

src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp

@@ -15,11 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
 #include "Containers.h"
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "ahnkahet.h"
 
 enum Misc
@@ -393,3 +395,4 @@ void AddSC_boss_elder_nadox()
     // Achievements
     new achievement_respect_your_elders();
 }
+

src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp

@@ -15,11 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "ahnkahet.h"
 
 enum Spells
@@ -503,3 +504,4 @@ void AddSC_boss_volazj()
     RegisterSpellScript(spell_herald_volzaj_insanity);
     RegisterSpellScript(spell_volazj_whisper);
 }
+

src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp

@@ -15,12 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
 #include "Containers.h"
+#include "CreatureScript.h"
 #include "ObjectAccessor.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "TemporarySummon.h"
 #include "ahnkahet.h"
 
@@ -733,3 +735,4 @@ void AddSC_boss_jedoga_shadowseeker()
     // Achievements
     new achievement_volunteer_work();
 }
+

src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp

@@ -15,12 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "ahnkahet.h"
 
 enum Spells
@@ -74,7 +75,7 @@ enum Event
 
 enum Yells
 {
-    SAY_SPHERE_ACTIVATED                    = 0,
+    //SAY_SPHERE_ACTIVATED                    = 0,
     SAY_REMOVE_PRISON                       = 1,
     SAY_AGGRO                               = 2,
     SAY_SLAY                                = 3,
@@ -212,7 +213,7 @@ struct boss_taldaram : public BossAI
         BossAI::InitializeAI();
 
         // Event not started
-        if (instance->GetData(DATA_TELDRAM_SPHERE1) != DONE || instance->GetData(DATA_TELDRAM_SPHERE2) != DONE)
+        if (instance->GetPersistentData(DATA_TELDRAM_SPHERE1) != DONE || instance->GetPersistentData(DATA_TELDRAM_SPHERE2) != DONE)
         {
             me->SetImmuneToAll(true);
             me->SetDisableGravity(true);
@@ -226,7 +227,7 @@ struct boss_taldaram : public BossAI
             return;
         }
 
-        if (instance->GetData(DATA_TELDRAM_SPHERE1) == DONE && instance->GetData(DATA_TELDRAM_SPHERE2) == DONE)
+        if (instance->GetPersistentData(DATA_TELDRAM_SPHERE1) == DONE && instance->GetPersistentData(DATA_TELDRAM_SPHERE2) == DONE)
         {
             DoAction(ACTION_REMOVE_PRISON_AT_RESET);
         }
@@ -490,44 +491,6 @@ private:
     }
 };
 
-/// @todo: Turn into new script type when Gossips have been updated
-class go_prince_taldaram_sphere : public GameObjectScript
-{
-public:
-    go_prince_taldaram_sphere() : GameObjectScript("go_prince_taldaram_sphere") {}
-
-    bool OnGossipHello(Player* pPlayer, GameObject* go) override
-    {
-        if (pPlayer && pPlayer->IsInCombat())
-        {
-            return true;
-        }
-
-        InstanceScript* pInstance = go->GetInstanceScript();
-        if (!pInstance)
-        {
-            return true;
-        }
-
-        go->SetGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
-        go->SetGoState(GO_STATE_ACTIVE);
-
-        uint32 const objectIndex = go->GetEntry() == GO_TELDARAM_SPHERE1 ? DATA_TELDRAM_SPHERE1 : DATA_TELDRAM_SPHERE2;
-        if (pInstance->GetData(objectIndex) == NOT_STARTED)
-        {
-            Creature* taldaram = ObjectAccessor::GetCreature(*go, pInstance->GetGuidData(DATA_PRINCE_TALDARAM));
-            if (taldaram && taldaram->IsAlive())
-            {
-                taldaram->AI()->Talk(SAY_SPHERE_ACTIVATED);
-            }
-
-            pInstance->SetData(objectIndex, DONE);
-        }
-
-        return true;
-    }
-};
-
 // 55931 - Conjure Flame Sphere
 class spell_prince_taldaram_conjure_flame_sphere : public SpellScript
 {
@@ -581,9 +544,9 @@ void AddSC_boss_taldaram()
 {
     RegisterAhnKahetCreatureAI(npc_taldaram_flamesphere);
     RegisterAhnKahetCreatureAI(boss_taldaram);
-    new go_prince_taldaram_sphere();
 
     // Spells
     RegisterSpellScript(spell_prince_taldaram_conjure_flame_sphere);
     RegisterSpellScript(spell_prince_taldaram_flame_sphere_summon);
 }
+

src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp

@@ -15,12 +15,25 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "ahnkahet.h"
-#include <array>
+
+ObjectData const creatureData[] =
+{
+    { NPC_PRINCE_TALDARAM, DATA_PRINCE_TALDARAM },
+    { 0,                   0                    }
+};
+
+DoorData const doorData[] =
+{
+    { GO_TELDARAM_DOOR, DATA_PRINCE_TALDARAM, DOOR_TYPE_PASSAGE },
+    { 0,                0,                    DOOR_TYPE_ROOM    }
+};
 
 class instance_ahnkahet : public InstanceMapScript
 {
@@ -29,180 +42,78 @@ public:
 
     struct instance_ahnkahet_InstanceScript : public InstanceScript
     {
-        instance_ahnkahet_InstanceScript(Map* pMap) : InstanceScript(pMap), canSaveBossStates(false)
+        instance_ahnkahet_InstanceScript(Map* pMap) : InstanceScript(pMap)
         {
             SetHeaders(DataHeader);
             SetBossNumber(MAX_ENCOUNTER);
-            teldaramSpheres.fill(NOT_STARTED);
+            SetPersistentDataCount(MAX_PERSISTENT_DATA);
+            LoadObjectData(creatureData, nullptr);
+            LoadDoorData(doorData);
         }
 
-        void OnCreatureCreate(Creature* pCreature) override
+        void OnGameObjectCreate(GameObject* go) override
         {
-            switch (pCreature->GetEntry())
-            {
-                case NPC_ELDER_NADOX:
-                    elderNadox_GUID = pCreature->GetGUID();
-                    break;
-                case NPC_PRINCE_TALDARAM:
-                    princeTaldaram_GUID = pCreature->GetGUID();
-                    break;
-                case NPC_JEDOGA_SHADOWSEEKER:
-                    jedogaShadowseeker_GUID = pCreature->GetGUID();
-                    break;
-                case NPC_HERALD_JOLAZJ:
-                    heraldVolazj_GUID = pCreature->GetGUID();
-                    break;
-                case NPC_AMANITAR:
-                    amanitar_GUID = pCreature->GetGUID();
-                    break;
-            }
-        }
-
-        void OnGameObjectCreate(GameObject* pGo) override
-        {
-            switch (pGo->GetEntry())
+            switch (go->GetEntry())
             {
                 case GO_TELDARAM_PLATFORM:
                 {
-                    taldaramPlatform_GUID = pGo->GetGUID();
-                    if (IsAllSpheresActivated() || GetBossState(DATA_PRINCE_TALDARAM) == DONE)
-                    {
-                        HandleGameObject(ObjectGuid::Empty, true, pGo);
-                    }
-
+                    taldaramPlatform_GUID = go->GetGUID();
+                    HandleGameObject(ObjectGuid::Empty, IsAllSpheresActivated(), go);
                     break;
                 }
                 case GO_TELDARAM_SPHERE1:
                 case GO_TELDARAM_SPHERE2:
                 {
-                    if (teldaramSpheres.at(pGo->GetEntry() == GO_TELDARAM_SPHERE1 ? 0 : 1) == DONE || GetBossState(DATA_PRINCE_TALDARAM) == DONE)
+                    if (GetPersistentData(go->GetEntry() == GO_TELDARAM_SPHERE1 ? 0 : 1) == DONE || GetBossState(DATA_PRINCE_TALDARAM) == DONE)
                     {
-                        pGo->SetGoState(GO_STATE_ACTIVE);
-                        pGo->SetGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
+                        go->SetGoState(GO_STATE_ACTIVE);
+                        go->SetGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
                     }
                     else
                     {
-                        pGo->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
-                    }
-
-                    break;
-                }
-                case GO_TELDARAM_DOOR:
-                {
-                    taldaramGate_GUID = pGo->GetGUID(); // Web gate past Prince Taldaram
-                    if (GetBossState(DATA_PRINCE_TALDARAM) == DONE)
-                    {
-                        HandleGameObject(ObjectGuid::Empty, true, pGo);
+                        go->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
                     }
 
                     break;
                 }
             }
+
+            InstanceScript::OnGameObjectCreate(go);
         }
 
-        bool SetBossState(uint32 type, EncounterState state) override
+        void SetData(uint32 type, uint32 /*data*/) override
         {
-            if (!InstanceScript::SetBossState(type, state))
+            uint8 index = type == DATA_TELDRAM_SPHERE1 ? 0 : 1;
+
+            if ((type == DATA_TELDRAM_SPHERE1 || type == DATA_TELDRAM_SPHERE2) && GetPersistentData(index) != DONE)
             {
-                return false;
-            }
-
-            if (type == DATA_PRINCE_TALDARAM && state == DONE)
-            {
-                HandleGameObject(taldaramGate_GUID, true);
-            }
-
-            if (canSaveBossStates)
-            {
-                SaveToDB();
-            }
-
-            return true;
-        }
-
-        void SetData(uint32 type, uint32 data) override
-        {
-            if (type == DATA_TELDRAM_SPHERE1 || type == DATA_TELDRAM_SPHERE2)
-            {
-
-                teldaramSpheres[type == DATA_TELDRAM_SPHERE1 ? 0 : 1] = data;
+                StorePersistentData(index, DONE);
                 SaveToDB();
 
-                if (IsAllSpheresActivated())
+                if (Creature* taldaram = GetCreature(DATA_PRINCE_TALDARAM))
                 {
-                    HandleGameObject(taldaramPlatform_GUID, true, nullptr);
-
-                    Creature* teldaram = instance->GetCreature(princeTaldaram_GUID);
-                    if (teldaram && teldaram->IsAlive())
+                    if (taldaram->IsAlive())
                     {
-                        teldaram->AI()->DoAction(ACTION_REMOVE_PRISON);
+                        taldaram->AI()->Talk(SAY_SPHERE_ACTIVATED);
+
+                        if (IsAllSpheresActivated())
+                        {
+                            HandleGameObject(taldaramPlatform_GUID, true, nullptr);
+                            taldaram->AI()->DoAction(ACTION_REMOVE_PRISON);
+                        }
                     }
                 }
             }
         }
 
-        uint32 GetData(uint32 type) const override
-        {
-            switch (type)
-            {
-                case DATA_TELDRAM_SPHERE1:
-                    return teldaramSpheres.at(0);
-                case DATA_TELDRAM_SPHERE2:
-                    return teldaramSpheres.at(1);
-            }
-
-            return 0;
-        }
-
-        ObjectGuid GetGuidData(uint32 type) const override
-        {
-            switch (type)
-            {
-                case DATA_ELDER_NADOX:
-                    return elderNadox_GUID;
-                case DATA_PRINCE_TALDARAM:
-                    return princeTaldaram_GUID;
-                case DATA_JEDOGA_SHADOWSEEKER:
-                    return jedogaShadowseeker_GUID;
-                case DATA_HERALD_VOLAZJ:
-                    return heraldVolazj_GUID;
-                case DATA_AMANITAR:
-                    return amanitar_GUID;
-            }
-
-            return ObjectGuid::Empty;
-        }
-
-        void ReadSaveDataMore(std::istringstream& data) override
-        {
-            data >> teldaramSpheres[0];
-            data >> teldaramSpheres[1];
-
-            canSaveBossStates = true;
-        }
-
-        void WriteSaveDataMore(std::ostringstream& data) override
-        {
-            data << teldaramSpheres[0] << ' '
-                << teldaramSpheres[1];
-        }
-
     private:
-        ObjectGuid elderNadox_GUID;
-        ObjectGuid princeTaldaram_GUID;
-        ObjectGuid jedogaShadowseeker_GUID;
-        ObjectGuid heraldVolazj_GUID;
-        ObjectGuid amanitar_GUID;
-
         // Teldaram related
         ObjectGuid taldaramPlatform_GUID;
-        ObjectGuid taldaramGate_GUID;
-        std::array<uint32, 2> teldaramSpheres;  // Used to identify activation status for sphere activation
-        bool canSaveBossStates;     // Indicates that it is safe to trigger SaveToDB call in SetBossState
 
         bool IsAllSpheresActivated() const
         {
-            return teldaramSpheres.at(0) == DONE && teldaramSpheres.at(1) == DONE;
+            return GetBossState(DATA_PRINCE_TALDARAM) == DONE ||
+                (GetPersistentData(DATA_TELDRAM_SPHERE1) == DONE && GetPersistentData(DATA_TELDRAM_SPHERE2) == DONE);
         }
     };
 

src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "obsidian_sanctum.h"
 
 enum Says
@@ -1583,3 +1584,4 @@ void AddSC_boss_sartharion()
 
     new spell_sartharion_lava_strike();
 }
+

src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp

@@ -17,8 +17,9 @@
 
 #include "AreaBoundary.h"
 #include "CreatureAIImpl.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "obsidian_sanctum.h"
 
@@ -194,3 +195,4 @@ void AddSC_instance_obsidian_sanctum()
 {
     new instance_obsidian_sanctum();
 }
+

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp

@@ -15,10 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
+#include "SpellScriptLoader.h"
 #include "ruby_sanctum.h"
 
 enum Texts
@@ -389,7 +391,6 @@ public:
             if (action == ACTION_BALTHARUS_DEATH)
             {
                 me->setActive(true);
-                me->SetFarVisible(true);
                 _isIntro = false;
 
                 _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_0, 6s);

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ruby_sanctum.h"

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp

@@ -15,14 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "GameObjectAI.h"
 #include "MapMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "Vehicle.h"
 #include "WorldSession.h"
 #include "ruby_sanctum.h"
@@ -1501,3 +1502,4 @@ void AddSC_boss_halion()
     new spell_halion_twilight_division();
     new spell_halion_twilight_mending();
 }
+

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "ruby_sanctum.h"
 
 enum Texts
@@ -244,3 +245,4 @@ void AddSC_boss_saviana_ragefire()
     new spell_saviana_conflagration_init();
     new spell_saviana_conflagration_throwback();
 }
+

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp

@@ -15,9 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
+#include "SpellScriptLoader.h"
 #include "TemporarySummon.h"
 #include "WorldPacket.h"
 #include "ruby_sanctum.h"
@@ -125,7 +127,7 @@ public:
                 case GO_BURNING_TREE_3:
                 case GO_BURNING_TREE_4:
                 case GO_TWILIGHT_FLAME_RING:
-                    AddDoor(go, true);
+                    AddDoor(go);
                     break;
                 case GO_FLAME_RING:
                     FlameRingGUID = go->GetGUID();
@@ -143,7 +145,7 @@ public:
                 case GO_BURNING_TREE_2:
                 case GO_BURNING_TREE_3:
                 case GO_BURNING_TREE_4:
-                    AddDoor(go, false);
+                    RemoveDoor(go);
                     break;
             }
         }
@@ -279,3 +281,4 @@ void AddSC_instance_ruby_sanctum()
     new instance_ruby_sanctum();
     new spell_ruby_sanctum_rallying_shout();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "trial_of_the_champion.h"
 
 enum EadricSpells
@@ -844,3 +845,4 @@ void AddSC_boss_argent_challenge()
     new spell_toc5_light_rain();
     new spell_reflective_shield();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "SpellInfo.h"

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "SpellInfo.h"

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp

@@ -15,9 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Group.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Vehicle.h"
 #include "trial_of_the_champion.h"
@@ -1310,3 +1311,4 @@ void AddSC_instance_trial_of_the_champion()
 {
     new instance_trial_of_the_champion();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "trial_of_the_champion.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp

@@ -15,11 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "trial_of_the_crusader.h"
 
 enum AnubTexts
@@ -880,7 +881,7 @@ public:
     {
         PrepareAuraScript(spell_gen_leeching_swarm_AuraScript);
 
-        bool Validate(SpellInfo const* /*spellEntry*/) override
+        bool Validate(SpellInfo const* /*spellInfo*/) override
         {
             return ValidateSpellInfo({ SPELL_LEECHING_SWARM_DMG, SPELL_LEECHING_SWARM_HEAL });
         }
@@ -952,3 +953,4 @@ void AddSC_boss_anubarak_trial()
     new spell_gen_leeching_swarm();
     new spell_gen_leeching_swarm_dmg();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "trial_of_the_crusader.h"
 
 enum eAIs
@@ -2495,3 +2496,4 @@ void AddSC_boss_faction_champions()
     new npc_toc_pet_hunter();
     new spell_faction_champion_warl_unstable_affliction();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "trial_of_the_crusader.h"
 
 enum JaraxxusTexts
@@ -523,3 +524,4 @@ void AddSC_boss_jaraxxus()
     new spell_toc25_mistress_kiss();
     new spell_mistress_kiss_area();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Vehicle.h"
 #include "trial_of_the_crusader.h"

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp

@@ -15,18 +15,18 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
-    (!) ACTUALLY FJOLA CONTROLLS THE WHOLE FIGHT (SPECIAL ABILITIES, SHARED HEALTH, ETC.) SINCE THEY DIE SIMULTANEOUSLY
-*/
-
+#include "CreatureScript.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "trial_of_the_crusader.h"
+/*
+    (!) ACTUALLY FJOLA CONTROLLS THE WHOLE FIGHT (SPECIAL ABILITIES, SHARED HEALTH, ETC.) SINCE THEY DIE SIMULTANEOUSLY
+*/
 
 enum Yells
 {
@@ -929,3 +929,4 @@ void AddSC_boss_twin_valkyr()
     new spell_valkyr_touch();
     new spell_valkyr_ball_periodic_dummy();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "GameTime.h"
 #include "Group.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "trial_of_the_crusader.h"
 
@@ -1695,3 +1696,4 @@ void AddSC_instance_trial_of_the_crusader()
 {
     new instance_trial_of_the_crusader();
 }
+

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "trial_of_the_crusader.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 

src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp

@@ -15,9 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "drak_tharon_keep.h"
 
 enum Spells

src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp

@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "drak_tharon_keep.h"
 
 enum Yells

src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "drak_tharon_keep.h"
 
 enum Yells
@@ -310,3 +311,4 @@ void AddSC_boss_tharon_ja()
     new spell_tharon_ja_dummy();
     new spell_tharon_ja_clear_gift_of_tharon_ja();
 }
+

src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp

@@ -15,9 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
+#include "SpellScriptLoader.h"
 #include "drak_tharon_keep.h"
 
 enum Yells

src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp

@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "drak_tharon_keep.h"
 
 DoorData const doorData[] =
@@ -50,7 +52,7 @@ public:
                 case GO_NOVOS_CRYSTAL_2:
                 case GO_NOVOS_CRYSTAL_3:
                 case GO_NOVOS_CRYSTAL_4:
-                    AddDoor(go, true);
+                    AddDoor(go);
                     break;
             }
         }
@@ -63,7 +65,7 @@ public:
                 case GO_NOVOS_CRYSTAL_2:
                 case GO_NOVOS_CRYSTAL_3:
                 case GO_NOVOS_CRYSTAL_4:
-                    AddDoor(go, false);
+                    RemoveDoor(go);
                     break;
             }
         }

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp

@@ -15,11 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "PassiveAI.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "forge_of_souls.h"
 
 enum Yells
@@ -405,3 +406,4 @@ void AddSC_boss_bronjahm()
     new spell_bronjahm_soulstorm_visual();
     new spell_bronjahm_soulstorm_targeting();
 }
+

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp

@@ -15,12 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "forge_of_souls.h"
 
 enum eTexts
@@ -376,3 +377,4 @@ void AddSC_boss_devourer_of_souls()
     new boss_devourer_of_souls();
     new spell_wailing_souls_periodic();
 }
+

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp

@@ -15,12 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "forge_of_souls.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "forge_of_souls.h"
 
 enum Yells
 {
@@ -303,3 +304,4 @@ void AddSC_forge_of_souls()
     new npc_fos_leader_second();
     new spell_shield_of_bones();
 }
+

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "forge_of_souls.h"
 
@@ -218,3 +219,4 @@ void AddSC_instance_forge_of_souls()
 {
     new instance_forge_of_souls();
 }
+

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "halls_of_reflection.h"
 
 enum Yells
@@ -182,3 +183,4 @@ void AddSC_boss_falric()
 {
     new boss_falric();
 }
+

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp

@@ -15,6 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "SpellScriptLoader.h"
 #include "halls_of_reflection.h"
 
 enum Yells

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp

@@ -15,8 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "halls_of_reflection.h"
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "MotionMaster.h"
+#include "SpellScriptLoader.h"
+#include "halls_of_reflection.h"
 
 enum Events
 {

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h

@@ -19,9 +19,9 @@
 #define DEF_HALLS_OF_REFLECTION_H
 
 #include "CreatureAIImpl.h"
+#include "CreatureScript.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuraEffects.h"

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "InstanceMapScript.h"
 #include "MapMgr.h"
 #include "Transport.h"
 #include "halls_of_reflection.h"
@@ -1211,3 +1212,4 @@ void AddSC_instance_halls_of_reflection()
 {
     new instance_halls_of_reflection();
 }
+

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp

@@ -16,12 +16,13 @@
  */
 
 #include "CreatureGroups.h"
+#include "CreatureScript.h"
 #include "Opcodes.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "WorldSession.h"
 #include "pit_of_saron.h"
 
@@ -380,3 +381,4 @@ void AddSC_boss_garfrost()
 
     new spell_garfrost_permafrost();
 }
+

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp

@@ -15,13 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Opcodes.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "Vehicle.h"
 #include "WorldSession.h"
 #include "pit_of_saron.h"
@@ -537,3 +538,4 @@ void AddSC_boss_ick()
     new spell_krick_explosive_barrage();
     new spell_exploding_orb_auto_grow();
 }
+

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "Vehicle.h"
 #include "pit_of_saron.h"

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "pit_of_saron.h"
 
@@ -408,3 +409,4 @@ void AddSC_instance_pit_of_saron()
 {
     new instance_pit_of_saron();
 }
+

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp

@@ -15,16 +15,18 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pit_of_saron.h"
+#include "AreaTriggerScript.h"
 #include "CreatureGroups.h"
+#include "CreatureScript.h"
 #include "MapMgr.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SmartAI.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "pit_of_saron.h"
 
 class npc_pos_leader : public CreatureScript
 {

src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "gundrak.h"
 
 enum Spells
@@ -497,3 +498,4 @@ void AddSC_boss_drakkari_colossus()
     new spell_drakkari_colossus_surge();
     new spell_drakkari_colossus_face_me();
 }
+

src/server/scripts/Northrend/Gundrak/boss_eck.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "gundrak.h"
 

src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp

@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "gundrak.h"
 
 enum Spells

src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp

@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "gundrak.h"
 
 enum eSpells

src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp

@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "gundrak.h"
 
 enum Spells

src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp

@@ -15,7 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "ScriptedCreature.h"
 #include "gundrak.h"
 
@@ -107,7 +108,7 @@ public:
                 case GO_GAL_DARAH_DOORS0:
                 case GO_GAL_DARAH_DOORS1:
                 case GO_GAL_DARAH_DOORS2:
-                    AddDoor(gameobject, true);
+                    AddDoor(gameobject);
                     break;
             }
         }
@@ -121,7 +122,7 @@ public:
                 case GO_GAL_DARAH_DOORS0:
                 case GO_GAL_DARAH_DOORS1:
                 case GO_GAL_DARAH_DOORS2:
-                    AddDoor(gameobject, false);
+                    RemoveDoor(gameobject);
                     break;
             }
         }
@@ -219,3 +220,4 @@ void AddSC_instance_gundrak()
 {
     new instance_gundrak();
 }
+

src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp

@@ -15,11 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 
 enum Texts
@@ -1814,3 +1815,4 @@ void AddSC_boss_blood_prince_council()
     new spell_valanar_kinetic_bomb_summon();
     new spell_blood_council_summon_shadow_resonance();
 }
+

src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp

@@ -15,12 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "GridNotifiers.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 
 enum Texts

src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp

@@ -15,12 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuras.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 
 enum ScriptTexts
@@ -646,7 +648,7 @@ public:
                         {
                             deathbringer->CastSpell(me, SPELL_RIDE_VEHICLE, true);
                             deathbringer->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-                            deathbringer->setDeathState(ALIVE);
+                            deathbringer->setDeathState(DeathState::Alive);
                         }
                         _events.ScheduleEvent(EVENT_OUTRO_HORDE_4, 1000);
                         _events.ScheduleEvent(EVENT_OUTRO_HORDE_5, 4000);

src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp

@@ -15,10 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 
 enum ScriptTexts

src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp

@@ -15,12 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "CreatureTextMgr.h"
 #include "GameTime.h"
 #include "MoveSpline.h"
 #include "MoveSplineInit.h"
-#include "ScriptMgr.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "Transport.h"
 #include "TransportMgr.h"
 #include "Vehicle.h"

src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp

@@ -15,12 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 #include <random>
 

src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp

@@ -15,13 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "MapMgr.h"
 #include "ObjectMgr.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
+#include "SpellScriptLoader.h"
 #include "Vehicle.h"
 #include "icecrown_citadel.h"
 #include <random>
@@ -710,3 +711,4 @@ void AddSC_boss_lord_marrowgar()
     new spell_marrowgar_bone_storm();
     new spell_marrowgar_bone_slice();
 }
+

src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp

@@ -15,13 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "GridNotifiers.h"
 #include "Group.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
+#include "SpellScriptLoader.h"
 #include "Vehicle.h"
 #include "icecrown_citadel.h"
 
@@ -1729,3 +1730,4 @@ void AddSC_boss_professor_putricide()
     new spell_putricide_eat_ooze();
     new spell_putricide_regurgitated_ooze();
 }
+

src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp

@@ -15,11 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "GridNotifiers.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuras.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 
 enum Texts
@@ -978,3 +979,4 @@ void AddSC_boss_rotface()
 
     new npc_precious_icc();
 }
+

src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp

@@ -15,12 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "GameTime.h"
 #include "GridNotifiers.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
 
 enum Texts
@@ -279,7 +282,6 @@ public:
 
         void Reset() override
         {
-            _didFirstFlyPhase = false;
             _isBelow20Pct = false;
             _isThirdPhase = false;
             _isLanding = false;
@@ -322,7 +324,6 @@ public:
                 return;
             }
 
-            _didFirstFlyPhase = false;
             _isBelow20Pct = false;
             _isThirdPhase = false;
             _bombCount = 0;
@@ -339,7 +340,6 @@ public:
             events.ScheduleEvent(EVENT_ICY_GRIP, 33s + 500ms, EVENT_GROUP_LAND_PHASE);
 
             me->setActive(true);
-            me->SetFarVisible(true);
             me->SetInCombatWithZone();
             instance->SetBossState(DATA_SINDRAGOSA, IN_PROGRESS);
 
@@ -378,7 +378,6 @@ public:
                     return;
 
                 me->setActive(true);
-                me->SetFarVisible(true);
                 me->SetDisableGravity(true);
                 me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                 me->SetSpeed(MOVE_RUN, 4.28571f);
@@ -453,9 +452,6 @@ public:
             if (!damage || me->IsInEvadeMode())
                 return;
 
-            if (!_didFirstFlyPhase)
-                return;
-
             if (!_isThirdPhase)
             {
                 if (!HealthAbovePct(35))
@@ -577,7 +573,6 @@ public:
                     }
 
                     _isInAirPhase = true;
-                    _didFirstFlyPhase = true;
                     Talk(SAY_AIR_PHASE);
                     me->SetReactState(REACT_PASSIVE);
                     me->SetSpeed(MOVE_RUN, 4.28571f);
@@ -673,7 +668,6 @@ public:
     private:
         uint8 _bombCount;
         uint8 _mysticBuffetStack;
-        bool _didFirstFlyPhase;
         bool _isBelow20Pct;
         bool _isThirdPhase;
         bool _isInAirPhase;
@@ -1409,7 +1403,6 @@ public:
                     return;
 
                 me->setActive(true);
-                me->SetFarVisible(true);
                 me->SetImmuneToPC(true);
                 float moveTime = me->GetExactDist(&SpinestalkerFlyPos) / (me->GetSpeed(MOVE_RUN) * 0.001f);
                 me->m_Events.AddEvent(new FrostwyrmLandEvent(*me, SpinestalkerLandPos), me->m_Events.CalculateTime(uint64(moveTime) + 250));
@@ -1426,7 +1419,6 @@ public:
                 return;
 
             me->setActive(false);
-            me->SetFarVisible(false);
             me->SetDisableGravity(false);
             me->SetHomePosition(SpinestalkerLandPos);
             me->SetFacingTo(SpinestalkerLandPos.GetOrientation());
@@ -1542,7 +1534,6 @@ public:
                     return;
 
                 me->setActive(true);
-                me->SetFarVisible(true);
                 me->SetImmuneToPC(true);
                 float moveTime = me->GetExactDist(&RimefangFlyPos) / (me->GetSpeed(MOVE_RUN) * 0.001f);
                 me->m_Events.AddEvent(new FrostwyrmLandEvent(*me, RimefangLandPos), me->m_Events.CalculateTime(uint64(moveTime) + 250));
@@ -1561,8 +1552,6 @@ public:
             if (point == POINT_FROSTWYRM_LAND)
             {
                 me->setActive(false);
-                me->SetFarVisible(false);
-                me->SetFarVisible(false);
                 me->SetDisableGravity(false);
                 me->SetHomePosition(RimefangLandPos);
                 me->SetFacingTo(RimefangLandPos.GetOrientation());

src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp

@@ -15,21 +15,24 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
 #include "Cell.h"
 #include "CellImpl.h"
+#include "CreatureScript.h"
 #include "CreatureTextMgr.h"
 #include "GameTime.h"
 #include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "Unit.h"
 #include "Vehicle.h"
+#include "Weather.h"
 #include "icecrown_citadel.h"
+#include "GridNotifiersImpl.h"
 
 enum Texts
 {

src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp

@@ -15,15 +15,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
 #include "Cell.h"
 #include "CellImpl.h"
+#include "CreatureScript.h"
 #include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "ObjectMgr.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
+#include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
+#include "GridNotifiersImpl.h"
 
 enum Texts
 {

src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp

@@ -15,20 +15,22 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "icecrown_citadel.h"
 #include "AccountMgr.h"
+#include "AreaTriggerScript.h"
 #include "Cell.h"
 #include "CellImpl.h"
+#include "CreatureScript.h"
 #include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "PassiveAI.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "SmartAI.h"
 #include "SpellAuraEffects.h"
+#include "SpellScriptLoader.h"
+#include "icecrown_citadel.h"
+#include "GridNotifiersImpl.h"
 
 enum Texts
 {
@@ -1257,7 +1259,7 @@ public:
     {
         if (spell->Id == SPELL_REVIVE_CHAMPION && !IsUndead)
         {
-            me->setDeathState(JUST_RESPAWNED);
+            me->setDeathState(DeathState::JustRespawned);
             uint32 newEntry = 0;
             switch (me->GetEntry())
             {

src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h

@@ -20,17 +20,18 @@
 
 #include "Chat.h"
 #include "Creature.h"
+#include "CreatureScript.h"
 #include "InstanceScript.h"
 #include "Map.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 
 #define DataHeader "IC"
 

src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp

@@ -15,9 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "InstanceScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedGossip.h"
 #include "Spell.h"
 #include "icecrown_citadel.h"
@@ -133,3 +135,4 @@ void AddSC_icecrown_citadel_teleport()
     new icecrown_citadel_teleport();
     new at_frozen_throne_teleport();
 }
+

src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp

@@ -16,13 +16,14 @@
  */
 
 #include "AccountMgr.h"
+#include "CreatureScript.h"
 #include "CreatureTextMgr.h"
 #include "Group.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
 #include "Map.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Transport.h"
 #include "WorldPacket.h"
@@ -727,7 +728,7 @@ public:
                 case GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR:
                 case GO_ICE_WALL:
                 case GO_SINDRAGOSA_ENTRANCE_DOOR:
-                    AddDoor(go, true);
+                    AddDoor(go);
                     break;
                 case GO_SCIENTIST_ENTRANCE:
                     PutricideEnteranceDoorGUID = go->GetGUID();
@@ -737,7 +738,7 @@ public:
                 case GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_01:
                 case GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_04:
                     if (instance->Is25ManRaid())
-                        AddDoor(go, true);
+                        AddDoor(go);
                     break;
                 case GO_LADY_DEATHWHISPER_ELEVATOR:
                     LadyDeathwisperElevatorGUID = go->GetGUID();
@@ -758,7 +759,7 @@ public:
                     break;
                 case GO_SAURFANG_S_DOOR:
                     DeathbringerSaurfangDoorGUID = go->GetGUID();
-                    AddDoor(go, true);
+                    AddDoor(go);
                     break;
                 case GO_DEATHBRINGER_S_CACHE_10N:
                 case GO_DEATHBRINGER_S_CACHE_25N:
@@ -873,7 +874,7 @@ public:
                         go->SetRespawnTime(7 * DAY);
                     break;
                 case GO_SCOURGE_TRANSPORTER_FIRST:
-                    AddDoor(go, true);
+                    AddDoor(go);
                     ScourgeTransporterFirstGUID = go->GetGUID();
                     if (GetBossState(DATA_LORD_MARROWGAR) == DONE)
                         go->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
@@ -911,7 +912,7 @@ public:
                 case GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR:
                 case GO_ICE_WALL:
                 case GO_SCOURGE_TRANSPORTER_FIRST:
-                    AddDoor(go, false);
+                    RemoveDoor(go);
                     break;
                 case GO_THE_SKYBREAKER_A:
                 case GO_ORGRIMS_HAMMER_H:

src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp

@@ -16,6 +16,9 @@
  */
 
 #include "boss_anubrekhan.h"
+#include "CreatureScript.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
 
 
 void AddSC_boss_anubrekhan()

src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp

@@ -16,6 +16,11 @@
  */
 
 #include "boss_faerlina.h"
+#include "CreatureScript.h"
+#include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "naxxramas.h"
+
 
 void AddSC_boss_faerlina()
 {

src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp

@@ -23,3 +23,4 @@ void AddSC_boss_four_horsemen()
     new spell_four_horsemen_mark();
     RegisterSpellScript(spell_four_horsemen_consumption);
 }
+

src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp

@@ -16,9 +16,17 @@
  */
 
 #include "boss_gluth.h"
+#include "CreatureScript.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "naxxramas.h"
+
 
 void AddSC_boss_gluth()
 {
     new boss_gluth();
     new spell_gluth_decimate();
 }
+

src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp

@@ -16,6 +16,13 @@
  */
 
 #include "boss_gothik.h"
+#include "CombatAI.h"
+#include "CreatureScript.h"
+#include "GridNotifiers.h"
+#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "naxxramas.h"
 
 void AddSC_boss_gothik()
 {
@@ -23,3 +30,4 @@ void AddSC_boss_gothik()
     new npc_boss_gothik_minion();
     new spell_gothik_shadow_bolt_volley();
 }
+

src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp

@@ -16,6 +16,14 @@
  */
 
 #include "boss_grobbulus.h"
+#include "CreatureScript.h"
+#include "PassiveAI.h"
+#include "ScriptedCreature.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "naxxramas.h"
 
 void AddSC_boss_grobbulus()
 {
@@ -24,3 +32,4 @@ void AddSC_boss_grobbulus()
     new spell_grobbulus_mutating_injection();
     new spell_grobbulus_poison();
 }
+

src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp

@@ -15,6 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
 
 #include "boss_heigan.h"
 

src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp

@@ -16,6 +16,12 @@
  */
 
 #include "boss_kelthuzad.h"
+#include "CreatureScript.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "naxxramas.h"
 
 void AddSC_boss_kelthuzad()
 {
@@ -24,3 +30,4 @@ void AddSC_boss_kelthuzad()
     new spell_kelthuzad_frost_blast();
     new spell_kelthuzad_detonate_mana();
 }
+

src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp

@@ -16,6 +16,9 @@
  */
 
 #include "boss_loatheb.h"
+#include "CreatureScript.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
 
 void AddSC_boss_loatheb()
 {

src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp

@@ -16,6 +16,11 @@
  */
 
 #include "boss_maexxna.h"
+#include "CreatureScript.h"
+#include "PassiveAI.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
+
 
 void AddSC_boss_maexxna()
 {

src/server/scripts/Northrend/Naxxramas/boss_noth.cpp

@@ -16,6 +16,10 @@
  */
 
 #include "boss_noth.h"
+#include "CreatureScript.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
+
 
 void AddSC_boss_noth()
 {

src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp

@@ -16,6 +16,9 @@
  */
 
 #include "boss_patchwerk.h"
+#include "CreatureScript.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
 
 void AddSC_boss_patchwerk()
 {

src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp

@@ -16,6 +16,10 @@
  */
 
 #include "boss_razuvious.h"
+#include "CreatureScript.h"
+#include "ScriptedCreature.h"
+#include "naxxramas.h"
+
 
 void AddSC_boss_razuvious()
 {

src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp

@@ -16,9 +16,16 @@
  */
 
 #include "boss_sapphiron.h"
+#include "CreatureScript.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "naxxramas.h"
 
 void AddSC_boss_sapphiron()
 {
     new boss_sapphiron();
     new spell_sapphiron_frost_explosion();
 }
+

src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp

@@ -16,6 +16,14 @@
  */
 
 #include "boss_thaddius.h"
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
+#include "naxxramas.h"
+
 
 void AddSC_boss_thaddius()
 {

src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp

@@ -15,11 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AreaTriggerScript.h"
 #include "CellImpl.h"
+#include "CreatureScript.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
+#include "InstanceMapScript.h"
 #include "PassiveAI.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "naxxramas.h"
 
@@ -1211,3 +1213,4 @@ void AddSC_instance_naxxramas()
     new boss_naxxramas_misc();
     new at_naxxramas_hub_portal();
 }
+

src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp

@@ -16,6 +16,8 @@
  */
 
 #include "CombatAI.h"
+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "MoveSpline.h"
 #include "MoveSplineInit.h"
 #include "Opcodes.h"
@@ -24,6 +26,7 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "Vehicle.h"
 #include "eye_of_eternity.h"
 
@@ -535,7 +538,6 @@ public:
                                             pPlayer->SendMessageToSet(&data, true);
 
                                             sScriptMgr->AnticheatSetUnderACKmount(pPlayer);
-                                            sScriptMgr->AnticheatSetSkipOnePacketForASH(pPlayer, true);
 
                                             pPlayer->SetGuidValue(PLAYER_FARSIGHT, vp->GetGUID());
                                             c->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
@@ -718,7 +720,6 @@ public:
                                 if (Player* pPlayer = i->GetSource())
                                 {
                                     sScriptMgr->AnticheatSetUnderACKmount(pPlayer);
-                                    sScriptMgr->AnticheatSetSkipOnePacketForASH(pPlayer, true);
 
                                     if (!pPlayer->IsAlive() || pPlayer->IsGameMaster())
                                         continue;
@@ -905,7 +906,6 @@ public:
 
                 sScriptMgr->AnticheatSetCanFlybyServer(plr, false);
                 sScriptMgr->AnticheatSetUnderACKmount(plr);
-                sScriptMgr->AnticheatSetSkipOnePacketForASH(plr, true);
             }
         }
 
@@ -945,7 +945,6 @@ public:
                                 plr->SetDisableGravity(true, true);
 
                                 sScriptMgr->AnticheatSetCanFlybyServer(plr, true);
-                                sScriptMgr->AnticheatSetSkipOnePacketForASH(plr, true);
                                 sScriptMgr->AnticheatSetUnderACKmount(plr);
                             }
 

src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Vehicle.h"
 #include "eye_of_eternity.h"
@@ -251,3 +252,4 @@ void AddSC_instance_eye_of_eternity()
 {
     new instance_eye_of_eternity();
 }
+

src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
 #include "nexus.h"
@@ -222,3 +223,4 @@ void AddSC_boss_anomalus()
     new boss_anomalus();
     new achievement_chaos_theory();
 }
+

src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "nexus.h"
 

src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp

@@ -16,7 +16,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "nexus.h"
 
@@ -213,3 +214,4 @@ void AddSC_boss_keristrasza()
     new boss_keristrasza();
     new achievement_intense_cold();
 }
+

src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp

@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "AchievementCriteriaScript.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "nexus.h"
 
 enum Spells

src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "nexus.h"
 

src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp

@@ -15,7 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "ScriptedCreature.h"
 #include "nexus.h"
 
@@ -93,17 +94,17 @@ public:
                 case GO_TELESTRA_SPHERE:
                     if (GetBossState(DATA_TELESTRA_ORB) != DONE && GetBossState(DATA_MAGUS_TELESTRA_EVENT) == DONE)
                         gameObject->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
-                    AddDoor(gameObject, true);
+                    AddDoor(gameObject);
                     break;
                 case GO_ANOMALUS_SPHERE:
                     if (GetBossState(DATA_ANOMALUS_ORB) != DONE && GetBossState(DATA_ANOMALUS_EVENT) == DONE)
                         gameObject->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
-                    AddDoor(gameObject, true);
+                    AddDoor(gameObject);
                     break;
                 case GO_ORMOROK_SPHERE:
                     if (GetBossState(DATA_ORMOROK_ORB) != DONE && GetBossState(DATA_ORMOROK_EVENT) == DONE)
                         gameObject->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
-                    AddDoor(gameObject, true);
+                    AddDoor(gameObject);
                     break;
             }
         }
@@ -115,7 +116,7 @@ public:
                 case GO_TELESTRA_SPHERE:
                 case GO_ANOMALUS_SPHERE:
                 case GO_ORMOROK_SPHERE:
-                    AddDoor(gameObject, false);
+                    RemoveDoor(gameObject);
                     break;
             }
         }
@@ -271,3 +272,4 @@ void AddSC_instance_nexus()
     new instance_nexus();
     new npc_crystalline_frayer();
 }
+

src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "oculus.h"
 

src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "oculus.h"
 

src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
 #include "oculus.h"

src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp

@@ -15,7 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "oculus.h"
 

src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureScript.h"
 #include "Group.h"
+#include "InstanceMapScript.h"
 #include "LFGMgr.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "oculus.h"
 
@@ -295,3 +296,4 @@ void AddSC_instance_oculus()
 {
     new instance_oculus();
 }
+