From 93d8ed48b76d2a89cad902f0f64fec0a1d55b49c Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 9 Dec 2023 00:21:22 +0100 Subject: [PATCH] Scripts/Northrend: moved scripted into their corresponding namespace (part 2) --- .../Northrend/AzjolNerub/Ahnkahet/ahnkahet.h | 3 +++ .../AzjolNerub/Ahnkahet/boss_amanitar.cpp | 5 +++++ .../AzjolNerub/Ahnkahet/boss_elder_nadox.cpp | 5 +++++ .../AzjolNerub/Ahnkahet/boss_herald_volazj.cpp | 5 +++++ .../Ahnkahet/boss_jedoga_shadowseeker.cpp | 5 +++++ .../Ahnkahet/boss_prince_taldaram.cpp | 5 +++++ .../AzjolNerub/Ahnkahet/instance_ahnkahet.cpp | 4 ++++ .../AzjolNerub/AzjolNerub/azjol_nerub.h | 3 +++ .../AzjolNerub/AzjolNerub/boss_anubarak.cpp | 5 +++++ .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 5 +++++ .../boss_krikthir_the_gatewatcher.cpp | 5 +++++ .../AzjolNerub/instance_azjol_nerub.cpp | 6 +++++- .../ObsidianSanctum/boss_sartharion.cpp | 5 +++++ .../instance_obsidian_sanctum.cpp | 4 ++++ .../ObsidianSanctum/obsidian_sanctum.cpp | 4 ++++ .../ObsidianSanctum/obsidian_sanctum.h | 3 +++ .../RubySanctum/boss_baltharus_the_warborn.cpp | 4 ++++ .../RubySanctum/boss_general_zarithrian.cpp | 5 +++++ .../RubySanctum/boss_halion.cpp | 7 +++++-- .../RubySanctum/boss_saviana_ragefire.cpp | 5 +++++ .../RubySanctum/instance_ruby_sanctum.cpp | 4 ++++ .../RubySanctum/ruby_sanctum.cpp | 4 ++++ .../ChamberOfAspects/RubySanctum/ruby_sanctum.h | 3 +++ .../boss_argent_challenge.cpp | 6 ++++++ .../TrialOfTheChampion/boss_black_knight.cpp | 5 +++++ .../TrialOfTheChampion/boss_grand_champions.cpp | 5 +++++ .../instance_trial_of_the_champion.cpp | 4 ++++ .../trial_of_the_champion.cpp | 4 ++++ .../TrialOfTheChampion/trial_of_the_champion.h | 3 +++ .../TrialOfTheCrusader/boss_anubarak_trial.cpp | 5 +++++ .../boss_faction_champions.cpp | 5 +++++ .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 5 +++++ .../boss_northrend_beasts.cpp | 5 +++++ .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 5 +++++ .../instance_trial_of_the_crusader.cpp | 4 ++++ .../trial_of_the_crusader.cpp | 4 ++++ .../TrialOfTheCrusader/trial_of_the_crusader.h | 7 +++++-- .../Northrend/DraktharonKeep/boss_king_dred.cpp | 5 +++++ .../Northrend/DraktharonKeep/boss_novos.cpp | 5 +++++ .../Northrend/DraktharonKeep/boss_tharon_ja.cpp | 5 +++++ .../Northrend/DraktharonKeep/boss_trollgore.cpp | 5 +++++ .../Northrend/DraktharonKeep/drak_tharon_keep.h | 3 +++ .../instance_drak_tharon_keep.cpp | 4 ++++ .../FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp | 5 +++++ .../ForgeOfSouls/boss_devourer_of_souls.cpp | 5 +++++ .../FrozenHalls/ForgeOfSouls/forge_of_souls.cpp | 4 ++++ .../FrozenHalls/ForgeOfSouls/forge_of_souls.h | 3 +++ .../ForgeOfSouls/instance_forge_of_souls.cpp | 5 ++++- .../HallsOfReflection/boss_falric.cpp | 7 +++++++ .../HallsOfReflection/boss_horAI.cpp | 3 +++ .../FrozenHalls/HallsOfReflection/boss_horAI.h | 3 +++ .../HallsOfReflection/boss_marwyn.cpp | 7 +++++++ .../HallsOfReflection/halls_of_reflection.cpp | 4 ++++ .../HallsOfReflection/halls_of_reflection.h | 3 +++ .../instance_halls_of_reflection.cpp | 4 ++++ .../PitOfSaron/boss_forgemaster_garfrost.cpp | 5 +++++ .../FrozenHalls/PitOfSaron/boss_krickandick.cpp | 5 +++++ .../PitOfSaron/boss_scourgelord_tyrannus.cpp | 5 +++++ .../PitOfSaron/instance_pit_of_saron.cpp | 4 ++++ .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 4 ++++ .../FrozenHalls/PitOfSaron/pit_of_saron.h | 3 +++ .../Gundrak/boss_drakkari_colossus.cpp | 5 +++++ .../scripts/Northrend/Gundrak/boss_eck.cpp | 5 +++++ .../Northrend/Gundrak/boss_gal_darah.cpp | 5 +++++ .../scripts/Northrend/Gundrak/boss_moorabi.cpp | 5 +++++ .../scripts/Northrend/Gundrak/boss_slad_ran.cpp | 5 +++++ src/server/scripts/Northrend/Gundrak/gundrak.h | 3 +++ .../Northrend/Gundrak/instance_gundrak.cpp | 4 ++++ .../boss_blood_prince_council.cpp | 5 +++++ .../boss_blood_queen_lana_thel.cpp | 5 +++++ .../boss_deathbringer_saurfang.cpp | 5 +++++ .../IcecrownCitadel/boss_festergut.cpp | 5 +++++ .../boss_icecrown_gunship_battle.cpp | 5 +++++ .../IcecrownCitadel/boss_lady_deathwhisper.cpp | 5 +++++ .../IcecrownCitadel/boss_lord_marrowgar.cpp | 5 +++++ .../boss_professor_putricide.cpp | 5 +++++ .../Northrend/IcecrownCitadel/boss_rotface.cpp | 5 +++++ .../IcecrownCitadel/boss_sindragosa.cpp | 5 +++++ .../IcecrownCitadel/boss_the_lich_king.cpp | 5 +++++ .../boss_valithria_dreamwalker.cpp | 5 +++++ .../IcecrownCitadel/icecrown_citadel.cpp | 4 ++++ .../IcecrownCitadel/icecrown_citadel.h | 17 +++++++++++++---- .../icecrown_citadel_teleport.cpp | 4 ++++ .../instance_icecrown_citadel.cpp | 12 ++++++++---- .../IsleOfConquest/boss_ioc_horde_alliance.cpp | 4 ++++ .../IsleOfConquest/isle_of_conquest.cpp | 4 ++++ .../Northrend/Naxxramas/boss_anubrekhan.cpp | 6 +++++- .../Northrend/Naxxramas/boss_faerlina.cpp | 5 +++++ .../Northrend/Naxxramas/boss_four_horsemen.cpp | 5 +++++ .../scripts/Northrend/Naxxramas/boss_gluth.cpp | 5 +++++ .../scripts/Northrend/Naxxramas/boss_gothik.cpp | 5 +++++ .../Northrend/Naxxramas/boss_grobbulus.cpp | 5 +++++ .../scripts/Northrend/Naxxramas/boss_heigan.cpp | 5 +++++ .../Northrend/Naxxramas/boss_kelthuzad.cpp | 5 +++++ .../Northrend/Naxxramas/boss_loatheb.cpp | 5 +++++ .../Northrend/Naxxramas/boss_maexxna.cpp | 5 +++++ .../scripts/Northrend/Naxxramas/boss_noth.cpp | 5 +++++ .../Northrend/Naxxramas/boss_patchwerk.cpp | 5 +++++ .../Northrend/Naxxramas/boss_razuvious.cpp | 5 +++++ .../Northrend/Naxxramas/boss_sapphiron.cpp | 5 +++++ .../Northrend/Naxxramas/boss_thaddius.cpp | 6 +++++- .../Northrend/Naxxramas/instance_naxxramas.cpp | 4 ++++ .../scripts/Northrend/Naxxramas/naxxramas.cpp | 4 ++++ .../scripts/Northrend/Naxxramas/naxxramas.h | 3 +++ 104 files changed, 486 insertions(+), 16 deletions(-) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index f3aa82768d..01d2931b5f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Ankahet +{ #define AhnKahetScriptName "instance_ahnkahet" #define DataHeader "AK" @@ -87,5 +89,6 @@ inline AI* GetAhnKahetAI(T* obj) { return GetInstanceAI(obj, AhnKahetScriptName); } +} #endif // AHNKAHET_H_ diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 339a71fa3d..a8e1ff2944 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace Ankahet::Armanitar +{ enum Spells { SPELL_BASH = 57094, // Victim @@ -232,9 +234,12 @@ public: return GetAhnKahetAI(creature); } }; +} void AddSC_boss_amanitar() { + using namespace Ankahet; + using namespace Ankahet::Armanitar; new boss_amanitar(); new npc_amanitar_mushrooms(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index fa73c4a504..573d1c1edf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -21,6 +21,8 @@ #include "SpellAuras.h" #include "SpellScript.h" +namespace Ankahet::ElderNadox +{ enum Yells { SAY_AGGRO = 0, @@ -287,9 +289,12 @@ class achievement_respect_your_elders : public AchievementCriteriaScript return target && target->GetAI()->GetData(DATA_RESPECT_YOUR_ELDERS); } }; +} void AddSC_boss_elder_nadox() { + using namespace Ankahet; + using namespace Ankahet::ElderNadox; new boss_elder_nadox(); new npc_ahnkahar_nerubian(); new spell_ahn_kahet_swarm(); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index d6af793fa5..efc71335fc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -31,6 +31,8 @@ #include "SpellMgr.h" #include "TemporarySummon.h" +namespace Ankahet::HeraldVolazj +{ enum Spells { SPELL_INSANITY = 57496, //Dummy @@ -296,8 +298,11 @@ public: return GetAhnKahetAI(creature); } }; +} void AddSC_boss_volazj() { + using namespace Ankahet; + using namespace Ankahet::HeraldVolazj; new boss_volazj(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index c88542294f..dfc726dfc9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -27,6 +27,8 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" +namespace Ankahet::JedogaShadowseeker +{ enum Yells { TEXT_AGGRO = 0, @@ -603,9 +605,12 @@ class achievement_volunteer_work : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_jedoga_shadowseeker() { + using namespace Ankahet; + using namespace Ankahet::JedogaShadowseeker; new boss_jedoga_shadowseeker(); new npc_jedoga_initiand(); new npc_jedogas_aufseher_trigger(); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 90db5182e0..18d6446bd5 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -28,6 +28,8 @@ #include "Spell.h" #include "SpellScript.h" +namespace Ankahet::PrinceTaldaram +{ enum Spells { SPELL_BLOODTHIRST = 55968, // Trigger Spell + add aura @@ -494,9 +496,12 @@ class spell_prince_taldaram_flame_sphere_summon : public SpellScriptLoader return new spell_prince_taldaram_flame_sphere_summon_SpellScript(); } }; +} void AddSC_boss_taldaram() { + using namespace Ankahet; + using namespace Ankahet::PrinceTaldaram; new boss_prince_taldaram(); new npc_prince_taldaram_flame_sphere(); new go_prince_taldaram_sphere(); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 41cb98fd2c..8c9cfd1c06 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -26,6 +26,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace Ankahet +{ DoorData const doorData[] = { { GO_PRINCE_TALDARAM_GATE, DATA_PRINCE_TALDARAM, DOOR_TYPE_PASSAGE }, @@ -301,9 +303,11 @@ class spell_combined_toxins : public AuraScript DoCheckEffectProc.Register(&spell_combined_toxins::CheckProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_DAMAGE); } }; +} void AddSC_instance_ahnkahet() { + using namespace Ankahet; new instance_ahnkahet(); RegisterSpellScript(spell_combined_toxins); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 1882ead39b..08dc6ddaf7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace AzjolNerub +{ #define AzjolNerubScriptName "instance_azjol_nerub" #define DataHeader "AN" @@ -71,5 +73,6 @@ inline AI* GetAzjolNerubAI(T* obj) { return GetInstanceAI(obj, AzjolNerubScriptName); } +} #endif // AZJOL_NERUB_H_ diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 8373b31874..9e0a1ae12a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -27,6 +27,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace AzjolNerub::Anubarak +{ enum Spells { SPELL_EMERGE = 53500, @@ -697,9 +699,12 @@ class spell_anubarak_carrion_beetles : public SpellScriptLoader return new spell_anubarak_carrion_beetles_AuraScript(); } }; +} void AddSC_boss_anub_arak() { + using namespace AzjolNerub; + using namespace AzjolNerub::Anubarak; new boss_anub_arak(); new npc_anubarak_anub_ar_darter(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 5e7dc9ccde..956434f5dc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -26,6 +26,8 @@ #include "SpellAuraEffects.h" #include "TemporarySummon.h" +namespace AzjolNerub::Hadronox +{ enum Events { // Hadronox @@ -1124,9 +1126,12 @@ class achievement_hadronox_denied : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_hadronox() { + using namespace AzjolNerub; + using namespace AzjolNerub::Hadronox; new boss_hadronox(); new npc_anub_ar_crusher(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index d08fdca4f8..e7e2770542 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -29,6 +29,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace AzjolNerub::KrikthirTheGatewatcher +{ enum Events { // Krik'thir the Gatewatcher @@ -1047,9 +1049,12 @@ class achievement_watch_him_die : public AchievementCriteriaScript return true; } }; +} void AddSC_boss_krik_thir() { + using namespace AzjolNerub; + using namespace AzjolNerub::KrikthirTheGatewatcher; new boss_krik_thir(); new npc_watcher_gashra(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index d60e39f998..c52c37bccb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -22,6 +22,8 @@ #include "CreatureAI.h" #include "InstanceScript.h" +namespace AzjolNerub +{ DoorData const doorData[] = { { GO_KRIKTHIR_DOOR, DATA_KRIKTHIR, DOOR_TYPE_PASSAGE }, @@ -131,8 +133,10 @@ class instance_azjol_nerub : public InstanceMapScript return new instance_azjol_nerub_InstanceScript(map); } }; +} void AddSC_instance_azjol_nerub() { - new instance_azjol_nerub(); + using namespace AzjolNerub; + new instance_azjol_nerub(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 7c38fb277a..4bee7b041b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -25,6 +25,8 @@ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace ObsidianSanctum::Sartharion +{ enum Enums { //Sartharion Yell @@ -517,8 +519,11 @@ public: return GetObsidianSanctumAI(creature); } }; +} void AddSC_boss_sartharion() { + using namespace ObsidianSanctum; + using namespace ObsidianSanctum::Sartharion; new boss_sartharion(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 81d2b66024..6617d5e8e1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -25,6 +25,8 @@ 0 - Sartharion */ +namespace ObsidianSanctum +{ BossBoundaryData const boundaries = { { DATA_SARTHARION, new RectangleBoundary(3218.86f, 3275.69f, 484.68f, 572.4f) } @@ -117,8 +119,10 @@ public: return new instance_obsidian_sanctum_InstanceMapScript(map); } }; +} void AddSC_instance_obsidian_sanctum() { + using namespace ObsidianSanctum; new instance_obsidian_sanctum(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 65dae8345a..4e87827509 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -26,6 +26,8 @@ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace ObsidianSanctum +{ enum Enums { //Mini bosses common spells @@ -1049,9 +1051,11 @@ class achievement_twilight_zone : public AchievementCriteriaScript return target && target->GetAI()->GetData(TWILIGHT_ACHIEVEMENTS) == 3; } }; +} void AddSC_obsidian_sanctum() { + using namespace ObsidianSanctum; new npc_vesperon(); new npc_shadron(); new npc_tenebron(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index 64365ca50b..fb1606b3a3 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -23,6 +23,8 @@ #define OSScriptName "instance_obsidian_sanctum" #define DataHeader "OS" +namespace ObsidianSanctum +{ uint32 const EncounterCount = 5; enum OSDataTypes @@ -53,5 +55,6 @@ inline AI* GetObsidianSanctumAI(T* obj) { return GetInstanceAI(obj, OSScriptName); } +} #endif // OBSIDIAN_SANCTUM_H_ diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 9b06d5c3da..c2c3aa03cf 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -22,6 +22,8 @@ #include "SpellAuras.h" #include "SpellScript.h" +namespace RubySanctum::BaltharusTheWarmorn +{ enum Texts { SAY_BALTHARUS_INTRO = 0, // Your power wanes, ancient one.... Soon you will join your friends. @@ -357,9 +359,11 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader return new spell_baltharus_enervating_brand_trigger_SpellScript(); } }; +} void AddSC_boss_baltharus_the_warborn() { + using namespace RubySanctum::BaltharusTheWarmorn; new boss_baltharus_the_warborn(); new npc_baltharus_the_warborn_clone(); new spell_baltharus_enervating_brand_trigger(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index f82ddfe9e1..40f4e22031 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -22,6 +22,8 @@ #include "ruby_sanctum.h" #include "ScriptedCreature.h" +namespace RubySanctum::GeneralZarithrian +{ enum Texts { SAY_AGGRO = 0, // Alexstrasza has chosen capable allies.... A pity that I must END YOU! @@ -272,9 +274,12 @@ class npc_onyx_flamecaller : public CreatureScript return GetRubySanctumAI(creature); } }; +} void AddSC_boss_general_zarithrian() { + using namespace RubySanctum; + using namespace RubySanctum::GeneralZarithrian; new boss_general_zarithrian(); new npc_onyx_flamecaller(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 46d1e28ca0..e57e85bd31 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -32,6 +32,8 @@ #include "TemporarySummon.h" #include "Vehicle.h" +namespace RubySanctum::Halion +{ enum Texts { // Shared @@ -1875,11 +1877,12 @@ class spell_halion_blazing_aura : public SpellScriptLoader return new spell_halion_blazing_aura_SpellScript(); } }; - - +} void AddSC_boss_halion() { + using namespace RubySanctum; + using namespace RubySanctum::Halion; new boss_halion(); new boss_twilight_halion(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index f270c8f930..5255c2cc4b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -22,6 +22,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace RubySanctum::SavianaRagefire +{ enum Texts { SAY_AGGRO = 0, // You will sssuffer for this intrusion! (17528) @@ -284,9 +286,12 @@ class spell_saviana_conflagration_throwback : public SpellScriptLoader return new spell_saviana_conflagration_throwback_SpellScript(); } }; +} void AddSC_boss_saviana_ragefire() { + using namespace RubySanctum; + using namespace RubySanctum::SavianaRagefire; new boss_saviana_ragefire(); new spell_saviana_conflagration_init(); new spell_saviana_conflagration_throwback(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index 745ec50401..e8e4899144 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -24,6 +24,8 @@ #include "InstanceScript.h" #include "Map.h" +namespace RubySanctum +{ Position const HalionControllerSpawnPos = { 3156.037f, 533.2656f, 72.97205f, 0.0f }; BossBoundaryData const boundaries = @@ -206,8 +208,10 @@ class instance_ruby_sanctum : public InstanceMapScript return new instance_ruby_sanctum_InstanceMapScript(map); } }; +} void AddSC_instance_ruby_sanctum() { + using namespace RubySanctum; new instance_ruby_sanctum(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 7f8b6956a2..43e168eaba 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -24,6 +24,8 @@ #include "ScriptedGossip.h" #include "SpellScript.h" +namespace RubySanctum +{ enum Texts { SAY_XERESTRASZA_EVENT = 0, @@ -214,9 +216,11 @@ class spell_ruby_sanctum_rallying_shout : public SpellScriptLoader return new spell_ruby_sanctum_rallying_shout_SpellScript(); } }; +} void AddSC_ruby_sanctum() { + using namespace RubySanctum; new npc_xerestrasza(); new at_baltharus_plateau(); new spell_ruby_sanctum_rallying_shout(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 095e54609a..6854033970 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -23,6 +23,8 @@ #define RSScriptName "instance_ruby_sanctum" #define DataHeader "RS" +namespace RubySanctum +{ uint32 const EncounterCount = 4; enum RSDataTypes @@ -134,5 +136,6 @@ inline AI* GetRubySanctumAI(T* obj) { return GetInstanceAI(obj, RSScriptName); } +} #endif // RUBY_SANCTUM_H_ diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index cdc344782b..c8b1235144 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -30,6 +30,9 @@ EndScriptData */ #include "SpellScript.h" #include "TemporarySummon.h" #include "trial_of_the_champion.h" + +namespace TrialOfTheChampion::ArgentChallenge +{ /* enum Yells { @@ -679,9 +682,12 @@ class spell_paletress_summon_memory : public SpellScriptLoader return new spell_paletress_summon_memory_SpellScript(); } }; +} void AddSC_boss_argent_challenge() { + using namespace TrialOfTheChampion; + using namespace TrialOfTheChampion::ArgentChallenge; new boss_eadric(); new spell_eadric_radiance(); new boss_paletress(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index ef29b5eff3..921ad7b5b8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -27,6 +27,8 @@ EndScriptData */ #include "ScriptedEscortAI.h" #include "trial_of_the_champion.h" +namespace TrialOfTheChampion::BlackKnight +{ enum Spells { //phase 1 @@ -377,9 +379,12 @@ public: return GetTrialOfTheChampionAI(creature); } }; +} void AddSC_boss_black_knight() { + using namespace TrialOfTheChampion; + using namespace TrialOfTheChampion::BlackKnight; new boss_black_knight(); new npc_risen_ghoul(); new npc_black_knight_skeletal_gryphon(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 22554d9405..6d34313eef 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -31,6 +31,8 @@ EndScriptData */ #include "trial_of_the_champion.h" #include "Vehicle.h" +namespace TrialOfTheChampion::GrandChampions +{ enum Spells { //Vehicle @@ -1026,9 +1028,12 @@ public: return GetTrialOfTheChampionAI(creature); } }; +} void AddSC_boss_grand_champions() { + using namespace TrialOfTheChampion; + using namespace TrialOfTheChampion::GrandChampions; new generic_vehicleAI_toc5(); new boss_warrior_toc5(); new boss_mage_toc5(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index dba9810365..0b2d95875d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -32,6 +32,8 @@ EndScriptData */ #include "Player.h" #include "trial_of_the_champion.h" +namespace TrialOfTheChampion +{ #define MAX_ENCOUNTER 4 class instance_trial_of_the_champion : public InstanceMapScript @@ -338,8 +340,10 @@ public: return new instance_trial_of_the_champion_InstanceMapScript(map); } }; +} void AddSC_instance_trial_of_the_champion() { + using namespace TrialOfTheChampion; new instance_trial_of_the_champion(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index ed9e8a38c9..9abbe748a4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -39,6 +39,8 @@ EndContentData */ #include "trial_of_the_champion.h" #include "Vehicle.h" +namespace TrialOfTheChampion +{ enum Yells { SAY_INTRO_1 = 0, @@ -493,8 +495,10 @@ public: return GetTrialOfTheChampionAI(creature); } }; +} void AddSC_trial_of_the_champion() { + using namespace TrialOfTheChampion; new npc_announcer_toc5(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h index e802088e7f..f960f15c3b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace TrialOfTheChampion +{ #define ToCScriptName "instance_trial_of_the_champion" #define DataHeader "TC" @@ -134,5 +136,6 @@ inline AI* GetTrialOfTheChampionAI(T* obj) { return GetInstanceAI(obj, ToCScriptName); } +} #endif diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index f0aa245304..12b6b6fbc6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -31,6 +31,8 @@ #include "TemporarySummon.h" #include "trial_of_the_crusader.h" +namespace TrialOfTheCrusader::AnubarakTrial +{ enum Yells { SAY_INTRO = 0, @@ -900,9 +902,12 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader return new spell_anubarak_leeching_swarm_AuraScript(); } }; +} void AddSC_boss_anubarak_trial() { + using namespace TrialOfTheCrusader; + using namespace TrialOfTheCrusader::AnubarakTrial; new boss_anubarak_trial(); new npc_swarm_scarab(); new npc_nerubian_burrower(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index c4799ff437..2aa49322e6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -28,6 +28,8 @@ #include "TemporarySummon.h" #include "trial_of_the_crusader.h" +namespace TrialOfTheCrusader::FactionChampions +{ enum Yells { SAY_KILL_PLAYER = 6 @@ -2393,9 +2395,12 @@ class spell_toc_heroism : public SpellScriptLoader return new spell_toc_heroism_SpellScript(); } }; +} void AddSC_boss_faction_champions() { + using namespace TrialOfTheCrusader; + using namespace TrialOfTheCrusader::FactionChampions; new boss_toc_champion_controller(); new npc_toc_druid(); new npc_toc_shaman(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 2ba1f8e80b..d644e432f3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -24,6 +24,8 @@ #include "SpellScript.h" #include "trial_of_the_crusader.h" +namespace TrialOfTheCrusader::LordJaraxxus +{ enum Yells { SAY_INTRO = 0, @@ -607,9 +609,12 @@ public: return new spell_fel_streak_visual_SpellScript(); } }; +} void AddSC_boss_jaraxxus() { + using namespace TrialOfTheCrusader; + using namespace TrialOfTheCrusader::LordJaraxxus; new boss_jaraxxus(); new npc_legion_flame(); new npc_infernal_volcano(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 34d750d953..6573c0f083 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -28,6 +28,8 @@ #include "trial_of_the_crusader.h" #include "Vehicle.h" +namespace TrialOfTheCrusader::NorthrendBeats +{ enum Yells { // Gormok @@ -1418,9 +1420,12 @@ public: return new spell_jormungars_paralysis_AuraScript(); } }; +} void AddSC_boss_northrend_beasts() { + using namespace TrialOfTheCrusader; + using namespace TrialOfTheCrusader::NorthrendBeats; new boss_gormok(); new npc_snobold_vassal(); new npc_firebomb(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index f9f59479a2..09f6630049 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -32,6 +32,8 @@ #include "SpellScript.h" #include "trial_of_the_crusader.h" +namespace TrialOfTheCrusader::TwinValkyr +{ enum Texts { SAY_AGGRO = 0, @@ -869,9 +871,12 @@ class spell_power_of_the_twins : public SpellScriptLoader return new spell_power_of_the_twins_AuraScript(); } }; +} void AddSC_boss_twin_valkyr() { + using namespace TrialOfTheCrusader; + using namespace TrialOfTheCrusader::TwinValkyr; new boss_fjola(); new boss_eydis(); new npc_unleashed_light(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 4b41fcdb1c..5c431d56fd 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -26,6 +26,8 @@ #include "TemporarySummon.h" #include "trial_of_the_crusader.h" +namespace TrialOfTheCrusader +{ BossBoundaryData const boundaries = { { BOSS_BEASTS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, @@ -733,8 +735,10 @@ class instance_trial_of_the_crusader : public InstanceMapScript return new instance_trial_of_the_crusader_InstanceMapScript(map); } }; +} void AddSC_instance_trial_of_the_crusader() { + using namespace TrialOfTheCrusader; new instance_trial_of_the_crusader(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 8d50c98b8a..f4caea75af 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -30,6 +30,8 @@ #include "TemporarySummon.h" #include "trial_of_the_crusader.h" +namespace TrialOfTheCrusader +{ enum Yells { // Highlord Tirion Fordring - 34996 @@ -1048,9 +1050,11 @@ class npc_varian_toc : public CreatureScript return GetTrialOfTheCrusaderAI(creature); } }; +} void AddSC_trial_of_the_crusader() { + using namespace TrialOfTheCrusader; new boss_lich_king_toc(); new npc_announcer_toc10(); new npc_fizzlebang_toc(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index adde3b278b..bf996be6ef 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -20,11 +20,13 @@ #include "CreatureAIImpl.h" +struct Position; + +namespace TrialOfTheCrusader +{ #define ToCrScriptName "instance_trial_of_the_crusader" #define DataHeader "TCR" -struct Position; - enum TCRDataTypes { BOSS_BEASTS = 0, @@ -224,5 +226,6 @@ inline AI* GetTrialOfTheCrusaderAI(T* obj) { return GetInstanceAI(obj, ToCrScriptName); } +} #endif diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp index 5c3109e1ce..d345088175 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp @@ -25,6 +25,8 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" +namespace DrakTharonKeep::KingDread +{ enum Spells { SPELL_BELLOWING_ROAR = 22686, // fears the group, can be resisted/dispelled @@ -301,9 +303,12 @@ class achievement_king_dred : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_king_dred() { + using namespace DrakTharonKeep; + using namespace DrakTharonKeep::KingDread; new boss_king_dred(); new npc_drakkari_gutripper(); new npc_drakkari_scytheclaw(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index a872d4a2ff..ff9affd62f 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -24,6 +24,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace DrakTharonKeep::Novos +{ enum Yells { SAY_AGGRO = 0, @@ -396,9 +398,12 @@ class spell_novos_summon_minions : public SpellScriptLoader return new spell_novos_summon_minions_SpellScript(); } }; +} void AddSC_boss_novos() { + using namespace DrakTharonKeep; + using namespace DrakTharonKeep::Novos; new boss_novos(); new npc_crystal_channel_target(); new spell_novos_summon_minions(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 7b73e89156..50c4da6496 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace DrakTharonKeep::TharonJa +{ /* * Known Issues: Spell 49356 and 53463 will be interrupted for an unknown reason */ @@ -235,9 +237,12 @@ class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScriptLoader return new spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript(); } }; +} void AddSC_boss_tharon_ja() { + using namespace DrakTharonKeep; + using namespace DrakTharonKeep::TharonJa; new boss_tharon_ja(); new spell_tharon_ja_clear_gift_of_tharon_ja(); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 661271ea49..f33c6d3e29 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -24,6 +24,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace DrakTharonKeep::Trollgore +{ enum Spells { SPELL_INFECTED_WOUND = 49637, @@ -345,9 +347,12 @@ class achievement_consumption_junction : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_trollgore() { + using namespace DrakTharonKeep; + using namespace DrakTharonKeep::Trollgore; new boss_trollgore(); new npc_drakkari_invader(); new spell_trollgore_consume(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index 31165ce9ff..af55d4a63e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace DrakTharonKeep +{ #define DrakTharonKeepScriptName "instance_drak_tharon_keep" #define DataHeader "DTK" @@ -91,5 +93,6 @@ inline AI* GetDrakTharonKeepAI(T* obj) { return GetInstanceAI(obj, DrakTharonKeepScriptName); } +} #endif // DRAK_THARON_KEEP_H_ diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 6d87399d42..dd126bb48f 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -22,6 +22,8 @@ #include "Map.h" #include "ScriptedCreature.h" +namespace DrakTharonKeep +{ class instance_drak_tharon_keep : public InstanceMapScript { public: @@ -169,8 +171,10 @@ class instance_drak_tharon_keep : public InstanceMapScript return new instance_drak_tharon_keep_InstanceScript(map); } }; +} void AddSC_instance_drak_tharon_keep() { + using namespace DrakTharonKeep; new instance_drak_tharon_keep(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 2582066d1f..444a2daefc 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -25,6 +25,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace ForgeOfSouls::Bronjahm +{ enum Yells { SAY_AGGRO = 0, @@ -394,9 +396,12 @@ class achievement_bronjahm_soul_power : public AchievementCriteriaScript return target && target->GetAI()->GetData(DATA_SOUL_POWER) >= 4; } }; +} void AddSC_boss_bronjahm() { + using namespace ForgeOfSouls; + using namespace ForgeOfSouls::Bronjahm; new boss_bronjahm(); new npc_corrupted_soul_fragment(); new spell_bronjahm_magic_bane(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 3aeb7d1302..d63de8aaf3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -28,6 +28,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace ForgeOfSouls::DevourerOfSouls +{ /* * @todo * - Fix model id during unleash soul -> seems DB issue 36503 is missing (likewise 36504 is also missing). @@ -496,9 +498,12 @@ class achievement_three_faced : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_devourer_of_souls() { + using namespace ForgeOfSouls; + using namespace ForgeOfSouls::DevourerOfSouls; new boss_devourer_of_souls(); new spell_devourer_of_souls_mirrored_soul(); new spell_devourer_of_souls_mirrored_soul_proc(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index e0647371f3..43b1b04d3a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "ScriptedGossip.h" +namespace ForgeOfSouls +{ enum Events { EVENT_NONE, @@ -275,9 +277,11 @@ public: return GetForgeOfSoulsAI(creature); } }; +} void AddSC_forge_of_souls() { + using namespace ForgeOfSouls; new npc_sylvanas_fos(); new npc_jaina_fos(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h index f1338736e6..311780c1bd 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace ForgeOfSouls +{ #define FoSScriptName "instance_forge_of_souls" #define DataHeader "FOS" @@ -62,5 +64,6 @@ inline AI* GetForgeOfSoulsAI(T* obj) { return GetInstanceAI(obj, FoSScriptName); } +} #endif // FORGE_OF_SOULS_H_ diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 63959e1368..99678814f2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -23,7 +23,8 @@ #include "Map.h" #include "Player.h" - +namespace ForgeOfSouls +{ BossBoundaryData const boundaries = { { DATA_BRONJAHM, new CircleBoundary(Position(5297.3f, 2506.45f), 100.96) }, @@ -129,8 +130,10 @@ class instance_forge_of_souls : public InstanceMapScript return new instance_forge_of_souls_InstanceScript(map); } }; +} void AddSC_instance_forge_of_souls() { + using namespace ForgeOfSouls; new instance_forge_of_souls(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 7de442cd0e..7f9b5fd457 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -21,6 +21,10 @@ #include "InstanceScript.h" #include "SpellMgr.h" +namespace HallsOfReflection::Falric +{ +using namespace HallsOfReflection::FarlicAndMarwyn; + enum Texts { SAY_AGGRO = 0, @@ -154,8 +158,11 @@ class boss_falric : public CreatureScript return GetHallsOfReflectionAI(creature); } }; +} void AddSC_boss_falric() { + using namespace HallsOfReflection; + using namespace HallsOfReflection::Falric; new boss_falric(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp index ebb618cd23..3bdd74a8d7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp @@ -19,6 +19,8 @@ #include "halls_of_reflection.h" #include "InstanceScript.h" +namespace HallsOfReflection::FarlicAndMarwyn +{ boss_horAI::boss_horAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId) { } @@ -51,3 +53,4 @@ void boss_horAI::JustSummoned(Creature* summon) { summons.Summon(summon); } +} diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h index fea8280561..e6bf8f5fc1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" +namespace HallsOfReflection::FarlicAndMarwyn +{ // Base class for FALRIC and MARWYN struct boss_horAI : BossAI { @@ -28,5 +30,6 @@ struct boss_horAI : BossAI void DoAction(int32 actionId) override; void JustSummoned(Creature* summon) override; }; +} #endif // boss_horAI_h__ diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index a71d4da100..bf5d7369d9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -22,6 +22,10 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace HallsOfReflection::Marwyn +{ +using namespace HallsOfReflection::FarlicAndMarwyn; + enum Texts { SAY_AGGRO = 0, @@ -164,9 +168,12 @@ class spell_marwyn_shared_suffering : public SpellScriptLoader return new spell_marwyn_shared_suffering_AuraScript(); } }; +} void AddSC_boss_marwyn() { + using namespace HallsOfReflection; + using namespace HallsOfReflection::Marwyn; new boss_marwyn(); new spell_marwyn_shared_suffering(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 36ab549e6d..58cc557370 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -29,6 +29,8 @@ #include "TemporarySummon.h" #include "Transport.h" +namespace HallsOfReflection +{ enum Text { SAY_JAINA_INTRO_1 = 0, @@ -2857,9 +2859,11 @@ class spell_hor_quel_delars_will : public SpellScript OnEffectHitTarget.Register(&spell_hor_quel_delars_will::HandleReagent, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; +} void AddSC_halls_of_reflection() { + using namespace HallsOfReflection; new at_hor_intro_start(); new at_hor_waves_restarter(); new at_hor_impenetrable_door(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 7362f95740..027638ee25 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -22,6 +22,8 @@ #include "EventProcessor.h" #include "ObjectGuid.h" +namespace HallsOfReflection +{ #define HoRScriptName "instance_halls_of_reflection" #define DataHeader "HOR" @@ -224,5 +226,6 @@ inline AI* GetHallsOfReflectionAI(T* obj) { return GetInstanceAI(obj, HoRScriptName); } +} #endif // HALLS_OF_REFLECTION_H_ diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 16b7cec037..a5f488d9a6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -28,6 +28,8 @@ #include "Transport.h" #include "TransportMgr.h" +namespace HallsOfReflection +{ Position const JainaSpawnPos = { 5236.659f, 1929.894f, 707.7781f, 0.8726646f }; // Jaina Spawn Position Position const SylvanasSpawnPos = { 5236.667f, 1929.906f, 707.7781f, 0.8377581f }; // Sylvanas Spawn Position (sniffed) Position const JainaSpawnPos2 = { 5549.011f, 2257.041f, 733.0120f, 1.153993f }; // Jaina Spawn Position 2 @@ -798,8 +800,10 @@ class instance_halls_of_reflection : public InstanceMapScript return new instance_halls_of_reflection_InstanceMapScript(map); } }; +} void AddSC_instance_halls_of_reflection() { + using namespace HallsOfReflection; new instance_halls_of_reflection(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 2dad966e1a..b5d28496bf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -25,6 +25,8 @@ #include "SpellAuras.h" #include "SpellScript.h" +namespace PitOfSaron::ForgemasterGarfrost +{ enum Yells { SAY_AGGRO = 0, @@ -331,9 +333,12 @@ class achievement_doesnt_go_to_eleven : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_garfrost() { + using namespace PitOfSaron; + using namespace PitOfSaron::ForgemasterGarfrost; new boss_garfrost(); new spell_garfrost_permafrost(); new achievement_doesnt_go_to_eleven(); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index a64686413a..ef61e478d6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -28,6 +28,8 @@ #include "TemporarySummon.h" #include "Vehicle.h" +namespace PitOfSaron::KrickAndIck +{ enum Spells { SPELL_MIGHTY_KICK = 69021, //ick's spell @@ -716,9 +718,12 @@ class spell_krick_pursuit_confusion : public SpellScriptLoader return new spell_krick_pursuit_confusion_AuraScript(); } }; +} void AddSC_boss_ick() { + using namespace PitOfSaron; + using namespace PitOfSaron::KrickAndIck; new boss_ick(); new boss_krick(); new spell_krick_explosive_barrage(); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index f0326ed259..590a46d0b7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -27,6 +27,8 @@ #include "TemporarySummon.h" #include "Vehicle.h" +namespace PitOfSaron::ScourgelordTyrannus +{ enum Yells { // Gorkun @@ -544,9 +546,12 @@ class at_tyrannus_event_starter : public AreaTriggerScript return false; } }; +} void AddSC_boss_tyrannus() { + using namespace PitOfSaron; + using namespace PitOfSaron::ScourgelordTyrannus; new boss_tyrannus(); new boss_rimefang(); new spell_tyrannus_overlord_brand(); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index e292a45a80..9b9bb5496b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -23,6 +23,8 @@ #include "pit_of_saron.h" #include "Player.h" +namespace PitOfSaron +{ // positions for Martin Victus (37591) and Gorkun Ironskull (37592) Position const SlaveLeaderPos = {689.7158f, -104.8736f, 513.7360f, 0.0f}; // position for Jaina and Sylvanas @@ -302,8 +304,10 @@ class instance_pit_of_saron : public InstanceMapScript return new instance_pit_of_saron_InstanceScript(map); } }; +} void AddSC_instance_pit_of_saron() { + using namespace PitOfSaron; new instance_pit_of_saron(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 3cbe1f685a..d4ec664565 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -26,6 +26,8 @@ #include "SpellScript.h" #include "Vehicle.h" +namespace PitOfSaron +{ enum Spells { SPELL_FIREBALL = 69583, //Ymirjar Flamebearer @@ -379,9 +381,11 @@ public: return true; } }; +} void AddSC_pit_of_saron() { + using namespace PitOfSaron; new npc_ymirjar_flamebearer(); new npc_iceborn_protodrake(); new npc_geist_ambusher(); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index e721d9fc9e..9f9a0c0e8c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -21,6 +21,8 @@ #include "CreatureAIImpl.h" #include "EventProcessor.h" +namespace PitOfSaron +{ #define PoSScriptName "instance_pit_of_saron" #define DataHeader "POS" @@ -126,5 +128,6 @@ inline AI* GetPitOfSaronAI(T* obj) { return GetInstanceAI(obj, PoSScriptName); } +} #endif // PIT_OF_SARON_H_ diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 51722622f4..95f821daa6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -26,6 +26,8 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" +namespace Gundrak::DrakkariColossus +{ enum Texts { // Drakkari Elemental @@ -479,9 +481,12 @@ public: return GetGundrakAI(creature); } }; +} void AddSC_boss_drakkari_colossus() { + using namespace Gundrak; + using namespace Gundrak::DrakkariColossus; new boss_drakkari_colossus(); new boss_drakkari_elemental(); new npc_living_mojo(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index ed040b7b33..63759145f7 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -19,6 +19,8 @@ #include "gundrak.h" #include "ScriptedCreature.h" +namespace Gundrak::Eck +{ enum Texts { EMOTE_SPAWN = 0 @@ -118,8 +120,11 @@ class boss_eck : public CreatureScript return GetGundrakAI(creature); } }; +} void AddSC_boss_eck() { + using namespace Gundrak; + using namespace Gundrak::Eck; new boss_eck(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 13c6aeb0f7..b134192a41 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -22,6 +22,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace Gundrak::GalDarah +{ enum Spells { SPELL_IMPALING_CHARGE = 54956, @@ -323,9 +325,12 @@ class achievement_share_the_love : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_gal_darah() { + using namespace Gundrak; + using namespace Gundrak::GalDarah; new boss_gal_darah(); new spell_gal_darah_impaling_charge(); new spell_gal_darah_stampede_charge(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index ddf9dee432..2aaaaf045e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -21,6 +21,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace Gundrak::Moorabi +{ enum Spells { SPELL_SUMMON_PHANTOM = 55205, @@ -246,9 +248,12 @@ class spell_moorabi_mojo_frenzy : public SpellScriptLoader return new spell_moorabi_mojo_frenzy_AuraScript(); } }; +} void AddSC_boss_moorabi() { + using namespace Gundrak; + using namespace Gundrak::Moorabi; new boss_moorabi(); new achievement_less_rabi(); new spell_moorabi_mojo_frenzy(); diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 29b4349a82..95d8ab586a 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -23,6 +23,8 @@ #include "SpellAuras.h" #include "TemporarySummon.h" +namespace Gundrak::SladRan +{ enum Spells { SPELL_POISON_NOVA = 55081, @@ -311,9 +313,12 @@ class achievement_snakes_whyd_it_have_to_be_snakes : public AchievementCriteriaS return false; } }; +} void AddSC_boss_slad_ran() { + using namespace Gundrak; + using namespace Gundrak::SladRan; new boss_slad_ran(); new npc_slad_ran_constrictor(); new npc_slad_ran_viper(); diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index 8f35724d03..b62262f704 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Gundrak +{ #define GundrakScriptName "instance_gundrak" #define DataHeader "GD" @@ -98,5 +100,6 @@ inline AI* GetGundrakAI(T* obj) { return GetInstanceAI(obj, GundrakScriptName); } +} #endif // GUNDRAK_H_ diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index bc595ad333..717a9a6c99 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -24,6 +24,8 @@ #include "InstanceScript.h" #include "Map.h" +namespace Gundrak +{ DoorData const doorData[] = { { GO_GAL_DARAH_DOOR_1, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE }, @@ -377,9 +379,11 @@ class go_gundrak_altar : public GameObjectScript return new go_gundrak_altarAI(go); } }; +} void AddSC_instance_gundrak() { + using namespace Gundrak; new instance_gundrak(); new go_gundrak_altar(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 5cd5ee012f..03ed26bd26 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -29,6 +29,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace IcecrownCitadel::BloodPrinceCouncil +{ enum Texts { // Blood Queen Lana'Thel @@ -1506,9 +1508,12 @@ class at_blood_prince_council_start_intro : public AreaTriggerScript return true; } }; +} void AddSC_boss_blood_prince_council() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::BloodPrinceCouncil; new boss_blood_council_controller(); new boss_prince_keleseth_icc(); new boss_prince_taldaram_icc(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index a542b80fd5..ae2de87b27 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -27,6 +27,8 @@ #include "SpellMgr.h" #include "SpellScript.h" +namespace IcecrownCitadel::BloodQueenLanaThel +{ enum Texts { SAY_AGGRO = 0, @@ -814,9 +816,12 @@ class achievement_once_bitten_twice_shy_v : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_blood_queen_lana_thel() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::BloodQueenLanaThel; new boss_blood_queen_lana_thel(); new spell_blood_queen_vampiric_bite(); new spell_blood_queen_frenzied_bloodthirst(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 8c643447ac..30a4d7478d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -27,6 +27,8 @@ #include "SpellAuras.h" #include "SpellScript.h" +namespace IcecrownCitadel::DeathbringerSaurfang +{ enum ScriptTexts { // Deathbringer Saurfang @@ -1367,9 +1369,12 @@ class achievement_ive_gone_and_made_a_mess : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_deathbringer_saurfang() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::DeathbringerSaurfang; new boss_deathbringer_saurfang(); new npc_high_overlord_saurfang_icc(); new npc_muradin_bronzebeard_icc(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index cbccc7324e..ab163aea64 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -26,6 +26,8 @@ #include "SpellMgr.h" #include "SpellScript.h" +namespace IcecrownCitadel::Festergut +{ enum ScriptTexts { SAY_STINKY_DEAD = 0, @@ -480,9 +482,12 @@ class achievement_flu_shot_shortage : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_festergut() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::Festergut; new boss_festergut(); new npc_stinky_icc(); new spell_festergut_pungent_blight(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index e774802a2b..e6b24fbee0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -37,6 +37,8 @@ #include "TransportMgr.h" #include "Vehicle.h" +namespace IcecrownCitadel::IcecrownGunshipBattle +{ enum Texts { // High Overlord Saurfang @@ -2432,9 +2434,12 @@ class achievement_im_on_a_boat : public AchievementCriteriaScript return target->GetAI() && target->GetAI()->GetData(ACTION_SHIP_VISITS) <= 2; } }; +} void AddSC_boss_icecrown_gunship_battle() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::IcecrownGunshipBattle; new npc_gunship(); new npc_high_overlord_saurfang_igb(); new npc_muradin_bronzebeard_igb(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 0e6b4a2109..e704200e1a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -27,6 +27,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace IcecrownCitadel::LadyDeathwhisper +{ enum ScriptTexts { // Lady Deathwhisper @@ -883,9 +885,12 @@ class spell_deathwhisper_summon_spirits : public SpellScriptLoader return new spell_deathwhisper_summon_spirits_SpellScript(); } }; +} void AddSC_boss_lady_deathwhisper() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::LadyDeathwhisper; new boss_lady_deathwhisper(); new npc_cult_fanatic(); new npc_cult_adherent(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index d6cbbf3342..f327372b27 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -28,6 +28,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace IcecrownCitadel::LordMarrowgar +{ enum ScriptTexts { SAY_ENTER_ZONE = 0, @@ -758,9 +760,12 @@ class at_lord_marrowgar_entrance : public OnlyOnceAreaTriggerScript } }; +} void AddSC_boss_lord_marrowgar() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::LordMarrowgar; new boss_lord_marrowgar(); new npc_coldflame(); new npc_bone_spike(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 8d2ed0a9cf..7637a951a9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -31,6 +31,8 @@ #include "TemporarySummon.h" #include "Vehicle.h" +namespace IcecrownCitadel::ProfessorPutricide +{ enum Say { // Festergut @@ -1607,9 +1609,12 @@ class spell_stinky_precious_decimate : public SpellScriptLoader return new spell_stinky_precious_decimate_SpellScript(); } }; +} void AddSC_boss_professor_putricide() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::ProfessorPutricide; new boss_professor_putricide(); new npc_volatile_ooze(); new npc_gas_cloud(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 3725988dbb..b81275d799 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -26,6 +26,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace IcecrownCitadel::Rotface +{ // KNOWN BUGS: // ~ No Slime Spray animation directly at target spot @@ -852,9 +854,12 @@ class spell_rotface_vile_gas_trigger : public SpellScriptLoader return new spell_rotface_vile_gas_trigger_SpellScript(); } }; +} void AddSC_boss_rotface() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::Rotface; new boss_rotface(); new npc_little_ooze(); new npc_big_ooze(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index b98748edff..fffed21e89 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -29,6 +29,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace IcecrownCitadel::Sindragosa +{ enum Texts { SAY_AGGRO = 0, // You are fools to have come to this place! The icy winds of Northrend will consume your souls! @@ -1630,9 +1632,12 @@ class achievement_all_you_can_eat : public AchievementCriteriaScript return target->GetAI()->GetData(DATA_MYSTIC_BUFFET_STACK) <= 5; } }; +} void AddSC_boss_sindragosa() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::Sindragosa; new boss_sindragosa(); new npc_ice_tomb(); new npc_spinestalker(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index b7946a4dfd..5da3813626 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -32,6 +32,8 @@ #include "Vehicle.h" #include "Weather.h" +namespace IcecrownCitadel::TheLichKing +{ enum Texts { // The Lich King @@ -3154,9 +3156,12 @@ class achievement_neck_deep_in_vile : public AchievementCriteriaScript return !target->GetAI()->GetData(DATA_VILE); } }; +} void AddSC_boss_the_lich_king() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::TheLichKing; new boss_the_lich_king(); new npc_tirion_fordring_tft(); new npc_shambling_horror_icc(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index e87432eb54..6dbaa5657f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -28,6 +28,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace IcecrownCitadel::ValithriaDreamwalker +{ enum Texts { // The Lich King @@ -1449,9 +1451,12 @@ class achievement_portal_jockey : public AchievementCriteriaScript return target && !target->GetAI()->GetData(MISSED_PORTALS); } }; +} void AddSC_boss_valithria_dreamwalker() { + using namespace IcecrownCitadel; + using namespace IcecrownCitadel::ValithriaDreamwalker; new boss_valithria_dreamwalker(); new npc_green_dragon_combat_trigger(); new npc_the_lich_king_controller(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 7320953b11..d264a2419f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -29,6 +29,8 @@ #include "TemporarySummon.h" #include "VehicleDefines.h" +namespace IcecrownCitadel +{ enum ICCTexts { // Highlord Tirion Fordring (at Light's Hammer) @@ -1976,9 +1978,11 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript return true; } }; +} void AddSC_icecrown_citadel() { + using namespace IcecrownCitadel; new npc_highlord_tirion_fordring_lh(); new npc_frost_freeze_trap(); new boss_sister_svalna(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index e3031e8478..208dd35dc7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -24,6 +24,8 @@ struct Position; enum TriggerCastFlags : uint32; +namespace IcecrownCitadel +{ #define ICCScriptName "instance_icecrown_citadel" #define DataHeader "IC" @@ -31,11 +33,17 @@ uint32 const EncounterCount = 13; uint32 const WeeklyNPCs = 9; // Defined in boss_sindragosa.cpp -extern Position const SindragosaSpawnPos; +namespace Sindragosa +{ + extern Position const SindragosaSpawnPos; +} // Defined in boss_the_lich_king.cpp -extern Position const TerenasSpawn; -extern Position const TerenasSpawnHeroic; -extern Position const SpiritWardenSpawn; +namespace TheLichKing +{ + extern Position const TerenasSpawn; + extern Position const TerenasSpawnHeroic; + extern Position const SpiritWardenSpawn; +} // Shared spells used by more than one script enum ICSharedSpells @@ -504,5 +512,6 @@ inline AI* GetIcecrownCitadelAI(T* obj) { return GetInstanceAI(obj, ICCScriptName); } +} #endif // ICECROWN_CITADEL_H_ diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index a03ca15eb7..66ca09238d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -27,6 +27,8 @@ #include "SpellMgr.h" #include "Transport.h" +namespace IcecrownCitadel +{ static std::vector const TeleportSpells = { LIGHT_S_HAMMER_TELEPORT, // 0 @@ -106,9 +108,11 @@ class at_frozen_throne_teleport : public AreaTriggerScript return true; } }; +} void AddSC_icecrown_citadel_teleport() { + using namespace IcecrownCitadel; new icecrown_citadel_teleport(); new at_frozen_throne_teleport(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 718b1b0fde..c6befad4d4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -28,6 +28,8 @@ #include "Transport.h" #include "TransportMgr.h" +namespace IcecrownCitadel +{ enum EventIds { EVENT_PLAYERS_GUNSHIP_SPAWN = 22663, @@ -389,8 +391,8 @@ class instance_icecrown_citadel : public InstanceMapScript FrostwyrmGUIDs.erase(creature->GetSpawnId()); if (FrostwyrmGUIDs.empty()) { - instance->LoadGrid(SindragosaSpawnPos.GetPositionX(), SindragosaSpawnPos.GetPositionY()); - if (Creature* boss = instance->SummonCreature(NPC_SINDRAGOSA, SindragosaSpawnPos)) + instance->LoadGrid(Sindragosa::SindragosaSpawnPos.GetPositionX(), Sindragosa::SindragosaSpawnPos.GetPositionY()); + if (Creature* boss = instance->SummonCreature(NPC_SINDRAGOSA, Sindragosa::SindragosaSpawnPos)) boss->AI()->DoAction(ACTION_START_FROSTWYRM); } break; @@ -1251,7 +1253,7 @@ class instance_icecrown_citadel : public InstanceMapScript } break; case EVENT_TELEPORT_TO_FROSTMOURNE: // Harvest Soul (normal mode) - if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, SummonCreatureExtraArgs().SetSummonDuration(63000))) + if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TheLichKing::TerenasSpawn, SummonCreatureExtraArgs().SetSummonDuration(63000))) { terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); std::list triggers; @@ -1263,7 +1265,7 @@ class instance_icecrown_citadel : public InstanceMapScript visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true); } - if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, SummonCreatureExtraArgs().SetSummonDuration(63000))) + if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, TheLichKing::SpiritWardenSpawn, SummonCreatureExtraArgs().SetSummonDuration(63000))) { terenas->AI()->AttackStart(warden); warden->GetThreatManager().AddThreat(terenas, 300000.0f, nullptr, true, true); @@ -1346,8 +1348,10 @@ class instance_icecrown_citadel : public InstanceMapScript return new instance_icecrown_citadel_InstanceMapScript(map); } }; +} void AddSC_instance_icecrown_citadel() { + using namespace IcecrownCitadel; new instance_icecrown_citadel(); } diff --git a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp index 2a8dfcbf2a..13dc164361 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "BattlegroundIC.h" +namespace IsleOfConquest +{ enum BossSpells { SPELL_BRUTAL_STRIKE = 58460, @@ -126,8 +128,10 @@ public: return new boss_ioc_horde_allianceAI(creature); } }; +} void AddSC_boss_ioc_horde_alliance() { + using namespace IsleOfConquest; new boss_ioc_horde_alliance(); } diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp index 53228902ef..4332ec8e5b 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp @@ -28,6 +28,8 @@ #include "SpellScript.h" #include "Vehicle.h" +namespace IsleOfConquest +{ // TO-DO: This should be done with SmartAI, but yet it does not correctly support vehicles's AIs. // Even adding ReactState Passive we still have issues using SmartAI. @@ -302,9 +304,11 @@ class spell_ioc_seaforium_blast_credit : public SpellScriptLoader return new spell_ioc_seaforium_blast_credit_SpellScript(); } }; +} void AddSC_isle_of_conquest() { + using namespace IsleOfConquest; new npc_four_car_garage(); new npc_ioc_gunship_captain(); new spell_ioc_gunship_portal(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 09f466ba2b..0f2d7237b2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -22,6 +22,8 @@ #include "Player.h" #include "ScriptedCreature.h" +namespace Naxxramas::AnubRekhan +{ enum AnubSays { SAY_AGGRO = 0, @@ -255,10 +257,12 @@ class at_anubrekhan_entrance : public OnlyOnceAreaTriggerScript return true; } }; +} void AddSC_boss_anubrekhan() { + using namespace Naxxramas; + using namespace Naxxramas::AnubRekhan; new boss_anubrekhan(); - new at_anubrekhan_entrance(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index addcd562a3..aaf7913802 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -24,6 +24,8 @@ #include "SpellAuras.h" #include "SpellInfo.h" +namespace Naxxramas::Faerlina +{ enum Yells { SAY_GREET = 0, @@ -278,9 +280,12 @@ class at_faerlina_entrance : public OnlyOnceAreaTriggerScript return true; } }; +} void AddSC_boss_faerlina() { + using namespace Naxxramas; + using namespace Naxxramas::Faerlina; new boss_faerlina(); new npc_faerlina_add(); new at_faerlina_entrance(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index ac5d6a3d8e..bbbcd7db02 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -28,6 +28,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace Naxxramas::FourHorsemen +{ enum Horseman { THANE = DATA_THANE, @@ -742,9 +744,12 @@ class spell_four_horsemen_mark : public SpellScriptLoader return new spell_four_horsemen_mark_AuraScript(); } }; +} void AddSC_boss_four_horsemen() { + using namespace Naxxramas; + using namespace Naxxramas::FourHorsemen; new boss_four_horsemen_baron(); new boss_four_horsemen_thane(); new boss_four_horsemen_lady(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 8b62548b10..b5088b04f1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -23,6 +23,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace Naxxramas::Gluth +{ enum Texts { EMOTE_SPOTS_ONE = 0, @@ -470,9 +472,12 @@ public: return GetNaxxramasAI(creature); } }; +} void AddSC_boss_gluth() { + using namespace Naxxramas; + using namespace Naxxramas::Gluth; new boss_gluth(); new spell_gluth_decimate(); new spell_gluth_zombiechow_search(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 4c90c9fd80..b12c019777 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -26,6 +26,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace Naxxramas::Gothik +{ /* Constants */ enum Yells { @@ -991,9 +993,12 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader return new spell_gothik_shadow_bolt_volley_SpellScript(); } }; +} void AddSC_boss_gothik() { + using namespace Naxxramas; + using namespace Naxxramas::Gothik; new boss_gothik(); new npc_gothik_minion_livingtrainee(); new npc_gothik_minion_livingknight(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 7ae1098331..ab76b5ceb9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -21,6 +21,8 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" +namespace Naxxramas::Grobbulus +{ enum Spells { SPELL_BOMBARD_SLIME = 28280, @@ -210,9 +212,12 @@ class spell_grobbulus_poison_cloud : public SpellScriptLoader return new spell_grobbulus_poison_cloud_AuraScript(); } }; +} void AddSC_boss_grobbulus() { + using namespace Naxxramas; + using namespace Naxxramas::Grobbulus; new boss_grobbulus(); new npc_grobbulus_poison_cloud(); new spell_grobbulus_mutating_injection(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 4a5b652a73..33d4baf2c9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -26,6 +26,8 @@ #include "ScriptedCreature.h" #include "SpellScript.h" +namespace Naxxramas::Heigan +{ enum Spells { SPELL_DECREPIT_FEVER = 29998, // 25-man: 55011 @@ -273,9 +275,12 @@ class achievement_safety_dance : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_heigan() { + using namespace Naxxramas; + using namespace Naxxramas::Heigan; new boss_heigan(); new spell_heigan_eruption(); new achievement_safety_dance(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9d62c56eec..5f0b833f86 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -28,6 +28,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace Naxxramas::Kelthuzard +{ enum Texts { SAY_AGGRO = 7, @@ -985,9 +987,12 @@ class achievement_just_cant_get_enough : public AchievementCriteriaScript return false; } }; +} void AddSC_boss_kelthuzad() { + using namespace Naxxramas; + using namespace Naxxramas::Kelthuzard; new boss_kelthuzad(); new npc_kelthuzad_skeleton(); new npc_kelthuzad_banshee(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 66dd1452f6..f6b7e77cba 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -22,6 +22,8 @@ #include "SpellAuras.h" #include "SpellScript.h" +namespace Naxxramas::Loatheb +{ enum Spells { SPELL_NECROTIC_AURA = 55593, @@ -193,9 +195,12 @@ class spell_loatheb_deathbloom : public SpellScriptLoader return new spell_loatheb_deathbloom_AuraScript(); } }; +} void AddSC_boss_loatheb() { + using namespace Naxxramas; + using namespace Naxxramas::Loatheb; new boss_loatheb(); new achievement_spore_loser(); new spell_loatheb_deathbloom(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index fe0ca0f1e3..ec63540d73 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -25,6 +25,8 @@ #include "SpellMgr.h" #include "SpellScript.h" +namespace Naxxramas::Maexxna +{ enum Spells { SPELL_WEB_WRAP = 28622, @@ -248,9 +250,12 @@ public: return GetNaxxramasAI(creature); } }; +} void AddSC_boss_maexxna() { + using namespace Naxxramas; + using namespace Naxxramas::Maexxna; new boss_maexxna(); new npc_webwrap(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 1991f9384d..be871890f5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -20,6 +20,8 @@ #include "naxxramas.h" #include "ScriptedCreature.h" +namespace Naxxramas::Noth +{ enum Phases { PHASE_NONE, @@ -342,8 +344,11 @@ public: return GetNaxxramasAI(creature); } }; +} void AddSC_boss_noth() { + using namespace Naxxramas; + using namespace Naxxramas::Noth; new boss_noth(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index df2d188c05..57e222fb7c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -20,6 +20,8 @@ #include "naxxramas.h" #include "ScriptedCreature.h" +namespace Naxxramas::Patchwerk +{ enum Spells { SPELL_HATEFUL_STRIKE = 28308, @@ -183,8 +185,11 @@ public: return GetNaxxramasAI(creature); } }; +} void AddSC_boss_patchwerk() { + using namespace Naxxramas; + using namespace Naxxramas::Patchwerk; new boss_patchwerk(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 8dbc9bd168..98f6541fce 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -23,6 +23,8 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" +namespace Naxxramas::Razuvious +{ enum Yells { SAY_AGGRO = 0, @@ -232,9 +234,12 @@ class npc_dk_understudy : public CreatureScript return GetNaxxramasAI(creature); } }; +} void AddSC_boss_razuvious() { + using namespace Naxxramas; + using namespace Naxxramas::Razuvious; new boss_razuvious(); new npc_dk_understudy(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 6caec78f45..d100c579bd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -28,6 +28,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +namespace Naxxramas::Sapphiron +{ enum Yells { EMOTE_AIR_PHASE = 0, @@ -634,9 +636,12 @@ class achievement_the_hundred_club : public AchievementCriteriaScript return target && target->GetAI()->GetData(DATA_THE_HUNDRED_CLUB); } }; +} void AddSC_boss_sapphiron() { + using namespace Naxxramas; + using namespace Naxxramas::Sapphiron; new boss_sapphiron(); RegisterNaxxramasCreatureAI(npc_sapphiron_blizzard); new go_sapphiron_birth(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index d949da4b2d..bfd011f82d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -26,6 +26,8 @@ #include "SpellInfo.h" #include "SpellScript.h" +namespace Naxxramas::Thaddius +{ enum Phases { PHASE_NOT_ENGAGED = 1, @@ -1245,10 +1247,12 @@ class achievement_thaddius_shocking : public AchievementCriteriaScript return target && target->GetAI() && target->GetAI()->GetData(DATA_POLARITY_CROSSED); } }; - +} void AddSC_boss_thaddius() { + using namespace Naxxramas; + using namespace Naxxramas::Thaddius; new boss_thaddius(); new npc_stalagg(); new npc_feugen(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index f4245093c1..23becc9c3d 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -25,6 +25,8 @@ #include "naxxramas.h" #include "TemporarySummon.h" +namespace Naxxramas +{ BossBoundaryData const boundaries = { /* Arachnid Quarter */ @@ -608,8 +610,10 @@ class instance_naxxramas : public InstanceMapScript return new instance_naxxramas_InstanceMapScript(map); } }; +} void AddSC_instance_naxxramas() { + using namespace Naxxramas; new instance_naxxramas(); } diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp index 03c74890b8..b97c7f9f96 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp @@ -25,6 +25,8 @@ #include "TemporarySummon.h" #include "naxxramas.h" +namespace Naxxramas +{ /* According to sniffs there are multiple spawn groups (5 to be precise) since Living Poisons with the same initial spline destination are only getting spawned in 31 seconds intervals. For the sake of readability we will stick @@ -126,8 +128,10 @@ private: slime->GetMotionMaster()->LaunchMoveSpline(std::move(init)); } }; +} void AddSC_naxxramas() { + using namespace Naxxramas; RegisterNaxxramasCreatureAI(npc_frogger_trigger_naxx); } diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 918fe62e21..e6257f9fe4 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -20,6 +20,8 @@ #include "CreatureAIImpl.h" +namespace Naxxramas +{ #define NaxxramasScriptName "instance_naxxramas" #define DataHeader "NAX" @@ -219,5 +221,6 @@ inline AI* GetNaxxramasAI(T* obj) return GetInstanceAI(obj, NaxxramasScriptName); } #define RegisterNaxxramasCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetNaxxramasAI) +} #endif