From 0e2b59ba1312f727300658b565118932c246cecb Mon Sep 17 00:00:00 2001 From: OneZero <70149485+OneZero1010@users.noreply.github.com> Date: Wed, 15 Jul 2026 12:01:10 +0200 Subject: [PATCH] fix(Scripts/Kalimdor): move hardcoded npc_plucky gossip to DB (#26629) Co-authored-by: Claude Sonnet 5 --- .../updates/pending_db_world/rev_1784097224106013850.sql | 4 ++++ src/server/scripts/Kalimdor/zone_thousand_needles.cpp | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1784097224106013850.sql diff --git a/data/sql/updates/pending_db_world/rev_1784097224106013850.sql b/data/sql/updates/pending_db_world/rev_1784097224106013850.sql new file mode 100644 index 000000000..acc4eb4f2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1784097224106013850.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `gossip_menu_option` WHERE `MenuID` = 6626 AND `OptionID` = 0; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`) VALUES +(6626, 0, 0, 'Please tell me the Phrase..', 0, 0, 0, 0, 0, 0, 0, '', 0); diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index 9c60689c5..c76108dac 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -202,13 +202,14 @@ public: # npc_plucky ######*/ -#define GOSSIP_P "Please tell me the Phrase.." - enum Plucky { QUEST_SCOOP = 1950, SPELL_PLUCKY_HUMAN = 9192, - SPELL_PLUCKY_CHICKEN = 9220 + SPELL_PLUCKY_CHICKEN = 9220, + + GOSSIP_MENU_PLUCKY = 6626, + GOSSIP_OPTION_PHRASE = 0 }; class npc_plucky : public CreatureScript @@ -232,7 +233,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) - AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_MENU_PLUCKY, GOSSIP_OPTION_PHRASE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, 738, creature->GetGUID());