From cd0fb6edbf54f34c01269b92fe0cc2363e89204e Mon Sep 17 00:00:00 2001 From: Sorikoff <46191832+Sorikoff@users.noreply.github.com> Date: Mon, 5 Aug 2019 12:09:09 +0000 Subject: Scripts/Blackrock Depths: Use DB Texts for Doom'rel (#23681) * Scripts/Blackrock Depths: Use DB Texts for Doom'rel * Quick Fix (cherry picked from commit 33807a065a24410cb3daf17cea6eb31af408c4e8) --- .../BlackrockDepths/boss_tomb_of_seven.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index d46d4af123b..e8b5d06f8d1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -114,7 +114,14 @@ enum DoomrelSpells SPELL_DEMONARMOR = 13787, SPELL_SUMMON_VOIDWALKERS = 15092 }; +enum DoomrelText +{ + GOSSIP_SELECT_DOOMREL = 1828, + GOSSIP_MENU_ID_CONTINUE = 1, + GOSSIP_MENU_CHALLENGE = 1947, + GOSSIP_MENU_ID_CHALLENGE = 0 +}; enum DoomrelEvents { EVENT_SHADOW_BOLT_VOLLEY = 1, @@ -124,9 +131,6 @@ enum DoomrelEvents EVENT_SUMMON_VOIDWALKERS = 5 }; -#define GOSSIP_ITEM_CHALLENGE "Your bondage is at an end, Doom'rel. I challenge you!" -#define GOSSIP_SELECT_DOOMREL "[PH] Continue..." - class boss_doomrel : public CreatureScript { public: @@ -233,7 +237,7 @@ class boss_doomrel : public CreatureScript switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_SELECT_DOOMREL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + AddGossipItemFor(player, GOSSIP_SELECT_DOOMREL, GOSSIP_MENU_ID_CONTINUE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); SendGossipMenuFor(player, 2605, me->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -251,7 +255,7 @@ class boss_doomrel : public CreatureScript bool GossipHello(Player* player) override { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_MENU_CHALLENGE, GOSSIP_MENU_ID_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, 2601, me->GetGUID()); return true; -- cgit v1.2.3