From 65d6bd0472ba3a60bbd5667e581e342d5a72b4ae Mon Sep 17 00:00:00 2001
From: Kalimist <cnahues@gmail.com>
Date: Thu, 8 Feb 2024 01:41:23 -0500
Subject: [PATCH] fix(Core/Creature): hardcoded gossip in zone_azshara (#18289)

* Changing hardcoded text in #define to enum member

- Changing #define to new enum member for AddGossipItemFor method

* Adding SQL Query File

* Forgot to add ';' in DELETE FROM
---
 .../sql/updates/pending_db_world/Rev_1629488923927348.sql | 3 +++
 src/server/scripts/Kalimdor/zone_azshara.cpp              | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/Rev_1629488923927348.sql

diff --git a/data/sql/updates/pending_db_world/Rev_1629488923927348.sql b/data/sql/updates/pending_db_world/Rev_1629488923927348.sql
new file mode 100644
index 000000000..ffa3d3d81
--- /dev/null
+++ b/data/sql/updates/pending_db_world/Rev_1629488923927348.sql
@@ -0,0 +1,3 @@
+DELETE FROM `gossip_menu_option` WHERE `MenuID`=21893;
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES 
+(21893, 0, 0, 'Hand over the Southfury moonstone and I\'ll let you go.', 20723, 1, 1, 0, 0, 0, 0, '', 0, 0);
diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index e225cff10..8fbb8f62a 100644
--- a/src/server/scripts/Kalimdor/zone_azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
@@ -53,10 +53,10 @@ enum RizzleSprysprocketData
     SAY_RIZZLE_START                = 0,
     SAY_RIZZLE_GRENADE              = 1,
     SAY_RIZZLE_FINAL                = 2,
-    MSG_ESCAPE_NOTICE               = 3
-};
+    MSG_ESCAPE_NOTICE               = 3,
+    GOSSIP_GET_MOONSTONE            = 21893
 
-#define GOSSIP_GET_MOONSTONE "Hand over the Southfury moonstone and I'll let you go."
+};
 
 Position const WPs[58] =
 {
@@ -295,7 +295,7 @@ public:
         if (player->GetQuestStatus(QUEST_CHASING_THE_MOONSTONE) != QUEST_STATUS_INCOMPLETE)
             return true;
 
-        AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        AddGossipItemFor(player, GOSSIP_GET_MOONSTONE, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
         SendGossipMenuFor(player, 10811, creature->GetGUID());
 
         return true;