Scripts/Halls of Origination: updated boss state and npc enums to current standard

5 files changed, 49 insertions, 49 deletions

diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
index 86e2c5ebe49..18f7fff34de 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
@@ -139,7 +139,7 @@ public:
 
     struct boss_anraphetAI : public BossAI
     {
-        boss_anraphetAI(Creature* creature) : BossAI(creature, DATA_ANRAPHET) { }
+        boss_anraphetAI(Creature* creature) : BossAI(creature, BOSS_ANRAPHET) { }
 
         void ScheduleCombatEvents()
         {
@@ -191,7 +191,7 @@ public:
         {
             instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
             _JustReachedHome();
-            instance->SetBossState(DATA_ANRAPHET, FAIL);
+            instance->SetBossState(BOSS_ANRAPHET, FAIL);
         }
 
         void DoAction(int32 action) override
@@ -338,12 +338,12 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript
 
             bool OnGossipSelect(Player* /*player*/, uint32 menuId, uint32 action) override
             {
-                if (_instance->GetBossState(DATA_VAULT_OF_LIGHTS) == DONE)
+                if (_instance->GetBossState(BOSS_VAULT_OF_LIGHTS) == DONE)
                     return true;
 
                 if (menuId == GOSSIP_MENU_START_INTRO && !action)
                 {
-                    _instance->SetBossState(DATA_VAULT_OF_LIGHTS, IN_PROGRESS);
+                    _instance->SetBossState(BOSS_VAULT_OF_LIGHTS, IN_PROGRESS);
                     _currentPoint = 0;
                     events.Reset();
                     me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
@@ -391,7 +391,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript
                             break;
                         case EVENT_BRANN_UNLOCK_DOOR:
                             Talk(BRANN_SAY_UNLOCK_DOOR);
-                            _instance->SetBossState(DATA_VAULT_OF_LIGHTS, DONE);
+                            _instance->SetBossState(BOSS_VAULT_OF_LIGHTS, DONE);
                             _instance->TriggerGameEvent(ACHIEV_VAULT_OF_LIGHTS_EVENT);
                             events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, 3500ms);
                             break;
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index 1f7c7cfd466..f8f61e76706 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -80,7 +80,7 @@ public:
 
     bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
     {
-        if (!_instance || _instance->GetBossState(DATA_EARTHRAGER_PTAH) != IN_PROGRESS)
+        if (!_instance || _instance->GetBossState(BOSS_EARTHRAGER_PTAH) != IN_PROGRESS)
             return true;    // delete event
 
         _owner->CastSpell(_owner, SPELL_SUMMON_JEWELED_SCARAB);
@@ -99,7 +99,7 @@ public:
 
     struct boss_earthrager_ptahAI : public BossAI
     {
-        boss_earthrager_ptahAI(Creature* creature) : BossAI(creature, DATA_EARTHRAGER_PTAH), _summonDeaths(0), _hasDispersed(false) { }
+        boss_earthrager_ptahAI(Creature* creature) : BossAI(creature, BOSS_EARTHRAGER_PTAH), _summonDeaths(0), _hasDispersed(false) { }
 
         void Cleanup()
         {
@@ -197,7 +197,7 @@ public:
         {
             instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
             _JustReachedHome();
-            instance->SetBossState(DATA_EARTHRAGER_PTAH, FAIL);
+            instance->SetBossState(BOSS_EARTHRAGER_PTAH, FAIL);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
index a5985dea99c..0c8c75c7df1 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
@@ -81,7 +81,7 @@ public:
 
     struct boss_temple_guardian_anhuurAI : public BossAI
     {
-        boss_temple_guardian_anhuurAI(Creature* creature) : BossAI(creature, DATA_TEMPLE_GUARDIAN_ANHUUR)
+        boss_temple_guardian_anhuurAI(Creature* creature) : BossAI(creature, BOSS_TEMPLE_GUARDIAN_ANHUUR)
         {
             Initialize();
         }
@@ -200,7 +200,7 @@ public:
         {
             instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
             _JustReachedHome();
-            instance->SetBossState(DATA_TEMPLE_GUARDIAN_ANHUUR, FAIL);
+            instance->SetBossState(BOSS_TEMPLE_GUARDIAN_ANHUUR, FAIL);
         }
 
         void UpdateAI(uint32 diff) override
@@ -326,7 +326,7 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader
                     return;
 
                 if (InstanceScript* instance = caster->GetInstanceScript())
-                    if (Creature* anhuur = instance->GetCreature(DATA_TEMPLE_GUARDIAN_ANHUUR))
+                    if (Creature* anhuur = instance->GetCreature(BOSS_TEMPLE_GUARDIAN_ANHUUR))
                         if (CreatureAI* ai = anhuur->AI())
                             ai->DoAction(ACTION_DISABLE_BEACON);
             }
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
index e8eb243c79e..770a88e31b9 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
@@ -20,26 +20,26 @@
 
 #include "CreatureAIImpl.h"
 
-#define DataHeader "HOO"
+constexpr char const* DataHeader = "HOO";
 #define HoOScriptName "instance_halls_of_origination"
 
-uint32 const EncounterCount = 12;
+constexpr uint32 const EncounterCount = 12;
 
 enum HOOData
 {
     // Bosses
-    DATA_TEMPLE_GUARDIAN_ANHUUR,
-    DATA_EARTHRAGER_PTAH,
-    DATA_VAULT_OF_LIGHTS,
-    DATA_FIRE_WARDEN,
-    DATA_EARTH_WARDEN,
-    DATA_WATER_WARDEN,
-    DATA_AIR_WARDEN,
-    DATA_ANRAPHET,
-    DATA_ISISET,
-    DATA_AMMUNAE,
-    DATA_SETESH,
-    DATA_RAJH,
+    BOSS_TEMPLE_GUARDIAN_ANHUUR,
+    BOSS_EARTHRAGER_PTAH,
+    BOSS_VAULT_OF_LIGHTS,
+    BOSS_FIRE_WARDEN,
+    BOSS_EARTH_WARDEN,
+    BOSS_WATER_WARDEN,
+    BOSS_AIR_WARDEN,
+    BOSS_ANRAPHET,
+    BOSS_ISISET,
+    BOSS_AMMUNAE,
+    BOSS_SETESH,
+    BOSS_RAJH,
 
     // Temple Guardian Anhuur
     DATA_ANHUUR_GUID,
@@ -56,23 +56,23 @@ enum HOOData
 
 enum HOOCreatures
 {
-    BOSS_TEMPLE_GUARDIAN_ANHUUR     = 39425,
+    NPC_TEMPLE_GUARDIAN_ANHUUR      = 39425,
     NPC_CAVE_IN_STALKER             = 40183,
     NPC_SEARING_LIGHT               = 40283,
 
-    BOSS_EARTHRAGER_PTAH            = 39428,
+    NPC_EARTHRAGER_PTAH             = 39428,
     NPC_BEETLE_STALKER              = 40459, // Summons both Jeweled Scarab and Dustbone Horror
     NPC_JEWELED_SCARAB              = 40458,
     NPC_DUSTBONE_HORROR             = 40450,
     NPC_QUICKSAND                   = 40503, // Summoned by a spell not in dbc (75550)
 
-    BOSS_ANRAPHET                   = 39788,
+    NPC_ANRAPHET                    = 39788,
     NPC_FIRE_WARDEN                 = 39800,
     NPC_EARTH_WARDEN                = 39801,
     NPC_WATER_WARDEN                = 39802,
     NPC_AIR_WARDEN                  = 39803,
 
-    WARDEN_ENTRY_DATA_DELTA         = NPC_FIRE_WARDEN - uint8(DATA_FIRE_WARDEN),
+    WARDEN_ENTRY_DATA_DELTA         = NPC_FIRE_WARDEN - uint8(BOSS_FIRE_WARDEN),
 
     NPC_BRANN_BRONZEBEARD_0         = 39908,
     NPC_OMEGA_STANCE                = 41194,
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
index f77d814f3df..838c0e53556 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
@@ -25,30 +25,30 @@
 
 DoorData const doorData[] =
 {
-    {GO_ANHUURS_DOOR,                 DATA_TEMPLE_GUARDIAN_ANHUUR, EncounterDoorBehavior::OpenWhenDone },
-    {GO_ANHUURS_BRIDGE,               DATA_TEMPLE_GUARDIAN_ANHUUR, EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_ELEVATOR_COL01,  DATA_TEMPLE_GUARDIAN_ANHUUR, EncounterDoorBehavior::OpenWhenDone },
-    {GO_VAULT_OF_LIGHTS_DOOR,         DATA_VAULT_OF_LIGHTS,        EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LIGHTMACHINE_02, DATA_EARTH_WARDEN,           EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LASERBEAMS01,    DATA_EARTH_WARDEN,           EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LIGHTMACHINE_01, DATA_FIRE_WARDEN,            EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LASERBEAMS_01,   DATA_FIRE_WARDEN,            EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LIGHTMACHINE_03, DATA_WATER_WARDEN,           EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LASERBEAMS_03,   DATA_WATER_WARDEN,           EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LIGHTMACHINE_04, DATA_AIR_WARDEN,             EncounterDoorBehavior::OpenWhenDone },
-    {GO_DOODAD_ULDUM_LASERBEAMS_02,   DATA_AIR_WARDEN,             EncounterDoorBehavior::OpenWhenDone },
-    {0,                              0,                            EncounterDoorBehavior::OpenWhenNotInProgress }
+    { GO_ANHUURS_DOOR,                  BOSS_TEMPLE_GUARDIAN_ANHUUR,    EncounterDoorBehavior::OpenWhenDone },
+    { GO_ANHUURS_BRIDGE,                BOSS_TEMPLE_GUARDIAN_ANHUUR,    EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_ELEVATOR_COL01,   BOSS_TEMPLE_GUARDIAN_ANHUUR,    EncounterDoorBehavior::OpenWhenDone },
+    { GO_VAULT_OF_LIGHTS_DOOR,          BOSS_VAULT_OF_LIGHTS,           EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LIGHTMACHINE_02,  BOSS_EARTH_WARDEN,              EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LASERBEAMS01,     BOSS_EARTH_WARDEN,              EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LIGHTMACHINE_01,  BOSS_FIRE_WARDEN,               EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LASERBEAMS_01,    BOSS_FIRE_WARDEN,               EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LIGHTMACHINE_03,  BOSS_WATER_WARDEN,              EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LASERBEAMS_03,    BOSS_WATER_WARDEN,              EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LIGHTMACHINE_04,  BOSS_AIR_WARDEN,                EncounterDoorBehavior::OpenWhenDone },
+    { GO_DOODAD_ULDUM_LASERBEAMS_02,    BOSS_AIR_WARDEN,                EncounterDoorBehavior::OpenWhenDone },
+    { 0,                                0,                              EncounterDoorBehavior::OpenWhenNotInProgress }
 };
 
 DungeonEncounterData const encounters[] =
 {
-    { DATA_TEMPLE_GUARDIAN_ANHUUR, {{ 1080 }} },
-    { DATA_EARTHRAGER_PTAH, {{ 1076 }} },
-    { DATA_ANRAPHET, {{ 1075 }} },
-    { DATA_ISISET, {{ 1077 }} },
-    { DATA_AMMUNAE, {{ 1074 }} },
-    { DATA_SETESH, {{ 1079 }} },
-    { DATA_RAJH, {{ 1078 }} }
+    { BOSS_TEMPLE_GUARDIAN_ANHUUR,  {{ 1080 }} },
+    { BOSS_EARTHRAGER_PTAH,         {{ 1076 }} },
+    { BOSS_ANRAPHET,                {{ 1075 }} },
+    { BOSS_ISISET,                  {{ 1077 }} },
+    { BOSS_AMMUNAE,                 {{ 1074 }} },
+    { BOSS_SETESH,                  {{ 1079 }} },
+    { BOSS_RAJH,                    {{ 1078 }} }
 };
 
 class instance_halls_of_origination : public InstanceMapScript