Scripts/Dire Maul: Added dungeon encounter ids

2 files changed, 47 insertions, 21 deletions

diff --git a/src/server/scripts/Kalimdor/DireMaul/diremaul.h b/src/server/scripts/Kalimdor/DireMaul/diremaul.h
index 923b26be422..f518d575bf7 100644
--- a/src/server/scripts/Kalimdor/DireMaul/diremaul.h
+++ b/src/server/scripts/Kalimdor/DireMaul/diremaul.h
@@ -25,12 +25,32 @@
 
 enum DMDataTypes
 {
+    DATA_PUSILLIN                       = 0,
+    DATA_LETHTENDRIS                    = 1,
+    DATA_HYDROSPAWN                     = 2,
+    DATA_ZEVRIM_THORNHOOF               = 3,
+    DATA_ALZZIN_THE_WILDSHAPER          = 4,
+    DATA_TENDRIS_WARPWOOD               = 5,
+    DATA_MAGISTER_KALENDRIS             = 6,
+    DATA_TSU_ZEE                        = 7,
+    DATA_ILLYANNA_RAVENOAK              = 8,
+    DATA_IMMOLTHAR                      = 9,
+    DATA_PRINCE_TORTHELDRIN             = 10,
+    DATA_GUARD_MOLDAR                   = 11,
+    DATA_STOMPER_KREEG                  = 12,
+    DATA_GUARD_FENGUS                   = 13,
+    DATA_GUARD_SLIPKIK                  = 14,
+    DATA_CAPTAIN_KROMCRUSH              = 15,
+    DATA_KING_GORDOK                    = 16,
     DATA_CRYSTAL_01                     = 17,
     DATA_CRYSTAL_02                     = 18,
     DATA_CRYSTAL_03                     = 19,
     DATA_CRYSTAL_04                     = 20,
     DATA_CRYSTAL_05                     = 21,
-    DATA_FORCEFIELD                     = 22
+    DATA_FORCEFIELD                     = 22,
+    DATA_CHO_RUSH_THE_OBSERVER          = 23,
+
+    MAX_ENCOUNTER
 };
 
 enum DMCreatureIds
@@ -38,7 +58,8 @@ enum DMCreatureIds
     NPC_IMMOLTHAR                       = 11496,
     NPC_TORTHELDRIN                     = 11486,
     NPC_ARCANE_ABERRATION               = 11480,
-    NPC_MANA_REMNANT                    = 11483
+    NPC_MANA_REMNANT                    = 11483,
+    NPC_CHO_RUSH                        = 14324
 };
 
 enum DMGameobjectIds
diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
index f60e14614f4..eeea79cdfac 100644
--- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
+++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
@@ -57,8 +57,7 @@ gets instead the deserter debuff.
 // 14 - Guard Slip'kik
 // 15 - Captain Kromcrush
 // 16 - King Gordok
-
-uint8 const EncounterCount = 23;
+// 23 - Cho'Rush the Observer
 
 uint32 const CrystalMobs[2] = { NPC_ARCANE_ABERRATION, NPC_MANA_REMNANT };
 
@@ -70,22 +69,22 @@ enum Events
 
 DungeonEncounterData const encounters[] =
 {
-    { 1, {{ 345 }} },
-    { 2, {{ 344 }} },
-    { 3, {{ 343 }} },
-    { 4, {{ 346 }} },
-    { 5, {{ 350 }} },
-    { 6, {{ 348 }} },
-    { 8, {{ 347 }} },
-    { 9, {{ 349 }} },
-    { 10, {{ 361 }} },
-    { 11, {{ 362 }} },
-    { 12, {{ 363 }} },
-    { 13, {{ 364 }} },
-    { 14, {{ 365 }} },
-    { 15, {{ 366 }} },
-    // { , {{ 367 }}}, Cho'Rush the Observer
-    { 16, {{ 368 }} }
+    { DATA_LETHTENDRIS, {{ 345 }} },
+    { DATA_HYDROSPAWN, {{ 344 }} },
+    { DATA_ZEVRIM_THORNHOOF, {{ 343 }} },
+    { DATA_ALZZIN_THE_WILDSHAPER, {{ 346 }} },
+    { DATA_TENDRIS_WARPWOOD, {{ 350 }} },
+    { DATA_MAGISTER_KALENDRIS, {{ 348 }} },
+    { DATA_ILLYANNA_RAVENOAK, {{ 347 }} },
+    { DATA_IMMOLTHAR, {{ 349 }} },
+    { DATA_PRINCE_TORTHELDRIN, {{ 361 }} },
+    { DATA_GUARD_MOLDAR, {{ 362 }} },
+    { DATA_STOMPER_KREEG, {{ 363 }} },
+    { DATA_GUARD_FENGUS, {{ 364 }} },
+    { DATA_GUARD_SLIPKIK, {{ 365 }} },
+    { DATA_CAPTAIN_KROMCRUSH, {{ 366 }} },
+    { DATA_CHO_RUSH_THE_OBSERVER, {{ 367 }} },
+    { DATA_KING_GORDOK, {{ 368 }} }
 };
 
 class instance_dire_maul : public InstanceMapScript
@@ -98,7 +97,7 @@ public:
         instance_dire_maul_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
         {
             SetHeaders(DataHeader);
-            SetBossNumber(EncounterCount);
+            SetBossNumber(MAX_ENCOUNTER);
             LoadDungeonEncounterData(encounters);
         }
 
@@ -118,6 +117,12 @@ public:
             }
         }
 
+        void OnUnitDeath(Unit* unit) override
+        {
+            if (unit->GetEntry() == NPC_CHO_RUSH)
+                SetBossState(DATA_CHO_RUSH_THE_OBSERVER, DONE);
+        }
+
         void OnGameObjectCreate(GameObject* go) override
         {
             InstanceScript::OnGameObjectCreate(go);