From 189afd14092f7892c8028ddaf1ee5a6a97718c1d Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 11 Dec 2022 14:53:55 +0100 Subject: [PATCH] =?UTF-8?q?fix(Scripts/Instances):=20Fixed=20text=20during?= =?UTF-8?q?=20"Opening=20the=20Dark=20Portal"=20i=E2=80=A6=20(#13872)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Scripts/Instances): Fixed text during "Opening the Dark Portal" on Black Morass. Fixes #1999 --- .../updates/pending_db_world/rev_1668869079028371900.sql | 3 +++ .../CavernsOfTime/TheBlackMorass/the_black_morass.cpp | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1668869079028371900.sql diff --git a/data/sql/updates/pending_db_world/rev_1668869079028371900.sql b/data/sql/updates/pending_db_world/rev_1668869079028371900.sql new file mode 100644 index 000000000..febebea88 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1668869079028371900.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_text` SET `text`='The shield is nearly gone! All that I have worked for is in danger!', `Sound`=10439, `BroadcastTextId`=16795 WHERE `CreatureID`=15608 AND `GroupId`=2; +UPDATE `creature_text` SET `text`='Champions! My shield grows weak!', `Sound`=10437, `BroadcastTextId`=16792 WHERE `CreatureID`=15608 AND `GroupId`=4; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 1ff0f2a0e..0fec969f0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -23,11 +23,7 @@ enum medivhSays { - SAY_WEAK75 = 0, - SAY_WEAK50 = 1, - SAY_WEAK25 = 2, - SAY_ENTER = 3, - SAY_INTRO = 4, + SAY_ENTER = 0, SAY_DEATH = 5, SAY_WIN = 6, SAY_ORCS_ENTER = 7, @@ -211,7 +207,7 @@ public: case EVENT_CHECK_HEALTH_75: if (instance && instance->GetData(DATA_SHIELD_PERCENT) <= eventId * 25) { - Talk(eventId - 1); + Talk(eventId + 1); break; } events.ScheduleEvent(eventId, 500);