From 9082eca660d73812844d39c57d647c4ae22d5ad5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 25 Sep 2022 00:15:12 +0200 Subject: DB/Icecrown Citadel: Migrate linked_respawn to spawn groups --- .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 16 +++++----------- .../scripts/Northrend/IcecrownCitadel/icecrown_citadel.h | 10 ++++++---- 2 files changed, 11 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 17612e01c8a..bd75bdb7929 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -207,7 +207,9 @@ enum Misc DATA_MADE_A_MESS = 45374613, // 4537, 4613 are achievement IDs GOSSIP_MENU_MURADIN_BRONZEBEARD = 10934, - GOSSIP_MENU_HIGH_OVERLORD_SAURFANG = 10952 + GOSSIP_MENU_HIGH_OVERLORD_SAURFANG = 10952, + + SPAWN_GROUP_ENTRANCE_THE_DAMNED_EVENT = 275, }; enum MovePoints @@ -747,11 +749,7 @@ struct npc_high_overlord_saurfang_icc : public ScriptedAI } else if (type == WAYPOINT_MOTION_TYPE && id == POINT_EXIT) { - std::list guards; - GetCreatureListWithEntryInGrid(guards, me, NPC_KOR_KRON_GENERAL, 50.0f); - for (std::list::iterator itr = guards.begin(); itr != guards.end(); ++itr) - (*itr)->DespawnOrUnsummon(); - me->DespawnOrUnsummon(); + me->GetMap()->SpawnGroupDespawn(SPAWN_GROUP_ENTRANCE_THE_DAMNED_EVENT); } } @@ -918,11 +916,7 @@ struct npc_muradin_bronzebeard_icc : public ScriptedAI } else if (type == WAYPOINT_MOTION_TYPE && id == POINT_EXIT) { - std::list guards; - GetCreatureListWithEntryInGrid(guards, me, NPC_ALLIANCE_COMMANDER, 50.0f); - for (std::list::iterator itr = guards.begin(); itr != guards.end(); ++itr) - (*itr)->DespawnOrUnsummon(); - me->DespawnOrUnsummon(); + me->GetMap()->SpawnGroupDespawn(SPAWN_GROUP_ENTRANCE_THE_DAMNED_EVENT); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 8dd11837c8c..b0be955fc2a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -80,10 +80,12 @@ enum ICDataTypes DATA_PROFESSOR_PUTRICIDE = 6, DATA_BLOOD_PRINCE_COUNCIL = 7, DATA_BLOOD_QUEEN_LANA_THEL = 8, - DATA_SISTER_SVALNA = 9, - DATA_VALITHRIA_DREAMWALKER = 10, - DATA_SINDRAGOSA = 11, - DATA_THE_LICH_KING = 12, + DATA_VALITHRIA_DREAMWALKER = 9, + DATA_SINDRAGOSA = 10, + DATA_THE_LICH_KING = 11, + + // miniboss, for door handling + DATA_SISTER_SVALNA = 12, // Additional data DATA_SAURFANG_EVENT_NPC = 13, -- cgit v1.2.3