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

Alliances & Pet autopot improvement + Crafters patch

Browse Source 
Improved Alliance invitations now using "invite popups" just like buddy, party and guild invites.
Pet autopot now properly uses up pots from the inventory, fetching from other inventory slots when one place has been completely used up but the "stop criteria" hasn't been fulfilled yet.
Pet autopot now properly detects pots with healing factor defined by the character's pool.
Fixed old exploit with mineral/jewel crafters.
Patched Doorway's questlines.
This commit is contained in:
ronancpl
2018-01-16 15:34:52 -02:00
parent 346d39c03a
commit f74dfbb46a
40 changed files with 619 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/db_database.sql
+4 -4
View File
@@ -3748,7 +3748,7 @@ INSERT IGNORE INTO `temp_data` (`id`, `dropperid`, `itemid`, `minimum_quantity`,
(3530, 4240000, 4004003, 1, 1, 0, 10000),
(3531, 4240000, 2043801, 1, 1, 0, 300),
(3532, 4240000, 4006001, 1, 1, 0, 10000),
(3533, 4240000, 4021009, 1, 1, 0, 9000),
(3533, 4240000, 4021009, 1, 1, 0, 7000),
(3534, 4240000, 1322016, 1, 1, 0, 700),
(3535, 4240000, 1041074, 1, 1, 0, 800),
(3536, 4240000, 1061069, 1, 1, 0, 800),
@@ -4123,7 +4123,7 @@ INSERT IGNORE INTO `temp_data` (`id`, `dropperid`, `itemid`, `minimum_quantity`,
(3904, 5120100, 4020001, 1, 1, 0, 90000),
(3905, 5120100, 4010006, 1, 1, 0, 90000),
(3906, 5120100, 4020007, 1, 1, 0, 90000),
(3907, 5120100, 4011007, 1, 1, 0, 30000),
(3907, 5120100, 4011007, 1, 1, 0, 7000),
(3908, 5120100, 2044602, 1, 1, 0, 3000),
(3909, 5120100, 1041082, 1, 1, 0, 8000),
(3910, 5120100, 1061081, 1, 1, 0, 8000),
@@ -16675,8 +16675,8 @@ INSERT INTO `reactordrops` (`reactordropid`, `reactorid`, `itemid`, `chance`, `q
(125, 1022001, 4032319, 7, -1),
(126, 1022002, 4001340, 1, 28167),
(127, 1202000, 4001366, 1, 28194),
(128, 1202003, 4001346, 1, 28225),
(129, 1202004, 4001346, 1, 28225),
(128, 1202003, 4001346, 3, 28225),
(129, 1202004, 4001346, 3, 28225),
(130, 1032000, 4032362, 1, 28252),
(131, 1032000, 4032363, 1, 28252),
(132, 1202004, 4032494, 1, 28255),
sql/db_drops.sql
+80 -32
View File
@@ -96,8 +96,8 @@ USE `heavenms`;
(9300219, 4000003, 1, 1, 0, 200000),
(130100, 4030009, 1, 1, 0, 10000),
(9300219, 4030009, 1, 1, 0, 10000),
(130100, 4001358, 1, 1, 0, 7000),
(9300219, 4001358, 1, 1, 0, 7000),
(130100, 4001358, 1, 1, 0, 20000),
(9300219, 4001358, 1, 1, 0, 20000),
(130100, 2000000, 1, 1, 0, 40000),
(9300219, 2000000, 1, 1, 0, 40000),
(130100, 2040402, 1, 1, 0, 750),
@@ -130,8 +130,8 @@ USE `heavenms`;
(9300219, 1482001, 1, 1, 0, 700),
(130101, 4000016, 1, 1, 0, 200000),
(9300218, 4000016, 1, 1, 0, 200000),
(130101, 4001359, 1, 1, 0, 7000),
(9300218, 4001359, 1, 1, 0, 7000),
(130101, 4001359, 1, 1, 0, 24000),
(9300218, 4001359, 1, 1, 0, 24000),
(130101, 2000000, 1, 1, 0, 40000),
(9300218, 2000000, 1, 1, 0, 40000),
(130101, 2040502, 1, 1, 0, 750),
@@ -568,7 +568,7 @@ USE `heavenms`;
(1110101, 4030009, 1, 1, 0, 10000),
(1110101, 4001344, 1, 1, 0, 7000),
(1110101, 4001356, 1, 1, 0, 7000),
(1110101, 4001360, 1, 1, 0, 7000),
(1110101, 4001360, 1, 1, 0, 12000),
(1110101, 2000000, 1, 1, 0, 40000),
(1110101, 2040802, 1, 1, 0, 750),
(1110101, 2380008, 1, 1, 0, 0),
@@ -2064,26 +2064,8 @@ USE `heavenms`;
(9300221, 1061054, 1, 1, 0, 700),
(2100103, 1072291, 1, 1, 0, 700),
(9300221, 1072291, 1, 1, 0, 700),
(9400609, 2000003, 1, 4, 0, 40000),
(9400609, 2000002, 1, 4, 0, 40000),
(9400609, 2002004, 1, 4, 0, 10000),
(9400609, 4010000, 1, 1, 0, 7000),
(9400609, 4010004, 1, 1, 0, 7000),
(9400609, 4010002, 1, 1, 0, 7000),
(9400609, 4010001, 1, 1, 0, 7000),
(9400610, 2000002, 1, 4, 0, 40000),
(9400623, 2000002, 1, 4, 0, 40000),
(9400610, 4010002, 1, 1, 0, 7000),
(9400623, 4010002, 1, 1, 0, 7000),
(9400612, 4020000, 1, 1, 0, 7000),
(9400612, 4010001, 1, 1, 0, 7000),
(9400612, 4010002, 1, 1, 0, 7000),
(9400612, 2000003, 1, 4, 0, 40000),
(9400612, 2000002, 1, 4, 0, 40000),
(9400612, 4010000, 1, 1, 0, 7000),
(9400612, 1082257, 1, 1, 0, 40000),
(9400612, 1003032, 1, 1, 0, 40000),
(9400612, 1072420, 1, 1, 0, 40000),
(2230112, 4000020, 1, 1, 0, 200000),
(2230112, 4003004, 1, 1, 0, 7000),
(2230112, 4000021, 1, 1, 0, 200000),
@@ -7679,10 +7661,10 @@ USE `heavenms`;
(9400502, 1072303, 1, 1, 0, 40000),
(9500121, 1072303, 1, 1, 0, 700),
(9500156, 1072303, 1, 1, 0, 700),
(4240000, 4021009, 1, 1, 0, 7000),
(9300334, 4021009, 1, 1, 0, 7000),
(9500122, 4021009, 1, 1, 0, 7000),
(9500369, 4021009, 1, 1, 0, 7000),
(4240000, 4021009, 1, 1, 0, 5000),
(9300334, 4021009, 1, 1, 0, 5000),
(9500122, 4021009, 1, 1, 0, 5000),
(9500369, 4021009, 1, 1, 0, 5000),
(4240000, 4130015, 1, 1, 0, 3000),
(9300334, 4130015, 1, 1, 0, 3000),
(9500122, 4130015, 1, 1, 0, 3000),
@@ -8453,7 +8435,7 @@ USE `heavenms`;
(9420505, 1041014, 1, 1, 0, 700),
(9420505, 1041065, 1, 1, 0, 700),
(9420505, 1061070, 1, 1, 0, 700),
(5120100, 4011007, 1, 1, 0, 7000),
(5120100, 4011007, 1, 1, 0, 5000),
(5120100, 2000002, 1, 4, 0, 40000),
(5120100, 2000004, 1, 4, 0, 40000),
(5120100, 2002010, 1, 4, 0, 10000),
@@ -19962,7 +19944,71 @@ USE `heavenms`;
(1110100, 4032317, 1, 1, 21717, 20000),
(1110130, 4032317, 1, 1, 21717, 20000),
(1110100, 4032318, 1, 1, 21718, 20000),
(1110130, 4032318, 1, 1, 21718, 20000);
(1110130, 4032318, 1, 1, 21718, 20000),
(9400204, 4130020, 1, 1, 0, 3000),
(9400614, 4001341, 1, 1, 28172, 15000),
(9400615, 4001341, 1, 1, 28172, 15000),
(9400616, 4001341, 1, 1, 28172, 15000),
(1110101, 4001347, 1, 1, 28229, 80000),
(1110100, 4001348, 1, 1, 28231, 400000),
(1120100, 4001349, 1, 1, 28235, 100000),
(1210101, 4001350, 1, 1, 28235, 100000),
(2220100, 4001351, 1, 1, 28237, 100000),
(9400614, 4001352, 1, 1, 28205, 40000),
(9400615, 4001352, 1, 1, 28205, 40000),
(9400616, 4001352, 1, 1, 28205, 40000),
(9400617, 4001352, 1, 1, 28205, 40000),
(9400617, 4001362, 1, 1, 28252, 40000),
(9400655, 4001362, 1, 1, 28252, 40000),
(9400656, 4001362, 1, 1, 28252, 40000),
(9400617, 4001363, 1, 1, 28252, 40000),
(9400655, 4001363, 1, 1, 28252, 40000),
(9400656, 4001363, 1, 1, 28252, 40000),
(9400609, 2000002, 1, 1, 0, 40000),
(9400609, 2000003, 1, 1, 0, 40000),
(9400609, 2000004, 1, 1, 0, 10000),
(9400609, 4010000, 1, 1, 0, 7000),
(9400609, 4010001, 1, 1, 0, 7000),
(9400609, 4010004, 1, 1, 0, 7000),
(9400609, 4020006, 1, 1, 0, 7000),
(9400609, 1082256, 1, 1, 0, 5000),
(9400609, 1072419, 1, 1, 0, 5000),
(9400610, 2000002, 1, 1, 0, 40000),
(9400610, 2000003, 1, 1, 0, 40000),
(9400610, 2000004, 1, 1, 0, 10000),
(9400610, 4010000, 1, 1, 0, 7000),
(9400610, 4010006, 1, 1, 0, 7000),
(9400610, 4020004, 1, 1, 0, 7000),
(9400610, 4020008, 1, 1, 0, 7000),
(9400610, 1082259, 1, 1, 0, 5000),
(9400610, 1072422, 1, 1, 0, 5000),
(9400611, 2000002, 1, 1, 0, 40000),
(9400611, 2000003, 1, 1, 0, 40000),
(9400611, 2000004, 1, 1, 0, 10000),
(9400611, 4010003, 1, 1, 0, 7000),
(9400611, 4020003, 1, 1, 0, 7000),
(9400611, 4020005, 1, 1, 0, 7000),
(9400611, 4020007, 1, 1, 0, 7000),
(9400611, 1082260, 1, 1, 0, 5000),
(9400611, 1072423, 1, 1, 0, 5000),
(9400612, 2000002, 1, 1, 0, 40000),
(9400612, 2000003, 1, 1, 0, 40000),
(9400612, 2000004, 1, 1, 0, 10000),
(9400612, 4010001, 1, 1, 0, 7000),
(9400612, 4010003, 1, 1, 0, 7000),
(9400612, 4020000, 1, 1, 0, 7000),
(9400612, 4020001, 1, 1, 0, 7000),
(9400612, 1082257, 1, 1, 0, 5000),
(9400612, 1072420, 1, 1, 0, 5000),
(9400613, 2000002, 1, 1, 0, 40000),
(9400613, 2000003, 1, 1, 0, 40000),
(9400613, 2000004, 1, 1, 0, 10000),
(9400613, 4010000, 1, 1, 0, 7000),
(9400613, 4010002, 1, 1, 0, 7000),
(9400613, 4010006, 1, 1, 0, 7000),
(9400613, 4020002, 1, 1, 0, 7000),
(9400613, 1082258, 1, 1, 0, 5000),
(9400613, 1072421, 1, 1, 0, 5000);
# (dropperid, itemid, minqty, maxqty, questid, chance)
@@ -20101,8 +20147,8 @@ USE `heavenms`;
UPDATE drop_data SET questid=28248 WHERE itemid=4001358;
UPDATE drop_data SET questid=28248 WHERE itemid=4001359;
UPDATE drop_data SET questid=7777 WHERE itemid=4001342; #id 7777 for ALL "quest items" with no v83 quest.
UPDATE drop_data SET questid=7777 WHERE itemid=4031906;
UPDATE drop_data SET questid=28175 WHERE itemid=4001342;
UPDATE drop_data SET questid=7777 WHERE itemid=4031906; #id 7777 for ALL "quest items" with no v83 quest.
UPDATE drop_data SET chance=0 WHERE itemid=2050099;
UPDATE drop_data SET chance=40000 WHERE itemid=4031991;
UPDATE drop_data SET questid=6191 WHERE itemid=4031477;
@@ -21359,7 +21405,6 @@ USE `heavenms`;
(9102001, 2020002, 2, -1),
(2002018, 4161014, 1, 3099),
(1012000, 4032143, 6, 20717),
(1202000, 4001366, 1, 28194),
(2402008, 4032512, 5, 3720),
(2602000, 4031574, 1, 3935),
(2619000, 4031709, 1, 3310),
@@ -21826,7 +21871,10 @@ USE `heavenms`;
(9400581, 0, 418, 617, 0, 400000),
(9400582, 0, 1127, 1583, 0, 400000),
(9400609, 0, 204, 1010, 0, 400000),
(9400610, 0, 204, 1010, 0, 400000),
(9400611, 0, 204, 1010, 0, 400000),
(9400612, 0, 204, 1010, 0, 400000),
(9400613, 0, 204, 1010, 0, 400000),
(9400633, 0, 258, 1270, 0, 400000),
(9400644, 0, 42, 61, 0, 400000),
(9410014, 0, 493, 728, 0, 400000),