diff options
Diffstat (limited to 'src/server/scripts/Argus')
| -rw-r--r-- | src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp index 58e07c7fb25..0b86e21fd1a 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp @@ -121,8 +121,7 @@ constexpr uint8 MAX_TARGETS_SIZE = 6; enum Misc { - SUMMON_GROUP_ID_SURGING_FEL = 0, - ENCOUNTER_ID_GAROTHI_WORLDBREAKER = 2076 + SUMMON_GROUP_ID_SURGING_FEL = 0 }; namespace TargetHandler @@ -242,7 +241,6 @@ struct boss_garothi_worldbreaker : public BossAI _JustDied(); Talk(SAY_DEATH); CleanupEncounter(); - instance->SendBossKillCredit(ENCOUNTER_ID_GAROTHI_WORLDBREAKER); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp index 1ea867c7317..ef6acfa964b 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp @@ -37,10 +37,25 @@ DoorData const doorData[] = { 0, 0, DOOR_TYPE_ROOM } // END }; -class instance_antorus_the_burning_throne: public InstanceMapScript +DungeonEncounterData const encounters[] = +{ + { DATA_GAROTHI_WORLDBREAKER, {{ 2076 }} }, + { DATA_FELHOUNDS_OF_SAGERAS, {{ 2074 }} }, + { DATA_ANTORAN_HIGH_COMMAND, {{ 2070 }} }, + { DATA_PORTAL_KEEPER_HASABEL, {{ 2064 }} }, + { DATA_EONAR_THE_LIFE_BINDER, {{ 2075 }} }, + { DATA_IMONAR_THE_SOULHUNTER, {{ 2082 }} }, + { DATA_KINGAROTH, {{ 2088 }} }, + { DATA_VARIMATHRAS, {{ 2069 }} }, + { DATA_THE_COVEN_OF_SHIVARRA, {{ 2073 }} }, + { DATA_AGGRAMAR, {{ 2063 }} }, + { DATA_ARGUS_THE_UNMAKER, {{ 2092 }} } +}; + +class instance_antorus_the_burning_throne : public InstanceMapScript { public: - instance_antorus_the_burning_throne() : InstanceMapScript(ABTScriptName, 757) { } + instance_antorus_the_burning_throne() : InstanceMapScript(ABTScriptName, 1712) { } struct instance_antorus_the_burning_throne_InstanceMapScript: public InstanceScript { @@ -50,6 +65,7 @@ class instance_antorus_the_burning_throne: public InstanceMapScript SetBossNumber(EncounterCount); LoadObjectData(creatureData, nullptr); LoadDoorData(doorData); + LoadDungeonEncounterData(encounters); } void OnCreatureCreate(Creature* creature) override @@ -68,7 +84,7 @@ class instance_antorus_the_burning_throne: public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_antorus_the_burning_throne_InstanceMapScript(map); } |