Core/DB2: Update GossipNpcOption field names

4 files changed, 30 insertions, 21 deletions

diff --git a/sql/updates/hotfixes/3.4.x/2023_11_23_01_hotfixes.sql b/sql/updates/hotfixes/3.4.x/2023_11_23_01_hotfixes.sql
new file mode 100644
index 00000000000..7d5941f0dbb
--- /dev/null
+++ b/sql/updates/hotfixes/3.4.x/2023_11_23_01_hotfixes.sql
@@ -0,0 +1,10 @@
+ALTER TABLE `gossip_npc_option`
+CHANGE COLUMN `Field34146722002` `Unk341_1` INT(10) NOT NULL DEFAULT '0' AFTER `LFGDungeonsID`,
+CHANGE COLUMN `Field34146722003` `Unk341_2` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_1`,
+CHANGE COLUMN `Field34146722004` `Unk341_3` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_2`,
+CHANGE COLUMN `Field34146722005` `Unk341_4` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_3`,
+CHANGE COLUMN `Field34146722006` `Unk341_5` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_4`,
+CHANGE COLUMN `Field34146722007` `Unk341_6` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_5`,
+CHANGE COLUMN `Field34146722008` `Unk341_7` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_6`,
+CHANGE COLUMN `Field34146722009` `Unk341_8` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_7`,
+CHANGE COLUMN `Field34146722010` `Unk341_9` INT(10) NOT NULL DEFAULT '0' AFTER `Unk341_8`;
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index 6cdea6df445..c5f1b720b3d 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -722,9 +722,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_GLYPH_REQUIRED_SPEC, "SELECT MAX(ID) + 1 FROM glyph_required_spec", CONNECTION_SYNCH);
 
     // GossipNpcOption.db2
-    PrepareStatement(HOTFIX_SEL_GOSSIP_NPC_OPTION, "SELECT ID, GossipNpcOption, LFGDungeonsID, Field34146722002, Field34146722003, Field34146722004, "
-        "Field34146722005, Field34146722006, Field34146722007, Field34146722008, Field34146722009, Field34146722010, GossipOptionID"
-        " FROM gossip_npc_option WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+    PrepareStatement(HOTFIX_SEL_GOSSIP_NPC_OPTION, "SELECT ID, GossipNpcOption, LFGDungeonsID, Unk341_1, Unk341_2, Unk341_3, Unk341_4, Unk341_5, Unk341_6, "
+        "Unk341_7, Unk341_8, Unk341_9, GossipOptionID FROM gossip_npc_option WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_GOSSIP_NPC_OPTION, "SELECT MAX(ID) + 1 FROM gossip_npc_option", CONNECTION_SYNCH);
 
     // GuildColorBackground.db2
diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index 026c4f89580..6cb7a4124e2 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -2219,15 +2219,15 @@ struct GossipNpcOptionLoadInfo
         { false, FT_INT, "ID" },
         { true, FT_INT, "GossipNpcOption" },
         { true, FT_INT, "LFGDungeonsID" },
-        { true, FT_INT, "Field34146722002" },
-        { true, FT_INT, "Field34146722003" },
-        { true, FT_INT, "Field34146722004" },
-        { true, FT_INT, "Field34146722005" },
-        { true, FT_INT, "Field34146722006" },
-        { true, FT_INT, "Field34146722007" },
-        { true, FT_INT, "Field34146722008" },
-        { true, FT_INT, "Field34146722009" },
-        { true, FT_INT, "Field34146722010" },
+        { true, FT_INT, "Unk341_1" },
+        { true, FT_INT, "Unk341_2" },
+        { true, FT_INT, "Unk341_3" },
+        { true, FT_INT, "Unk341_4" },
+        { true, FT_INT, "Unk341_5" },
+        { true, FT_INT, "Unk341_6" },
+        { true, FT_INT, "Unk341_7" },
+        { true, FT_INT, "Unk341_8" },
+        { true, FT_INT, "Unk341_9" },
         { true, FT_INT, "GossipOptionID" },
     };
 
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 79b80d66581..5f2bc8b7d3f 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -1862,15 +1862,15 @@ struct GossipNPCOptionEntry
     uint32 ID;
     int32 GossipNpcOption;
     int32 LFGDungeonsID;
-    int32 Field34146722002;
-    int32 Field34146722003;
-    int32 Field34146722004;
-    int32 Field34146722005;
-    int32 Field34146722006;
-    int32 Field34146722007;
-    int32 Field34146722008;
-    int32 Field34146722009;
-    int32 Field34146722010;
+    int32 Unk341_1;
+    int32 Unk341_2;
+    int32 Unk341_3;
+    int32 Unk341_4;
+    int32 Unk341_5;
+    int32 Unk341_6;
+    int32 Unk341_7;
+    int32 Unk341_8;
+    int32 Unk341_9;
     int32 GossipOptionID;
 };