Scripts/Maelstrom: moved all scripts into their own zone or instance related namespace

src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp

@@ -16,16 +16,17 @@
  */
 
 #include "ScriptMgr.h"
-#include "Player.h"
-#include "CreatureGroups.h"
 #include "InstanceScript.h"
+#include "Map.h"
+#include "MotionMaster.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
-#include "MotionMaster.h"
 #include "SpellScript.h"
-#include "Map.h"
 #include "stonecore.h"
 
+namespace Stonecore::Corborus
+{
 enum Spells
 {
     // Corborus Intro
@@ -471,9 +472,12 @@ class spell_corborus_crystal_barrage : public AuraScript
         OnEffectRemove.Register(&spell_corborus_crystal_barrage::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
     }
 };
+}
 
 void AddSC_boss_corborus()
 {
+    using namespace Stonecore;
+    using namespace Stonecore::Corborus;
     new boss_corborus();
     new npc_rock_borer();
     new npc_crystal_shard();

src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp

@@ -34,6 +34,8 @@
 #include "Vehicle.h"
 #include <G3D/Vector3.h>
 
+namespace Stonecore::HighPriestessAzil
+{
 enum Spells
 {
     SPELL_ENERGY_SHIELD                     = 82858,
@@ -760,9 +762,12 @@ class spell_azil_force_grip_change_seat : public SpellScript
         OnEffectHitTarget.Register(&spell_azil_force_grip_change_seat::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
     }
 };
+}
 
 void AddSC_boss_high_priestess_azil()
 {
+    using namespace Stonecore;
+    using namespace Stonecore::HighPriestessAzil;
     new boss_high_priestess_azil();
     new npc_azil_devout_follower();
     new npc_azil_gravity_well();

src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp

@@ -27,6 +27,9 @@
 #include "Map.h"
 #include "ScriptedCreature.h"
 
+namespace Stonecore::Ozruk
+{
+
 enum Spells
 {
     // Ozruk
@@ -287,10 +290,12 @@ class spell_ozruk_paralyze_stun : public AuraScript
         AfterEffectRemove.Register(&spell_ozruk_paralyze_stun::OnAuraRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
     }
 };
-
+}
 
 void AddSC_boss_ozruk()
 {
+    using namespace Stonecore;
+    using namespace Stonecore::Ozruk;
     RegisterStonecoreCreatureAI(boss_ozruk);
     RegisterSpellScript(spell_ozruk_rupture);
     RegisterSpellScript(spell_ozuruk_rupture_summon);

src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp

@@ -26,6 +26,8 @@
 #include "Spell.h"
 #include "SpellScript.h"
 
+namespace Stonecore::Slabhide
+{
 enum Spells
 {
     SPELL_FACE_RANDOM_PLAYER        = 82530,
@@ -417,9 +419,12 @@ class spell_slabhide_crystal_storm_periodic : public SpellScript
         OnEffectHitTarget.Register(&spell_slabhide_crystal_storm_periodic::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
     }
 };
+}
 
 void AddSC_boss_slabhide()
 {
+    using namespace Stonecore;
+    using namespace Stonecore::Slabhide;
     RegisterStonecoreCreatureAI(boss_slabhide);
     RegisterStonecoreCreatureAI(npc_slabhide_lava_fissure);
     RegisterStonecoreCreatureAI(npc_slabhide_stalactite_trigger);

src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp

@@ -25,6 +25,8 @@
 #include "EventMap.h"
 #include "stonecore.h"
 
+namespace Stonecore
+{
 #define MAX_ENCOUNTER 4
 
 /* Stonecore encounters:
@@ -311,8 +313,10 @@ class instance_stonecore : public InstanceMapScript
             return new instance_stonecore_InstanceScript(map);
         }
 };
+}
 
 void AddSC_instance_stonecore()
 {
+    using namespace Stonecore;
     new instance_stonecore();
 }

src/server/scripts/Maelstrom/Stonecore/stonecore.cpp

@@ -25,6 +25,9 @@
 #include "SpellScript.h"
 #include "stonecore.h"
 
+namespace Stonecore
+{
+
 enum Texts
 {
     // Millhouse Manastorm
@@ -419,9 +422,11 @@ public:
         return true;
     }
 };
+}
 
 void AddSC_stonecore()
 {
+    using namespace Stonecore;
     new npc_sc_millhouse_manastorm();
     new spell_force_of_earth();
     new spell_sc_anchor_here();

src/server/scripts/Maelstrom/Stonecore/stonecore.h

@@ -21,6 +21,9 @@
 #include "CreatureAIImpl.h"
 #include "Position.h"
 
+namespace Stonecore
+{
+
 #define SCScriptName "instance_stonecore"
 #define DataHeader "SC"
 
@@ -126,5 +129,6 @@ inline AI* GetStonecoreAI(T* obj)
 }
 
 #define RegisterStonecoreCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetStonecoreAI)
+}
 
 #endif // DEF_STONECORE

src/server/scripts/Maelstrom/kezan.cpp

@@ -15,6 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-void AddSC_kezan()
+namespace Kezan
 {
 }
+
+void AddSC_kezan()
+{
+    using namespace Kezan;
+}

src/server/scripts/Maelstrom/zone_deepholm.cpp

@@ -18,11 +18,12 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
-#include "SpellAuraEffects.h"
 #include "MotionMaster.h"
 #include "PassiveAI.h"
 #include "Vehicle.h"
 
+namespace Deepholm
+{
 enum VehicleSeatIds
 {
     SEAT_1 = 0,
@@ -282,9 +283,11 @@ class spell_deepholm_twilight_buffet_targeting : public SpellScript
         OnEffectHitTarget.Register(&spell_deepholm_twilight_buffet_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
+}
 
 void AddSC_deepholm()
 {
+    using namespace Deepholm;
     RegisterCreatureAI(npc_deepholm_xariona);
     RegisterCreatureAI(npc_deepholm_wyvern);
     RegisterSpellScript(spell_deepholm_twilight_buffet_targeting);