Scripts/Northrend: moved scripted into their corresponding namespace …

…(part 2)
ElunaLuaEngine · Dec 8, 2023 · 93d8ed4 · 93d8ed4
1 parent 7ad103d
commit 93d8ed4
Show file tree

Hide file tree

Showing 104 changed files with 486 additions and 16 deletions.
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace Ankahet
+{
 #define AhnKahetScriptName "instance_ahnkahet"
 #define DataHeader         "AK"
 
@@ -87,5 +89,6 @@ inline AI* GetAhnKahetAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, AhnKahetScriptName);
 }
+}
 
 #endif // AHNKAHET_H_
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
@@ -21,6 +21,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace Ankahet::Armanitar
+{
 enum Spells
 {
     SPELL_BASH                                    = 57094, // Victim
@@ -232,9 +234,12 @@ class npc_amanitar_mushrooms : public CreatureScript
         return GetAhnKahetAI<npc_amanitar_mushroomsAI>(creature);
     }
 };
+}
 
 void AddSC_boss_amanitar()
 {
+    using namespace Ankahet;
+    using namespace Ankahet::Armanitar;
     new boss_amanitar();
     new npc_amanitar_mushrooms();
 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -21,6 +21,8 @@
 #include "SpellAuras.h"
 #include "SpellScript.h"
 
+namespace Ankahet::ElderNadox
+{
 enum Yells
 {
     SAY_AGGRO       = 0,
@@ -287,9 +289,12 @@ class achievement_respect_your_elders : public AchievementCriteriaScript
             return target && target->GetAI()->GetData(DATA_RESPECT_YOUR_ELDERS);
         }
 };
+}
 
 void AddSC_boss_elder_nadox()
 {
+    using namespace Ankahet;
+    using namespace Ankahet::ElderNadox;
     new boss_elder_nadox();
     new npc_ahnkahar_nerubian();
     new spell_ahn_kahet_swarm();

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
@@ -31,6 +31,8 @@
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
 
+namespace Ankahet::HeraldVolazj
+{
 enum Spells
 {
     SPELL_INSANITY                                = 57496, //Dummy
@@ -296,8 +298,11 @@ class boss_volazj : public CreatureScript
         return GetAhnKahetAI<boss_volazjAI>(creature);
     }
 };
+}
 
 void AddSC_boss_volazj()
 {
+    using namespace Ankahet;
+    using namespace Ankahet::HeraldVolazj;
     new boss_volazj();
 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -27,6 +27,8 @@
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace Ankahet::JedogaShadowseeker
+{
 enum Yells
 {
     TEXT_AGGRO          = 0,
@@ -603,9 +605,12 @@ class achievement_volunteer_work : public AchievementCriteriaScript
             return false;
         }
 };
+}
 
 void AddSC_boss_jedoga_shadowseeker()
 {
+    using namespace Ankahet;
+    using namespace Ankahet::JedogaShadowseeker;
     new boss_jedoga_shadowseeker();
     new npc_jedoga_initiand();
     new npc_jedogas_aufseher_trigger();

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -28,6 +28,8 @@
 #include "Spell.h"
 #include "SpellScript.h"
 
+namespace Ankahet::PrinceTaldaram
+{
 enum Spells
 {
     SPELL_BLOODTHIRST                       = 55968, // Trigger Spell + add aura
@@ -494,9 +496,12 @@ class spell_prince_taldaram_flame_sphere_summon : public SpellScriptLoader
             return new spell_prince_taldaram_flame_sphere_summon_SpellScript();
         }
 };
+}
 
 void AddSC_boss_taldaram()
 {
+    using namespace Ankahet;
+    using namespace Ankahet::PrinceTaldaram;
     new boss_prince_taldaram();
     new npc_prince_taldaram_flame_sphere();
     new go_prince_taldaram_sphere();

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
@@ -26,6 +26,8 @@
 #include "SpellInfo.h"
 #include "SpellScript.h"
 
+namespace Ankahet
+{
 DoorData const doorData[] =
 {
     { GO_PRINCE_TALDARAM_GATE, DATA_PRINCE_TALDARAM, DOOR_TYPE_PASSAGE },
@@ -301,9 +303,11 @@ class spell_combined_toxins : public AuraScript
         DoCheckEffectProc.Register(&spell_combined_toxins::CheckProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_DAMAGE);
     }
 };
+}
 
 void AddSC_instance_ahnkahet()
 {
+    using namespace Ankahet;
     new instance_ahnkahet();
     RegisterSpellScript(spell_combined_toxins);
 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace AzjolNerub
+{
 #define AzjolNerubScriptName "instance_azjol_nerub"
 #define DataHeader           "AN"
 
@@ -71,5 +73,6 @@ inline AI* GetAzjolNerubAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, AzjolNerubScriptName);
 }
+}
 
 #endif // AZJOL_NERUB_H_
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -27,6 +27,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace AzjolNerub::Anubarak
+{
 enum Spells
 {
     SPELL_EMERGE                = 53500,
@@ -697,9 +699,12 @@ class spell_anubarak_carrion_beetles : public SpellScriptLoader
             return new spell_anubarak_carrion_beetles_AuraScript();
         }
 };
+}
 
 void AddSC_boss_anub_arak()
 {
+    using namespace AzjolNerub;
+    using namespace AzjolNerub::Anubarak;
     new boss_anub_arak();
 
     new npc_anubarak_anub_ar_darter();

diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -26,6 +26,8 @@
 #include "SpellAuraEffects.h"
 #include "TemporarySummon.h"
 
+namespace AzjolNerub::Hadronox
+{
 enum Events
 {
     // Hadronox
@@ -1124,9 +1126,12 @@ class achievement_hadronox_denied : public AchievementCriteriaScript
             return false;
         }
 };
+}
 
 void AddSC_boss_hadronox()
 {
+    using namespace AzjolNerub;
+    using namespace AzjolNerub::Hadronox;
     new boss_hadronox();
 
     new npc_anub_ar_crusher();

diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -29,6 +29,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace AzjolNerub::KrikthirTheGatewatcher
+{
 enum Events
 {
     // Krik'thir the Gatewatcher
@@ -1047,9 +1049,12 @@ class achievement_watch_him_die : public AchievementCriteriaScript
             return true;
         }
 };
+}
 
 void AddSC_boss_krik_thir()
 {
+    using namespace AzjolNerub;
+    using namespace AzjolNerub::KrikthirTheGatewatcher;
     new boss_krik_thir();
 
     new npc_watcher_gashra();

diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -22,6 +22,8 @@
 #include "CreatureAI.h"
 #include "InstanceScript.h"
 
+namespace AzjolNerub
+{
 DoorData const doorData[] =
 {
     { GO_KRIKTHIR_DOOR,     DATA_KRIKTHIR, DOOR_TYPE_PASSAGE },
@@ -131,8 +133,10 @@ class instance_azjol_nerub : public InstanceMapScript
             return new instance_azjol_nerub_InstanceScript(map);
         }
 };
+}
 
 void AddSC_instance_azjol_nerub()
 {
-   new instance_azjol_nerub();
+    using namespace AzjolNerub;
+    new instance_azjol_nerub();
 }
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -25,6 +25,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace ObsidianSanctum::Sartharion
+{
 enum Enums
 {
     //Sartharion Yell
@@ -517,8 +519,11 @@ class boss_sartharion : public CreatureScript
         return GetObsidianSanctumAI<boss_sartharionAI>(creature);
     }
 };
+}
 
 void AddSC_boss_sartharion()
 {
+    using namespace ObsidianSanctum;
+    using namespace ObsidianSanctum::Sartharion;
     new boss_sartharion();
 }
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -25,6 +25,8 @@
 0 - Sartharion
 */
 
+namespace ObsidianSanctum
+{
 BossBoundaryData const boundaries =
 {
     { DATA_SARTHARION, new RectangleBoundary(3218.86f, 3275.69f, 484.68f, 572.4f) }
@@ -117,8 +119,10 @@ class instance_obsidian_sanctum : public InstanceMapScript
         return new instance_obsidian_sanctum_InstanceMapScript(map);
     }
 };
+}
 
 void AddSC_instance_obsidian_sanctum()
 {
+    using namespace ObsidianSanctum;
     new instance_obsidian_sanctum();
 }
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
@@ -26,6 +26,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace ObsidianSanctum
+{
 enum Enums
 {
     //Mini bosses common spells
@@ -1049,9 +1051,11 @@ class achievement_twilight_zone : public AchievementCriteriaScript
             return target && target->GetAI()->GetData(TWILIGHT_ACHIEVEMENTS) == 3;
         }
 };
+}
 
 void AddSC_obsidian_sanctum()
 {
+    using namespace ObsidianSanctum;
     new npc_vesperon();
     new npc_shadron();
     new npc_tenebron();

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
@@ -23,6 +23,8 @@
 #define OSScriptName "instance_obsidian_sanctum"
 #define DataHeader "OS"
 
+namespace ObsidianSanctum
+{
 uint32 const EncounterCount = 5;
 
 enum OSDataTypes
@@ -53,5 +55,6 @@ inline AI* GetObsidianSanctumAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, OSScriptName);
 }
+}
 
 #endif // OBSIDIAN_SANCTUM_H_
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -22,6 +22,8 @@
 #include "SpellAuras.h"
 #include "SpellScript.h"
 
+namespace RubySanctum::BaltharusTheWarmorn
+{
 enum Texts
 {
     SAY_BALTHARUS_INTRO         = 0,    // Your power wanes, ancient one.... Soon you will join your friends.
@@ -357,9 +359,11 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader
             return new spell_baltharus_enervating_brand_trigger_SpellScript();
         }
 };
+}
 
 void AddSC_boss_baltharus_the_warborn()
 {
+    using namespace RubySanctum::BaltharusTheWarmorn;
     new boss_baltharus_the_warborn();
     new npc_baltharus_the_warborn_clone();
     new spell_baltharus_enervating_brand_trigger();

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
@@ -22,6 +22,8 @@
 #include "ruby_sanctum.h"
 #include "ScriptedCreature.h"
 
+namespace RubySanctum::GeneralZarithrian
+{
 enum Texts
 {
     SAY_AGGRO                   = 0,    // Alexstrasza has chosen capable allies.... A pity that I must END YOU!
@@ -272,9 +274,12 @@ class npc_onyx_flamecaller : public CreatureScript
             return GetRubySanctumAI<npc_onyx_flamecallerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_general_zarithrian()
 {
+    using namespace RubySanctum;
+    using namespace RubySanctum::GeneralZarithrian;
     new boss_general_zarithrian();
     new npc_onyx_flamecaller();
 }
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -32,6 +32,8 @@
 #include "TemporarySummon.h"
 #include "Vehicle.h"
 
+namespace RubySanctum::Halion
+{
 enum Texts
 {
     // Shared
@@ -1875,11 +1877,12 @@ class spell_halion_blazing_aura : public SpellScriptLoader
             return new spell_halion_blazing_aura_SpellScript();
         }
 };
-
-
+}
 
 void AddSC_boss_halion()
 {
+    using namespace RubySanctum;
+    using namespace RubySanctum::Halion;
     new boss_halion();
     new boss_twilight_halion();