diff options
author | Shauren <shauren.trinity@gmail.com> | 2021-01-23 22:58:07 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-10-04 00:19:38 +0200 |
commit | 46e0056196dd6e56077aeeb67d41ec520046a79e (patch) | |
tree | 50eb5d5a6ee6fc3fd1b35cae035158ed5ebcc97c /src/server/scripts/Kalimdor | |
parent | ab12e77cf72bcd361a380c8d1ed37d12fe0e1bbb (diff) |
Scripts/Instances: Add dungeon encounter data
Diffstat (limited to 'src/server/scripts/Kalimdor')
10 files changed, 104 insertions, 1 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index 21d4338de3e..06ba6b40026 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -21,7 +21,7 @@ #include "CreatureAIImpl.h" #define BFDScriptName "instance_blackfathom_deeps" -#define DataHeader "BFD" +#define DataHeader "BFDv1" uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 6e368abee84..05eb00e7f5b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -58,6 +58,15 @@ ObjectData const creatureData[] = { 0, 0 } // END }; +DungeonEncounterData const encounters[] = +{ + { DATA_RAGEWINTERCHILL, {{ 618 }} }, + { DATA_ANETHERON, {{ 619 }} }, + { DATA_KAZROGAL, {{ 620 }} }, + { DATA_AZGALOR, {{ 621 }} }, + { DATA_ARCHIMONDE, {{ 622 }} } +}; + class instance_hyjal : public InstanceMapScript { public: @@ -75,6 +84,7 @@ public: SetHeaders(DataHeader); SetBossNumber(EncounterCount); LoadObjectData(creatureData, nullptr); + LoadDungeonEncounterData(encounters); RaidDamage = 0; Trash = 0; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 167082fd16e..b85cb34814e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -128,6 +128,14 @@ DoorData const doorData[] = { 0, 0, DOOR_TYPE_ROOM } // END }; +DungeonEncounterData const encounters[] = +{ + { DATA_MEATHOOK, {{ 2002 }} }, + { DATA_SALRAMM, {{ 2004 }} }, + { DATA_EPOCH, {{ 2003 }} }, + { DATA_MAL_GANIS, {{ 2005 }} } +}; + COSProgressStates GetStableStateFor(COSProgressStates const state) { switch (state) @@ -274,6 +282,7 @@ class instance_culling_of_stratholme : public InstanceMapScript SetHeaders(DataHeader); SetBossNumber(EncounterCount); LoadDoorData(doorData); + LoadDungeonEncounterData(encounters); _currentWorldStates[WORLDSTATE_SHOW_CRATES] = _currentWorldStates[WORLDSTATE_CRATES_REVEALED] = _currentWorldStates[WORLDSTATE_WAVE_COUNT] = _currentWorldStates[WORLDSTATE_TIME_GUARDIAN_SHOW] = _currentWorldStates[WORLDSTATE_TIME_GUARDIAN] = 0; _plagueCrates.reserve(NUM_PLAGUE_CRATES); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 9f5c2510f26..bcebfcaa72f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -39,6 +39,13 @@ EndScriptData */ #define QUEST_ENTRY_DIVERSION 10283 #define LODGE_QUEST_TRIGGER 20155 +DungeonEncounterData const encounters[] = +{ + { DATA_LIEUTENANT_DRAKE, {{ 1905 }} }, + { DATA_CAPTAIN_SKARLOC, {{ 1907 }} }, + { DATA_EPOCH_HUNTER, {{ 1906 }} } +}; + class instance_old_hillsbrad : public InstanceMapScript { public: @@ -55,6 +62,7 @@ public: { SetHeaders(DataHeader); SetBossNumber(OldHillsbradFoothillsBossCount); + LoadDungeonEncounterData(encounters); ThrallEscortState = OH_ESCORT_PRISON_TO_SKARLOC; mBarrelCount = 0; diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 6244cf2dcbb..f60e14614f4 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -68,6 +68,26 @@ enum Events EVENT_CRYSTAL_CREATURE_CHECK = 2 }; +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 }} } +}; + class instance_dire_maul : public InstanceMapScript { public: @@ -79,6 +99,7 @@ public: { SetHeaders(DataHeader); SetBossNumber(EncounterCount); + LoadDungeonEncounterData(encounters); } void OnCreatureCreate(Creature* creature) override diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index 57a03c08668..11ea87763a6 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -22,6 +22,17 @@ #include "InstanceScript.h" #include "Map.h" +DungeonEncounterData const encounters[] = +{ + { DATA_BETH_TILAC, {{ 1197 }} }, + { DATA_LORD_RHYOLITH, {{ 1204 }} }, + { DATA_SHANNOX, {{ 1205 }} }, + { DATA_ALYSRAZOR, {{ 1206 }} }, + { DATA_BALEROC, {{ 1200 }} }, + { DATA_MAJORDOMO_STAGHELM, {{ 1185 }} }, + { DATA_RAGNAROS, {{ 1203 }} } +}; + class instance_firelands : public InstanceMapScript { public: @@ -33,6 +44,7 @@ class instance_firelands : public InstanceMapScript { SetHeaders(DataHeader); SetBossNumber(EncounterCount); + LoadDungeonEncounterData(encounters); } void OnCreatureCreate(Creature* creature) override 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 484d29d0487..c63a6f98f68 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -40,6 +40,17 @@ DoorData const doorData[] = {0, 0, DOOR_TYPE_ROOM } }; +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 }} } +}; + class instance_halls_of_origination : public InstanceMapScript { public: @@ -52,6 +63,7 @@ class instance_halls_of_origination : public InstanceMapScript SetHeaders(DataHeader); SetBossNumber(EncounterCount); LoadDoorData(doorData); + LoadDungeonEncounterData(encounters); _deadElementals = 0; } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index bb5a6d36ebb..55615271882 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -37,6 +37,11 @@ BossBoundaryData const boundaries = { DATA_ONYXIA, new CircleBoundary(Position(-34.3697f, -212.3296f), 100.0) } }; +DungeonEncounterData const encounters[] = +{ + { DATA_ONYXIA, {{ 1084 }} } +}; + class instance_onyxias_lair : public InstanceMapScript { public: @@ -54,6 +59,7 @@ public: SetHeaders(DataHeader); SetBossNumber(EncounterCount); LoadBossBoundaries(boundaries); + LoadDungeonEncounterData(encounters); onyxiaLiftoffTimer = 0; manyWhelpsCounter = 0; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 8e93bab3371..47ebfaf2a16 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -20,6 +20,16 @@ #include "InstanceScript.h" #include "ruins_of_ahnqiraj.h" +DungeonEncounterData const encounters[] = +{ + { DATA_KURINNAXX, {{ 718 }} }, + { DATA_RAJAXX, {{ 719 }} }, + { DATA_MOAM, {{ 720 }} }, + { DATA_BURU, {{ 721 }} }, + { DATA_AYAMISS, {{ 722 }} }, + { DATA_OSSIRIAN, {{ 723 }} } +}; + class instance_ruins_of_ahnqiraj : public InstanceMapScript { public: @@ -31,6 +41,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript { SetHeaders(DataHeader); SetBossNumber(NUM_ENCOUNTER); + LoadDungeonEncounterData(encounters); } void OnCreatureCreate(Creature* creature) override diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index d4f1d044428..f0553f53057 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -46,6 +46,19 @@ DoorData const doorData[] = { 0, 0, DOOR_TYPE_ROOM } // END }; +DungeonEncounterData const encounters[] = +{ + { DATA_SKERAM, {{ 709 }} }, + { DATA_SARTURA, {{ 711 }} }, + { DATA_FRANKRIS, {{ 712 }} }, + { DATA_HUHURAN, {{ 714 }} }, + { DATA_TWIN_EMPERORS, {{ 715 }} }, + { DATA_CTHUN, {{ 717 }} }, + { DATA_BUG_TRIO, {{ 710 }} }, + { DATA_VISCIDUS, {{ 713 }} }, + { DATA_OURO, {{ 716 }} } +}; + class instance_temple_of_ahnqiraj : public InstanceMapScript { public: @@ -64,6 +77,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript LoadObjectData(creatureData, nullptr); SetBossNumber(EncounterCount); LoadDoorData(doorData); + LoadDungeonEncounterData(encounters); IsBossDied[0] = false; IsBossDied[1] = false; IsBossDied[2] = false; |