diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 87c07410c1..c119cadd4b 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -37,6 +37,8 @@ Script Data End */ #include "TemporarySummon.h" #include "Vehicle.h" +namespace EyeOfEternity::Malygos +{ enum Events { // =========== INTRO BEFORE WE START ENCOUNTER =============== @@ -2399,9 +2401,12 @@ class achievement_denyin_the_scion : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_malygos() { + using namespace EyeOfEternity; + using namespace EyeOfEternity::Malygos; new boss_malygos(); new npc_portal_eoe(); new npc_power_spark(); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h index df840177a4..566ab53423 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace EyeOfEternity +{ #define EoEScriptName "instance_eye_of_eternity" #define DataHeader "EOE" @@ -92,5 +94,6 @@ inline AI* GetEyeOfEternityAI(T* obj) { return GetInstanceAI(obj, EoEScriptName); } +} #endif diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index b2fb6324a5..ec675404bc 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -25,6 +25,8 @@ #include "Map.h" #include "Player.h" +namespace EyeOfEternity +{ BossBoundaryData const boundaries = { { DATA_MALYGOS_EVENT, new CircleBoundary(Position(754.362f, 1301.609985f), 280.0) } // sanity check boundary @@ -281,8 +283,10 @@ public: Position exitPortalPosition; }; }; +} void AddSC_instance_eye_of_eternity() { + using namespace EyeOfEternity; new instance_eye_of_eternity(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index b0e3a1a975..5bb0782f37 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -22,6 +22,8 @@ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace Nexus::Anomalus +{ enum Spells { SPELL_SPARK = 47751, @@ -288,9 +290,12 @@ class achievement_chaos_theory : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_anomalus() { + using namespace Nexus; + using namespace Nexus::Anomalus; new boss_anomalus(); new npc_chaotic_rift(); new achievement_chaos_theory(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp index 947ab8d639..5d074bb9ec 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp @@ -26,6 +26,8 @@ Script Data End */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +namespace Nexus::CommanderStoutbeard +{ enum CommanderStoutbeard { SPELL_BATTLE_SHOUT = 31403, @@ -64,8 +66,11 @@ public: }; }; +} void AddSC_boss_commander_stoutbeard() { + using namespace Nexus; + using namespace Nexus::CommanderStoutbeard; new boss_commander_stoutbeard(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 9f644e39cb..00bb6b762f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -26,6 +26,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace Nexus::Keristrasza +{ enum Spells { //Spells @@ -306,9 +308,12 @@ class achievement_intense_cold : public AchievementCriteriaScript return true; } }; +} void AddSC_boss_keristrasza() { + using namespace Nexus; + using namespace Nexus::Keristrasza; new boss_keristrasza(); new containment_sphere(); new achievement_intense_cold(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 9d67c7a7bb..9e29b59d03 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -24,6 +24,8 @@ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace Nexus::MagusTelestra +{ enum Spells { SPELL_ICE_NOVA = 47772, @@ -378,9 +380,12 @@ class achievement_split_personality : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_magus_telestra() { + using namespace Nexus; + using namespace Nexus::MagusTelestra; new boss_magus_telestra(); new achievement_split_personality(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp index 85fe36921e..fbb38fd81b 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp @@ -19,6 +19,8 @@ #include "nexus.h" #include "ScriptedCreature.h" +namespace Nexus::NexusCommander +{ enum Spells { SPELL_BATTLE_SHOUT = 31403, @@ -103,8 +105,11 @@ class boss_nexus_commanders : public CreatureScript return GetNexusAI(creature); } }; +} void AddSC_boss_nexus_commanders() { + using namespace Nexus; + using namespace Nexus::NexusCommander; new boss_nexus_commanders(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index ca80617f20..6c2608a1dd 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace Nexus::Ormorok +{ enum Spells { SPELL_SPELL_REFLECTION = 47981, @@ -292,9 +294,12 @@ class spell_crystal_spike : public SpellScriptLoader return new spell_crystal_spike_AuraScript(); } }; +} void AddSC_boss_ormorok() { + using namespace Nexus; + using namespace Nexus::Ormorok; new boss_ormorok(); new npc_crystal_spike_trigger(); new spell_crystal_spike(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index a413a5a766..77a46a0d26 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -23,6 +23,8 @@ #include "nexus.h" #include "Player.h" +namespace Nexus +{ class instance_nexus : public InstanceMapScript { public: @@ -188,8 +190,10 @@ class instance_nexus : public InstanceMapScript return new instance_nexus_InstanceMapScript(map); } }; +} void AddSC_instance_nexus() { + using namespace Nexus; new instance_nexus(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index e5367ad1c5..ab8fa66ecb 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Nexus +{ #define NexusScriptName "instance_nexus" #define DataHeader "NEX" @@ -70,5 +72,6 @@ inline AI* GetNexusAI(T* obj) { return GetInstanceAI(obj, NexusScriptName); } +} #endif diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 41c96abea8..85d154bdd0 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -21,6 +21,8 @@ #include "oculus.h" #include "ScriptedCreature.h" +namespace Oculus::Drakos +{ enum Spells { SPELL_MAGIC_PULL = 51336, @@ -206,9 +208,12 @@ class npc_unstable_sphere : public CreatureScript return GetOculusAI(creature); } }; +} void AddSC_boss_drakos() { + using namespace Oculus; + using namespace Oculus::Drakos; new boss_drakos(); new npc_unstable_sphere(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 84fa8a0c4a..0829a36306 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -24,6 +24,8 @@ // Types of drake mounts: Ruby (Tank), Amber (DPS), Emerald (Healer) // Two Repeating phases +namespace Oculus::Eregos +{ enum Events { EVENT_ARCANE_BARRAGE = 1, @@ -300,12 +302,15 @@ class achievement_gen_eregos_void : public AchievementCriteriaScript private: uint32 _data; }; +} - void AddSC_boss_eregos() - { +void AddSC_boss_eregos() +{ + using namespace Oculus; + using namespace Oculus::Eregos; new boss_eregos(); new spell_eregos_planar_shift(); new achievement_gen_eregos_void("achievement_ruby_void", DATA_RUBY_VOID); new achievement_gen_eregos_void("achievement_emerald_void", DATA_EMERALD_VOID); new achievement_gen_eregos_void("achievement_amber_void", DATA_AMBER_VOID); - } +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 947e4bf7d6..8256111f4d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -28,6 +28,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "SpellInfo.h" +namespace Oculus::Urom +{ enum Spells { SPELL_ARCANE_SHIELD = 53813, //Dummy --> Channeled, shields the caster from damage. @@ -345,8 +347,11 @@ class boss_urom : public CreatureScript return GetOculusAI(creature); } }; +} void AddSC_boss_urom() { + using namespace Oculus; + using namespace Oculus::Urom; new boss_urom(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 04eb7f124b..e58e986256 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -24,6 +24,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace Oculus::Varos +{ enum Says { SAY_AGGRO = 0, @@ -395,9 +397,12 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader return new spell_varos_energize_core_area_entrySpellScript(); } }; +} void AddSC_boss_varos() { + using namespace Oculus; + using namespace Oculus::Varos; new boss_varos(); new npc_azure_ring_captain(); new spell_varos_centrifuge_shield(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 00a7f93398..4beb6a0b12 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -27,6 +27,8 @@ #include "TemporarySummon.h" #include "WorldPacket.h" +namespace Oculus +{ DoorData const doorData[] = { { GO_DRAGON_CAGE_DOOR, DATA_DRAKOS, DOOR_TYPE_PASSAGE }, @@ -316,8 +318,10 @@ class instance_oculus : public InstanceMapScript return new instance_oculus_InstanceMapScript(map); } }; +} void AddSC_instance_oculus() { + using namespace Oculus; new instance_oculus(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index ec99f8cb27..50d5e41575 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -29,6 +29,8 @@ #include "SpellScript.h" #include "Vehicle.h" +namespace Oculus +{ enum GossipNPCs { GOSSIP_MENU_VERDISA = 9573, @@ -670,9 +672,11 @@ class spell_oculus_dream_funnel : public SpellScriptLoader return new spell_oculus_dream_funnel_AuraScript(); } }; +} void AddSC_oculus() { + using namespace Oculus; new npc_verdisa_beglaristrasz_eternos(); new npc_image_belgaristrasz(); new npc_ruby_emerald_amber_drake(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index 83c6e8eca4..00b54038e2 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Oculus +{ #define OculusScriptName "instance_oculus" #define DataHeader "OC" @@ -112,5 +114,6 @@ inline AI* GetOculusAI(T* obj) { return GetInstanceAI(obj, OculusScriptName); } +} #endif // OCULUS_H_ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp index 6b3d62c466..0888349dcb 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp @@ -28,6 +28,8 @@ #include "SpellHistory.h" #include "SpellMgr.h" +namespace HallsOfLightning::GeneralBjarngrim +{ enum Spells { // General Bjarngrim @@ -490,9 +492,12 @@ class spell_bjarngrim_arc_weld : public AuraScript OnEffectPeriodic.Register(&spell_bjarngrim_arc_weld::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; +} void AddSC_boss_general_bjarngrim() { + using namespace HallsOfLightning; + using namespace HallsOfLightning::GeneralBjarngrim; RegisterHallsOfLightningCreatureAI(boss_general_bjarngrim); RegisterHallsOfLightningCreatureAI(npc_bjarngrim_stormforged_lieutenant); RegisterSpellScriptWithArgs(spell_bjarngrim_stance_dummy, "spell_bjarngrim_defensive_stance_dummy", STANCE_DEFENSIVE); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 03836542a8..59dde04054 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -27,6 +27,8 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" +namespace HallsOfLightning::Ionar +{ enum Spells { SPELL_BALL_LIGHTNING = 52780, @@ -381,9 +383,12 @@ public: return GetHallsOfLightningAI(creature); } }; +} void AddSC_boss_ionar() { + using namespace HallsOfLightning; + using namespace HallsOfLightning::Ionar; new boss_ionar(); new npc_spark_of_ionar(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index aa8bb660f3..3bc018b2ff 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -22,6 +22,8 @@ #include "SpellMgr.h" #include "SpellScript.h" +namespace HallsOfLightning::Loken +{ enum Texts { SAY_INTRO_1 = 0, @@ -203,9 +205,12 @@ class spell_loken_pulsing_shockwave : public SpellScript OnEffectHitTarget.Register(&spell_loken_pulsing_shockwave::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; +} void AddSC_boss_loken() { + using namespace HallsOfLightning; + using namespace HallsOfLightning::Loken; RegisterHallsOfLightningCreatureAI(boss_loken); RegisterSpellScript(spell_loken_pulsing_shockwave); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index dca83ac147..01ef9bd0ae 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -27,6 +27,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace HallsOfLightning::Volkhan +{ enum Texts { // Volkhan @@ -494,9 +496,12 @@ class achievement_shatter_resistant : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_volkhan() { + using namespace HallsOfLightning; + using namespace HallsOfLightning::Volkhan; RegisterHallsOfLightningCreatureAI(boss_volkhan); RegisterHallsOfLightningCreatureAI(npc_volkhan_molten_golem); RegisterSpellScript(spell_volkhan_temper_dummy); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index a5995c0926..e9fbfe3bda 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace HallsOfLightning +{ #define HoLScriptName "instance_halls_of_lightning" #define DataHeader "HOL" @@ -80,5 +82,6 @@ inline AI* GetHallsOfLightningAI(T* obj) } #define RegisterHallsOfLightningCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetHallsOfLightningAI) +} #endif // HALLS_OF_LIGHTNING_H_ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index b1aa46dd16..0da75dae71 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -23,6 +23,8 @@ #include "InstanceScript.h" #include "Map.h" +namespace HallsOfLightning +{ DoorData const doorData[] = { { GO_VOLKHAN_DOOR, DATA_VOLKHAN, DOOR_TYPE_PASSAGE }, @@ -110,8 +112,10 @@ class instance_halls_of_lightning : public InstanceMapScript return new instance_halls_of_lightning_InstanceMapScript(map); } }; +} void AddSC_instance_halls_of_lightning() { + using namespace HallsOfLightning; new instance_halls_of_lightning(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 643c16cb16..bc31de6174 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -21,6 +21,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace HallsOfStone::Krystallus +{ enum Spells { SPELL_BOULDER_TOSS = 50843, @@ -202,9 +204,12 @@ class spell_krystallus_shatter_effect : public SpellScriptLoader return new spell_krystallus_shatter_effect_SpellScript(); } }; +} void AddSC_boss_krystallus() { + using namespace HallsOfStone; + using namespace HallsOfStone::Krystallus; new boss_krystallus(); new spell_krystallus_shatter(); new spell_krystallus_shatter_effect(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 5681d5b64b..edcb07b7d5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -20,6 +20,8 @@ #include "InstanceScript.h" #include "ScriptedCreature.h" +namespace HallsOfStone::MaidenOfGrief +{ enum Yells { SAY_AGGRO = 0, @@ -142,8 +144,11 @@ class boss_maiden_of_grief : public CreatureScript return GetHallsOfStoneAI(creature); } }; +} void AddSC_boss_maiden_of_grief() { + using namespace HallsOfStone; + using namespace HallsOfStone::MaidenOfGrief; new boss_maiden_of_grief(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 5e0f933a68..7513813253 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -22,6 +22,8 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" +namespace HallsOfStone::Sjonnir +{ enum Spells { SPELL_LIGHTING_RING = 51849, // Periodic Trigger (interval 2s) spell = 50841 @@ -317,9 +319,12 @@ class achievement_abuse_the_ooze : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_sjonnir() { + using namespace HallsOfStone; + using namespace HallsOfStone::Sjonnir; new boss_sjonnir(); new npc_malformed_ooze(); new npc_iron_sludge(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index fee32932cb..43e21b1d7d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -24,6 +24,8 @@ #include "ScriptedGossip.h" #include "TemporarySummon.h" +namespace HallsOfStone +{ enum Texts { SAY_KILL = 0, @@ -733,9 +735,11 @@ class achievement_brann_spankin_new : public AchievementCriteriaScript return false; } }; +} void AddSC_halls_of_stone() { + using namespace HallsOfStone; new npc_brann_hos(); new npc_tribuna_controller(); new achievement_brann_spankin_new(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h index 9cbf93e986..3643ad28ac 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace HallsOfStone +{ #define HoSScriptName "instance_halls_of_stone" #define DataHeader "HOS" @@ -74,5 +76,6 @@ inline AI* GetHallsOfStoneAI(T* obj) { return GetInstanceAI(obj, HoSScriptName); } +} #endif // HALLS_OF_STONE_H_ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 9e7dd6a323..caa635018d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -23,6 +23,8 @@ #include "Map.h" #include "Player.h" +namespace HallsOfStone +{ DoorData const doorData[] = { { GO_SJONNIR_DOOR, DATA_TRIBUNAL_OF_AGES, DOOR_TYPE_PASSAGE }, @@ -200,8 +202,10 @@ class instance_halls_of_stone : public InstanceMapScript return new instance_halls_of_stone_InstanceMapScript(map); } }; +} void AddSC_instance_halls_of_stone() { + using namespace HallsOfStone; new instance_halls_of_stone(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 4da3e9b6dd..80db5679e9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -33,6 +33,8 @@ #include "TemporarySummon.h" #include "ulduar.h" +namespace Ulduar::AlgalonTheObserver +{ enum Texts { SAY_BRANN_ALGALON_INTRO_1 = 0, @@ -1328,9 +1330,12 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader return new spell_algalon_cosmic_smash_damage_SpellScript(); } }; +} void AddSC_boss_algalon_the_observer() { + using namespace Ulduar; + using namespace Ulduar::AlgalonTheObserver; new boss_algalon_the_observer(); new npc_living_constellation(); new npc_collapsing_star(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 6929c12bde..c9b3197384 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -29,6 +29,8 @@ #include "TemporarySummon.h" #include "ulduar.h" +namespace Ulduar::AssemblyOfIron +{ enum Spells { // General @@ -893,9 +895,12 @@ class achievement_assembly_i_choose_you : public AchievementCriteriaScript return target && target->GetAI()->GetData(DATA_PHASE_3); } }; +} void AddSC_boss_assembly_of_iron() { + using namespace Ulduar; + using namespace Ulduar::AssemblyOfIron; RegisterUlduarCreatureAI(boss_steelbreaker); RegisterUlduarCreatureAI(boss_runemaster_molgeim); RegisterUlduarCreatureAI(boss_stormcaller_brundir); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 090b59dbf5..470242a792 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -22,6 +22,8 @@ #include "SpellScript.h" #include "ulduar.h" +namespace Ulduar::Auriaya +{ enum AuriayaSpells { // Auriaya @@ -587,9 +589,12 @@ class achievement_crazy_cat_lady : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_auriaya() { + using namespace Ulduar; + using namespace Ulduar::Auriaya; new boss_auriaya(); new npc_auriaya_seeping_trigger(); new npc_feral_defender(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index d70265f64f..be93d761bf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -39,6 +39,8 @@ #include "ulduar.h" #include "Vehicle.h" +namespace Ulduar::FlameLeviathan +{ enum Spells { SPELL_PURSUED = 62374, @@ -1719,9 +1721,12 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader return new spell_vehicle_throw_passenger_SpellScript(); } }; +} void AddSC_boss_flame_leviathan() { + using namespace Ulduar; + using namespace Ulduar::FlameLeviathan; new boss_flame_leviathan(); new boss_flame_leviathan_seat(); new boss_flame_leviathan_defense_turret(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 46981f3c75..45b93ed519 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -26,6 +26,8 @@ #include "TemporarySummon.h" #include "ulduar.h" +namespace Ulduar::Freya +{ enum FreyaYells { // Freya @@ -1637,9 +1639,12 @@ class achievement_knock_knock_knock_on_wood : public AchievementCriteriaScript return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) == 3; } }; +} void AddSC_boss_freya() { + using namespace Ulduar; + using namespace Ulduar::Freya; new boss_freya(); new boss_elder_brightleaf(); new boss_elder_ironbranch(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 613eb2f541..8fb0f96969 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -25,6 +25,8 @@ #include "SpellScript.h" #include "ulduar.h" +namespace Ulduar::GeneralVezax +{ enum VezaxYells { SAY_AGGRO = 0, @@ -579,9 +581,12 @@ class achievement_smell_saronite : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_general_vezax() { + using namespace Ulduar; + using namespace Ulduar::GeneralVezax; new boss_general_vezax(); new boss_saronite_animus(); new npc_saronite_vapors(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 0d45886652..2b57b98b3b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -26,6 +26,8 @@ #include "TemporarySummon.h" #include "ulduar.h" +namespace Ulduar::Hodir +{ /* @todo Achievements Storm Cloud (Shaman ability) Destroying of Toasty Fires @@ -1061,9 +1063,12 @@ public: return new spell_biting_cold_dot_AuraScript(); } }; +} void AddSC_boss_hodir() { + using namespace Ulduar; + using namespace Ulduar::Hodir; new boss_hodir(); new npc_icicle(); new npc_snowpacked_icicle(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 57f98f3148..3785f99922 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -25,6 +25,8 @@ #include "ulduar.h" #include "Vehicle.h" +namespace Ulduar::Ignis +{ enum Yells { SAY_AGGRO = 0, @@ -497,9 +499,12 @@ class achievement_ignis_shattered : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_ignis() { + using namespace Ulduar; + using namespace Ulduar::Ignis; new boss_ignis(); new npc_iron_construct(); new npc_scorch_ground(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 6bce5fedea..08abab82f9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -34,6 +34,8 @@ SDComment: @todo Achievements SDCategory: Ulduar EndScriptData */ +namespace Ulduar::Kologarn +{ enum Spells { SPELL_ARM_DEAD_DAMAGE = 63629, @@ -646,9 +648,12 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader return new spell_kologarn_summon_focused_eyebeam_SpellScript(); } }; +} void AddSC_boss_kologarn() { + using namespace Ulduar; + using namespace Ulduar::Kologarn; new boss_kologarn(); new spell_ulduar_rubble_summon(); new spell_ulduar_squeezed_lifeless(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 2b6cd0eee6..7951d18622 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -29,6 +29,8 @@ #include "ulduar.h" #include "Vehicle.h" +namespace Ulduar::Mimiron +{ enum Yells { SAY_AGGRO = 0, @@ -2734,9 +2736,12 @@ class achievement_firefighter : public AchievementCriteriaScript return target && target->GetAI()->GetData(DATA_FIREFIGHTER); } }; +} void AddSC_boss_mimiron() { + using namespace Ulduar; + using namespace Ulduar::Mimiron; new boss_aerial_command_unit(); new boss_leviathan_mk_ii(); new boss_mimiron(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index a9cb5d48a6..c6fa8900b8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -32,6 +32,8 @@ #include "TemporarySummon.h" #include "ulduar.h" +namespace Ulduar::Razorscale +{ enum Says { // Expedition Commander @@ -1175,9 +1177,12 @@ class achievement_quick_shave : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_razorscale() { + using namespace Ulduar; + using namespace Ulduar::Razorscale; new boss_razorscale_controller(); new go_razorscale_harpoon(); new boss_razorscale(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 9c4b096078..1075ce8740 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -32,6 +32,8 @@ #include "ulduar.h" #include +namespace Ulduar::Thorim +{ enum Spells { // Thorim @@ -2166,9 +2168,12 @@ class condition_thorim_arena_leap : public ConditionScript private: HeightPositionCheck _check; }; +} void AddSC_boss_thorim() { + using namespace Ulduar; + using namespace Ulduar::Thorim; new boss_thorim(); new npc_thorim_pre_phase(); new npc_thorim_arena_phase(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index e648dca73e..639c011e05 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -35,6 +35,8 @@ #include "Vehicle.h" #include "WorldPacket.h" +namespace Ulduar::XT002 +{ enum Spells { SPELL_TYMPANIC_TANTRUM = 62776, @@ -1090,9 +1092,12 @@ class achievement_nerf_gravity_bombs : public AchievementCriteriaScript return !(target->GetAI()->GetData(DATA_GRAVITY_BOMB_CASUALTY)); } }; +} void AddSC_boss_xt002() { + using namespace Ulduar; + using namespace Ulduar::XT002; new npc_xt002_heart(); new npc_scrapbot(); new npc_pummeller(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 3242b582ff..cafc9a674f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -33,6 +33,8 @@ #include "TemporarySummon.h" #include "ulduar.h" +namespace Ulduar::YoggSaron +{ enum Yells { // Sara @@ -3080,9 +3082,12 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // return new spell_yogg_saron_hodirs_protective_gaze_AuraScript(); } }; +} void AddSC_boss_yogg_saron() { + using namespace Ulduar; + using namespace Ulduar::YoggSaron; new boss_voice_of_yogg_saron(); new boss_sara(); new boss_yogg_saron(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index a4e35a99f0..aff68560f6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -30,6 +30,8 @@ #include "Vehicle.h" #include "WorldPacket.h" +namespace Ulduar +{ static BossBoundaryData const boundaries = { { DATA_FLAME_LEVIATHAN, new RectangleBoundary(148.0f, 401.3f, -155.0f, 90.0f) }, @@ -211,7 +213,7 @@ class instance_ulduar : public InstanceMapScript if (_summonAlgalon) { _summonAlgalon = false; - TempSummon* algalon = instance->SummonCreature(NPC_ALGALON, AlgalonLandPos); + TempSummon* algalon = instance->SummonCreature(NPC_ALGALON, AlgalonTheObserver::AlgalonLandPos); if (_algalonTimer && _algalonTimer <= 60) algalon->AI()->DoAction(ACTION_INIT_ALGALON); else @@ -222,33 +224,33 @@ class instance_ulduar : public InstanceMapScript if (GetBossState(DATA_FREYA) == DONE && _summonObservationRingKeeper[0] && !KeeperGUIDs[0]) { _summonObservationRingKeeper[0] = false; - instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, ObservationRingKeepersPos[0]); + instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[0]); } if (GetBossState(DATA_HODIR) == DONE && _summonObservationRingKeeper[1] && !KeeperGUIDs[1]) { _summonObservationRingKeeper[1] = false; - instance->SummonCreature(NPC_HODIR_OBSERVATION_RING, ObservationRingKeepersPos[1]); + instance->SummonCreature(NPC_HODIR_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[1]); } if (GetBossState(DATA_THORIM) == DONE && _summonObservationRingKeeper[2] && !KeeperGUIDs[2]) { _summonObservationRingKeeper[2] = false; - instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, ObservationRingKeepersPos[2]); + instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[2]); } if (GetBossState(DATA_MIMIRON) == DONE && _summonObservationRingKeeper[3] && !KeeperGUIDs[3]) { _summonObservationRingKeeper[3] = false; - instance->SummonCreature(NPC_MIMIRON_OBSERVATION_RING, ObservationRingKeepersPos[3]); + instance->SummonCreature(NPC_MIMIRON_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[3]); } // Keepers in Yogg-Saron's room if (_summonYSKeeper[0]) - instance->SummonCreature(NPC_FREYA_YS, YSKeepersPos[0]); + instance->SummonCreature(NPC_FREYA_YS, YoggSaron::YSKeepersPos[0]); if (_summonYSKeeper[1]) - instance->SummonCreature(NPC_HODIR_YS, YSKeepersPos[1]); + instance->SummonCreature(NPC_HODIR_YS, YoggSaron::YSKeepersPos[1]); if (_summonYSKeeper[2]) - instance->SummonCreature(NPC_THORIM_YS, YSKeepersPos[2]); + instance->SummonCreature(NPC_THORIM_YS, YoggSaron::YSKeepersPos[2]); if (_summonYSKeeper[3]) - instance->SummonCreature(NPC_MIMIRON_YS, YSKeepersPos[3]); + instance->SummonCreature(NPC_MIMIRON_YS, YoggSaron::YSKeepersPos[3]); } // This hook is being called when the instance is created for the first time without a instance save. Handle the Assembly of Iron initial spawn procedure in here. @@ -637,11 +639,11 @@ class instance_ulduar : public InstanceMapScript break; case DATA_MIMIRON: if (state == DONE) - instance->SummonCreature(NPC_MIMIRON_OBSERVATION_RING, ObservationRingKeepersPos[3]); + instance->SummonCreature(NPC_MIMIRON_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[3]); break; case DATA_FREYA: if (state == DONE) - instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, ObservationRingKeepersPos[0]); + instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[0]); break; case DATA_IRONBRANCH: case DATA_STONEBARK: @@ -670,7 +672,7 @@ class instance_ulduar : public InstanceMapScript if (GameObject* HodirChest = instance->GetGameObject(HodirChestGUID)) HodirChest->SetRespawnTime(HodirChest->GetRespawnDelay()); - instance->SummonCreature(NPC_HODIR_OBSERVATION_RING, ObservationRingKeepersPos[1]); + instance->SummonCreature(NPC_HODIR_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[1]); } break; case DATA_THORIM: @@ -686,7 +688,7 @@ class instance_ulduar : public InstanceMapScript } } - instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, ObservationRingKeepersPos[2]); + instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, YoggSaron::ObservationRingKeepersPos[2]); } else { @@ -1121,9 +1123,11 @@ class spell_ulduar_teleporter : public SpellScriptLoader return new spell_ulduar_teleporter_SpellScript(); } }; +} void AddSC_instance_ulduar() { + using namespace Ulduar; new instance_ulduar(); new spell_ulduar_teleporter(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index b01aad420a..e60c9d77d9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -20,12 +20,21 @@ #include "CreatureAIImpl.h" +namespace Ulduar +{ #define UlduarScriptName "instance_ulduar" #define DataHeader "UU" -extern Position const ObservationRingKeepersPos[4]; -extern Position const YSKeepersPos[4]; -extern Position const AlgalonLandPos; + namespace YoggSaron + { + extern Position const ObservationRingKeepersPos[4]; + extern Position const YSKeepersPos[4]; + } + + namespace AlgalonTheObserver + { + extern Position const AlgalonLandPos; + } static constexpr uint8 const MAX_ENCOUNTER = 17; @@ -534,5 +543,6 @@ class PlayerOrPetCheck return true; } }; +} #endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 01cf86d899..5f758946ce 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -31,6 +31,8 @@ EndScriptData */ #include "SpellScript.h" #include "utgarde_keep.h" +namespace UtgardeKeep::IngvarThePlunderer +{ enum Yells { // Ingvar (Human/Undead) @@ -479,9 +481,12 @@ class spell_ingvar_woe_strike : public SpellScriptLoader return new spell_ingvar_woe_strike_AuraScript(); } }; +} void AddSC_boss_ingvar_the_plunderer() { + using namespace UtgardeKeep; + using namespace UtgardeKeep::IngvarThePlunderer; new boss_ingvar_the_plunderer(); new npc_annhylde_the_caller(); new npc_ingvar_throw_dummy(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 2a9b23628d..0d8f011e92 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -31,6 +31,8 @@ EndScriptData */ #include "SpellScript.h" #include "utgarde_keep.h" +namespace UtgardeKeep::Keleseth +{ enum KelsethEncounter { SPELL_SHADOWBOLT = 43667, @@ -373,9 +375,12 @@ class achievement_on_the_rocks : public AchievementCriteriaScript return target && target->GetAI() && target->GetAI()->GetData(DATA_ON_THE_ROCKS); } }; +} void AddSC_boss_keleseth() { + using namespace UtgardeKeep; + using namespace UtgardeKeep::Keleseth; new boss_keleseth(); new npc_frost_tomb(); new npc_vrykul_skeleton(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index dd28c75e7a..2b1ee4204f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -28,6 +28,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "utgarde_keep.h" +namespace UtgardeKeep::SkarvaldDalronn +{ enum Texts { // Texts are common for both bosses and their ghosts. @@ -294,9 +296,12 @@ class boss_dalronn_the_controller : public CreatureScript return GetUtgardeKeepAI(creature); } }; +} void AddSC_boss_skarvald_dalronn() { + using namespace UtgardeKeep; + using namespace UtgardeKeep::SkarvaldDalronn; new boss_skarvald_the_constructor(); new boss_dalronn_the_controller(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 0803206543..be0570ec57 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -21,6 +21,8 @@ #include "InstanceScript.h" #include "utgarde_keep.h" +namespace UtgardeKeep +{ DoorData const doorData[] = { { GO_GIANT_PORTCULLIS_1, DATA_INGVAR, DOOR_TYPE_PASSAGE }, @@ -200,8 +202,10 @@ class instance_utgarde_keep : public InstanceMapScript return new instance_utgarde_keep_InstanceMapScript(map); } }; +} void AddSC_instance_utgarde_keep() { + using namespace UtgardeKeep; new instance_utgarde_keep(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index f774607641..d77eac9f1f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -24,6 +24,8 @@ #include "SpellScript.h" #include "utgarde_keep.h" +namespace UtgardeKeep +{ uint32 ForgeSearch[3] = { GO_GLOWING_ANVIL_1, @@ -336,9 +338,11 @@ class npc_enslaved_proto_drake : public CreatureScript return GetUtgardeKeepAI(creature); } }; +} void AddSC_utgarde_keep() { + using namespace UtgardeKeep; new npc_dragonflayer_forge_master(); new npc_enslaved_proto_drake(); new spell_ticking_time_bomb(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index d23c211b89..f2eb1ff7c1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace UtgardeKeep +{ #define UKScriptName "instance_utgarde_keep" #define DataHeader "UK" @@ -92,5 +94,6 @@ inline AI* GetUtgardeKeepAI(T* obj) { return GetInstanceAI(obj, UKScriptName); } +} #endif // UTGARDE_KEEP_H_ diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 2743ee4432..f271f8e7ff 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -26,6 +26,8 @@ #include "TemporarySummon.h" #include "utgarde_pinnacle.h" +namespace UtgardePinnacle::Palehoof +{ enum Spells { // Palehoof @@ -699,9 +701,12 @@ class spell_palehoof_awaken_gortok : public SpellScriptLoader return new spell_palehoof_awaken_gortok_SpellScript(); } }; +} void AddSC_boss_palehoof() { + using namespace UtgardePinnacle; + using namespace UtgardePinnacle::Palehoof; new boss_palehoof(); new boss_ravenous_furbolg(); new boss_frenzied_worgen(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index ea722e3ff7..fc3ecd1eef 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -27,6 +27,8 @@ #include "TemporarySummon.h" #include "utgarde_pinnacle.h" +namespace UtgardePinnacle::Skadi +{ enum Spells { // Skadi Spells @@ -930,9 +932,12 @@ class at_skadi_gaunlet : public AreaTriggerScript return true; } }; +} void AddSC_boss_skadi() { + using namespace UtgardePinnacle; + using namespace UtgardePinnacle::Skadi; new boss_skadi(); new npc_grauf(); new npc_ymirjar_warrior(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index d1d54dd6a4..8e3e282dd5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -26,6 +26,8 @@ #include "TemporarySummon.h" #include "utgarde_pinnacle.h" +namespace UtgardePinnacle::Svala +{ enum Spells { SPELL_SVALA_TRANSFORMING1 = 54140, @@ -607,9 +609,12 @@ class achievement_incredible_hulk : public AchievementCriteriaScript return target && target->GetAI() && target->GetAI()->GetData(DATA_INCREDIBLE_HULK); } }; +} void AddSC_boss_svala() { + using namespace UtgardePinnacle; + using namespace UtgardePinnacle::Svala; new boss_svala(); new npc_ritual_channeler(); new npc_spectator(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 58978496ba..2972963294 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -24,6 +24,8 @@ #include "TemporarySummon.h" #include "utgarde_pinnacle.h" +namespace UtgardePinnacle::Ymiron +{ enum Spells { SPELL_BANE = 48294, @@ -344,9 +346,12 @@ class achievement_kings_bane : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_ymiron() { + using namespace UtgardePinnacle; + using namespace UtgardePinnacle::Ymiron; new boss_ymiron(); RegisterSpellScript(spell_dark_slash); new achievement_kings_bane(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 9b5b5a8cb4..9521983070 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -21,6 +21,8 @@ #include "InstanceScript.h" #include "utgarde_pinnacle.h" +namespace UtgardePinnacle +{ BossBoundaryData const boundaries = { { DATA_KING_YMIRON, new RectangleBoundary(340.0f, 443.0f, -412.0f, -275.0f) } @@ -107,8 +109,10 @@ class instance_utgarde_pinnacle : public InstanceMapScript return new instance_utgarde_pinnacle_InstanceMapScript(map); } }; +} void AddSC_instance_utgarde_pinnacle() { + using namespace UtgardePinnacle; new instance_utgarde_pinnacle(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index c5566d9d94..84159fcb20 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace UtgardePinnacle +{ #define UPScriptName "instance_utgarde_pinnacle" #define DataHeader "UP" @@ -102,5 +104,6 @@ inline AI* GetUtgardePinnacleAI(T* obj) { return GetInstanceAI(obj, UPScriptName); } +} #endif // UTGARDE_PINNACLE_H_ diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index fb4e2e6cdd..3d06f41bb0 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -20,6 +20,8 @@ #include "SpellScript.h" #include "vault_of_archavon.h" +namespace VaultOfArchavon::Archavon +{ enum Emotes { EMOTE_BERSERK = 0, @@ -262,9 +264,12 @@ class spell_archavon_rock_shards : public SpellScriptLoader return new spell_archavon_rock_shards_SpellScript(); } }; +} void AddSC_boss_archavon() { + using namespace VaultOfArchavon; + using namespace VaultOfArchavon::Archavon; new boss_archavon(); new npc_archavon_warder(); new spell_archavon_rock_shards(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 8003819168..ee1cff649e 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -22,6 +22,8 @@ #include "SpellAuras.h" #include "vault_of_archavon.h" +namespace VaultOfArchavon::Emalon +{ enum Spells { SPELL_OVERCHARGE = 64218, // Cast every 45 sec on a random Tempest Minion @@ -282,9 +284,12 @@ class npc_tempest_minion : public CreatureScript return GetVaultOfArchavonAI(creature); } }; +} void AddSC_boss_emalon() { + using namespace VaultOfArchavon; + using namespace VaultOfArchavon::Emalon; new boss_emalon(); new npc_tempest_minion(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index acda478adc..b467dd2322 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -20,6 +20,8 @@ #include "SpellScript.h" #include "vault_of_archavon.h" +namespace VaultOfArchavon::Koralon +{ enum Events { // Koralon @@ -284,9 +286,12 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader return new spell_flame_warder_meteor_fists_AuraScript(); } }; +} void AddSC_boss_koralon() { + using namespace VaultOfArchavon; + using namespace VaultOfArchavon::Koralon; new boss_koralon(); new npc_flame_warder(); new spell_koralon_meteor_fists(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index eac187bb9c..b136d27fcb 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "vault_of_archavon.h" +namespace VaultOfArchavon::Toravon +{ enum Spells { // Toravon @@ -291,9 +293,12 @@ class npc_frozen_orb_stalker : public CreatureScript return GetVaultOfArchavonAI(creature); } }; +} void AddSC_boss_toravon() { + using namespace VaultOfArchavon; + using namespace VaultOfArchavon::Toravon; new boss_toravon(); new npc_frost_warder(); new npc_frozen_orb(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index b3adec78b5..fd37004e4b 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -20,6 +20,8 @@ #include "InstanceScript.h" #include "vault_of_archavon.h" +namespace VaultOfArchavon +{ /* Vault of Archavon encounters: 1 - Archavon the Stone Watcher event 2 - Emalon the Storm Watcher event @@ -116,8 +118,10 @@ class instance_vault_of_archavon : public InstanceMapScript return new instance_vault_of_archavon_InstanceMapScript(map); } }; +} void AddSC_instance_vault_of_archavon() { + using namespace VaultOfArchavon; new instance_vault_of_archavon(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index 3d03559ec7..e755fcb779 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace VaultOfArchavon +{ #define VoAScriptName "instance_vault_of_archavon" #define DataHeader "VA" @@ -57,5 +59,6 @@ inline AI* GetVaultOfArchavonAI(T* obj) { return GetInstanceAI(obj, VoAScriptName); } +} #endif diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 972b776b49..63bd3eaf29 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "violet_hold.h" +namespace VioletHold::Cyanigosa +{ enum Spells { SPELL_SUMMON_PLAYER = 21150, @@ -172,9 +174,12 @@ class spell_cyanigosa_arcane_vacuum : public SpellScriptLoader return new spell_cyanigosa_arcane_vacuum_SpellScript(); } }; +} void AddSC_boss_cyanigosa() { + using namespace VioletHold; + using namespace VioletHold::Cyanigosa; new boss_cyanigosa(); new achievement_defenseless(); new spell_cyanigosa_arcane_vacuum(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index aaaf03c272..3476e3921a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -22,6 +22,8 @@ #include "ScriptedCreature.h" #include "violet_hold.h" +namespace VioletHold::Erekem +{ enum Spells { SPELL_BLOODLUST = 54516, @@ -315,9 +317,12 @@ class npc_erekem_guard : public CreatureScript return GetVioletHoldAI(creature); } }; +} void AddSC_boss_erekem() { + using namespace VioletHold; + using namespace VioletHold::Erekem; new boss_erekem(); new npc_erekem_guard(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 760546260b..5e78113978 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -23,6 +23,8 @@ #include "SpellScript.h" #include "violet_hold.h" +namespace VioletHold::Ichoron +{ enum Spells { SPELL_WATER_BLAST = 54237, @@ -475,9 +477,12 @@ class achievement_dehydration : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_ichoron() { + using namespace VioletHold; + using namespace VioletHold::Ichoron; new boss_ichoron(); new npc_ichor_globule(); new spell_ichoron_drained(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 34743b0f74..68b68e560e 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "violet_hold.h" +namespace VioletHold::Lavanthor +{ enum Spells { SPELL_CAUTERIZING_FLAMES = 59466, // Only in heroic @@ -100,8 +102,11 @@ class boss_lavanthor : public CreatureScript return GetVioletHoldAI(creature); } }; +} void AddSC_boss_lavanthor() { + using namespace VioletHold; + using namespace VioletHold::Lavanthor; new boss_lavanthor(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 28359cf9a9..624f81ed5d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -22,6 +22,8 @@ #include "SpellScript.h" #include "violet_hold.h" +namespace VioletHold::Moragg +{ enum Spells { SPELL_CORROSIVE_SALIVA = 54527, @@ -180,9 +182,12 @@ public: return new spell_moragg_optic_link_AuraScript(); } }; +} void AddSC_boss_moragg() { + using namespace VioletHold; + using namespace VioletHold::Moragg; new boss_moragg(); new spell_moragg_ray(); new spell_moragg_optic_link(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index de0ea2b691..e8888295f3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -24,6 +24,9 @@ #include "SpellScript.h" #include "violet_hold.h" +namespace VioletHold::Xevozz +{ + /* * TODO: * - Implement Ethereal Summon Target @@ -280,9 +283,12 @@ class spell_xevozz_summon_players : public SpellScriptLoader return new spell_xevozz_summon_players_SpellScript(); } }; +} void AddSC_boss_xevozz() { + using namespace VioletHold; + using namespace VioletHold::Xevozz; new boss_xevozz(); new npc_ethereal_sphere(); new spell_xevozz_summon_players(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 2cb072d3f2..7fe4c2773b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "violet_hold.h" +namespace VioletHold::Zuramat +{ enum Spells { SPELL_SHROUD_OF_DARKNESS = 54524, @@ -222,10 +224,14 @@ class achievement_void_dance : public AchievementCriteriaScript return false; } + }; +} void AddSC_boss_zuramat() { + using namespace VioletHold; + using namespace VioletHold::Zuramat; new boss_zuramat(); new npc_void_sentry(); new achievement_void_dance(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index dd72cf5157..ac9cd24878 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -26,6 +26,8 @@ #include "violet_hold.h" #include "WorldPacket.h" +namespace VioletHold +{ /* * TODO: * - replace bosses by dummy npcs also after grid unload @@ -940,8 +942,10 @@ class instance_violet_hold : public InstanceMapScript return new instance_violet_hold_InstanceMapScript(map); } }; +} void AddSC_instance_violet_hold() { + using namespace VioletHold; new instance_violet_hold(); } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 7a6ab2fea1..880e54cbde 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -29,6 +29,8 @@ #include "TemporarySummon.h" #include "violet_hold.h" +namespace VioletHold +{ /* * TODO: * - add missing trash emotes @@ -1409,9 +1411,11 @@ class spell_violet_hold_teleport_player : public SpellScriptLoader return new spell_violet_hold_teleport_player_SpellScript(); } }; +} void AddSC_violet_hold() { + using namespace VioletHold; new npc_sinclari_vh(); new npc_violet_hold_teleportation_portal(); new npc_violet_hold_teleportation_portal_elite(); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index 55b2a52baa..e271fbad67 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace VioletHold +{ #define VioletHoldScriptName "instance_violet_hold" #define DataHeader "VH" @@ -158,5 +160,6 @@ inline AI* GetVioletHoldAI(T* obj) { return GetInstanceAI(obj, VioletHoldScriptName); } +} #endif // VIOLET_HOLD_H_ diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 2f09fbcbef..92cf6bc164 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -48,6 +48,8 @@ EndContentData */ #include "TemporarySummon.h" #include "WorldSession.h" +namespace BoreanTundra +{ /*###### ## npc_sinkhole_kill_credit ######*/ @@ -2467,9 +2469,11 @@ public: return new npc_bloodmage_laurithAI(creature); } }; +} void AddSC_borean_tundra() { + using namespace BoreanTundra; new npc_sinkhole_kill_credit(); new npc_khunok_the_behemoth(); new npc_corastrasza(); diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index b352558efc..0bd5fd6bee 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -28,6 +28,8 @@ Script Data End */ #include "Player.h" #include "ScriptedCreature.h" +namespace CrystalsongForest +{ /******************************************************* * npc_warmage_violetstand *******************************************************/ @@ -107,8 +109,10 @@ public: return new npc_warmage_violetstandAI(creature); } }; +} void AddSC_crystalsong_forest() { + using namespace CrystalsongForest; new npc_warmage_violetstand; } diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index ca4ccc8428..07e81bd598 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -36,6 +36,8 @@ Script Data End */ * npc_mageguard_dalaran *******************************************************/ +namespace Dalaran +{ enum Spells { SPELL_TRESPASSER_A = 54028, @@ -238,9 +240,11 @@ class npc_minigob_manabonk : public CreatureScript return new npc_minigob_manabonkAI(creature); } }; +} void AddSC_dalaran() { + using namespace Dalaran; new npc_mageguard_dalaran(); new npc_minigob_manabonk(); } diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index eae3dce0ef..379f6e1c1a 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -37,6 +37,8 @@ EndContentData */ #include "SpellInfo.h" #include "SpellScript.h" +namespace DragonBlight +{ /*##### # npc_commander_eligor_dawnbringer #####*/ @@ -722,9 +724,11 @@ public: return true; } }; +} void AddSC_dragonblight() { + using namespace DragonBlight; new npc_commander_eligor_dawnbringer(); new spell_q12096_q12092_dummy(); new spell_q12096_q12092_bark(); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index b416b13ade..ae8cbecf13 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -25,6 +25,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace GrizzlyHills +{ /*###### ## Quest 12027: Mr. Floppy's Perilous Adventure ######*/ @@ -1088,9 +1090,11 @@ public: return new spell_warhead_fuse_AuraScript(); } }; +} void AddSC_grizzly_hills() { + using namespace GrizzlyHills; new npc_emily(); new npc_mrfloppy(); new npc_outhouse_bunny(); diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 708347ca6a..adfc9967f9 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -36,6 +36,8 @@ EndContentData */ #include "SpellScript.h" #include "TemporarySummon.h" +namespace HowlingFjord +{ /*###### ## npc_apothecary_hanes ######*/ @@ -653,9 +655,11 @@ public: return new npc_riven_widow_cocoonAI(creature); } }; +} void AddSC_howling_fjord() { + using namespace HowlingFjord; new npc_apothecary_hanes(); new npc_plaguehound_tracker(); new npc_razael_and_lyana(); diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index f82e31fd6f..e4841e32b5 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -26,6 +26,8 @@ #include "SpellInfo.h" #include "TemporarySummon.h" +namespace Icecrown +{ /*###### ## npc_argent_valiant ######*/ @@ -780,9 +782,11 @@ class npc_frostbrood_skytalon : public CreatureScript return new npc_frostbrood_skytalonAI(creature); } }; +} void AddSC_icecrown() { + using namespace Icecrown; new npc_argent_valiant; new npc_guardian_pavilion; new npc_tournament_training_dummy; diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index ba4b5fe447..fd88b88eb2 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -44,6 +44,8 @@ EndContentData */ #include "SpellScript.h" #include "Vehicle.h" +namespace SholazarBasin +{ /*###### ## npc_engineer_helice ######*/ @@ -758,9 +760,11 @@ public: return new spell_shango_tracks_SpellScript(); } }; +} void AddSC_sholazar_basin() { + using namespace SholazarBasin; new npc_engineer_helice(); new npc_jungle_punch_target(); new spell_q12620_the_lifewarden_wrath(); diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 77f91d31a4..caf0a5ca96 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -29,6 +29,8 @@ #include "Vehicle.h" #include "WorldSession.h" +namespace StormPeaks +{ ///////////////////// ///npc_injured_goblin ///////////////////// @@ -1409,9 +1411,11 @@ class spell_player_mount_wyrm : public SpellScriptLoader return new spell_player_mount_wyrm_AuraScript(); } }; +} void AddSC_storm_peaks() { + using namespace StormPeaks; new npc_injured_goblin(); new npc_roxi_ramrocket(); new npc_brunnhildar_prisoner(); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 7c58d30b25..c013ed5320 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -29,6 +29,8 @@ #include "TemporarySummon.h" #include "Vehicle.h" +namespace Zuldrak +{ /*#### ## npc_drakuru_shackles ####*/ @@ -944,9 +946,11 @@ public: return new npc_storm_cloudAI(creature); } }; +} void AddSC_zuldrak() { + using namespace Zuldrak; new npc_drakuru_shackles(); new npc_captured_rageclaw(); new npc_released_offspring_harkoa();