aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-08-26 15:02:22 +0200
committerOvahlord <dreadkiller@gmx.de>2024-08-27 17:20:43 +0200
commit18ae1540b53072c5fe10eaa80d96fed3a2e2c9a2 (patch)
tree52e3aa4ad56cdbd908fec5c9b4d239eacbf4df9d /sql
parenta3c66fe0b870f9ccb0225d307b2b190a60d5c0ef (diff)
Core/Loot: Implemented currency loot
(cherry picked from commit 3e28ee080a1cf3c7cd332a8d1e0808505b4ea9d4) # Conflicts: # sql/base/characters_database.sql # sql/updates/auth/cata_classic/2024_08_26_00_characters.sql # sql/updates/world/cata_classic/2024_08_26_00_world.sql # src/server/game/Entities/Player/Player.cpp # src/server/game/Loot/Loot.cpp # src/server/scripts/ExilesReach/zone_exiles_reach.cpp
Diffstat (limited to 'sql')
-rw-r--r--sql/base/characters_database.sql6
-rw-r--r--sql/updates/characters/cata_classic/2024_08_27_00_characters_2024_08_26_00_characters.sql3
-rw-r--r--sql/updates/world/cata_classic/2024_08_27_01_world_2024_08_26_00_world.sql3
3 files changed, 10 insertions, 2 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 35e3138b430..c4d6e126c41 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2702,6 +2702,7 @@ DROP TABLE IF EXISTS `item_loot_items`;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `item_loot_items` (
`container_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'guid of container (item_instance.guid)',
+ `item_type` tinyint NOT NULL DEFAULT '0' COMMENT 'item or currency',
`item_id` int unsigned NOT NULL DEFAULT '0' COMMENT 'loot item entry (item_instance.itemEntry)',
`item_count` int NOT NULL DEFAULT '0' COMMENT 'stack size',
`item_index` int unsigned NOT NULL DEFAULT '0',
@@ -2714,7 +2715,7 @@ CREATE TABLE `item_loot_items` (
`rnd_bonus` int unsigned NOT NULL DEFAULT '0' COMMENT 'random bonus list added when originally rolled',
`context` tinyint unsigned NOT NULL DEFAULT '0',
`bonus_list_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'Space separated list of bonus list ids',
- PRIMARY KEY (`container_id`,`item_id`)
+ PRIMARY KEY (`container_id`,`item_type`,`item_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -3434,7 +3435,8 @@ INSERT INTO `updates` VALUES
('2024_06_05_00_characters.sql','3BE1839524918827D4C0C8F9FBE9890CDF759FB4','RELEASED','2024-06-05 21:44:36',0),
('2024_06_25_00_characters.sql','046AC59E8B828B0C81A1A3C79860E464D96228B8','RELEASED','2024-06-25 17:56:15',0),
('2024_07_27_00_characters.sql','912ADCAC4948C75386387251D6FAEFB841574606','RELEASED','2024-07-27 01:03:05',0),
-('2024_07_28_00_characters.sql','22C94D231C155686691780B65C12FCC2B4C3A6AA','RELEASED','2024-07-28 00:59:04',0);
+('2024_07_28_00_characters.sql','22C94D231C155686691780B65C12FCC2B4C3A6AA','RELEASED','2024-07-28 00:59:04',0),
+('2024_08_27_00_characters_2024_08_26_00_characters.sql','68EEBE1D639D59B24F5121008C2D103CA67FFC9A','RELEASED','2024-08-27 17:15:49',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/updates/characters/cata_classic/2024_08_27_00_characters_2024_08_26_00_characters.sql b/sql/updates/characters/cata_classic/2024_08_27_00_characters_2024_08_26_00_characters.sql
new file mode 100644
index 00000000000..dedde7070ec
--- /dev/null
+++ b/sql/updates/characters/cata_classic/2024_08_27_00_characters_2024_08_26_00_characters.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `item_loot_items` ADD `item_type` tinyint NOT NULL DEFAULT 0 COMMENT 'item or currency' AFTER `container_id`;
+ALTER TABLE `item_loot_items` DROP PRIMARY KEY;
+ALTER TABLE `item_loot_items` ADD PRIMARY KEY (`container_id`,`item_type`,`item_id`);
diff --git a/sql/updates/world/cata_classic/2024_08_27_01_world_2024_08_26_00_world.sql b/sql/updates/world/cata_classic/2024_08_27_01_world_2024_08_26_00_world.sql
new file mode 100644
index 00000000000..1a466256697
--- /dev/null
+++ b/sql/updates/world/cata_classic/2024_08_27_01_world_2024_08_26_00_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=296;
+INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
+(296,'├%.*s %dx |c%08x|Hcurrency:%d:%d|h[%s]|h|r (#%05d)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);