From b596cf2452a2e2121fcbc58c806c8fbfe0a954eb Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 20 Sep 2022 16:24:31 +0200 Subject: DB/Shattered Halls: Migrate linked_respawn to spawn groups (cherry picked from commit f982e566a71e320f2c88bac06eeabaebed14ba84) --- .../ShatteredHalls/instance_shattered_halls.cpp | 6 ++++++ .../Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src') 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 860f02d6a49..cb856a4de10 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -135,6 +135,12 @@ class instance_shattered_halls : public InstanceMapScript } } + void OnUnitDeath(Unit* unit) override + { + if (unit->GetEntry() == NPC_BLOOD_GUARD_PORUNG) + SetBossState(DATA_PORUNG, DONE); + } + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index 1bf9b822b31..ae71528220d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -30,13 +30,14 @@ uint32 const VictimCount = 3; enum SHDataTypes { DATA_NETHEKURSE = 0, - DATA_OMROGG = 1, - DATA_KARGATH = 2, + DATA_PORUNG = 1, + DATA_OMROGG = 2, + DATA_KARGATH = 3, - DATA_SHATTERED_EXECUTIONER = 3, - DATA_PRISONERS_EXECUTED = 4, + DATA_SHATTERED_EXECUTIONER = 4, + DATA_PRISONERS_EXECUTED = 5, - DATA_TEAM_IN_INSTANCE = 5, + DATA_TEAM_IN_INSTANCE = 6, DATA_FIRST_PRISONER, DATA_SECOND_PRISONER, @@ -46,6 +47,7 @@ enum SHDataTypes enum SHCreatureIds { NPC_GRAND_WARLOCK_NETHEKURSE = 16807, + NPC_BLOOD_GUARD_PORUNG = 20923, NPC_KARGATH_BLADEFIST = 16808, NPC_SHATTERED_EXECUTIONER = 17301, -- cgit v1.2.3