Scripts/HallsOfStone: Set the Tribunal of Ages encounter state to IN_PROGRESS once it starts, instead of when Brann's escort starts

(cherry picked from commit 335cceb26e806feb9601537b2f15f52a115e0826)

3 files changed, 13 insertions, 12 deletions

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index ffeac5ff6d8..6233c7e8953 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -330,7 +330,7 @@ public:
 
                 DespawnDwarf();
 
-                instance->SetBossState(DATA_BRANN_EVENT, NOT_STARTED);
+                instance->SetBossState(DATA_TRIBUNAL_OF_AGES, NOT_STARTED);
             }
         }
 
@@ -362,8 +362,10 @@ public:
                     break;
                 case 13:
                     Talk(SAY_EVENT_INTRO_1);
+                    instance->SetBossState(DATA_TRIBUNAL_OF_AGES, IN_PROGRESS);
                     SetEscortPaused(true);
                     JumpToNextStep(20000);
+                    // @todo: There should be a pause here and a gossip should start the next step.
                     break;
                 case 17:
                     Talk(SAY_EVENT_INTRO_2);
@@ -421,9 +423,9 @@ public:
             Start();
         }
 
-        void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) override
+        void DamageTaken(Unit* /*done_by*/, uint32& /*damage*/) override
         {
-            if (instance->GetBossState(DATA_BRANN_EVENT) == IN_PROGRESS)
+            if (instance->GetBossState(DATA_TRIBUNAL_OF_AGES) == IN_PROGRESS)
                 brannSparklinNews = false;
         }
 
@@ -442,9 +444,8 @@ public:
                 switch (uiStep)
                 {
                     case 1:
-                        if (instance->GetBossState(DATA_BRANN_EVENT) != NOT_STARTED)
+                        if (instance->GetBossState(DATA_TRIBUNAL_OF_AGES) != NOT_STARTED)
                             return;
-                        instance->SetBossState(DATA_BRANN_EVENT, IN_PROGRESS);
                         bIsBattle = false;
                         Talk(SAY_ESCORT_START);
                         SetRun(true);
@@ -582,7 +583,7 @@ public:
                         break;
                     case 29:
                         Talk(SAY_EVENT_END_02);
-                        instance->SetBossState(DATA_BRANN_EVENT, DONE);
+                        instance->SetBossState(DATA_TRIBUNAL_OF_AGES, DONE);
                         me->CastSpell(me, SPELL_REWARD_ACHIEVEMENT, true);
                         JumpToNextStep(5500);
                         break;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
index 2ed47b42bbc..df56aadfe22 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
@@ -28,7 +28,7 @@ enum DataTypes
     // Encounter States/Boss GUIDs
     DATA_KRYSTALLUS             = 0,
     DATA_MAIDEN_OF_GRIEF        = 1,
-    DATA_BRANN_EVENT            = 2,
+    DATA_TRIBUNAL_OF_AGES       = 2,
     DATA_SJONNIR                = 3,
 
     // Additional data
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index a70d1ff3a0d..c67e31c4cc0 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -23,8 +23,8 @@
 
 DoorData const doorData[] =
 {
-    { GO_SJONNIR_DOOR, DATA_BRANN_EVENT, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
-    { 0,               0,                DOOR_TYPE_ROOM,    BOUNDARY_NONE } // END
+    { GO_SJONNIR_DOOR, DATA_TRIBUNAL_OF_AGES, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
+    { 0,               0,                     DOOR_TYPE_ROOM,    BOUNDARY_NONE } // END
 };
 
 class instance_halls_of_stone : public InstanceMapScript
@@ -90,7 +90,7 @@ class instance_halls_of_stone : public InstanceMapScript
                     case GO_TRIBUNAL_CHEST:
                     case GO_TRIBUNAL_CHEST_HERO:
                         TribunalChestGUID = go->GetGUID();
-                        if (GetBossState(DATA_BRANN_EVENT) == DONE)
+                        if (GetBossState(DATA_TRIBUNAL_OF_AGES) == DONE)
                             go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
                         break;
                     case GO_TRIBUNAL_SKY_FLOOR:
@@ -156,7 +156,7 @@ class instance_halls_of_stone : public InstanceMapScript
 
                 switch (type)
                 {
-                    case DATA_BRANN_EVENT:
+                    case DATA_TRIBUNAL_OF_AGES:
                         if (state == DONE)
                         {
                             if (GameObject* go = instance->GetGameObject(TribunalChestGUID))
@@ -178,7 +178,7 @@ class instance_halls_of_stone : public InstanceMapScript
                 switch (bossId)
                 {
                     case DATA_SJONNIR:
-                        if (GetBossState(DATA_BRANN_EVENT) != DONE)
+                        if (GetBossState(DATA_TRIBUNAL_OF_AGES) != DONE)
                             return false;
                         break;
                     default: