feat(Core/Scripting): move all script objects to separated files (#17860)

* feat(Core/Scripts): move all script objects to separated files * Apply 5bfeabde81 * try gcc build * again
2026-02-04 19:43:48 +00:00 · 2023-12-03 03:13:20 +07:00
parent fe9bda1bc4
commit eb1ecc38a5
717 changed files with 5832 additions and 3579 deletions
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.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 "auchenai_crypts.h"

--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.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 "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "auchenai_crypts.h"

 enum Spells
@@ -241,3 +242,4 @@ void AddSC_boss_shirrak_the_dead_watcher()
    RegisterAuchenaiCryptsCreatureAI(boss_shirrak_the_dead_watcher);
    RegisterSpellScript(spell_auchenai_possess);
 }
+
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
 #include "Map.h"
-#include "ScriptMgr.h"
 #include "auchenai_crypts.h"

 class instance_auchenai_crypts : public InstanceMapScript
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.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 "mana_tombs.h"

--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.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 "mana_tombs.h"

--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_tavarok.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_tavarok.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 "mana_tombs.h"

--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
 #include "Map.h"
-#include "ScriptMgr.h"
 #include "mana_tombs.h"

 class instance_mana_tombs : public InstanceMapScript
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.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 "SpellScript.h"
 #include "Unit.h"
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.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 "sethekk_halls.h"

--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "sethekk_halls.h"

 enum Text
@@ -179,3 +180,4 @@ void AddSC_boss_talon_king_ikiss()
    RegisterSethekkHallsCreatureAI(boss_talon_king_ikiss);
    RegisterSpellScript(spell_talon_king_ikiss_blink);
 }
+
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "sethekk_halls.h"

 DoorData const doorData[] =
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.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 "shadow_labyrinth.h"

--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.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 "shadow_labyrinth.h"

--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.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 "shadow_labyrinth.h"

--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "SpellScriptLoader.h"
 #include "shadow_labyrinth.h"

 enum Spells
@@ -257,3 +258,4 @@ void AddSC_boss_murmur()
    RegisterSpellScript(spell_shockwave_knockback);
    RegisterSpellScript(spell_murmur_sonic_boom_effect);
 }
+
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -15,8 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
+#include "SpellScriptLoader.h"
 #include "shadow_labyrinth.h"

 DoorData const doorData[] =
@@ -136,3 +138,4 @@ void AddSC_instance_shadow_labyrinth()
    new instance_shadow_labyrinth();
    RegisterSpellScript(spell_mark_of_malice);
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.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 "black_temple.h"

 enum Says
@@ -266,3 +267,4 @@ void AddSC_boss_gurtogg_bloodboil()
    new spell_gurtogg_bloodboil();
    new spell_gurtogg_eject();
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
+#include "SpellScriptLoader.h"
 #include "black_temple.h"

 enum Says
@@ -1426,3 +1427,4 @@ void AddSC_boss_illidan()
    new spell_illidan_cage_trap();
    new spell_illidan_cage_trap_stun();
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.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 "black_temple.h"

 enum Says
@@ -379,3 +380,4 @@ void AddSC_boss_mother_shahraz()
    new spell_mother_shahraz_fatal_attraction_dummy();
    new spell_mother_shahraz_fatal_attraction_aura();
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
+#include "SpellScriptLoader.h"
 #include "black_temple.h"

 enum Says
@@ -790,3 +791,4 @@ void AddSC_boss_reliquary_of_souls()
    new spell_reliquary_of_souls_aura_of_anger();
    new spell_reliquary_of_souls_spite();
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.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 "black_temple.h"

 enum Says
@@ -564,3 +565,4 @@ void AddSC_boss_shade_of_akama()
    RegisterSpellScript(spell_shade_of_akama_shade_soul_channel);
    RegisterSpellScript(spell_shade_of_akama_akama_soul_expel);
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.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 "black_temple.h"

--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.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 "black_temple.h"

 enum Says
@@ -280,3 +281,4 @@ void AddSC_boss_teron_gorefiend()
    RegisterSpellScript(spell_teron_gorefiend_spiritual_vengeance);
    RegisterSpellScript(spell_teron_gorefiend_shadowy_construct);
 }
+
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.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 "black_temple.h"

 enum Yells
@@ -155,3 +156,4 @@ void AddSC_boss_najentus()
    RegisterSpellScript(spell_najentus_needle_spine);
    RegisterSpellScript(spell_najentus_hurl_spine);
 }
+
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.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 "black_temple.h"

 enum Says
@@ -766,3 +767,4 @@ void AddSC_boss_illidari_council()
    new spell_illidari_council_judgement();
    new spell_illidari_council_deadly_strike();
 }
+
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -15,8 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
+#include "SpellScriptLoader.h"
 #include "black_temple.h"

 DoorData const doorData[] =
@@ -657,3 +659,4 @@ void AddSC_instance_black_temple()
    new spell_black_temple_curse_of_vitality();
    new spell_black_temple_dementia();
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.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 "TaskScheduler.h"
 #include "serpent_shrine.h"

@@ -576,3 +577,4 @@ void AddSC_boss_fathomlord_karathress()
    RegisterSpellScript(spell_karathress_power_of_tidalvess);
    RegisterSpellScript(spell_karathress_power_of_caribdis);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.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 "serpent_shrine.h"

 enum Talk
@@ -356,3 +357,4 @@ void AddSC_boss_hydross_the_unstable()
    RegisterSpellScript(spell_hydross_cleansing_field_command);
    RegisterSpellScript(spell_hydross_mark_of_hydross);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.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 "Spell.h"
+#include "SpellScriptLoader.h"
 #include "WorldSession.h"
 #include "serpent_shrine.h"

@@ -338,3 +339,4 @@ void AddSC_boss_lady_vashj()
    RegisterSpellScript(spell_lady_vashj_summon_sporebat);
    RegisterSpellScript(spell_lady_vashj_spore_drop_effect);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -16,9 +16,10 @@
 */

 #include "CreatureGroups.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "serpent_shrine.h"

@@ -434,3 +435,4 @@ void AddSC_boss_leotheras_the_blind()
    RegisterSpellScript(spell_leotheras_demon_link);
    RegisterSpellScript(spell_leotheras_clear_consuming_madness);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -15,8 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "serpent_shrine.h"

 enum Spells
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.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 "serpent_shrine.h"

 enum Yells
@@ -202,3 +203,4 @@ void AddSC_boss_morogrim_tidewalker()
    RegisterSpellScript(spell_morogrim_tidewalker_watery_grave);
    RegisterSpellScript(spell_morogrim_tidewalker_water_globule_new_target);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.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 "serpent_shrine.h"

@@ -341,3 +343,4 @@ void AddSC_instance_serpentshrine_cavern()
    RegisterSpellScript(spell_serpentshrine_cavern_infection);
    RegisterSpellScript(spell_serpentshrine_cavern_coilfang_water);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
@@ -15,11 +15,12 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "Group.h"
 #include "LFGMgr.h"
 #include "PassiveAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "the_slave_pens.h"
@@ -403,3 +404,4 @@ void AddSC_boss_ahune()
    new go_ahune_ice_stone();
    RegisterTheSlavePensCreatureAI(boss_ahune);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_mennu_the_betrayer.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_mennu_the_betrayer.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 "the_slave_pens.h"

--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_quagmirran.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_quagmirran.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 "the_slave_pens.h"

--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_rokmar_the_crackler.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 "the_slave_pens.h"

@@ -30,7 +30,7 @@ enum Spells

 struct boss_rokmar_the_crackler : public BossAI
 {
-    boss_rokmar_the_crackler(Creature* creature) : BossAI(creature, DATA_ROKMAR_THE_CRACKLER)
+    explicit boss_rokmar_the_crackler(Creature* creature) : BossAI(creature, DATA_ROKMAR_THE_CRACKLER)
    {
        scheduler.SetValidator([this]
        {
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
@@ -23,9 +23,10 @@
 */

 #include "Creature.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
 #include "Map.h"
-#include "ScriptMgr.h"
 #include "the_slave_pens.h"

 ObjectData const creatureData[] =
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp
@@ -16,8 +16,10 @@
 */

 #include "the_slave_pens.h"
+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
+#include "InstanceScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"

 class at_quagmirran_lair : public AreaTriggerScript
 {
@@ -42,3 +44,4 @@ void AddSC_the_slave_pens()
 {
    new at_quagmirran_lair();
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.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 "steam_vault.h"

--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.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 "steam_vault.h"

--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.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 "steam_vault.h"

 enum Texts
@@ -171,3 +172,4 @@ void AddSC_boss_warlord_kalithresh()
    RegisterSteamvaultCreatureAI(boss_warlord_kalithresh);
    RegisterSpellScript(spell_warlords_rage);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -15,8 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "GameObjectScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "steam_vault.h"

 enum MainChambersAccessPanelSays
@@ -187,3 +189,4 @@ void AddSC_instance_steam_vault()
    new go_main_chambers_access_panel();
    new instance_steam_vault();
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "the_underbog.h"
@@ -158,3 +159,4 @@ void AddSC_boss_ghazan()
    RegisterUnderbogCreatureAI(boss_ghazan);
    new at_underbog_ghazan();
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.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 "TaskScheduler.h"
 #include "the_underbog.h"

@@ -188,3 +189,4 @@ void AddSC_boss_hungarfen()
    RegisterSpellScript(spell_spore_cloud);
    RegisterSpellScript(spell_despawn_underbog_mushrooms);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_swamplord_muselek.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_swamplord_muselek.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 "TaskScheduler.h"
 #include "the_underbog.h"
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "the_underbog.h"

 /*
@@ -216,3 +217,4 @@ void AddSC_boss_the_black_stalker()
    RegisterSpellScript(spell_the_black_stalker_someone_grab_me);
    RegisterSpellScript(spell_the_black_stalker_magnetic_pull);
 }
+
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
 #include "Map.h"
-#include "ScriptMgr.h"
 #include "the_underbog.h"

 ObjectData const creatureData[] =
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/underbog.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/underbog.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "the_underbog.h"

@@ -122,3 +123,4 @@ void AddSC_underbog()
    RegisterSpellScript(spell_fungal_decay);
    RegisterSpellScript(spell_allergies);
 }
+
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -15,10 +15,11 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
 #include "PassiveAI.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "gruuls_lair.h"

 enum Yells
@@ -313,3 +314,4 @@ void AddSC_boss_gruul()
    RegisterSpellScript(spell_gruul_shatter);
    RegisterSpellScript(spell_gruul_shatter_effect);
 }
+
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.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 "TaskScheduler.h"
 #include "gruuls_lair.h"
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "gruuls_lair.h"

 DoorData const doorData[] =
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -15,10 +15,12 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "blood_furnace.h"

 enum Say
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.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 "SpellAuras.h"
 #include "blood_furnace.h"
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.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 "blood_furnace.h"

--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -16,8 +16,9 @@
 */

 #include "CreatureAI.h"
+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "blood_furnace.h"

 DoorData const doorData[] =
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.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 "hellfire_ramparts.h"

--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.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 "TaskScheduler.h"
 #include "hellfire_ramparts.h"

@@ -363,3 +364,4 @@ void AddSC_boss_vazruden_the_herald()
    RegisterSpellScript(spell_vazruden_fireball);
    RegisterSpellScript(spell_vazruden_call_nazan);
 }
+
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.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 "hellfire_ramparts.h"

 enum Says
@@ -169,3 +170,4 @@ void AddSC_boss_watchkeeper_gargolmar()
    RegisterHellfireRampartsCreatureAI(boss_watchkeeper_gargolmar);
    RegisterSpellScript(spell_gargolmar_retalliation);
 }
+
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "hellfire_ramparts.h"

 class instance_hellfire_ramparts : public InstanceMapScript
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -15,10 +15,12 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "magtheridons_lair.h"

--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "magtheridons_lair.h"

 BossBoundaryData const boundaries =
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -15,9 +15,11 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "shattered_halls.h"

 enum Texts
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_porung.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_porung.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "shattered_halls.h"

@@ -316,3 +317,4 @@ void AddSC_boss_porung()
    RegisterShatteredHallsCreatureAI(npc_shattered_hand_scout);
    RegisterSpellScript(spell_tsh_shoot_flame_arrow);
 }
+
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "shattered_halls.h"

@@ -287,3 +288,4 @@ void AddSC_boss_warbringer_omrogg()
    RegisterShatteredHallsCreatureAI(boss_warbringer_omrogg);
    RegisterSpellScript(spell_burning_maul);
 }
+
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "shattered_halls.h"

@@ -321,3 +322,4 @@ void AddSC_boss_warchief_kargath_bladefist()
    RegisterShatteredHallsCreatureAI(npc_warchief_portal);
    RegisterSpellScript(spell_blade_dance_targeting);
 }
+
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -15,9 +15,11 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "CreatureTextMgr.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "shattered_halls.h"

 ObjectData const creatureData[] =
@@ -205,3 +207,4 @@ void AddSC_instance_shattered_halls()
    new instance_shattered_halls();
    new at_shattered_halls_execution();
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
 #include "MoveSplineInit.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "WaypointMgr.h"
 #include "the_eye.h"

@@ -501,3 +502,4 @@ void AddSC_boss_alar()
    new spell_alar_ember_blast_death();
    new spell_alar_dive_bomb();
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.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 "the_eye.h"

 enum Yells
@@ -294,3 +295,4 @@ void AddSC_boss_high_astromancer_solarian()
    new spell_astromancer_wrath_of_the_astromancer();
    new spell_astromancer_solarian_transform();
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
 #include "Opcodes.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
 #include "WorldPacket.h"
 #include "the_eye.h"

@@ -1062,3 +1063,4 @@ void AddSC_boss_kaelthas()
    new spell_kaelthas_nether_beam();
    new spell_kaelthas_summon_nether_vapor();
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.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 "the_eye.h"

--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -15,8 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
+#include "SpellScriptLoader.h"
 #include "the_eye.h"

 class instance_the_eye : public InstanceMapScript
@@ -150,3 +152,4 @@ void AddSC_instance_the_eye()
    new instance_the_eye();
    new spell_the_eye_countercharge();
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.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 "mechanar.h"

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.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 "mechanar.h"

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.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 "mechanar.h"

 enum Spells
@@ -222,3 +223,4 @@ void AddSC_boss_mechano_lord_capacitus()
    RegisterSpellScript(spell_capacitus_polarity_charge_aura);
    RegisterSpellScript(spell_capacitus_polarity_shift);
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.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 "mechanar.h"

 enum Says
@@ -210,3 +211,4 @@ void AddSC_boss_nethermancer_sepethrea()
    RegisterMechanarCreatureAI(npc_raging_flames);
    RegisterSpellScript(spell_ragin_flames_inferno);
 }
+
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.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 "mechanar.h"

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "mechanar.h"

 static DoorData const doorData[] =
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "arcatraz.h"
-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScriptLoader.h"
+#include "arcatraz.h"

 enum MillhouseSays
 {
@@ -625,3 +626,4 @@ void AddSC_arcatraz()

    new spell_arcatraz_soul_steal();
 }
+
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.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 "arcatraz.h"

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.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 "arcatraz.h"

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.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 "arcatraz.h"

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.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 "arcatraz.h"

 enum Say
@@ -111,3 +112,4 @@ void AddSC_boss_zereketh_the_unbound()
    RegisterArcatrazCreatureAI(boss_zereketh_the_unbound);
    RegisterSpellScript(spell_zereketh_seed_of_corruption);
 }
+
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -15,8 +15,9 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
 #include "arcatraz.h"

 DoorData const doorData[] =
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ScriptMgr.h"
+#include "CreatureScript.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "the_botanica.h"

 enum Says
@@ -161,3 +162,4 @@ void AddSC_boss_commander_sarannis()
    RegisterSpellScript(spell_commander_sarannis_arcane_devastation);
    RegisterSpellScript(spell_commander_sarannis_summon_reinforcements);
 }
+
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.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 "the_botanica.h"

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.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 "the_botanica.h"

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.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 "the_botanica.h"

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.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 "the_botanica.h"

--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -15,9 +15,11 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
 #include "GameTime.h"
+#include "InstanceMapScript.h"
 #include "InstanceScript.h"
-#include "ScriptMgr.h"
+#include "SpellScriptLoader.h"
 #include "the_botanica.h"

 class instance_the_botanica : public InstanceMapScript
@@ -172,3 +174,4 @@ void AddSC_instance_the_botanica()
    new spell_botanica_call_of_the_falcon();
    new spell_botanica_shift_form();
 }
+
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.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 "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"

 enum Texts
 {
@@ -199,3 +200,4 @@ void AddSC_boss_doomlordkazzak()
    new boss_doomlord_kazzak();
    new spell_mark_of_kazzak();
 }
+
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.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"

 enum Texts
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -15,6 +15,18 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "Cell.h"
+#include "CellImpl.h"
+#include "CreatureScript.h"
+#include "GameObjectScript.h"
+#include "GridNotifiers.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "SpellInfo.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
 /* ScriptData
 SDName: Blades_Edge_Mountains
 SD%Complete: 90
@@ -28,17 +40,6 @@ npc_daranelle
 go_legion_obelisk
 EndContentData */

-#include "Cell.h"
-#include "CellImpl.h"
-#include "GridNotifiers.h"
-#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
-#include "SpellAuraEffects.h"
-#include "SpellAuras.h"
-#include "SpellInfo.h"
-#include "SpellScript.h"
-
 /// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue
 //  there is probably some underlying problem with imports which should properly addressed
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -15,13 +15,15 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
 #include "GameObjectAI.h"
+#include "GameObjectScript.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"

 // Ours

--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -15,6 +15,13 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "GameObjectScript.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "ScriptedEscortAI.h"
+#include "ScriptedGossip.h"
+#include "SpellInfo.h"
 /* ScriptData
 SDName: Nagrand
 SD%Complete: 90
@@ -27,13 +34,6 @@ npc_maghar_captive
 npc_creditmarker_visit_with_ancestors
 EndContentData */

-#include "Player.h"
-#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedEscortAI.h"
-#include "ScriptedGossip.h"
-#include "SpellInfo.h"
-
 /*#####
 ## npc_maghar_captive
 #####*/
@@ -490,3 +490,4 @@ void AddSC_nagrand()
    new npc_kurenai_captive();
    new go_warmaul_prison();
 }
+
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -15,9 +15,10 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "AreaTriggerScript.h"
+#include "CreatureScript.h"
 #include "GameObjectAI.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
@@ -962,3 +963,4 @@ void AddSC_netherstorm()
    new npc_maxx_a_million_escort();
    RegisterSpellAndAuraScriptPair(spell_q10190_battery_recharging_blaster, spell_q10190_battery_recharging_blaster_aura);
 }
+
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -15,6 +15,14 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "GameObjectScript.h"
+#include "Group.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
 /* ScriptData
 SDName: Shadowmoon_Valley
 SD%Complete: 100
@@ -36,13 +44,6 @@ go_crystal_prison
 npc_enraged_spirit
 EndContentData */

-#include "Group.h"
-#include "Player.h"
-#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
-#include "SpellScript.h"
-
 // Ours
 class spell_q10612_10613_the_fel_and_the_furious : public SpellScriptLoader
 {
--- a/src/server/scripts/Outland/zone_shattrath_city.cpp
+++ b/src/server/scripts/Outland/zone_shattrath_city.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 "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -15,14 +15,16 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "CreatureScript.h"
+#include "GameObjectScript.h"
 #include "Group.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
+#include "SpellScriptLoader.h"

 // Ours
 enum fumping