Scripts/Northrend: moved scripts into their corresponding namespace (…

…part 1)

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();

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<AI>(obj, EoEScriptName);
 }
+}
 
 #endif

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 @@ class instance_eye_of_eternity : public InstanceMapScript
  Position exitPortalPosition;
  };
 };
+}
 
 void AddSC_instance_eye_of_eternity()
 {
+ using namespace EyeOfEternity;
  new instance_eye_of_eternity();
 }

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();

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 @@ class boss_commander_stoutbeard : public CreatureScript
  };
 
 };
+}
 
 void AddSC_boss_commander_stoutbeard()
 {
+ using namespace Nexus;
+ using namespace Nexus::CommanderStoutbeard;
  new boss_commander_stoutbeard();
 }

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();

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();
 }

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<boss_nexus_commandersAI>(creature);
  }
 };
+}
 
 void AddSC_boss_nexus_commanders()
 {
+ using namespace Nexus;
+ using namespace Nexus::NexusCommander;
  new boss_nexus_commanders();
 }

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();

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();
 }

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<AI>(obj, NexusScriptName);
 }
+}
 
 #endif

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<npc_unstable_sphereAI>(creature);
  }
 };
+}
 
 void AddSC_boss_drakos()
 {
+ using namespace Oculus;
+ using namespace Oculus::Drakos;
  new boss_drakos();
  new npc_unstable_sphere();
 }

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);
- }
+}

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<boss_uromAI>(creature);
  }
 };
+}
 
 void AddSC_boss_urom()
 {
+ using namespace Oculus;
+ using namespace Oculus::Urom;
  new boss_urom();
 }

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();

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();
 }

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();

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<AI>(obj, OculusScriptName);
 }
+}
 
 #endif // OCULUS_H_

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);