Restore Avatar of Hakkar code.

It was deleted by @schell244. Very cool. 04b61aa Closes #2139
vmangos · Jul 28, 2023 · 0286aa7 · 0286aa7
1 parent 6306d23
commit 0286aa7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/instance_sunken_temple.cpp b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/instance_sunken_temple.cpp
@@ -55,6 +55,7 @@ struct instance_sunken_temple : public ScriptedInstance
 
     uint64 m_luiProtectorGUIDs[6];  // Jammalan door handling
     uint8 m_uiStatueCounter;        // Atalarion Statue Event
+    uint8 m_uiFlameCounter;         // Avatar of Hakkar Event
     uint64 m_uiShadeHakkarGUID;
     uint64 m_uiAtalarionGUID;
     uint64 m_uiJammalanBarrierGUID;
@@ -80,6 +81,7 @@ struct instance_sunken_temple : public ScriptedInstance
         memset(&m_luiBigLightGUIDs, 0, sizeof(m_luiBigLightGUIDs));
 
         m_uiStatueCounter = 0;
+        m_uiFlameCounter = 0;
         m_uiShadeHakkarGUID = 0;
         m_uiAtalarionGUID = 0;
         m_uiJammalanBarrierGUID = 0;
@@ -493,6 +495,9 @@ struct instance_sunken_temple : public ScriptedInstance
                     mobsEntries.clear();
                 }
                 break;
+            case TYPE_ETERNAL_FLAME:
+                m_uiFlameCounter = uiData;
+                break;
         }
 
         if (uiData == DONE)
@@ -555,6 +560,8 @@ struct instance_sunken_temple : public ScriptedInstance
                 return m_auiEncounter[4];
             case TYPE_ERANIKUS:
                 return m_auiEncounter[5];
+            case TYPE_ETERNAL_FLAME:
+                return m_uiFlameCounter;
             default:
                 return 0;
         }

diff --git a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.h b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.h
@@ -23,6 +23,7 @@ enum
 {
     SUNKENTEMPLE_MAX_ENCOUNTER = 6,
     MAX_STATUES                = 6,
+    MAX_FLAMES                 = 4,
 
     // Don't change types 1,2 and 3 (handled in ACID)
     TYPE_ATALARION_OBSOLET= 1,
@@ -35,6 +36,7 @@ enum
     TYPE_MALFURION        = 7,
     TYPE_AVATAR           = 8,
     TYPE_ERANIKUS         = 9,
+    TYPE_ETERNAL_FLAME    = 10,
 
     NPC_ATALARION         = 8580,
     NPC_DREAMSCYTH        = 5721,