[14050] Add Slot field to npc_vendor and npc_vendor_template and use …

…it to determine order of items in vendor window.
cmangos · Feb 25, 2022 · 7fdb1ea · 7fdb1ea
1 parent 825cd86
commit 7fdb1ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/sql/base/mangos.sql b/sql/base/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) DEFAULT NULL,
   `creature_ai_version` varchar(120) DEFAULT NULL,
   `cache_id` int(10) DEFAULT '0',
-  `required_14049_01_mangos_unitflags2` bit(1) DEFAULT NULL
+  `required_14050_01_mangos_npc_vendor` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Used DB version notes';
 
 --
@@ -5682,6 +5682,7 @@ CREATE TABLE `npc_vendor` (
   `item` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `incrtime` int(10) unsigned NOT NULL DEFAULT '0',
+  `slot` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
   `ExtendedCost` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `condition_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`,`item`,`ExtendedCost`)
@@ -5706,6 +5707,7 @@ CREATE TABLE `npc_vendor_template` (
   `item` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `incrtime` int(10) unsigned NOT NULL DEFAULT '0',
+  `slot` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
   `ExtendedCost` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `condition_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`,`item`,`ExtendedCost`)

diff --git a/sql/updates/mangos/14050_01_mangos_npc_vendor.sql b/sql/updates/mangos/14050_01_mangos_npc_vendor.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_14049_01_mangos_unitflags2 required_14050_01_mangos_npc_vendor bit;
+
+ALTER TABLE `npc_vendor` ADD COLUMN `slot` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `incrtime`;
+ALTER TABLE `npc_vendor_template` ADD COLUMN `slot` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `incrtime`;
diff --git a/src/game/Globals/ObjectMgr.cpp b/src/game/Globals/ObjectMgr.cpp
@@ -9573,7 +9573,7 @@ void ObjectMgr::LoadVendors(char const* tableName, bool isTemplates)
 
     std::set<uint32> skip_vendors;
 
-    QueryResult* result = WorldDatabase.PQuery("SELECT entry, item, maxcount, incrtime, ExtendedCost, condition_id FROM %s", tableName);
+    QueryResult* result = WorldDatabase.PQuery("SELECT entry, item, maxcount, incrtime, ExtendedCost, condition_id FROM %s ORDER BY slot", tableName);
     if (!result)
     {
         BarGoLink bar(1);

diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
@@ -3,5 +3,5 @@
  #define REVISION_DB_REALMD "required_14039_01_realmd_anticheat"
  #define REVISION_DB_LOGS "required_14039_01_logs_anticheat"
  #define REVISION_DB_CHARACTERS "required_14044_01_characters_extend_state"
- #define REVISION_DB_MANGOS "required_14049_01_mangos_unitflags2"
+ #define REVISION_DB_MANGOS "required_14050_01_mangos_npc_vendor"
 #endif // __REVISION_SQL_H__