Core/Scripts: Include cleanup

7 files changed, 35 insertions, 31 deletions

diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index be0d7053129..868c1ae21a1 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -16,8 +16,9 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "CreatureGroups.h"
+#include "InstanceScript.h"
+#include "ScriptedCreature.h"
 #include "stonecore.h"
 
 // TO-DO:
@@ -250,7 +251,7 @@ class boss_corborus : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_corborusAI>(creature);
+            return GetStonecoreAI<boss_corborusAI>(creature);
         }
 };
 
@@ -312,7 +313,7 @@ class npc_rock_borer : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<npc_rock_borerAI>(creature);
+            return GetStonecoreAI<npc_rock_borerAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index ba6728f76f6..ce6a3d77411 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -22,7 +22,6 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
-#include "SpellMgr.h"
 #include "SpellScript.h"
 #include "stonecore.h"
 #include "Vehicle.h"
@@ -300,7 +299,7 @@ class boss_high_priestess_azil : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_high_priestess_azilAI>(creature);
+            return GetStonecoreAI<boss_high_priestess_azilAI>(creature);
         }
 };
 
@@ -334,7 +333,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_devout_followerAI>(creature);
+        return GetStonecoreAI<npc_devout_followerAI>(creature);
     }
 };
 
@@ -351,7 +350,7 @@ public:
             DoCast(me, SPELL_GRAVITY_WELL_VISUAL);
             events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_DAMAGE, 3200);
             events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_PULL, 4500);
-            if (!me->GetMap()->IsHeroic())
+            if (!IsHeroic())
                 me->DespawnOrUnsummon(23200);
         }
 
@@ -392,7 +391,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_gravity_wellAI>(creature);
+        return GetStonecoreAI<npc_gravity_wellAI>(creature);
     }
 };
 
@@ -465,7 +464,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_seismic_shardAI>(creature);
+        return GetStonecoreAI<npc_seismic_shardAI>(creature);
     }
 };
 
@@ -481,9 +480,7 @@ public:
 
         bool Validate(SpellInfo const* /*spellInfo*/) override
         {
-            if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_ADD_SOUTH))
-                return false;
-            return true;
+            return ValidateSpellInfo({ SPELL_SUMMON_ADD_SOUTH });
         }
 
         void HandleScript(SpellEffIndex /*effIndex*/)
@@ -517,9 +514,7 @@ public:
 
         bool Validate(SpellInfo const* /*spellInfo*/) override
         {
-            if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_ADD_WEST))
-                return false;
-            return true;
+            return ValidateSpellInfo({ SPELL_SUMMON_ADD_WEST });
         }
 
         void HandleScript(SpellEffIndex /*effIndex*/)
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index 963e336dd51..38303a31ae2 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -19,8 +19,9 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
-#include "Vehicle.h"
 #include "stonecore.h"
+#include "TemporarySummon.h"
+#include "Vehicle.h"
 
 enum Spells
 {
@@ -180,7 +181,7 @@ class boss_ozruk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_ozrukAI>(creature);
+            return GetStonecoreAI<boss_ozrukAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
index 1b8c3682b09..a9beb1b5421 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
@@ -19,10 +19,8 @@
 #include "GameObject.h"
 #include "InstanceScript.h"
 #include "Map.h"
-#include "Player.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
-#include "SpellMgr.h"
 #include "SpellScript.h"
 #include "stonecore.h"
 
@@ -318,7 +316,7 @@ class boss_slabhide : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_slabhideAI>(creature);
+            return GetStonecoreAI<boss_slabhideAI>(creature);
         }
 };
 
@@ -361,7 +359,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_lava_fissureAI>(creature);
+        return GetStonecoreAI<npc_lava_fissureAI>(creature);
     }
 };
 
@@ -407,7 +405,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_stalactite_triggerAI>(creature);
+        return GetStonecoreAI<npc_stalactite_triggerAI>(creature);
     }
 };
 
@@ -513,9 +511,7 @@ public:
 
         bool Validate(SpellInfo const* /*spellInfo*/) override
         {
-            if (!sSpellMgr->GetSpellInfo(SPELL_CRYSTAL_STORM_TRIGGER))
-                return false;
-            return true;
+            return ValidateSpellInfo({ SPELL_CRYSTAL_STORM_TRIGGER });
         }
 
         void HandleDummyEffect(SpellEffIndex /*eff*/)
diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
index c8624afa969..6ef8893292f 100644
--- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
@@ -16,9 +16,11 @@
  */
 
 #include "ScriptMgr.h"
-#include "Player.h"
+#include "Creature.h"
 #include "CreatureGroups.h"
+#include "GameObject.h"
 #include "InstanceScript.h"
+#include "Map.h"
 #include "stonecore.h"
 
 #define MAX_ENCOUNTER 4
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
index 5b267676561..26c42183c93 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
@@ -15,12 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ObjectGuid.h"
-#include "ObjectMgr.h"
 #include "ScriptMgr.h"
+#include "GameObject.h"
+#include "InstanceScript.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
-#include "Player.h"
 #include "stonecore.h"
 
 enum Texts
@@ -264,7 +265,7 @@ class npc_sc_millhouse_manastorm : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<npc_sc_millhouse_manastormAI>(creature);
+            return GetStonecoreAI<npc_sc_millhouse_manastormAI>(creature);
         }
 };
 
@@ -343,7 +344,7 @@ class spell_sc_twilight_documents : public SpellScriptLoader
             void SpawnGameObject(SpellEffIndex /*effIndex*/)
             {
                 if (WorldLocation* loc = GetHitDest())
-                    GetCaster()->SummonGameObject(GAMEOBJECT_TWILIGHT_DOCUMENTS, *loc, G3D::Quat(), 7200);
+                    GetCaster()->SummonGameObject(GAMEOBJECT_TWILIGHT_DOCUMENTS, *loc, QuaternionData(), 7200);
             }
 
             void Register() override
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.h b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
index 7d5aa8183cb..ef9749d5797 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.h
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
@@ -18,6 +18,8 @@
 #ifndef DEF_STONECORE_H
 #define DEF_STONECORE_H
 
+#include "CreatureAIImpl.h"
+
 #define SCScriptName "instance_stonecore"
 #define DataHeader "SC"
 
@@ -74,4 +76,10 @@ enum SCMisc
     CREATURE_FORMATION_MILLHOUSE_EVENT_LAST_GROUP = 340492,
 };
 
+template<typename AI>
+inline AI* GetStonecoreAI(Creature* creature)
+{
+    return GetInstanceAI<AI>(creature, SCScriptName);
+}
+
 #endif // DEF_STONECORE