Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AmoriaPQ + ItemSort fix + revamped GMShop

Browse Source 
Implemented AmoriaPQ. Fixed an issue with ItemIdSortHandler where empty
vectors given to the sorting module would cause an exception thrown,
wiping players inventory items. Thanks to Vcoc, revamped shop data for
GMShop (shop id 1337). Mount quest for explorers now uses event script.
This commit is contained in:
ronancpl
2017-09-15 21:32:15 -03:00
parent 6abbc2947e
commit 1ffcf47f79
133 changed files with 63565 additions and 60865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/db_database.sql
+32 -22
View File
@@ -20689,27 +20689,27 @@ INSERT INTO `shopitems` (`shopitemid`, `shopid`, `itemid`, `price`, `pitch`, `po
(6510, 1337, 1902001, 1, 0, 32),
(6511, 1337, 1902002, 1, 0, 33),
(6512, 1337, 2044503, 1, 0, 34),
(6513, 1337, 2044703, 1, 0, 35),
(6514, 1337, 2044603, 1, 0, 36),
(6515, 1337, 2043303, 1, 0, 37),
(6516, 1337, 2043103, 1, 0, 38),
(6517, 1337, 2043203, 1, 0, 39),
(6518, 1337, 2043003, 1, 0, 40),
(6519, 1337, 2044403, 1, 0, 41),
(6520, 1337, 2044303, 1, 0, 42),
(6521, 1337, 2043803, 1, 0, 43),
(6522, 1337, 2044103, 1, 0, 44),
(6523, 1337, 2044203, 1, 0, 45),
(6524, 1337, 2044003, 1, 0, 46),
(6525, 1337, 2043703, 1, 0, 47),
(6526, 1337, 2040807, 1, 0, 48),
(6527, 1337, 2040806, 1, 0, 49),
(6528, 1337, 2040007, 1, 0, 50),
(6529, 1337, 2040506, 1, 0, 51),
(6530, 1337, 2040710, 1, 0, 52),
(6531, 1337, 2040711, 1, 0, 53),
(6532, 1337, 2340000, 1, 0, 54),
(20020, 1337, 1082149, 1, 0, 54),
(6513, 1337, 2044703, 1, 0, 44),
(6514, 1337, 2044603, 1, 0, 45),
(6515, 1337, 2043303, 1, 0, 46),
(6516, 1337, 2043103, 1, 0, 47),
(6517, 1337, 2043203, 1, 0, 48),
(6518, 1337, 2043003, 1, 0, 49),
(6519, 1337, 2044403, 1, 0, 50),
(6520, 1337, 2044303, 1, 0, 51),
(6521, 1337, 2043803, 1, 0, 52),
(6522, 1337, 2044103, 1, 0, 53),
(6523, 1337, 2044203, 1, 0, 54),
(6524, 1337, 2044003, 1, 0, 55),
(6525, 1337, 2043703, 1, 0, 56),
(6526, 1337, 2040807, 1, 0, 57),
(6527, 1337, 2040806, 1, 0, 58),
(6528, 1337, 2040007, 1, 0, 59),
(6529, 1337, 2040506, 1, 0, 60),
(6530, 1337, 2040710, 1, 0, 61),
(6531, 1337, 2040711, 1, 0, 62),
(6532, 1337, 2340000, 1, 0, 63),
(20020, 1337, 1082149, 1, 0, 64),
(6533, 9000069, 2022503, 0, 5, 1),
(6534, 9000069, 2000004, 0, 5, 2),
(6535, 9000069, 2022514, 0, 10, 3),
@@ -21222,7 +21222,17 @@ INSERT INTO `shopitems` ( `shopid`, `itemid`, `price`, `position`) VALUES
(1052116, 2000002, 320, 212),
(1052116, 2000001, 160, 216),
(1052116, 2000000, 50, 220),
(9120002, 2061003, 40, 100);
(9120002, 2061003, 40, 100),
(2030009, 2022001, 700, 100),
(1337, 1912005, 1, 35),
(1337, 1902005, 1, 36),
(1337, 1902006, 1, 37),
(1337, 1902007, 1, 38),
(1337, 1912011, 1, 39),
(1337, 1902015, 1, 40),
(1337, 1902016, 1, 41),
(1337, 1902017, 1, 42),
(1337, 1902018, 1, 43);
CREATE TABLE IF NOT EXISTS `skillmacros` (
`id` int(11) NOT NULL AUTO_INCREMENT,
sql/db_drops.sql
+304 -4
View File
@@ -4527,7 +4527,7 @@ USE `maplesolaxia`;
(9410020, 1002177, 1, 1, 0, 700),
(3230405, 1082192, 1, 1, 0, 700),
(9410020, 1082192, 1, 1, 0, 700),
(9400515, 4031593, 1, 1, 0, 7000),
(9400515, 4031593, 1, 1, 0, 40000),
(3110303, 4000356, 1, 1, 0, 200000),
(3110303, 2000002, 1, 1, 0, 40000),
(3110303, 2000003, 1, 1, 0, 40000),
@@ -5205,7 +5205,7 @@ USE `maplesolaxia`;
(4230201, 1051037, 1, 1, 0, 700),
(4230201, 1041074, 1, 1, 0, 700),
(4230201, 1061077, 1, 1, 0, 700),
(9400516, 4031593, 1, 1, 0, 7000),
(9400516, 4031593, 1, 1, 0, 40000),
(4230500, 4000276, 1, 1, 0, 200000),
(4230500, 4000021, 1, 1, 0, 200000),
(4230500, 4130014, 1, 1, 0, 3000),
@@ -19820,8 +19820,10 @@ USE `maplesolaxia`;
DELETE FROM temp_data WHERE dropperid=4220001;
DELETE FROM temp_data WHERE dropperid=5220001;
# delete item drops from summoned Slimes
# delete item drops from summoned mobs
DELETE FROM temp_data WHERE dropperid=9500100;
DELETE FROM temp_data WHERE dropperid=9300103;
DELETE FROM temp_data WHERE dropperid=9300104;
# delete item drops from Dojo summoned mobs
DELETE FROM temp_data WHERE dropperid>=9300217 AND dropperid<=9300270;
@@ -20513,7 +20515,21 @@ USE `maplesolaxia`;
(4300012, 2049200, 1, 1, 0, 8000),
(4300012, 2049202, 1, 1, 0, 8000),
(4300012, 2049204, 1, 1, 0, 8000),
(4300012, 2049206, 1, 1, 0, 8000);
(4300012, 2049206, 1, 1, 0, 8000),
(9400514, 4031594, 1, 1, 0, 999999),
(9400518, 4031596, 1, 1, 0, 999999),
(9400523, 4031597, 1, 1, 0, 999999),
(9400524, 4031597, 1, 1, 0, 999999),
(9400525, 4031597, 1, 1, 0, 999999),
(9400526, 4031597, 1, 1, 0, 999999),
(9400527, 4031597, 1, 1, 0, 999999),
(9400528, 4031597, 1, 1, 0, 999999),
(9400529, 4031597, 1, 1, 0, 999999),
(9400530, 4031597, 1, 1, 0, 999999),
(9400531, 4031597, 1, 1, 0, 999999),
(9400532, 4031597, 1, 1, 0, 999999),
(9400533, 4031597, 1, 1, 0, 999999),
(9400534, 4031597, 1, 1, 0, 999999);
# update quest reactor items
UPDATE reactordrops SET questid=2086 WHERE itemid=4031165;
@@ -20529,6 +20545,290 @@ USE `maplesolaxia`;
UPDATE reactordrops SET questid=1008 WHERE itemid=4031161;
UPDATE reactordrops SET questid=1008 WHERE itemid=4031162;
# update Amoria PQ reward boxes
DELETE FROM `reactordrops` WHERE `reactorid` >= 6702003 AND `reactorid` <= 6702012;
INSERT INTO `reactordrops` (`reactorid`, `itemid`, `chance`, `questid`) VALUES
(6702003, 1032043, 25, -1),
(6702003, 1032044, 25, -1),
(6702003, 1032045, 25, -1),
(6702003, 1102099, 30, -1),
(6702003, 1102100, 30, -1),
(6702003, 4021007, 20, -1),
(6702003, 4021008, 20, -1),
(6702003, 4020007, 5, -1),
(6702003, 4020007, 5, -1),
(6702003, 4011006, 20, -1),
(6702003, 2040759, 50, -1),
(6702003, 2041035, 20, -1),
(6702003, 2041037, 20, -1),
(6702003, 2041039, 20, -1),
(6702003, 2041041, 20, -1),
(6702003, 2040005, 20, -1),
(6702003, 2000005, 5, -1),
(6702003, 2022179, 15, -1),
(6702003, 2022180, 5, -1),
(6702003, 2022181, 10, -1),
(6702003, 2022182, 10, -1),
(6702003, 2020020, 5, -1),
(6702003, 2000005, 5, -1),
(6702003, 2020010, 5, -1),
(6702003, 2020013, 5, -1),
(6702003, 2022015, 5, -1),
(6702003, 3010011, 50, -1),
(6702003, 3012005, 100, -1),
(6702004, 1032043, 25, -1),
(6702004, 1032044, 25, -1),
(6702004, 1032045, 25, -1),
(6702004, 1102099, 30, -1),
(6702004, 1102100, 30, -1),
(6702004, 4021007, 20, -1),
(6702004, 4021008, 20, -1),
(6702004, 4020007, 5, -1),
(6702004, 4020007, 5, -1),
(6702004, 4011006, 20, -1),
(6702004, 2040759, 50, -1),
(6702004, 2041035, 20, -1),
(6702004, 2041037, 20, -1),
(6702004, 2041039, 20, -1),
(6702004, 2041041, 20, -1),
(6702004, 2040005, 20, -1),
(6702004, 2000005, 5, -1),
(6702004, 2022179, 15, -1),
(6702004, 2022180, 5, -1),
(6702004, 2022181, 10, -1),
(6702004, 2022182, 10, -1),
(6702004, 2020020, 5, -1),
(6702004, 2000005, 5, -1),
(6702004, 2020010, 5, -1),
(6702004, 2020013, 5, -1),
(6702004, 2022015, 5, -1),
(6702004, 3010011, 50, -1),
(6702004, 3012005, 100, -1),
(6702005, 1032043, 25, -1),
(6702005, 1032044, 25, -1),
(6702005, 1032045, 25, -1),
(6702005, 1102099, 30, -1),
(6702005, 1102100, 30, -1),
(6702005, 4021007, 20, -1),
(6702005, 4021008, 20, -1),
(6702005, 4020007, 5, -1),
(6702005, 4020007, 5, -1),
(6702005, 4011006, 20, -1),
(6702005, 2040759, 50, -1),
(6702005, 2041035, 20, -1),
(6702005, 2041037, 20, -1),
(6702005, 2041039, 20, -1),
(6702005, 2041041, 20, -1),
(6702005, 2040005, 20, -1),
(6702005, 2000005, 5, -1),
(6702005, 2022179, 15, -1),
(6702005, 2022180, 5, -1),
(6702005, 2022181, 10, -1),
(6702005, 2022182, 10, -1),
(6702005, 2020020, 5, -1),
(6702005, 2000005, 5, -1),
(6702005, 2020010, 5, -1),
(6702005, 2020013, 5, -1),
(6702005, 2022015, 5, -1),
(6702005, 3010011, 50, -1),
(6702005, 3012005, 100, -1),
(6702006, 1032043, 25, -1),
(6702006, 1032044, 25, -1),
(6702006, 1032045, 25, -1),
(6702006, 1102099, 30, -1),
(6702006, 1102100, 30, -1),
(6702006, 4021007, 20, -1),
(6702006, 4021008, 20, -1),
(6702006, 4020007, 5, -1),
(6702006, 4020007, 5, -1),
(6702006, 4011006, 20, -1),
(6702006, 2040759, 50, -1),
(6702006, 2041035, 20, -1),
(6702006, 2041037, 20, -1),
(6702006, 2041039, 20, -1),
(6702006, 2041041, 20, -1),
(6702006, 2040005, 20, -1),
(6702006, 2000005, 5, -1),
(6702006, 2022179, 15, -1),
(6702006, 2022180, 5, -1),
(6702006, 2022181, 10, -1),
(6702006, 2022182, 10, -1),
(6702006, 2020020, 5, -1),
(6702006, 2000005, 5, -1),
(6702006, 2020010, 5, -1),
(6702006, 2020013, 5, -1),
(6702006, 2022015, 5, -1),
(6702006, 3010011, 50, -1),
(6702006, 3012005, 100, -1),
(6702007, 1032043, 25, -1),
(6702007, 1032044, 25, -1),
(6702007, 1032045, 25, -1),
(6702007, 1102099, 30, -1),
(6702007, 1102100, 30, -1),
(6702007, 4021007, 20, -1),
(6702007, 4021008, 20, -1),
(6702007, 4020007, 5, -1),
(6702007, 4020007, 5, -1),
(6702007, 4011006, 20, -1),
(6702007, 2040759, 50, -1),
(6702007, 2041035, 20, -1),
(6702007, 2041037, 20, -1),
(6702007, 2041039, 20, -1),
(6702007, 2041041, 20, -1),
(6702007, 2040005, 20, -1),
(6702007, 2000005, 5, -1),
(6702007, 2022179, 15, -1),
(6702007, 2022180, 5, -1),
(6702007, 2022181, 10, -1),
(6702007, 2022182, 10, -1),
(6702007, 2020020, 5, -1),
(6702007, 2000005, 5, -1),
(6702007, 2020010, 5, -1),
(6702007, 2020013, 5, -1),
(6702007, 2022015, 5, -1),
(6702007, 3010011, 50, -1),
(6702007, 3012005, 100, -1),
(6702008, 1032043, 25, -1),
(6702008, 1032044, 25, -1),
(6702008, 1032045, 25, -1),
(6702008, 1102099, 30, -1),
(6702008, 1102100, 30, -1),
(6702008, 4021007, 20, -1),
(6702008, 4021008, 20, -1),
(6702008, 4020007, 5, -1),
(6702008, 4020007, 5, -1),
(6702008, 4011006, 20, -1),
(6702008, 2040759, 50, -1),
(6702008, 2041035, 20, -1),
(6702008, 2041037, 20, -1),
(6702008, 2041039, 20, -1),
(6702008, 2041041, 20, -1),
(6702008, 2040005, 20, -1),
(6702008, 2000005, 5, -1),
(6702008, 2022179, 15, -1),
(6702008, 2022180, 5, -1),
(6702008, 2022181, 10, -1),
(6702008, 2022182, 10, -1),
(6702008, 2020020, 5, -1),
(6702008, 2000005, 5, -1),
(6702008, 2020010, 5, -1),
(6702008, 2020013, 5, -1),
(6702008, 2022015, 5, -1),
(6702008, 3010011, 50, -1),
(6702008, 3012005, 100, -1),
(6702009, 1032043, 25, -1),
(6702009, 1032044, 25, -1),
(6702009, 1032045, 25, -1),
(6702009, 1102099, 30, -1),
(6702009, 1102100, 30, -1),
(6702009, 4021007, 20, -1),
(6702009, 4021008, 20, -1),
(6702009, 4020007, 5, -1),
(6702009, 4020007, 5, -1),
(6702009, 4011006, 20, -1),
(6702009, 2040759, 50, -1),
(6702009, 2041035, 20, -1),
(6702009, 2041037, 20, -1),
(6702009, 2041039, 20, -1),
(6702009, 2041041, 20, -1),
(6702009, 2040005, 20, -1),
(6702009, 2000005, 5, -1),
(6702009, 2022179, 15, -1),
(6702009, 2022180, 5, -1),
(6702009, 2022181, 10, -1),
(6702009, 2022182, 10, -1),
(6702009, 2020020, 5, -1),
(6702009, 2000005, 5, -1),
(6702009, 2020010, 5, -1),
(6702009, 2020013, 5, -1),
(6702009, 2022015, 5, -1),
(6702009, 3010011, 50, -1),
(6702009, 3012005, 100, -1),
(6702010, 1032043, 25, -1),
(6702010, 1032044, 25, -1),
(6702010, 1032045, 25, -1),
(6702010, 1102099, 30, -1),
(6702010, 1102100, 30, -1),
(6702010, 4021007, 20, -1),
(6702010, 4021008, 20, -1),
(6702010, 4020007, 5, -1),
(6702010, 4020007, 5, -1),
(6702010, 4011006, 20, -1),
(6702010, 2040759, 50, -1),
(6702010, 2041035, 20, -1),
(6702010, 2041037, 20, -1),
(6702010, 2041039, 20, -1),
(6702010, 2041041, 20, -1),
(6702010, 2040005, 20, -1),
(6702010, 2000005, 5, -1),
(6702010, 2022179, 15, -1),
(6702010, 2022180, 5, -1),
(6702010, 2022181, 10, -1),
(6702010, 2022182, 10, -1),
(6702010, 2020020, 5, -1),
(6702010, 2000005, 5, -1),
(6702010, 2020010, 5, -1),
(6702010, 2020013, 5, -1),
(6702010, 2022015, 5, -1),
(6702010, 3010011, 50, -1),
(6702010, 3012005, 100, -1),
(6702011, 1032043, 25, -1),
(6702011, 1032044, 25, -1),
(6702011, 1032045, 25, -1),
(6702011, 1102099, 30, -1),
(6702011, 1102100, 30, -1),
(6702011, 4021007, 20, -1),
(6702011, 4021008, 20, -1),
(6702011, 4020007, 5, -1),
(6702011, 4020007, 5, -1),
(6702011, 4011006, 20, -1),
(6702011, 2040759, 50, -1),
(6702011, 2041035, 20, -1),
(6702011, 2041037, 20, -1),
(6702011, 2041039, 20, -1),
(6702011, 2041041, 20, -1),
(6702011, 2040005, 20, -1),
(6702011, 2000005, 5, -1),
(6702011, 2022179, 15, -1),
(6702011, 2022180, 5, -1),
(6702011, 2022181, 10, -1),
(6702011, 2022182, 10, -1),
(6702011, 2020020, 5, -1),
(6702011, 2000005, 5, -1),
(6702011, 2020010, 5, -1),
(6702011, 2020013, 5, -1),
(6702011, 2022015, 5, -1),
(6702011, 3010011, 50, -1),
(6702011, 3012005, 100, -1),
(6702012, 1032043, 25, -1),
(6702012, 1032044, 25, -1),
(6702012, 1032045, 25, -1),
(6702012, 1102099, 30, -1),
(6702012, 1102100, 30, -1),
(6702012, 4021007, 20, -1),
(6702012, 4021008, 20, -1),
(6702012, 4020007, 5, -1),
(6702012, 4020007, 5, -1),
(6702012, 4011006, 20, -1),
(6702012, 2040759, 50, -1),
(6702012, 2041035, 20, -1),
(6702012, 2041037, 20, -1),
(6702012, 2041039, 20, -1),
(6702012, 2041041, 20, -1),
(6702012, 2040005, 20, -1),
(6702012, 2000005, 5, -1),
(6702012, 2022179, 15, -1),
(6702012, 2022180, 5, -1),
(6702012, 2022181, 10, -1),
(6702012, 2022182, 10, -1),
(6702012, 2020020, 5, -1),
(6702012, 2000005, 5, -1),
(6702012, 2020010, 5, -1),
(6702012, 2020013, 5, -1),
(6702012, 2022015, 5, -1),
(6702012, 3010011, 50, -1),
(6702012, 3012005, 100, -1);
INSERT INTO `reactordrops` (`reactorid`, `itemid`, `chance`, `questid`) VALUES
(9102000, 4031157, 1, 2074),
(9102001, 4031158, 1, 2074),
sql/db_shopupdate.sql
+92 -2
View File
@@ -94,7 +94,6 @@ INSERT IGNORE INTO `shopitems` (`shopid`, `itemid`, `price`, `pitch`, `position`
(9110002, 3010019, 7700000, 0, 92),
(9110002, 3010008, 10000000, 0, 96),
(9110002, 3010007, 10000000, 0, 100),
(9201020, 3010011, 12000000, 0, 92),
(9201020, 3010009, 4200000, 0, 96),
(9201020, 3010014, 7000000, 0, 100),
(1081000, 3010013, 4000000, 0, 100);
@@ -131,4 +130,95 @@ INSERT IGNORE INTO `shopitems` (`shopid`, `itemid`, `price`, `pitch`, `position`
(1338, 2030100, 450, 0, 114),
(9270057, 2030100, 450, 0, 4),
(9270065, 2030100, 450, 0, 3),
(9270022, 2030100, 450, 0, 118);
(9270022, 2030100, 450, 0, 118);
# Thanks to Vcoc
# GMShop: Sacks, GmEquip, Cheese & Onix, Utils,
# Arrows, Bullets, Throwings and Capsules,
# Others, Equips, Mounts, Scrolls.
DELETE FROM `shopitems` WHERE `shopid`=1337;
INSERT INTO `shopitems` ( `shopid`, `itemid`, `price`, `position`) VALUES
(1337, 2100036, 1, 1),
(1337, 2100035, 1, 2),
(1337, 2100034, 1, 3),
(1337, 2100033, 1, 4),
(1337, 2100007, 1, 5),
(1337, 2100006, 1, 6),
(1337, 2100005, 1, 7),
(1337, 2100004, 1, 8),
(1337, 2100003, 1, 9),
(1337, 2100002, 1, 10),
(1337, 2100001, 1, 11),
(1337, 1002140, 1, 12),
(1337, 1042003, 1, 13),
(1337, 1062007, 1, 14),
(1337, 1322013, 1, 15),
(1337, 1072010, 1, 16),
(1337, 2022179, 1, 17),
(1337, 2022273, 1, 18),
(1337, 2041200, 1, 19),
(1337, 4006001, 1, 20),
(1337, 4001017, 1, 21),
(1337, 4031179, 1, 22),
(1337, 2070018, 1, 23),
(1337, 2060004, 1, 24),
(1337, 2061004, 1, 25),
(1337, 2330005, 1, 26),
(1337, 2332000, 1, 27),
(1337, 2331000, 1, 28),
(1337, 5072000, 1, 29),
(1337, 5390000, 1, 30),
(1337, 5390001, 1, 31),
(1337, 5390002, 1, 32),
(1337, 5390005, 1, 33),
(1337, 5390006, 1, 34),
(1337, 1492013, 1, 35),
(1337, 1482013, 1, 36),
(1337, 1452044, 1, 37),
(1337, 1472052, 1, 38),
(1337, 1462039, 1, 39),
(1337, 1332050, 1, 40),
(1337, 1312031, 1, 41),
(1337, 1322052, 1, 42),
(1337, 1302059, 1, 43),
(1337, 1442045, 1, 44),
(1337, 1432038, 1, 45),
(1337, 1382036, 1, 46),
(1337, 1412026, 1, 47),
(1337, 1422028, 1, 48),
(1337, 1402036, 1, 49),
(1337, 1372032, 1, 50),
(1337, 1122000, 1, 51),
(1337, 1082149, 1, 52),
(1337, 1912000, 1, 53),
(1337, 1902000, 1, 54),
(1337, 1902001, 1, 55),
(1337, 1902002, 1, 56),
(1337, 1912005, 1, 57),
(1337, 1902005, 1, 58),
(1337, 1902006, 1, 59),
(1337, 1902007, 1, 60),
(1337, 1912011, 1, 61),
(1337, 1902015, 1, 62),
(1337, 1902016, 1, 63),
(1337, 1902017, 1, 64),
(1337, 1902018, 1, 65),
(1337, 2044908, 1, 66),
(1337, 2044815, 1, 67),
(1337, 2044512, 1, 68),
(1337, 2044712, 1, 69),
(1337, 2044612, 1, 70),
(1337, 2043312, 1, 71),
(1337, 2043117, 1, 72),
(1337, 2043217, 1, 73),
(1337, 2043023, 1, 74),
(1337, 2044417, 1, 75),
(1337, 2044317, 1, 76),
(1337, 2043812, 1, 77),
(1337, 2044117, 1, 78),
(1337, 2044217, 1, 79),
(1337, 2044025, 1, 80),
(1337, 2043712, 1, 81),
(1337, 2340000, 1, 82),
(1337, 2040807, 1, 83);