Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

DB/Shattered Halls: Migrate linked_respawn to spawn groups

Browse Source 
(cherry picked from commit f982e566a7)
This commit is contained in:
Shauren
2022-09-20 16:24:31 +02:00
parent 224d764ded
commit b596cf2452
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/updates/world/master/2022_09_30_01_world_2022_09_20_01_world.sql Normal file
View File

@@ -0,0 +1,26 @@
DELETE FROM `spawn_group_template` WHERE `groupId` BETWEEN 169 AND 172;
INSERT INTO `spawn_group_template` (`groupId`,`groupName`,`groupFlags`) VALUES
(169,'Hellfire Citadel: The Shattered Halls - Grand Warlock Nethekurse',4),
(170,'Hellfire Citadel: The Shattered Halls - Blood Guard Porung',4),
(171,'Hellfire Citadel: The Shattered Halls - Warbringer O''mrogg',4),
(172,'Hellfire Citadel: The Shattered Halls - Warchief Kargath Bladefist',4);
DELETE FROM `instance_spawn_groups` WHERE `spawnGroupId` BETWEEN 169 AND 172;
INSERT INTO `instance_spawn_groups` (`instanceMapId`,`bossStateId`,`bossStates`,`spawnGroupId`,`flags`) VALUES
(540,0,23,169,1),
(540,1,23,170,1),
(540,2,23,171,1),
(540,3,23,172,1);
DELETE FROM `spawn_group` WHERE `groupId` BETWEEN 169 AND 172;
INSERT INTO `spawn_group` SELECT 169, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=57853 AND `linkType` IN (0,3);
INSERT INTO `spawn_group` SELECT 170, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=34038 AND `linkType` IN (0,3);
INSERT INTO `spawn_group` SELECT 171, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=57855 AND `linkType` IN (0,3);
INSERT INTO `spawn_group` SELECT 172, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=57854 AND `linkType` IN (0,3);
INSERT INTO `spawn_group` (`groupId`,`spawnType`,`spawnId`) VALUES
(169,0,57853),
(170,0,34038),
(171,0,57855),
(172,0,57854);
DELETE FROM `linked_respawn` WHERE `linkedGuid` IN (57853,34038,57855,57854);

6
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
View File

@@ -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))

12
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
View File

@@ -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,