From fa59b30184047dce7d7de40e8003b5f3c4265fa8 Mon Sep 17 00:00:00 2001 From: daobashun <49193927+fangshun2004@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:04:37 +0800 Subject: [PATCH] fix(Scripts/IcecrownCitadel): Tirion Fordring attacks the Lich King empty-handed (#15823) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Tirion Fordring's final stage attacking the Lich King empty-handed * Tirion Fordring's uses text in BroadcastText to speak * Code format changes * Add data to the data table * Update rev_1680658371591699800.sql Change from INSERT to INSERT/INSERT * Update and rename boss_the_lich_king.cpp to boss_the_lich_king.cpp的 Remove useless comments * Rename boss_the_lich_king.cpp的 to boss_the_lich_king.cpp The input method caused an unexpected rename * Delete the extra rows * Update boss_the_lich_king.cpp Delete references that can be omitted --- .../updates/pending_db_world/rev_1680658371591699800.sql | 3 +++ .../Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1680658371591699800.sql diff --git a/data/sql/updates/pending_db_world/rev_1680658371591699800.sql b/data/sql/updates/pending_db_world/rev_1680658371591699800.sql new file mode 100644 index 000000000..c8213f46f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680658371591699800.sql @@ -0,0 +1,3 @@ +-- Add Highlord Tirion Fordring - SAY_TIRION_OUTRO_3 +DELETE FROM `creature_text` WHERE `CreatureID`=38995 AND `GroupID`=4 AND `ID`=0; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES (38995, 4, 0, 'The Lich King must fall!!', 14, 0, 0, 0, 0, 17389, 38113, 0, 'Highlord Tirion Fordring - SAY_TIRION_OUTRO_3'); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 17ce3995c..8db7c0c14 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -61,6 +61,7 @@ enum Texts SAY_TIRION_INTRO_2 = 1, SAY_TIRION_OUTRO_1 = 2, SAY_TIRION_OUTRO_2 = 3, + SAY_TIRION_OUTRO_3 = 4, // Terenas Menethil (outro) SAY_TERENAS_OUTRO_1 = 0, @@ -343,6 +344,7 @@ enum MiscData { LIGHT_SNOWSTORM = 2490, LIGHT_SOULSTORM = 2508, + EQUIP_ASHBRINGER = 13262, MUSIC_FROZEN_THRONE = 17457, MUSIC_SPECIAL = 17458, // Summon Shambling Horror, Remorseless Winter, Quake, Summon Val'kyr Periodic, Harvest Soul, Vile Spirits MUSIC_FURY_OF_FROSTMOURNE = 17459, @@ -833,8 +835,7 @@ public: _bFordringMustFallYell = true; if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING))) { - tirion->Yell("The Lich King must fall!", LANG_UNIVERSAL); - tirion->PlayDirectSound(17389); + tirion->AI()->Talk(SAY_TIRION_OUTRO_3); } } } @@ -1354,7 +1355,7 @@ public: { // remove glow on ashbringer and tirion me->RemoveAllAuras(); - SetEquipmentSlots(true); + SetEquipmentSlots(false, EQUIP_ASHBRINGER); } } @@ -1595,7 +1596,7 @@ public: lichKing->SetImmuneToNPC(false); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); me->RemoveAllAuras(); - SetEquipmentSlots(true); + SetEquipmentSlots(false, EQUIP_ASHBRINGER); me->Attack(lichKing, true); me->GetMotionMaster()->MovePoint(0, 512.16f, -2120.25f, 840.86f); }