Scripts/Outland: moved scripts into their respectice namespace (part 1)

The-Cataclysm-Preservation-Project · Dec 8, 2023 · cf80433 · cf80433
1 parent c1ac99c
commit cf80433
Show file tree

Hide file tree

Showing 38 changed files with 170 additions and 0 deletions.
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -31,6 +31,8 @@ EndScriptData */
 #include "TemporarySummon.h"
 #include "the_eye.h"
 
+namespace Eye::Alar
+{
 enum Spells
 {
  SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
@@ -557,9 +559,12 @@ class npc_flame_patch_alar : public CreatureScript
  return GetTheEyeAI<npc_flame_patch_alarAI>(creature);
  }
 };
+}
 
 void AddSC_boss_alar()
 {
+ using namespace Eye;
+ using namespace Eye::Alar;
  new boss_alar();
  new npc_ember_of_alar();
  new npc_flame_patch_alar();

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -32,6 +32,8 @@ EndScriptData */
 #include "TemporarySummon.h"
 #include "the_eye.h"
 
+namespace Eye::Astromancer
+{
 enum Yells
 {
  SAY_AGGRO = 0,
@@ -536,9 +538,12 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader
  return new spell_astromancer_wrath_of_the_astromancer_AuraScript();
  }
 };
+}
 
 void AddSC_boss_high_astromancer_solarian()
 {
+ using namespace Eye;
+ using namespace Eye::Astromancer;
  new boss_high_astromancer_solarian();
  new npc_solarium_priest();
  new spell_astromancer_wrath_of_the_astromancer();

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -33,6 +33,8 @@ EndScriptData */
 #include "SpellScript.h"
 #include "the_eye.h"
 
+namespace Eye::Kaelthas
+{
 enum Yells
 {
  // Kael'thas Speech
@@ -1486,9 +1488,12 @@ class spell_kael_gravity_lapse : public SpellScriptLoader
  return new spell_kael_gravity_lapse_SpellScript();
  }
 };
+}
 
 void AddSC_boss_kaelthas()
 {
+ using namespace Eye;
+ using namespace Eye::Kaelthas;
  new boss_kaelthas();
  new boss_thaladred_the_darkener();
  new boss_lord_sanguinar();

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -20,6 +20,8 @@
 #include "ScriptedCreature.h"
 #include "the_eye.h"
 
+namespace Eye::Voidreaver
+{
 enum Yells
 {
  SAY_AGGRO = 0,
@@ -166,8 +168,11 @@ class boss_void_reaver : public CreatureScript
  return GetTheEyeAI<boss_void_reaverAI>(creature);
  }
 };
+}
 
 void AddSC_boss_void_reaver()
 {
+ using namespace Eye;
+ using namespace Eye::Voidreaver;
  new boss_void_reaver();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -34,6 +34,8 @@ EndScriptData */
 3 - Void Reaver event
 */
 
+namespace Eye
+{
 DoorData const doorData[] =
 {
  { GO_ARCANE_DOOR_LEFT, DATA_KAELTHAS, DOOR_TYPE_ROOM/*, BOUNDARY_SW */ },
@@ -123,7 +125,10 @@ class instance_the_eye : public InstanceMapScript
  return new instance_the_eye_InstanceMapScript(map);
  }
 };
+}
+
 void AddSC_instance_the_eye()
 {
+ using namespace Eye;
  new instance_the_eye;
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -30,6 +30,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "the_eye.h"
 
+namespace Eye
+{
 enum Spells
 {
  SPELL_COUNTERCHARGE = 35035,
@@ -107,7 +109,10 @@ class npc_crystalcore_devastator : public CreatureScript
  return GetTheEyeAI<npc_crystalcore_devastatorAI>(creature);
  }
 };
+}
+
 void AddSC_the_eye()
 {
+ using namespace Eye;
  new npc_crystalcore_devastator();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace Eye
+{
 #define TheEyeScriptName "instance_the_eye"
 #define DataHeader "TE"
 
@@ -70,5 +72,6 @@ inline AI* GetTheEyeAI(T* obj)
 {
  return GetInstanceAI<AI>(obj, TheEyeScriptName);
 }
+}
 
 #endif
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "mechanar.h"
 #include "ScriptedCreature.h"
 
+namespace Mechanar::GatewatcherGyrokill
+{
 enum Say
 {
  SAY_AGGRO = 0,
@@ -123,8 +125,11 @@ class boss_gatewatcher_gyrokill : public CreatureScript
  return GetMechanarAI<boss_gatewatcher_gyrokillAI>(creature);
  }
 };
+}
 
 void AddSC_boss_gatewatcher_gyrokill()
 {
+ using namespace Mechanar;
+ using namespace Mechanar::GatewatcherGyrokill;
  new boss_gatewatcher_gyrokill();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "mechanar.h"
 #include "ScriptedCreature.h"
 
+namespace Mechanar::GatewatcherIronhand
+{
 enum Says
 {
  SAY_AGGRO = 0,
@@ -129,8 +131,11 @@ class boss_gatewatcher_iron_hand : public CreatureScript
  return GetMechanarAI<boss_gatewatcher_iron_handAI>(creature);
  }
 };
+}
 
 void AddSC_boss_gatewatcher_iron_hand()
 {
+ using namespace Mechanar;
+ using namespace Mechanar::GatewatcherIronhand;
  new boss_gatewatcher_iron_hand();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -22,6 +22,8 @@
 #include "SpellInfo.h"
 #include "SpellScript.h"
 
+namespace Mechanar::MechanoLordCapacitus
+{
 enum Spells
 {
  SPELL_HEADCRACK = 35161,
@@ -255,9 +257,12 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader
  return new spell_capacitus_polarity_shift_SpellScript();
  }
 };
+}
 
 void AddSC_boss_mechano_lord_capacitus()
 {
+ using namespace Mechanar;
+ using namespace Mechanar::MechanoLordCapacitus;
  new boss_mechano_lord_capacitus();
  new spell_capacitus_polarity_charge();
  new spell_capacitus_polarity_shift();

diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "MotionMaster.h"
 #include "ScriptedCreature.h"
 
+namespace Mechanar::NethermancerSepethrea
+{
 enum Says
 {
  SAY_AGGRO = 0,
@@ -232,9 +234,12 @@ class npc_ragin_flames : public CreatureScript
  return GetMechanarAI<npc_ragin_flamesAI>(creature);
  }
 };
+}
 
 void AddSC_boss_nethermancer_sepethrea()
 {
+ using namespace Mechanar;
+ using namespace Mechanar::NethermancerSepethrea;
  new boss_nethermancer_sepethrea();
  new npc_ragin_flames();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace Mechanar::PathaleonTheCalculator
+{
 enum Says
 {
  SAY_AGGRO = 0,
@@ -246,9 +248,12 @@ class npc_nether_wraith : public CreatureScript
  return GetMechanarAI<npc_nether_wraithAI>(creature);
  }
 };
+}
 
 void AddSC_boss_pathaleon_the_calculator()
 {
+ using namespace Mechanar;
+ using namespace Mechanar::PathaleonTheCalculator;
  new boss_pathaleon_the_calculator();
  new npc_nether_wraith();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -19,6 +19,8 @@
 #include "InstanceScript.h"
 #include "mechanar.h"
 
+namespace Mechanar
+{
 static DoorData const doorData[] =
 {
  { GO_DOOR_MOARG_1, DATA_GATEWATCHER_IRON_HAND, DOOR_TYPE_PASSAGE },
@@ -67,8 +69,10 @@ class instance_mechanar : public InstanceMapScript
  return new instance_mechanar_InstanceMapScript(map);
  }
 };
+}
 
 void AddSC_instance_mechanar()
 {
+ using namespace Mechanar;
  new instance_mechanar();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace Mechanar
+{
 #define MechanarScriptName "instance_mechanar"
 #define DataHeader "MR"
 
@@ -46,5 +48,6 @@ inline AI* GetMechanarAI(T* obj)
 {
  return GetInstanceAI<AI>(obj, MechanarScriptName);
 }
+}
 
 #endif
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -34,6 +34,8 @@ EndContentData */
 #include "MotionMaster.h"
 #include "ScriptedCreature.h"
 
+namespace Arcatraz
+{
 /*#####
 # npc_millhouse_manastorm
 #####*/
@@ -556,9 +558,11 @@ class npc_zerekethvoidzone : public CreatureScript
  return GetArcatrazAI<npc_zerekethvoidzoneAI>(creature);
  }
 };
+}
 
 void AddSC_arcatraz()
 {
+ using namespace Arcatraz;
  new npc_millhouse_manastorm();
  new npc_warden_mellichar();
  new npc_zerekethvoidzone();

diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -20,6 +20,9 @@
 
 #include "CreatureAIImpl.h"
 
+namespace Arcatraz
+{
+
 #define ArcatrazScriptName "instance_arcatraz"
 #define DataHeader "AZ"
 
@@ -75,5 +78,6 @@ inline AI* GetArcatrazAI(T* obj)
 {
  return GetInstanceAI<AI>(obj, ArcatrazScriptName);
 }
+}
 
 #endif // ARCATRAZ_H
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -21,6 +21,8 @@
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace Arcatraz::DalliahTheDoomsayer
+{
 enum Say
 {
  // Dalliah the Doomsayer
@@ -197,8 +199,11 @@ class boss_dalliah_the_doomsayer : public CreatureScript
  return GetArcatrazAI<boss_dalliah_the_doomsayerAI>(creature);
  }
 };
+}
 
 void AddSC_boss_dalliah_the_doomsayer()
 {
+ using namespace Arcatraz;
+ using namespace Arcatraz::DalliahTheDoomsayer;
  new boss_dalliah_the_doomsayer();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -33,6 +33,8 @@ EndContentData */
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace Arcatraz::HarbingerSkyriss
+{
 enum Says
 {
  SAY_INTRO = 0,
@@ -301,9 +303,12 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
  return GetArcatrazAI<boss_harbinger_skyriss_illusionAI>(creature);
  }
 };
+}
 
 void AddSC_boss_harbinger_skyriss()
 {
+ using namespace Arcatraz;
+ using namespace Arcatraz::HarbingerSkyriss;
  new boss_harbinger_skyriss();
  new boss_harbinger_skyriss_illusion();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -29,6 +29,8 @@ EndScriptData */
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace Arcatraz::WrathScyrerSoccothrates
+{
 enum Say
 {
  // Wrath-Scryer Soccothrates
@@ -287,8 +289,11 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
  return GetArcatrazAI<boss_wrath_scryer_soccothratesAI>(creature);
  }
 };
+}
 
 void AddSC_boss_wrath_scryer_soccothrates()
 {
+ using namespace Arcatraz;
+ using namespace Arcatraz::WrathScyrerSoccothrates;
  new boss_wrath_scryer_soccothrates();
 }