Scripts/Instances: Add dungeon encounter data

18 files changed, 152 insertions, 2 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
index c12df1266f5..010fd4d32ce 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
@@ -19,6 +19,12 @@
 #include "auchenai_crypts.h"
 #include "InstanceScript.h"
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_SHIRRAK_THE_DEAD_WATCHER, {{ 1890 }} },
+    { DATA_EXARCH_MALADAAR, {{ 1889 }} }
+};
+
 class instance_auchenai_crypts : public InstanceMapScript
 {
     public:
@@ -30,6 +36,7 @@ class instance_auchenai_crypts : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
+                LoadDungeonEncounterData(encounters);
             }
         };
 
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
index 8eb8b4fd751..88bcf525156 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
@@ -20,6 +20,14 @@
 #include "Unit.h"
 #include "mana_tombs.h"
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_PANDEMONIUS, {{ 1900 }} },
+    { DATA_TAVAROK, {{ 1901 }} },
+    { DATA_NEXUSPRINCE_SHAFFAR, {{ 1899 }} },
+    { DATA_YOR, {{ 250 }} }
+};
+
 class instance_mana_tombs : public InstanceMapScript
 {
     public:
@@ -31,6 +39,7 @@ class instance_mana_tombs : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
+                LoadDungeonEncounterData(encounters);
             }
 
             void OnUnitDeath(Unit* unit) override
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index bd892c3aca5..0036bb89192 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -33,6 +33,13 @@ ObjectData const gameObjectData[] =
     { 0,                    0                      } // END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_DARKWEAVER_SYTH, {{ 1903 }} },
+    { DATA_TALON_KING_IKISS, {{ 1902 }} },
+    { DATA_ANZU, {{ 1904 }} }
+};
+
 class instance_sethekk_halls : public InstanceMapScript
 {
     public:
@@ -46,6 +53,7 @@ class instance_sethekk_halls : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
                 LoadObjectData(nullptr, gameObjectData);
+                LoadDungeonEncounterData(encounters);
             }
 
             void OnCreatureCreate(Creature* creature) override
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index fa608b1f824..d3062853c3c 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -30,6 +30,14 @@ DoorData const doorData[] =
     { 0,                        0,                              DOOR_TYPE_ROOM } // END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_AMBASSADOR_HELLMAW, {{ 1908 }} },
+    { DATA_BLACKHEART_THE_INCITER, {{ 1909 }} },
+    { DATA_GRANDMASTER_VORPIL, {{ 1911 }} },
+    { DATA_MURMUR, {{ 1910 }} }
+};
+
 class instance_shadow_labyrinth : public InstanceMapScript
 {
     public:
@@ -42,6 +50,7 @@ class instance_shadow_labyrinth : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
+                LoadDungeonEncounterData(encounters);
 
                 FelOverseerCount      = 0;
             }
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index c872b185e5c..0a21e0753a0 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -88,6 +88,19 @@ ObjectData const gameObjectData[] =
     { 0,                              0                             } //END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_HIGH_WARLORD_NAJENTUS, {{ 601 }} },
+    { DATA_SUPREMUS, {{ 602 }} },
+    { DATA_SHADE_OF_AKAMA, {{ 603 }} },
+    { DATA_TERON_GOREFIEND, {{ 604 }} },
+    { DATA_GURTOGG_BLOODBOIL, {{ 605 }} },
+    { DATA_RELIQUARY_OF_SOULS, {{ 606 }} },
+    { DATA_MOTHER_SHAHRAZ, {{ 607 }} },
+    { DATA_ILLIDARI_COUNCIL, {{ 608 }} },
+    { DATA_ILLIDAN_STORMRAGE, {{ 609 }} }
+};
+
 class instance_black_temple : public InstanceMapScript
 {
     public:
@@ -102,6 +115,7 @@ class instance_black_temple : public InstanceMapScript
                 LoadDoorData(doorData);
                 LoadObjectData(creatureData, gameObjectData);
                 LoadBossBoundaries(boundaries);
+                LoadDungeonEncounterData(encounters);
                 AkamaState = AKAMA_INTRO;
                 AkamaIllidanIntro = 1;
             }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index d50073a73d5..39eb7914045 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -60,6 +60,16 @@ enum Misc
 5 - Lady Vashj Event
 */
 
+DungeonEncounterData const encounters[] =
+{
+    { BOSS_HYDROSS_THE_UNSTABLE, {{ 623 }} },
+    { BOSS_THE_LURKER_BELOW, {{ 624 }} },
+    { BOSS_LEOTHERAS_THE_BLIND, {{ 625 }} },
+    { BOSS_FATHOM_LORD_KARATHRESS, {{ 626 }} },
+    { BOSS_MOROGRIM_TIDEWALKER, {{ 627 }} },
+    { BOSS_LADY_VASHJ, {{ 628 }} }
+};
+
 class go_bridge_console : public GameObjectScript
 {
     public:
@@ -96,6 +106,7 @@ class instance_serpent_shrine : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(MAX_ENCOUNTER);
+                LoadDungeonEncounterData(encounters);
 
                 StrangePool = 0;
                 Water = WATERSTATE_FRENZY;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index a37f0753a4c..fc25677e2ec 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -58,6 +58,13 @@ ObjectData const creatureData[] =
     { 0,                            0                          } // END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_HYDROMANCER_THESPIA, {{ 1942 }} },
+    { DATA_MEKGINEER_STEAMRIGGER, {{ 1943 }} },
+    { DATA_WARLORD_KALITHRESH, {{ 1944 }} }
+};
+
 class instance_steam_vault : public InstanceMapScript
 {
     public:
@@ -70,6 +77,7 @@ class instance_steam_vault : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadObjectData(creatureData, gameObjectData);
+                LoadDungeonEncounterData(encounters);
                 distillerState = 0;
             }
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
index b80e8c845f9..cd9aad5cb95 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
@@ -35,6 +35,13 @@ ObjectData const creatureData[] =
     { 0,                            0,                     }
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_MENNU_THE_BETRAYER, {{ 1939 }} },
+    { DATA_ROKMAR_THE_CRACKLER, {{ 1941 }} },
+    { DATA_QUAGMIRRAN, {{ 1940 }} }
+};
+
 class instance_the_slave_pens : public InstanceMapScript
 {
 public:
@@ -45,8 +52,9 @@ public:
         instance_the_slave_pens_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
         {
             counter = DATA_FLAMECALLER_000;
-            LoadObjectData(creatureData, nullptr);
             SetBossNumber(EncounterCount);
+            LoadObjectData(creatureData, nullptr);
+            LoadDungeonEncounterData(encounters);
         }
 
         void OnCreatureCreate(Creature* creature) override
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index eca916a89ee..b69dd7c7653 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -37,6 +37,12 @@ MinionData const minionData[] =
     { 0, 0 }
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_MAULGAR, {{ 649 }} },
+    { DATA_GRUUL, {{ 650 }} }
+};
+
 class instance_gruuls_lair : public InstanceMapScript
 {
     public:
@@ -50,6 +56,7 @@ class instance_gruuls_lair : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
                 LoadMinionData(minionData);
+                LoadDungeonEncounterData(encounters);
             }
 
             void OnCreatureCreate(Creature* creature) override
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 25fe0fb89ae..549e17d8beb 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -45,6 +45,13 @@ ObjectData const gameObjectData[] =
     { 0,                     0                  } //END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_THE_MAKER, {{ 1922 }} },
+    { DATA_BROGGOK, {{ 1924 }} },
+    { DATA_KELIDAN_THE_BREAKER, {{ 1923 }} }
+};
+
 class instance_blood_furnace : public InstanceMapScript
 {
     public:
@@ -58,6 +65,7 @@ class instance_blood_furnace : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
                 LoadObjectData(creatureData, gameObjectData);
+                LoadDungeonEncounterData(encounters);
 
                 PrisonerCounter5        = 0;
                 PrisonerCounter6        = 0;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 839c478b0e0..67a0308058d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -28,6 +28,13 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "Map.h"
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_WATCHKEEPER_GARGOLMAR, {{ 1893 }} },
+    { DATA_OMOR_THE_UNSCARRED, {{ 1891 }} },
+    { DATA_VAZRUDEN, {{ 1892 }} }
+};
+
 class instance_ramparts : public InstanceMapScript
 {
     public:
@@ -39,6 +46,7 @@ class instance_ramparts : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
+                LoadDungeonEncounterData(encounters);
             }
 
             void OnGameObjectCreate(GameObject* go) override
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index c6983a0f63f..e0c1bc322b0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -64,6 +64,11 @@ static MLDataTypes const collapseObjectDatas[] =
     DATA_MAGTHERIDON_COLUMN_5,
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_MAGTHERIDON, {{ 651 }} }
+};
+
 class instance_magtheridons_lair : public InstanceMapScript
 {
     public:
@@ -78,6 +83,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                 LoadDoorData(doorData);
                 LoadBossBoundaries(boundaries);
                 LoadObjectData(creatureData, gameObjectData);
+                LoadDungeonEncounterData(encounters);
             }
 
             void OnGameObjectCreate(GameObject* go) override
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 52dec1e3174..38ebad415d4 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -38,6 +38,14 @@ DoorData const doorData[] =
     { 0,                               0,               DOOR_TYPE_ROOM }
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_NETHEKURSE, {{ 1936 }} },
+    { DATA_PORUNG, {{ 1935 }} },
+    { DATA_OMROGG, {{ 1937 }} },
+    { DATA_KARGATH, {{ 1938 }} },
+};
+
 class instance_shattered_halls : public InstanceMapScript
 {
     public:
@@ -55,6 +63,7 @@ class instance_shattered_halls : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
+                LoadDungeonEncounterData(encounters);
                 executionTimer = 0;
                 executed = 0;
                 _team = 0;
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index ae71528220d..214a73fd69f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -22,7 +22,7 @@
 #include "Position.h"
 
 #define SHScriptName "instance_shattered_halls"
-#define DataHeader "SH"
+#define DataHeader "SHv1"
 
 uint32 const EncounterCount          = 4;
 uint32 const VictimCount             = 3;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 0832efd40fe..3f332f96e11 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -55,6 +55,14 @@ ObjectData const gameObjectData[] =
     {                         0, 0                          } // END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_KAELTHAS, {{ 733 }} },
+    { DATA_ALAR, {{ 730 }} },
+    { DATA_SOLARIAN, {{ 732 }} },
+    { DATA_VOID_REAVER, {{ 731 }} }
+};
+
 class instance_the_eye : public InstanceMapScript
 {
     public:
@@ -68,6 +76,7 @@ class instance_the_eye : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
                 LoadObjectData(creatureData, gameObjectData);
+                LoadDungeonEncounterData(encounters);
             }
         };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index 6cdeb655cce..9fd1208aa9e 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -27,6 +27,15 @@ static DoorData const doorData[] =
     { 0,                        0,                              DOOR_TYPE_ROOM    }
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_GATEWATCHER_GYROKILL, {{ 1933 }} },
+    { DATA_GATEWATCHER_IRON_HAND, {{ 1934 }} },
+    { DATA_MECHANOLORD_CAPACITUS, {{ 1932 }} },
+    { DATA_NETHERMANCER_SEPRETHREA, {{ 1930 }} },
+    { DATA_PATHALEON_THE_CALCULATOR, {{ 1931 }} }
+};
+
 class instance_mechanar : public InstanceMapScript
 {
     public:
@@ -39,6 +48,7 @@ class instance_mechanar : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
+                LoadDungeonEncounterData(encounters);
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 5f1321fb762..adeaec19ca2 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -29,6 +29,14 @@ DoorData const doorData[] =
     { 0,                                        0,                  DOOR_TYPE_ROOM } // END
 };
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_ZEREKETH, {{ 1916 }} },
+    { DATA_DALLIAH, {{ 1913 }} },
+    { DATA_SOCCOTHRATES, {{ 1915 }} },
+    { DATA_HARBINGER_SKYRISS, {{ 1914 }} }
+};
+
 class instance_arcatraz : public InstanceMapScript
 {
     public:
@@ -41,6 +49,7 @@ class instance_arcatraz : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
+                LoadDungeonEncounterData(encounters);
 
                 ConversationState = NOT_STARTED;
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index 0529b427415..1ab3574ada8 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -20,6 +20,15 @@
 #include "InstanceScript.h"
 #include "the_botanica.h"
 
+DungeonEncounterData const encounters[] =
+{
+    { DATA_COMMANDER_SARANNIS, {{ 1925 }} },
+    { DATA_HIGH_BOTANIST_FREYWINN, {{ 1926 }} },
+    { DATA_THORNGRIN_THE_TENDER, {{ 1928 }} },
+    { DATA_LAJ, {{ 1927 }} },
+    { DATA_WARP_SPLINTER, {{ 1929 }} }
+};
+
 class instance_the_botanica : public InstanceMapScript
 {
     public:
@@ -31,6 +40,7 @@ class instance_the_botanica : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
+                LoadDungeonEncounterData(encounters);
             }
 
             void OnCreatureCreate(Creature* creature) override