From d627e196492bda78a83601f35dc6830a17633738 Mon Sep 17 00:00:00 2001 From: SoglaHash <74299960+SoglaHash@users.noreply.github.com> Date: Sun, 7 Aug 2022 19:52:01 +0200 Subject: [PATCH] fix(Core/BlackwingLair): add missing Nefarian Gate (#12608) --- .../pending_db_world/rev_1659484347526582712.sql | 8 ++++++++ .../BlackrockMountain/BlackwingLair/blackwing_lair.h | 6 ++++-- .../BlackwingLair/instance_blackwing_lair.cpp | 11 +++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1659484347526582712.sql diff --git a/data/sql/updates/pending_db_world/rev_1659484347526582712.sql b/data/sql/updates/pending_db_world/rev_1659484347526582712.sql new file mode 100644 index 000000000..4c41267e2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1659484347526582712.sql @@ -0,0 +1,8 @@ +DELETE FROM `gameobject` WHERE `id` = 176966; +INSERT INTO `gameobject` (`id`, `map`, `zoneId`, `areaId`, + `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, + `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, + `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) +VALUES (176966, 469, 0, 0, 1, 1, -7488.1, -1150.7, 476.535, 3.73064, -0.0, + -0.0, -0.95694, 0.290285, 300, 0, 1, 'Nefarian\'s Gate', 0); +UPDATE `gameobject_template_addon` SET `flags` = `flags`|16 WHERE `entry` = 176966; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h index a0adcf52b..1313f4f3a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h @@ -43,7 +43,8 @@ enum BWLEncounter DATA_NEFARIAN_TROOPS = 10, // Doors - DATA_GO_CHROMAGGUS_DOOR = 11 + DATA_GO_CHROMAGGUS_DOOR = 11, + DATA_GO_CHROMAGGUS_DOOR_EXIT= 12 }; enum BWLCreatureIds @@ -92,7 +93,8 @@ enum BWLGameObjectIds GO_PORTCULLIS_THREEDRAGONS = 179115, GO_CHROMAGGUS_LEVER = 179148, GO_PORTCULLIS_CHROMAGGUS = 179116, - GO_PORTCULLIS_NEFARIAN = 179117, + GO_PORTCULLIS_CHROMAGGUS_EXIT = 179117, + GO_PORTCULLIS_NEFARIAN = 176966, GO_SUPPRESSION_DEVICE = 179784 }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index a9d1299e6..586952047 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -35,8 +35,10 @@ DoorData const doorData[] = { GO_PORTCULLIS_RAZORGORE_ROOM, DATA_RAZORGORE_THE_UNTAMED, DOOR_TYPE_ROOM, }, // ID 176964 || GUID 75158 { GO_PORTCULLIS_VAELASTRASZ, DATA_VAELASTRAZ_THE_CORRUPT, DOOR_TYPE_PASSAGE }, // ID 175185 || GUID 7229 { GO_PORTCULLIS_BROODLORD, DATA_BROODLORD_LASHLAYER, DOOR_TYPE_PASSAGE }, // ID 179365 || GUID 75159 - { GO_PORTCULLIS_NEFARIAN, DATA_CHROMAGGUS, DOOR_TYPE_PASSAGE }, // ID 179116 || GUID 75161 - { GO_PORTCULLIS_NEFARIAN, DATA_NEFARIAN, DOOR_TYPE_ROOM }, // ID 179117 || GUID 75164 + { GO_PORTCULLIS_CHROMAGGUS, DATA_CHROMAGGUS, DOOR_TYPE_PASSAGE }, // ID 179116 || GUID 75161 + { GO_PORTCULLIS_CHROMAGGUS_EXIT,DATA_CHROMAGGUS, DOOR_TYPE_PASSAGE }, // ID 179117 || GUID 75164 + { GO_PORTCULLIS_CHROMAGGUS_EXIT,DATA_NEFARIAN, DOOR_TYPE_ROOM }, // ID 179117 || GUID 75164 + { GO_PORTCULLIS_NEFARIAN, DATA_NEFARIAN, DOOR_TYPE_ROOM }, // ID 176966 { 0, 0, DOOR_TYPE_ROOM } // END }; @@ -45,12 +47,13 @@ ObjectData const creatureData[] = { NPC_GRETHOK, DATA_GRETHOK }, { NPC_NEFARIAN_TROOPS, DATA_NEFARIAN_TROOPS }, { NPC_VICTOR_NEFARIUS, DATA_LORD_VICTOR_NEFARIUS }, - { NPC_CHROMAGGUS, DATA_CHROMAGGUS } + { NPC_CHROMAGGUS, DATA_CHROMAGGUS }, }; ObjectData const objectData[] = { - { GO_PORTCULLIS_CHROMAGGUS, DATA_GO_CHROMAGGUS_DOOR } + { GO_PORTCULLIS_CHROMAGGUS, DATA_GO_CHROMAGGUS_DOOR }, + { GO_PORTCULLIS_CHROMAGGUS_EXIT, DATA_GO_CHROMAGGUS_DOOR_EXIT } }; Position const SummonPosition[8] =