diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 8caeb89d28b..af84974b7d7 100644 --- 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(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 index 8c5d54ef6f8..1bd631b0f76 100644 --- 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 index b08d1a3acc5..556822d4fee 100644 --- 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 index 568c3fb7bf3..0a58bb5bae2 100644 --- 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(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 index dcd2df56c41..4f90403d4b5 100644 --- 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 index b9eedc85432..7572a1c0205 100644 --- 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(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 index f65b6714248..19e8642cb48 100644 --- 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(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 index 123fbd97e05..7c7b002e3c6 100644 --- 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(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 index 8e26a24b0d6..f697bac2151 100644 --- 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(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 index 3de0a648369..1e9f1dbd18e 100644 --- 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 index 0af0ab63726..d11b417eb51 100644 --- 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(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 index ff798bedabb..ae1342ac9a4 100644 --- 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(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 index 6cdeb655cce..880fdf861b0 100644 --- 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 index beca8bd3849..928a7087103 100644 --- 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(obj, MechanarScriptName); } +} #endif diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index c11b29fbfc5..8e03edaa84d 100644 --- 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(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 index 0c5c9d07d2f..810d11a37af 100644 --- 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(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 index 843830efdf1..68ee190bed6 100644 --- 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(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 index 6b9d2533fed..34e86aed907 100644 --- 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(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 index 49919f1be46..81530a2b60c 100644 --- 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(creature); } }; +} void AddSC_boss_wrath_scryer_soccothrates() { + using namespace Arcatraz; + using namespace Arcatraz::WrathScyrerSoccothrates; new boss_wrath_scryer_soccothrates(); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 9b9620984af..947baf73966 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "arcatraz.h" +namespace Arcatraz::ZerekethTheUnbound +{ enum Say { SAY_AGGRO = 0, @@ -121,8 +123,11 @@ class boss_zereketh_the_unbound : public CreatureScript return GetArcatrazAI(creature); } }; +} void AddSC_boss_zereketh_the_unbound() { + using namespace Arcatraz; + using namespace Arcatraz::ZerekethTheUnbound; new boss_zereketh_the_unbound(); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 5f1321fb762..6c55c8eae4d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -22,6 +22,8 @@ #include "InstanceScript.h" #include "Map.h" +namespace Arcatraz +{ DoorData const doorData[] = { { GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA, DATA_SOCCOTHRATES, DOOR_TYPE_PASSAGE }, @@ -205,8 +207,10 @@ class instance_arcatraz : public InstanceMapScript return new instance_arcatraz_InstanceMapScript(map); } }; +} void AddSC_instance_arcatraz() { + using namespace Arcatraz; new instance_arcatraz(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 51be9cdebac..38c7e333058 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -21,6 +21,8 @@ #include "SpellScript.h" #include "the_botanica.h" +namespace Botanica::CommanderSarannis +{ enum Says { SAY_AGGRO = 0, @@ -188,9 +190,12 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader return new spell_commander_sarannis_summon_reinforcements_SpellScript(); } }; +} void AddSC_boss_commander_sarannis() { + using namespace Botanica; + using namespace Botanica::CommanderSarannis; new boss_commander_sarannis(); new spell_commander_sarannis_summon_reinforcements(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 88c1cdbc2f5..cbd35854a30 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -28,6 +28,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" +namespace Botanica::HighBotanistFreywinn +{ enum Says { SAY_AGGRO = 0, @@ -214,8 +216,11 @@ class boss_high_botanist_freywinn : public CreatureScript return GetBotanicaAI(creature); } }; +} void AddSC_boss_high_botanist_freywinn() { + using namespace Botanica; + using namespace Botanica::HighBotanistFreywinn; new boss_high_botanist_freywinn(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 7d18b01133a..3c5bd8f181e 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -26,6 +26,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" +namespace Botanica::Laj +{ enum Spells { SPELL_ALLERGIC_REACTION = 34697, @@ -225,8 +227,11 @@ class boss_laj : public CreatureScript return GetBotanicaAI(creature); } }; +} void AddSC_boss_laj() { + using namespace Botanica; + using namespace Botanica::Laj; new boss_laj(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index 6e9eb7387b6..a10e4b3c7e5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "the_botanica.h" +namespace Botanica::ThorngrinTheTender +{ enum Says { SAY_AGGRO = 0, @@ -155,8 +157,11 @@ class boss_thorngrin_the_tender : public CreatureScript return GetBotanicaAI(creature); } }; +} void AddSC_boss_thorngrin_the_tender() { + using namespace Botanica; + using namespace Botanica::ThorngrinTheTender; new boss_thorngrin_the_tender(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 3d706dcce63..9ac7a21d3b5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -29,6 +29,8 @@ EndScriptData */ #include "TemporarySummon.h" #include "the_botanica.h" +namespace Botanica::WarpSplinter +{ enum Says { SAY_AGGRO = 0, @@ -243,9 +245,12 @@ class boss_warp_splinter : public CreatureScript return GetBotanicaAI(creature); } }; +} void AddSC_boss_warp_splinter() { + using namespace Botanica; + using namespace Botanica::WarpSplinter; new boss_warp_splinter(); new npc_warp_splinter_treant(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index d78caa3c364..1b73f684454 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -20,6 +20,8 @@ #include "InstanceScript.h" #include "the_botanica.h" +namespace Botanica +{ class instance_the_botanica : public InstanceMapScript { public: @@ -110,8 +112,10 @@ class instance_the_botanica : public InstanceMapScript return new instance_the_botanica_InstanceMapScript(map); } }; +} void AddSC_instance_the_botanica() { + using namespace Botanica; new instance_the_botanica; } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h index 4c8fb6ae0d5..11576c4a001 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h +++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Botanica +{ #define BotanicaScriptName "instance_the_botanica" #define DataHeader "BC" @@ -48,5 +50,6 @@ inline AI* GetBotanicaAI(T* obj) { return GetInstanceAI(obj, BotanicaScriptName); } +} #endif diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 24c2f3cb5ac..816f04cecbb 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -20,6 +20,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace DoomlordKazzak +{ enum Texts { SAY_INTRO = 0, @@ -251,9 +253,11 @@ class spell_twisted_reflection : public SpellScriptLoader return new spell_twisted_reflection_AuraScript(); } }; +} void AddSC_boss_doomlordkazzak() { + using namespace DoomlordKazzak; new boss_doomlord_kazzak(); new spell_mark_of_kazzak(); new spell_twisted_reflection(); diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index b24ecda9297..6ce915eb557 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -18,6 +18,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace Doomwalker +{ enum Texts { SAY_AGGRO = 0, @@ -169,8 +171,10 @@ class boss_doomwalker : public CreatureScript return new boss_doomwalkerAI(creature); } }; +} void AddSC_boss_doomwalker() { + using namespace Doomwalker; new boss_doomwalker(); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 6b210a75c82..107032e4bf8 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -41,6 +41,8 @@ EndContentData */ #include "SpellScript.h" #include "TemporarySummon.h" +namespace BladesEdgeMountains +{ /*###### ## npc_nether_drake ######*/ @@ -1051,9 +1053,11 @@ class spell_oscillating_field : public SpellScriptLoader return new spell_oscillating_field_SpellScript(); } }; +} void AddSC_blades_edge_mountains() { + using namespace BladesEdgeMountains; new npc_nether_drake(); new npc_daranelle(); new go_legion_obelisk(); diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index d13e736c61e..90ceb1b7d53 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -40,6 +40,9 @@ EndContentData */ #include "ScriptedGossip.h" #include "WorldSession.h" +namespace HellfirePeninsula +{ + /*###### ## npc_aeranas ######*/ @@ -1243,9 +1246,11 @@ struct npc_fear_controller : public ScriptedAI private: EventMap _events; }; +} void AddSC_hellfire_peninsula() { + using namespace HellfirePeninsula; new npc_aeranas(); new npc_ancestral_wolf(); new npc_wounded_blood_elf(); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 12d5b8ef195..ed7b1ff2788 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -36,6 +36,8 @@ EndContentData */ #include "SpellInfo.h" #include "TemporarySummon.h" +namespace Nagrand +{ /*###### ## npc_maghar_captive #####*/ @@ -632,9 +634,11 @@ class go_warmaul_prison : public GameObjectScript return new go_warmaul_prisonAI(go); } }; +} void AddSC_nagrand() { + using namespace Nagrand; new npc_maghar_captive(); new npc_creditmarker_visit_with_ancestors(); new npc_corki(); diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index b538bb6f51f..7ec0793bd98 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -37,6 +37,8 @@ EndContentData */ #include "Player.h" #include "ScriptedEscortAI.h" +namespace Netherstorm +{ /*###### ## npc_commander_dawnforge ######*/ @@ -697,9 +699,11 @@ class go_captain_tyralius_prison : public GameObjectScript return new go_captain_tyralius_prisonAI(go); } }; +} void AddSC_netherstorm() { + using namespace Netherstorm; new npc_commander_dawnforge(); new at_commander_dawnforge(); new npc_phase_hunter(); diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 303db079177..6c823161be1 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -48,6 +48,8 @@ EndContentData */ #include "SpellScript.h" #include "TemporarySummon.h" +namespace ShadowmoonValley +{ /*##### # npc_invis_infernal_caster #####*/ @@ -1675,9 +1677,11 @@ class npc_shadowmoon_tuber_node : public CreatureScript return new npc_shadowmoon_tuber_nodeAI(creature); } }; +} void AddSC_shadowmoon_valley() { + using namespace ShadowmoonValley; new npc_invis_infernal_caster(); new npc_infernal_attacker(); new npc_mature_netherwing_drake(); diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index afeaa068086..b2596de9d60 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -32,6 +32,8 @@ EndContentData */ #include "Player.h" #include "WorldSession.h" +namespace ShattrathCity +{ /*###### # npc_kservant ######*/ @@ -176,8 +178,10 @@ class npc_kservant : public CreatureScript void Reset() override { } }; }; +} void AddSC_shattrath_city() { + using namespace ShattrathCity; new npc_kservant(); } diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index b54ee8124aa..f04d9f35bd5 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -40,6 +40,8 @@ EndContentData */ #include "ScriptedGossip.h" #include "WorldSession.h" +namespace TerokkarForest +{ /*###### ## npc_unkor_the_ruthless ######*/ @@ -589,9 +591,11 @@ enum Akuno QUEST_ESCAPING_THE_TOMB = 10887, NPC_CABAL_SKRIMISHER = 21661 }; +} void AddSC_terokkar_forest() { + using namespace TerokkarForest; new npc_unkor_the_ruthless(); new npc_infested_root_walker(); new npc_rotting_forest_rager(); diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 53138b1a0be..47aa00f47fd 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -34,6 +34,8 @@ EndContentData */ #include "Player.h" #include "WorldSession.h" +namespace Zangarmarsh +{ /*###### ## npcs_ashyen_and_keleth ######*/ @@ -231,6 +233,7 @@ class npc_kayra_longmane : public CreatureScript return new npc_kayra_longmaneAI(creature); } }; +} /*###### ## AddSC @@ -238,6 +241,7 @@ class npc_kayra_longmane : public CreatureScript void AddSC_zangarmarsh() { + using namespace Zangarmarsh; new npcs_ashyen_and_keleth(); new npc_kayra_longmane(); }