From 871a47ad26230b4b2fd602db008b2338ad67fa0a Mon Sep 17 00:00:00 2001 From: P0nk Date: Wed, 2 Jul 2025 14:52:36 +0200 Subject: [PATCH] Remove duplicate Orange Mushroom drops --- database/sql/2-db_drops.sql | 27 ++++++++++++++++--------- src/main/resources/db/152-drop-data.sql | 16 --------------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/database/sql/2-db_drops.sql b/database/sql/2-db_drops.sql index 85ddaf53c8..da02d5346c 100644 --- a/database/sql/2-db_drops.sql +++ b/database/sql/2-db_drops.sql @@ -28,31 +28,40 @@ USE `cosmic`; -- Copying drops from some mobs to other versions of them INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 9300342, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 1210102; + SELECT 9300342, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 1210102; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 6300001, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 6300000; + SELECT 6300001, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 6300000; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 6300002, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 6300000; + SELECT 6300002, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 6300000; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 6400001, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 6400000; + SELECT 6400001, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 6400000; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 6130102, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 6130103; + SELECT 6130102, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 6130103; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 6230201, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 6230200; + SELECT 6230201, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 6230200; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 3000002, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 3000001; + SELECT 3000002, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 3000001; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 3000003, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 3000001; + SELECT 3000003, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 3000001; INSERT IGNORE INTO drop_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) - SELECT 3000004, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` FROM drop_data WHERE dropperid = 3000001; + SELECT 3000004, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance` + FROM drop_data WHERE dropperid = 3000001; -- Thanks to DietStory v1.02 dev team -- There are two Jr. Boogies mob ids for some unknown reason. 3230301 had no drops, but 3230300 had all the correct drops. diff --git a/src/main/resources/db/152-drop-data.sql b/src/main/resources/db/152-drop-data.sql index 3ce181661c..c8a53e7d0c 100644 --- a/src/main/resources/db/152-drop-data.sql +++ b/src/main/resources/db/152-drop-data.sql @@ -13156,45 +13156,29 @@ VALUES (5100004, 2383034, 1, 1, 0, 8000), (100133, 1072009, 1, 1, 0, 700), (100133, 1082000, 1, 1, 0, 700), (100133, 1442006, 1, 1, 0, 700), - (1210102, 4000001, 1, 1, 0, 200000), (9500102, 4000001, 1, 1, 0, 200000), (1210102, 4030001, 1, 1, 0, 10000), (9500102, 4030001, 1, 1, 0, 10000), (1210102, 4001345, 1, 1, 28170, 70000), (9500102, 4001345, 1, 1, 28170, 70000), - (1210102, 2000000, 1, 1, 0, 40000), (9500102, 2000000, 1, 1, 0, 40000), - (1210102, 2040705, 1, 1, 0, 750), (9500102, 2040705, 1, 1, 0, 750), (1210102, 2040001, 1, 1, 0, 750), (9500102, 2040001, 1, 1, 0, 750), (1210102, 2041009, 1, 1, 0, 750), (9500102, 2041009, 1, 1, 0, 750), - (1210102, 2330000, 1, 1, 0, 400), (9500102, 2330000, 1, 1, 0, 400), - (1210102, 2380007, 1, 1, 0, 8000), (9500102, 2380007, 1, 1, 0, 8000), - (1210102, 4010000, 1, 1, 0, 7000), (9500102, 4010000, 1, 1, 0, 7000), - (1210102, 4020007, 1, 1, 0, 7000), (9500102, 4020007, 1, 1, 0, 7000), - (1210102, 1312000, 1, 1, 0, 700), (9500102, 1312000, 1, 1, 0, 700), - (1210102, 1072004, 1, 1, 0, 700), (9500102, 1072004, 1, 1, 0, 700), - (1210102, 1432000, 1, 1, 0, 700), (9500102, 1432000, 1, 1, 0, 700), - (1210102, 1002043, 1, 1, 0, 700), (9500102, 1002043, 1, 1, 0, 700), - (1210102, 1432000, 1, 1, 0, 700), (9500102, 1432000, 1, 1, 0, 700), - (1210102, 1072015, 1, 1, 0, 700), (9500102, 1072015, 1, 1, 0, 700), - (1210102, 1432000, 1, 1, 0, 700), (9500102, 1432000, 1, 1, 0, 700), - (1210102, 1072031, 1, 1, 0, 700), (9500102, 1072031, 1, 1, 0, 700), - (1210102, 1052095, 1, 1, 0, 700), (9500102, 1052095, 1, 1, 0, 700), (9300274, 4000001, 1, 1, 0, 200000), (9300274, 4030001, 1, 1, 0, 10000),