From cefd86e330f77a567550fbbbe97a48ee0bec56f3 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 22 Jul 2018 13:08:21 +0200 Subject: [PATCH] Creature/Script: Add missing emote to Princess Moira Bronzebeard Closes #22182 (cherry picked from commit 7c2fb9c7aa3eaab5f662c24a6e2e6acd8efbbe52) --- .../master/2021_10_17_04_world_2018_07_22_04_world.sql | 4 ++++ .../BlackrockDepths/boss_emperor_dagran_thaurissan.cpp | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 sql/updates/world/master/2021_10_17_04_world_2018_07_22_04_world.sql diff --git a/sql/updates/world/master/2021_10_17_04_world_2018_07_22_04_world.sql b/sql/updates/world/master/2021_10_17_04_world_2018_07_22_04_world.sql new file mode 100644 index 00000000000..36de2e6a5a7 --- /dev/null +++ b/sql/updates/world/master/2021_10_17_04_world_2018_07_22_04_world.sql @@ -0,0 +1,4 @@ +-- Princess Moira Bronzebeard +DELETE FROM `creature_text` WHERE `CreatureID`=8929; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(8929,0,0,"%s is visibly shaken by the death of Emperor Thaurissan.",16,0,100,18,0,0,5429,0,"Princess Moira Bronzebeard"); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 9685abdc679..50f387fe665 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -39,6 +39,11 @@ enum Events EVENT_AVATAROFFLAME = 2 }; +enum Emotes +{ + EMOTE_SHAKEN = 0 +}; + class boss_emperor_dagran_thaurissan : public CreatureScript { public: @@ -76,6 +81,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript { moira->AI()->EnterEvadeMode(); moira->SetFaction(FACTION_FRIENDLY); + moira->AI()->Talk(EMOTE_SHAKEN); } }