From 2ab09b28c2a28ff5e135a4f2214b88d046c5c128 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 24 May 2019 13:55:52 +0200 Subject: [PATCH] Scripts/BWD: optimized door handling for the Inner Chamber Door --- .../BlackwingDescent/blackwing_descent.h | 3 --- .../instance_blackwing_descent.cpp | 14 +++----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h index 252029b047..90a9341581 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h @@ -41,9 +41,6 @@ enum BWDDataTypes DATA_COLUMN_OF_LIGHT, DATA_ATRAMEDES_INTRO, - /*GameObjects*/ - DATA_INNER_CHAMBER_DOOR, - // Encounter Data /*Magmaw*/ DATA_PREPARE_MASSIVE_CRASH_AND_GET_TARGET_GUID, diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp index ecaa71183b..c4240264ef 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp @@ -37,14 +37,15 @@ ObjectData const creatureData[] = ObjectData const gameobjectData[] = { - { GO_INNER_CHAMBER_DOOR, DATA_INNER_CHAMBER_DOOR }, { GO_ANCIENT_BELL, DATA_ANCIENT_BELL }, { 0, 0 } // END }; DoorData const doorData[] = { - { 0, 0, DOOR_TYPE_ROOM } // END + { GO_INNER_CHAMBER_DOOR, DATA_MAGMAW, DOOR_TYPE_PASSAGE }, + { GO_INNER_CHAMBER_DOOR, DATA_OMNOTRON_DEFENSE_SYSTEM, DOOR_TYPE_PASSAGE }, + { 0, 0, DOOR_TYPE_ROOM } // END }; Position const MassiveCrashRightSpawnPosition = { -288.59f, -14.8472f, 211.2573f }; @@ -191,17 +192,8 @@ class instance_blackwing_descent : public InstanceMapScript } _roomStalkerGUIDs.clear(); - - if (state == DONE && GetBossState(DATA_OMNOTRON_DEFENSE_SYSTEM) == DONE) - if (GameObject* door = GetGameObject(DATA_INNER_CHAMBER_DOOR)) - door->SetGoState(GO_STATE_ACTIVE); } break; - case DATA_OMNOTRON_DEFENSE_SYSTEM: - if (state == DONE && GetBossState(DATA_MAGMAW) == DONE) - if (GameObject* door = GetGameObject(DATA_INNER_CHAMBER_DOOR)) - door->SetGoState(GO_STATE_ACTIVE); - break; default: break; }