Scripts/Kalimdor: moved scipts into their corresponding namespace

The-Cataclysm-Preservation-Project · Dec 9, 2023 · 22c843d · 22c843d
1 parent 93d8ed4
commit 22c843d
Show file tree

Hide file tree

Showing 159 changed files with 781 additions and 89 deletions.
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -25,6 +25,8 @@
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
 
+namespace BlackfathomDeeps
+{
 enum Spells
 {
  SPELL_BLESSING_OF_BLACKFATHOM = 8733,
@@ -256,9 +258,11 @@ class npc_morridune : public CreatureScript
  return GetBlackfathomDeepsAI<npc_morriduneAI>(creature);
  }
 };
+}
 
 void AddSC_blackfathom_deeps()
 {
+ using namespace BlackfathomDeeps;
  new go_blackfathom_altar();
  new go_blackfathom_fire();
  new npc_blackfathom_deeps_event();

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BlackfathomDeeps
+{
 #define BFDScriptName "instance_blackfathom_deeps"
 #define DataHeader "BFD"
 
@@ -75,5 +77,6 @@ inline AI* GetBlackfathomDeepsAI(T* obj)
 {
  return GetInstanceAI<AI>(obj, BFDScriptName);
 }
+}
 
 #endif // BFD_H_
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -19,6 +19,8 @@
 #include "blackfathom_deeps.h"
 #include "ScriptedCreature.h"
 
+namespace BlackfathomDeeps::AkuMai
+{
 enum Spells
 {
  SPELL_POISON_CLOUD = 3815,
@@ -91,8 +93,11 @@ class boss_aku_mai : public CreatureScript
  return GetBlackfathomDeepsAI<boss_aku_maiAI>(creature);
  }
 };
+}
 
 void AddSC_boss_aku_mai()
 {
+ using namespace BlackfathomDeeps;
+ using namespace BlackfathomDeeps::AkuMai;
  new boss_aku_mai();
 }
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -19,6 +19,8 @@
 #include "blackfathom_deeps.h"
 #include "ScriptedCreature.h"
 
+namespace BlackfathomDeeps::Gelihast
+{
 enum Spells
 {
  SPELL_NET = 6533
@@ -69,8 +71,11 @@ class boss_gelihast : public CreatureScript
  return GetBlackfathomDeepsAI<boss_gelihastAI>(creature);
  }
 };
+}
 
 void AddSC_boss_gelihast()
 {
+ using namespace BlackfathomDeeps;
+ using namespace BlackfathomDeeps::Gelihast;
  new boss_gelihast();
 }
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -19,6 +19,8 @@
 #include "blackfathom_deeps.h"
 #include "ScriptedCreature.h"
 
+namespace BlackfathomDeeps::Kelris
+{
 enum Spells
 {
  SPELL_MIND_BLAST = 15587,
@@ -104,8 +106,11 @@ class boss_kelris : public CreatureScript
  return GetBlackfathomDeepsAI<boss_kelrisAI>(creature);
  }
 };
+}
 
 void AddSC_boss_kelris()
 {
+ using namespace BlackfathomDeeps;
+ using namespace BlackfathomDeeps::Kelris;
  new boss_kelris();
 }
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -29,6 +29,8 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "Map.h"
 
+namespace BlackfathomDeeps
+{
 const Position LorgusPosition[4] =
 {
  { -458.500610f, -38.343079f, -33.474445f, 0.0f },
@@ -241,8 +243,10 @@ class instance_blackfathom_deeps : public InstanceMapScript
  return new instance_blackfathom_deeps_InstanceMapScript(map);
  }
 };
+}
 
 void AddSC_instance_blackfathom_deeps()
 {
+ using namespace BlackfathomDeeps;
  new instance_blackfathom_deeps();
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -21,6 +21,10 @@
 #include "ObjectAccessor.h"
 #include "SpellScript.h"
 
+namespace BattleForMountHyjal::Anetheron
+{
+using namespace BattleForMountHyjal::Trash;
+
 enum Spells
 {
  SPELL_CARRION_SWARM = 31306,
@@ -294,9 +298,12 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader
  return new spell_anetheron_vampiric_aura_AuraScript();
  }
 };
+}
 
 void AddSC_boss_anetheron()
 {
+ using namespace BattleForMountHyjal;
+ using namespace BattleForMountHyjal::Anetheron;
  new boss_anetheron();
  new npc_towering_infernal();
  new spell_anetheron_vampiric_aura();

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -31,6 +31,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 
+namespace BattleForMountHyjal::Archimonde
+{
 enum Texts
 {
  SAY_AGGRO = 1,
@@ -566,9 +568,12 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader
  return new spell_archimonde_drain_world_tree_dummy_SpellScript();
  }
 };
+}
 
 void AddSC_boss_archimonde()
 {
+ using namespace BattleForMountHyjal;
+ using namespace BattleForMountHyjal::Archimonde;
  new boss_archimonde();
  new npc_doomfire();
  new npc_doomfire_targetting();

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -21,6 +21,9 @@
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace BattleForMountHyjal::Azgalor
+{
+using namespace BattleForMountHyjal::Trash;
 enum Spells
 {
  SPELL_RAIN_OF_FIRE = 31340,
@@ -271,9 +274,12 @@ class npc_lesser_doomguard : public CreatureScript
  return GetHyjalAI<npc_lesser_doomguardAI>(creature);
  }
 };
+}
 
 void AddSC_boss_azgalor()
 {
+ using namespace BattleForMountHyjal;
+ using namespace BattleForMountHyjal::Azgalor;
  new boss_azgalor();
  new npc_lesser_doomguard();
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -23,6 +23,9 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BattleForMountHyjal::Kazrogal
+{
+using namespace BattleForMountHyjal::Trash;
 enum Spells
 {
  SPELL_CLEAVE = 31436,
@@ -233,9 +236,12 @@ class spell_mark_of_kazrogal : public SpellScriptLoader
  return new spell_mark_of_kazrogal_AuraScript();
  }
 };
+}
 
 void AddSC_boss_kazrogal()
 {
+ using namespace BattleForMountHyjal;
+ using namespace BattleForMountHyjal::Kazrogal;
  new boss_kazrogal();
  new spell_mark_of_kazrogal();
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -20,6 +20,10 @@
 #include "InstanceScript.h"
 #include "ObjectAccessor.h"
 
+namespace BattleForMountHyjal::RageWinterchill
+{
+using namespace BattleForMountHyjal::Trash;
+
 enum Spells
 {
  SPELL_FROST_ARMOR = 31256,
@@ -162,8 +166,11 @@ class boss_rage_winterchill : public CreatureScript
  return GetHyjalAI<boss_rage_winterchillAI>(creature);
  }
 };
+}
 
 void AddSC_boss_rage_winterchill()
 {
+ using namespace BattleForMountHyjal;
+ using namespace BattleForMountHyjal::RageWinterchill;
  new boss_rage_winterchill();
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -36,6 +36,10 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 
+namespace BattleForMountHyjal
+{
+using namespace BattleForMountHyjal::HyjalAI;
+
 #define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore."
 #define GOSSIP_ITEM_ANETHERON "We are ready for whatever Archimonde might send our way, Lady Proudmoore."
 
@@ -251,9 +255,11 @@ class npc_tyrande_whisperwind : public CreatureScript
  return GetHyjalAI<npc_tyrande_whisperwindAI>(creature);
  }
 };
+}
 
 void AddSC_hyjal()
 {
+ using namespace BattleForMountHyjal;
  new npc_jaina_proudmoore();
  new npc_thrall();
  new npc_tyrande_whisperwind();

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BattleForMountHyjal
+{
 #define HyjalScriptName "instance_hyjal"
 #define DataHeader "HY"
 
@@ -100,5 +102,6 @@ inline AI* GetHyjalAI(T* obj)
 {
  return GetInstanceAI<AI>(obj, HyjalScriptName);
 }
+}
 
 #endif
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -33,6 +33,10 @@ EndScriptData */
 #include "ObjectAccessor.h"
 #include "TemporarySummon.h"
 
+namespace BattleForMountHyjal::HyjalAI
+{
+using namespace BattleForMountHyjal::Trash;
+
 enum Spawns
 {
  SPAWN_GARG_GATE = 0,
@@ -1106,3 +1110,4 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
  break;
  }
 }
+}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
@@ -21,6 +21,8 @@
 #include "hyjal.h"
 #include "ScriptedEscortAI.h"
 
+namespace BattleForMountHyjal::HyjalAI
+{
 #define HYJAL_AI_MAX_SPELLS 3
 
 enum SpellIds
@@ -204,4 +206,5 @@ struct hyjalAI : public EscortAI
  private:
  uint32 SpellTimer[3];
 };
+}
 #endif
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -23,6 +23,8 @@
 #include "ObjectAccessor.h"
 #include "TemporarySummon.h"
 
+namespace BattleForMountHyjal::Trash
+{
 enum Spells
 {
  SPELL_METEOR = 33814, //infernal visual
@@ -1442,9 +1444,12 @@ class alliance_rifleman : public CreatureScript
  return GetHyjalAI<alliance_riflemanAI>(creature);
  }
 };
+}
 
 void AddSC_hyjal_trash()
 {
+ using namespace BattleForMountHyjal;
+ using namespace BattleForMountHyjal::Trash;
  new npc_giant_infernal();
  new npc_abomination();
  new npc_ghoul();

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
@@ -21,6 +21,8 @@
 #include "hyjal.h"
 #include "ScriptedEscortAI.h"
 
+namespace BattleForMountHyjal::Trash
+{
 struct hyjal_trashAI : public EscortAI
 {
  hyjal_trashAI(Creature* creature);
@@ -46,4 +48,5 @@ struct hyjal_trashAI : public EscortAI
 
  //private:
 };
+}
 #endif
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -42,6 +42,8 @@ EndScriptData */
 4 - Archimonde event
 */
 
+namespace BattleForMountHyjal
+{
 enum Yells
 {
  YELL_ARCHIMONDE_INTRO = 8
@@ -321,8 +323,10 @@ class instance_hyjal : public InstanceMapScript
  return new instance_mount_hyjal_InstanceMapScript(map);
  }
 };
+}
 
 void AddSC_instance_mount_hyjal()
 {
+ using namespace BattleForMountHyjal;
  new instance_hyjal();
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
@@ -23,6 +23,8 @@
 #include "SpellInfo.h"
 #include <vector>
 
+namespace CullingOfStratholme::ChronoLordEpoch
+{
 enum Spells
 {
  SPELL_CURSE_OF_EXERTION = 52772,
@@ -157,8 +159,11 @@ class boss_epoch : public CreatureScript
  return GetCullingOfStratholmeAI<boss_epochAI>(creature);
  }
 };
+}
 
 void AddSC_boss_epoch()
 {
+ using namespace CullingOfStratholme;
+ using namespace CullingOfStratholme::ChronoLordEpoch;
  new boss_epoch();
 }