From 6dab5a32c02974961f6300f688deac41dae1b2c9 Mon Sep 17 00:00:00 2001 From: patou01 <2592673+patou01@users.noreply.github.com> Date: Tue, 9 Nov 2021 03:57:59 +0100 Subject: [PATCH] fix(Scripts/LBRS): Wyrmthalak, adds no longer despawn after death (#9036) --- .../updates/pending_db_world/rev_1636311037132029200.sql | 5 +++++ .../BlackrockSpire/boss_overlord_wyrmthalak.cpp | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1636311037132029200.sql diff --git a/data/sql/updates/pending_db_world/rev_1636311037132029200.sql b/data/sql/updates/pending_db_world/rev_1636311037132029200.sql new file mode 100644 index 000000000..463f5b8b2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1636311037132029200.sql @@ -0,0 +1,5 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1636311037132029200'); + +DELETE FROM `creature_text` WHERE `CreatureID` = 9568; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`) VALUES +(9568, 0, 0, '%s calls for help!' , 16); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 9a0614974..472d24416 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -41,8 +41,10 @@ enum Adds NPC_SMOLDERTHORN_BERSERKER = 9268 }; -const Position SummonLocation1 = { -39.355f, -513.456f, 88.472f, 4.679f }; -const Position SummonLocation2 = { -49.875f, -511.896f, 88.195f, 4.613f }; +constexpr uint32 CALL_HELP = 0; + +const Position SummonLocation1 = {-49.43f, -455.82f, 77.82f, 4.61f}; +const Position SummonLocation2 = {-58.48f, -456.29f, 77.82f, 4.613f}; class boss_overlord_wyrmthalak : public CreatureScript { @@ -77,7 +79,7 @@ public: void JustDied(Unit* /*killer*/) override { - _JustDied(); + instance->SetBossState(DATA_OVERLORD_WYRMTHALAK, DONE); } void UpdateAI(uint32 diff) override @@ -87,6 +89,7 @@ public: if (!Summoned && HealthBelowPct(51)) { + Talk(CALL_HELP); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (Creature* warlord = me->SummonCreature(NPC_SPIRESTONE_WARLORD, SummonLocation1, TEMPSUMMON_TIMED_DESPAWN, 300 * IN_MILLISECONDS))