From 376a7983b394f5269b9c4538ff987b9f4b418fc2 Mon Sep 17 00:00:00 2001 From: Walter Pagani Date: Fri, 14 May 2021 15:41:54 -0300 Subject: [PATCH] fix(Scripts/Innkeeper): remove hard-coded texts (#5811) --- src/server/scripts/World/npc_innkeeper.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 0fd8f47b2..c37922fe1 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -12,6 +12,8 @@ enum eTrickOrTreatSpells SPELL_TREAT = 24715, SPELL_TRICKED_OR_TREATED = 24755, HALLOWEEN_EVENTID = 12, + GOSSIP_MENU = 9733, + GOSSIP_MENU_EVENT = 342 }; class npc_innkeeper : public CreatureScript @@ -22,16 +24,24 @@ public: bool OnGossipHello(Player* player, Creature* creature) override { if (IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICKED_OR_TREATED)) - AddGossipItemFor(player, GOSSIP_ICON_CHAT, "Trick or Treat!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + HALLOWEEN_EVENTID); + { + AddGossipItemFor(player, GOSSIP_MENU_EVENT, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + HALLOWEEN_EVENTID); + } if (creature->IsQuestGiver()) + { player->PrepareQuestMenu(creature->GetGUID()); + } if (creature->IsVendor()) - AddGossipItemFor(player, GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + { + AddGossipItemFor(player, GOSSIP_MENU, 2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + } if (creature->IsInnkeeper()) - AddGossipItemFor(player, GOSSIP_ICON_INTERACT_1, "Make this inn my home.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INN); + { + AddGossipItemFor(player, GOSSIP_MENU, 1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INN); + } player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID());