From 55d8bd60220fb863a988a406853c2886c72166c7 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sat, 29 Feb 2020 23:01:10 -0600 Subject: [PATCH 01/11] Fixed a typo in Aubury's dialogue during Rune Mysteries --- Server/src/plugin/interaction/city/WizardTowerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/plugin/interaction/city/WizardTowerPlugin.java b/Server/src/plugin/interaction/city/WizardTowerPlugin.java index dbf118ac4..7cf35caec 100644 --- a/Server/src/plugin/interaction/city/WizardTowerPlugin.java +++ b/Server/src/plugin/interaction/city/WizardTowerPlugin.java @@ -1531,7 +1531,7 @@ public final class WizardTowerPlugin extends OptionHandler { npc = (NPC) args[0]; final Quest quest = player.getQuestRepository().getQuest("Rune Mysteries"); if (quest.getStage(player) == 40) { - interpreter.sendDialogues(npc, null, "My gratitude to you adventurer for bringing me these", "research notes. I notice that you brought the head", "wizard a speical talisman that was the key to our finally", "unlocking the puzzle."); + interpreter.sendDialogues(npc, null, "My gratitude to you adventurer for bringing me these", "research notes. I notice that you brought the head", "wizard a special talisman that was the key to our finally", "unlocking the puzzle."); stage = 900; return true; } From 725a11034dcc569cd84e24be072dbf5b8c0f3e71 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 00:07:05 -0600 Subject: [PATCH 02/11] Made yak meat cookable --- .../crandor/game/content/global/consumable/Consumables.java | 4 ++-- Server/src/plugin/skill/cooking/CookingPlugin.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/src/org/crandor/game/content/global/consumable/Consumables.java b/Server/src/org/crandor/game/content/global/consumable/Consumables.java index fd6000ec1..6bd9f5c3a 100644 --- a/Server/src/org/crandor/game/content/global/consumable/Consumables.java +++ b/Server/src/org/crandor/game/content/global/consumable/Consumables.java @@ -12,9 +12,9 @@ import java.util.List; */ public enum Consumables { /** meats */ - CHICKEN(new Food(2140, 2138, 2144, new ConsumableProperties(3), new CookingProperties(1, 30, 30))), UGTHANKI(new Food(1861, 1859, 2146, new ConsumableProperties(2), new CookingProperties(1, 40, 40))), RABBIT(new Food(3228, 3226, 7222, new ConsumableProperties(5), new CookingProperties(1, 30, 30))), - CRAB(new Food(7521, 7518, 7520, new ConsumableProperties(10), new CookingProperties(21, 100, 100))), + CHICKEN(new Food(2140, 2138, 2144, new ConsumableProperties(3), new CookingProperties(1, 30, 30))), UGTHANKI(new Food(1861, 1859, 2146, new ConsumableProperties(2), new CookingProperties(1, 40, 40))), RABBIT(new Food(3228, 3226, 7222, new ConsumableProperties(5), new CookingProperties(1, 30, 30))), YAK(new Food(2142, 10816, 2146, new ConsumableProperties(2), new CookingProperties(1, 30, 30))), DARK_CRAB(new Food(14939, 14937, 14941, new ConsumableProperties(22), new CookingProperties(90, 215, 100))), + CRAB(new Food(7521, 7518, 7520, new ConsumableProperties(10), new CookingProperties(21, 100, 100))), /** fish */ KARAMBWANJI(new Food(3151, 3150, 592, new ConsumableProperties(3), new CookingProperties(1, 10, 30, "You cook the karambwanji.", "You accidentally burn the karambwanji to ashes."))), SARDINE(new Food(325, 327, 369, new ConsumableProperties(4), new CookingProperties(1, 40, 38))), ANCHOVIES(new Food(319, 321, 323, new ConsumableProperties(1), new CookingProperties(1, 30, 34))), HERRING(new Food(347, 345, 357, new ConsumableProperties(5), new CookingProperties(5, 50, 41))), MACKEREL(new Food(355, 353, 357, new ConsumableProperties(6), new CookingProperties(10, 60, 45))), TROUT(new Food(333, 335, 343, new ConsumableProperties(7), new CookingProperties(15, 70, 50, 49, 50))), COD(new Food(339, 341, 343, new ConsumableProperties(7), new CookingProperties(18, 75, 52))), PIKE(new Food(351, 349, 343, new ConsumableProperties(8), new CookingProperties(20, 80, 53))), SALMON(new Food(329, 331, 343, new ConsumableProperties(9), new CookingProperties(25, 58, 90))), SLIMY_EEL(new Food(3381, 3379, 3383, new ConsumableProperties(6), new CookingProperties(28, 95, 58))), TUNA(new Food(361, 359, 367, new ConsumableProperties(10), new CookingProperties(30, 100, 64, 63, 63))), RAINBOW_FISH(new Food(10136, 10138, 10140, new ConsumableProperties(11), new CookingProperties(35, 110, 60))), CAVE_EEL(new Food(5003, 5001, 5002, new ConsumableProperties(7), new CookingProperties(38, 115, 40))), LOBSTER(new Food(379, 377, 381, new ConsumableProperties(12), new CookingProperties(40, 120, 74, 74, 68))), BASS(new Food(365, 363, 367, new ConsumableProperties(13), new CookingProperties(43, 130, 80, 80, 70))), SWORDFISH(new Food(373, 371, 375, new ConsumableProperties(14), new CookingProperties(45, 140, 86, 86, 81))), LAVA_EEL(new Food(2149, 2148, 3383, new ConsumableProperties(14), new CookingProperties(53, 30, 53))), MONKFISH(new Food(7946, 7944, 7948, new ConsumableProperties(16), new CookingProperties(62, 150, 92, 90, 89))), SHARK(new Food(385, 383, 387, new ConsumableProperties(20), new CookingProperties(80, 210, 100, 100, 94))), SEA_TURTLE(new Food(397, 395, 399, new ConsumableProperties(21), new CookingProperties(82, 212, 100))), MANTA_RAY(new Food(391, 389, 393, new ConsumableProperties(22), new CookingProperties(91, 216, 100))), KARAMBWAN(new Food(3144, 3142, 3146, new ConsumableProperties(18), new CookingProperties(1, 80, 30))), /** snails */ diff --git a/Server/src/plugin/skill/cooking/CookingPlugin.java b/Server/src/plugin/skill/cooking/CookingPlugin.java index 0f481a63b..e7ef0dc2f 100644 --- a/Server/src/plugin/skill/cooking/CookingPlugin.java +++ b/Server/src/plugin/skill/cooking/CookingPlugin.java @@ -30,7 +30,7 @@ public final class CookingPlugin extends UseWithHandler { * Constructs a new {@code CookingPlugin} {@code Object}. */ public CookingPlugin() { - super(2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224); + super(10816, 2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224); } @Override From 8b07e874b2fa6e3279ba1bc2c5bf7bfcf12286fb Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 00:29:26 -0600 Subject: [PATCH 03/11] Made it so you can cook on the range in Port Sarim --- Server/src/plugin/skill/cooking/CookingPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/plugin/skill/cooking/CookingPlugin.java b/Server/src/plugin/skill/cooking/CookingPlugin.java index e7ef0dc2f..3ce6f8977 100644 --- a/Server/src/plugin/skill/cooking/CookingPlugin.java +++ b/Server/src/plugin/skill/cooking/CookingPlugin.java @@ -24,7 +24,7 @@ public final class CookingPlugin extends UseWithHandler { /** * Represents the objects allowed to cook {@code Food} on. */ - private static final int[] OBJECTS = new int[] { 21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426 }; + private static final int[] OBJECTS = new int[] { 21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110 }; /** * Constructs a new {@code CookingPlugin} {@code Object}. From 4b007ebd6c874d623384033add119d1b29126b0e Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 01:23:44 -0600 Subject: [PATCH 04/11] Cook all now works --- Server/src/plugin/dialogue/CookingDialoguePlugin.java | 11 +++++++++++ .../plugin/skill/cooking/CookingDialoguePlugin.java | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/Server/src/plugin/dialogue/CookingDialoguePlugin.java b/Server/src/plugin/dialogue/CookingDialoguePlugin.java index 71495f23f..f28c2593c 100644 --- a/Server/src/plugin/dialogue/CookingDialoguePlugin.java +++ b/Server/src/plugin/dialogue/CookingDialoguePlugin.java @@ -110,6 +110,14 @@ public final class CookingDialoguePlugin extends DialoguePlugin { } }); player.getDialogueInterpreter().sendInput(false, "Enter the amount:"); + } else if (amount == 28){ + player.setAttribute("runscript", new RunScript() { + @Override + public boolean handle() { + food.cook(player, object, amount); + return false; + } + }); } food.cook(player, object, amount); break; @@ -158,6 +166,9 @@ public final class CookingDialoguePlugin extends DialoguePlugin { return 5; case 4: return -1; + case 3: + return 28; + } return -1; } diff --git a/Server/src/plugin/skill/cooking/CookingDialoguePlugin.java b/Server/src/plugin/skill/cooking/CookingDialoguePlugin.java index 988335648..742372977 100644 --- a/Server/src/plugin/skill/cooking/CookingDialoguePlugin.java +++ b/Server/src/plugin/skill/cooking/CookingDialoguePlugin.java @@ -102,6 +102,14 @@ public final class CookingDialoguePlugin extends DialoguePlugin { } }); player.getDialogueInterpreter().sendInput(false, "Enter the amount:"); + } else if (amount == 28) { + player.setAttribute("runscript", new RunScript() { + @Override + public boolean handle() { + food.cook(player, object, amount); + return false; + } + }); } food.cook(player, object, amount); break; @@ -150,6 +158,8 @@ public final class CookingDialoguePlugin extends DialoguePlugin { return 5; case 3: return -1; + case 2: + return 28; } return -1; } From 6d1142628e77756b1cd043f3c51a4b9377b16792 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 10:47:51 -0600 Subject: [PATCH 05/11] Added Crazy Archaeologist's drop table --- Server/server.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Server/server.sql b/Server/server.sql index 4d059431f..45d3f3984 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19591,7 +19591,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (8352, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8353, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8354, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), -(8355, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), +(8355, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{12::89,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8356, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8357, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES @@ -19606,6 +19606,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (8366, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8610, '{532,1,1,0.0,ALWAYS}', '{560,250,250,0.0,COMMON}~{562,400,400,0.0,COMMON}~{560,300,300,0.0,COMMON}~{565,200,200,0.0,COMMON}~{1620,20,20,0.0,COMMON}~{1618,10,10,0.0,COMMON}~{6035,100,100,0.0,UNCOMMON}~{238,100,100,0.0,UNCOMMON}~{224,500,500,0.0,UNCOMMON}~{445,300,300,0.0,UNCOMMON}~{2,250,250,0.0,UNCOMMON}~{1514,100,100,0.0,RARE}~{226,50,50,0.0,RARE}~{1631,1,1,0.0,RARE}~{5315,1,1,0.0,RARE}~{5316,1,1,0.0,RARE}~{5289,1,1,0.0,RARE}~{3052,100,100,0.0,RARE}~{3024,3,3,0.0,RARE}~{995,15000,20000,0.0,COMMON}~{9194,60,60,0.0,UNCOMMON}~{1275,1,1,0.0,COMMON}~{9244,100,100,0.0,UNCOMMON}~{1319,1,1,0.0,UNCOMMON}~{868,60,60,0.0,COMMON}~{14669,1,1,0.0,RARE,256}~{7158,1,1,0.0,RARE,256}~{14722,1,1,0.0,RARE,512}~{14939,8,8,0.0,COMMON}~{14943,375,375,0.0,RARE,128}', '{12158,4,4,0.06,ALWAYS}~{12159,4,4,0.03,ALWAYS}~{12160,4,4,0.63,ALWAYS}~{12163,4,4,0.02,ALWAYS}'), (8612, '{562,1,1,0.0,ALWAYS}', '{562,400,400,0.0,COMMON}~{560,300,300,0.0,COMMON}~{565,200,200,0.0,COMMON}~{1620,20,20,0.0,COMMON}~{1618,10,10,0.0,COMMON}~{6035,100,100,0.0,UNCOMMON}~{238,100,100,0.0,UNCOMMON}~{224,500,500,0.0,UNCOMMON}~{445,300,300,0.0,UNCOMMON}~{2,250,250,0.0,UNCOMMON}~{1514,100,100,0.0,RARE}~{226,50,50,0.0,RARE}~{1631,1,1,0.0,RARE}~{5315,1,1,0.0,RARE}~{5316,1,1,0.0,RARE}~{5289,1,1,0.0,RARE}~{3052,100,100,0.0,RARE}~{3024,3,3,0.0,RARE}~{995,15000,20000,0.0,COMMON}~{9194,60,60,0.0,UNCOMMON}~{1275,1,1,0.0,COMMON}~{9244,100,100,0.0,UNCOMMON}~{1319,1,1,0.0,UNCOMMON}~{868,60,60,0.0,COMMON}~{14669,1,1,0.0,RARE,256}~{7158,1,1,0.0,RARE,256}~{14862,1,1,0.0,RARE,512}~{14939,8,8,0.0,COMMON}~{14943,375,375,0.0,RARE,128}', '{12158,4,4,0.06,ALWAYS}~{12159,4,4,0.03,ALWAYS}~{12160,4,4,0.63,ALWAYS}~{12163,4,4,0.02,ALWAYS}'), +(8656, '{526,1,1,0.0,ALWAYS}', '{1731,1,1,0.0,COMMON}~{2501,1,1,0.0,UNCOMMON}~{868,10,10,0.0,UNCOMMON}~{4698,30,30,0.0,UNCOMMON}~{2,150,150,0.0,UNCOMMON}~{11212,75,75,0.0,RARE}~{385,1,1,0.0,COMMON}~{6705,3,3,0.0,COMMON}~{2434,1,1,0.0,COMMON}~{2298,8,8,0.0,UNCOMMON}~{995,499,3998,0.0,COMMON}~{218,4,4,0.0,COMMON}~{240,10,10,0.0,COMMON}~{443,40,40,0.0,COMMON}~{1622,6,6,0.0,UNCOMMON}~{1624,4,4,0.0,UNCOMMON}~{1750,10,10,0.0,UNCOMMON}~{991,1,1,0.0,UNCOMMON}~{9194,12,12,0.0,RARE}~{10976,1,1,0.0,RARE}~{4675,1,1,0.0,RARE}', ''), (8629, '{14693,1,1,0.0,ALWAYS}~{14695,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}~', '{811,12,12,0.0,COMMON}~{830,20,20,0.0,COMMON}~{554,75,75,0.0,COMMON}~{4699,15,30,0.0,COMMON}~{868,8,8,0.0,UNCOMMON}~{9144,30,30,0.0,UNCOMMON}~{560,20,20,0.0,UNCOMMON}~{565,20,20,0.0,UNCOMMON}~{563,20,20,0.0,UNCOMMON}~{9194,12,12,0.0,UNCOMMON}~{1317,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,UNCOMMON}~{3053,1,1,0.0,UNCOMMON}~{1359,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1201,1,1,0.0,UNCOMMON}~{1147,1,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{995,66,3000,0.0,COMMON}~{1442,1,1,0.0,COMMON}~{570,15,15,0.0,UNCOMMON}~{1897,3,3,0.0,UNCOMMON}~{2362,2,2,0.0,UNCOMMON}~{11286,1,1,0.0,VERY_RARE}', '{0,1,1,0.915,ALWAYS}~{12158,1,1,0.03,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.032,ALWAYS}~{12163,1,1,0.003,ALWAYS}'); -- -------------------------------------------------------- From 12c193f6f6ce63b76700965f3341f4924200ee3b Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 10:55:22 -0600 Subject: [PATCH 06/11] Fixed a woopsie and added Archaeologist's drop table --- Server/server.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/server.sql b/Server/server.sql index 45d3f3984..c0b0be890 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19591,7 +19591,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (8352, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8353, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8354, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), -(8355, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{12::89,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), +(8355, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8356, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'), (8357, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES From ca550976c2e9ed630ac14d46da5a5397b4503cc1 Mon Sep 17 00:00:00 2001 From: Purplecow-dev <61662796+Purplecow-dev@users.noreply.github.com> Date: Sun, 1 Mar 2020 13:11:29 -0500 Subject: [PATCH 07/11] Fixed magic tutors typos --- Server/src/plugin/dialogue/MagicTutorDialogue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/dialogue/MagicTutorDialogue.java b/Server/src/plugin/dialogue/MagicTutorDialogue.java index a9cc96612..35702e2d0 100644 --- a/Server/src/plugin/dialogue/MagicTutorDialogue.java +++ b/Server/src/plugin/dialogue/MagicTutorDialogue.java @@ -151,7 +151,7 @@ public final class MagicTutorDialogue extends DialoguePlugin { stage = 12; break; case 12: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Nemarti, the Ranged Combat tutor and I both give out", "items every 30 minutes, however you must choose", "wether you want runes or ranged equipment. To", "claim runes, right-click on me and choose Claim, to claim"); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Nemarti, the Ranged Combat tutor and I both give out", "items every 30 minutes, however you must choose", "whether you want runes or ranged equipment. To", "claim runes, right-click on me and choose Claim, to claim"); stage = 13; break; case 13: @@ -159,7 +159,7 @@ public final class MagicTutorDialogue extends DialoguePlugin { stage = 14; break; case 14: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have the sepll available, click on it once, then", "click on your target. A good target would be a monster", "that is below your combat level."); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have the spell available, click on it once, then", "click on your target. A good target would be a monster", "that is below your combat level."); stage = 15; break; case 15: From a231a5a0bc104b4efd1af5c963d2b8a5ea84df7e Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 14:24:39 -0600 Subject: [PATCH 08/11] Made it so the game doesn't spam you when a familiar can't be called and just remains silent. --- .../content/skill/member/summoning/familiar/Familiar.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java b/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java index eaacf867e..5f65830a5 100644 --- a/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java +++ b/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java @@ -536,11 +536,13 @@ public abstract class Familiar extends NPC implements Plugin { /** * Calls the familiar. */ + //int spamTimer = 0; public boolean call() { Location destination = getSpawnLocation(); - if (destination == null) { - owner.getPacketDispatch().sendMessage("Your familiar is too big to fit here. Try calling it again when you are standing"); - owner.getPacketDispatch().sendMessage("somewhere with more space."); + if (destination == null && spamTimer == 0) { + //owner.getPacketDispatch().sendMessage("Your familiar is too big to fit here. Try calling it again when you are standing"); + //owner.getPacketDispatch().sendMessage("somewhere with more space."); + //spamTimer = 50; return false; } setInvisible(getZoneMonitor().isRestricted(ZoneRestriction.FOLLOWERS) && !owner.getLocks().isLocked("enable_summoning")); From dd143084310878f08f4a7256c1e4d7f2536ff8a3 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 20:04:52 -0600 Subject: [PATCH 09/11] added some spideys --- Server/server.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/server.sql b/Server/server.sql index c0b0be890..007798dd2 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19714,8 +19714,8 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (53, '{2694,9508,0,0,3}-{2703,9505,0,0,6}-{2710,9499,0,0,1}-{2704,9520,0,0,5}-{2714,9523,0,0,3}-{2722,9520,0,0,7}'), (4356, '{3755,9391,0,1,5}-{3723,9441,0,1,4}-{3766,9459,0,1,4}-{3800,9414,0,1,2}-{3821,9418,0,1,3}-{3810,9462,0,1,0}-{3809,9440,0,1,2}-{3748,9450,0,1,6}-{3765,9424,0,1,2}-{3787,9464,0,1,0}'), (52, '{2899,9765,0,1,1}-{2893,9768,0,1,1}-{2895,9771,0,1,6}-{2894,9781,0,1,6}-{2891,9787,0,1,2}-{2904,9798,0,1,0}-{2910,9799,0,1,4}'), -(59, '{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}'), -(58, '{3289,5482,0,1,1}-{3296,5472,0,1,0}-{3291,5466,0,1,6}-{3294,5481,0,1,0}-{3300,5479,0,1,7}-{3288,5480,0,1,3}-{3293,5475,0,1,3}-{3293,5481,0,1,2}-{3286,5465,0,1,3}-{3279,5478,0,1,4}-{3270,5464,0,1,2}-{3270,5468,0,1,1}-{2574,9874,0,1,0}-{2577,9877,0,1,3}-{2574,9878,0,1,0}-{2575,9871,0,1,4}'), +(59, '{3188,3216,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}'), +(58, '{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3289,5482,0,1,1}-{3296,5472,0,1,0}-{3291,5466,0,1,6}-{3294,5481,0,1,0}-{3300,5479,0,1,7}-{3288,5480,0,1,3}-{3293,5475,0,1,3}-{3293,5481,0,1,2}-{3286,5465,0,1,3}-{3279,5478,0,1,4}-{3270,5464,0,1,2}-{3270,5468,0,1,1}-{2574,9874,0,1,0}-{2577,9877,0,1,3}-{2574,9878,0,1,0}-{2575,9871,0,1,4}'), (63, '{3118,9950,0,1,6}-{3116,9956,0,1,0}-{3127,9953,0,1,7}-{3122,9955,0,1,4}-{3124,9951,0,1,4}-{3124,9950,0,1,3}-{3074,3892,0,1,3}-{3071,3894,0,1,7}-{3062,3897,0,1,3}-{3058,3889,0,1,4}-{3054,3880,0,1,2}-{3054,3895,0,1,7}-{3051,3879,0,1,6}-{3051,3886,0,1,6}-{3047,3893,0,1,1}-{3047,3881,0,1,4}-{3044,3893,0,1,5}-{3041,3894,0,1,1}-{3038,3890,0,1,1}-{3046,3872,0,1,4}-{3165,9891,0,1,6}-{3177,9886,0,1,4}-{3175,9889,0,1,4}-{3177,9879,0,1,4}-{3177,9888,0,1,1}-{3178,9895,0,1,4}-{3182,9884,0,1,3}-{2841,9583,0,1,4}-{2841,9582,0,1,4}-{2839,9582,0,1,1}-{2837,9572,0,1,6}-{2832,9580,0,1,1}-{3164,9888,0,1,3}-{3169,9892,0,1,6}-{3258,5560,0,1,2}-{3258,5555,0,1,3}-{3260,5557,0,1,3}-{3257,5552,0,1,1}-{3260,5558,0,1,5}-{3258,5556,0,1,6}-{3257,5555,0,1,6}-{3260,5559,0,1,7}-{3257,5561,0,1,1}'), (62, '{2769,3198,0,1,7}-{2768,3206,0,1,1}-{2776,3107,0,1,1}-{2794,3121,0,1,3}-{2795,3118,0,1,1}-{2796,3109,0,1,1}-{2808,3112,0,1,6}-{2791,3124,0,1,1}-{2860,3094,0,1,6}-{2854,3086,0,1,6}-{2863,3083,0,1,3}-{2853,3081,0,1,4}-{2859,3079,0,1,4}-{2859,3075,0,1,6}-{2871,3092,0,1,1}-{2867,3094,0,1,1}-{2861,3082,0,1,3}-{2861,3094,0,1,3}-{2863,3081,0,1,2}-{2864,3089,0,1,3}-{2859,3084,0,1,0}-{2850,3060,0,1,6}-{2857,3044,0,1,7}-{2856,3066,0,1,4}-{2784,3030,0,1,4}-{2783,3017,0,1,3}-{2811,2975,0,1,7}-{2815,2987,0,1,5}-{2808,3007,0,1,6}-{2812,3007,0,1,1}-{2885,2950,0,1,4}-{2891,2951,0,1,6}-{2894,2946,0,1,4}-{2928,3022,0,1,3}-{2930,3029,0,1,4}-{2927,3039,0,1,6}-{2928,3043,0,1,0}-{2929,3036,0,1,7}-{2919,3040,0,1,4}-{2934,3045,0,1,2}-{2929,3035,0,1,4}-{2914,3055,0,1,4}-{2922,3059,0,1,3}-{2930,3049,0,1,4}-{2914,3047,0,1,4}-{2935,3049,0,1,1}-{2927,3058,0,1,3}'), (61, '{3321,3145,0,1,3}-{3327,3131,0,1,5}-{3322,3143,0,1,3}-{3182,3878,0,1,6}-{3182,3886,0,1,7}-{3182,3888,0,1,5}-{3175,3888,0,1,4}-{3175,3879,0,1,7}-{3174,3879,0,1,3}-{3174,3882,0,1,0}-{3175,3885,0,1,3}-{3172,3876,0,1,2}-{3172,3894,0,1,1}-{3172,3885,0,1,3}-{3165,3886,0,1,3}-{3165,3896,0,1,1}-{3166,3886,0,1,1}-{3164,3893,0,1,4}-{3163,3881,0,1,4}-{3159,3889,0,1,0}-{3213,9890,0,1,5}-{3210,9886,0,1,4}-{3213,9887,0,1,1}-{3207,9880,0,1,0}-{3255,9870,0,1,4}-{3258,9872,0,1,3}-{3261,9870,0,1,4}-{3156,3248,0,1,4}-{3143,3241,0,1,4}-{3156,3249,0,1,4}-{3175,3248,0,1,7}-{3169,3260,0,1,4}-{3171,3254,0,1,5}-{3162,3246,0,1,6}-{3179,3262,0,1,1}-{3162,3226,0,1,1}-{3166,3222,0,1,1}-{3157,3229,0,1,5}-{3168,3222,0,1,4}-{3211,9622,0,1,2}-{3215,9620,0,1,4}-{3212,9618,0,1,3}-{3217,9617,0,1,3}-{3214,9620,0,1,7}-{2541,3189,0,1,3}-{2542,3187,0,1,6}-{2543,3186,0,1,4}-{2545,3183,0,1,3}-{2545,3183,0,1,3}-{2545,3182,0,1,3}-{2543,3183,0,1,0}-{2543,3182,0,1,3}-{2539,3182,0,1,0}'), From 6e211e215263e072fe25d1fee7b568b673578518 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 20:07:23 -0600 Subject: [PATCH 10/11] Fixed a typo in my code --- .../game/content/skill/member/summoning/familiar/Familiar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java b/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java index 5f65830a5..0bf21d0e2 100644 --- a/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java +++ b/Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java @@ -539,7 +539,7 @@ public abstract class Familiar extends NPC implements Plugin { //int spamTimer = 0; public boolean call() { Location destination = getSpawnLocation(); - if (destination == null && spamTimer == 0) { + if (destination == null) { //owner.getPacketDispatch().sendMessage("Your familiar is too big to fit here. Try calling it again when you are standing"); //owner.getPacketDispatch().sendMessage("somewhere with more space."); //spamTimer = 50; From 9d61e721b1085447664494a95ec67ad1db62a823 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 1 Mar 2020 20:08:58 -0600 Subject: [PATCH 11/11] Another typo fix because I'm big dumb dumb --- Server/server.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/server.sql b/Server/server.sql index 007798dd2..964f77ec4 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19714,8 +19714,8 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (53, '{2694,9508,0,0,3}-{2703,9505,0,0,6}-{2710,9499,0,0,1}-{2704,9520,0,0,5}-{2714,9523,0,0,3}-{2722,9520,0,0,7}'), (4356, '{3755,9391,0,1,5}-{3723,9441,0,1,4}-{3766,9459,0,1,4}-{3800,9414,0,1,2}-{3821,9418,0,1,3}-{3810,9462,0,1,0}-{3809,9440,0,1,2}-{3748,9450,0,1,6}-{3765,9424,0,1,2}-{3787,9464,0,1,0}'), (52, '{2899,9765,0,1,1}-{2893,9768,0,1,1}-{2895,9771,0,1,6}-{2894,9781,0,1,6}-{2891,9787,0,1,2}-{2904,9798,0,1,0}-{2910,9799,0,1,4}'), -(59, '{3188,3216,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}'), -(58, '{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3289,5482,0,1,1}-{3296,5472,0,1,0}-{3291,5466,0,1,6}-{3294,5481,0,1,0}-{3300,5479,0,1,7}-{3288,5480,0,1,3}-{3293,5475,0,1,3}-{3293,5481,0,1,2}-{3286,5465,0,1,3}-{3279,5478,0,1,4}-{3270,5464,0,1,2}-{3270,5468,0,1,1}-{2574,9874,0,1,0}-{2577,9877,0,1,3}-{2574,9878,0,1,0}-{2575,9871,0,1,4}'), +(59, '{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3188,3216,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}'), +(58, '{3289,5482,0,1,1}-{3296,5472,0,1,0}-{3291,5466,0,1,6}-{3294,5481,0,1,0}-{3300,5479,0,1,7}-{3288,5480,0,1,3}-{3293,5475,0,1,3}-{3293,5481,0,1,2}-{3286,5465,0,1,3}-{3279,5478,0,1,4}-{3270,5464,0,1,2}-{3270,5468,0,1,1}-{2574,9874,0,1,0}-{2577,9877,0,1,3}-{2574,9878,0,1,0}-{2575,9871,0,1,4}'), (63, '{3118,9950,0,1,6}-{3116,9956,0,1,0}-{3127,9953,0,1,7}-{3122,9955,0,1,4}-{3124,9951,0,1,4}-{3124,9950,0,1,3}-{3074,3892,0,1,3}-{3071,3894,0,1,7}-{3062,3897,0,1,3}-{3058,3889,0,1,4}-{3054,3880,0,1,2}-{3054,3895,0,1,7}-{3051,3879,0,1,6}-{3051,3886,0,1,6}-{3047,3893,0,1,1}-{3047,3881,0,1,4}-{3044,3893,0,1,5}-{3041,3894,0,1,1}-{3038,3890,0,1,1}-{3046,3872,0,1,4}-{3165,9891,0,1,6}-{3177,9886,0,1,4}-{3175,9889,0,1,4}-{3177,9879,0,1,4}-{3177,9888,0,1,1}-{3178,9895,0,1,4}-{3182,9884,0,1,3}-{2841,9583,0,1,4}-{2841,9582,0,1,4}-{2839,9582,0,1,1}-{2837,9572,0,1,6}-{2832,9580,0,1,1}-{3164,9888,0,1,3}-{3169,9892,0,1,6}-{3258,5560,0,1,2}-{3258,5555,0,1,3}-{3260,5557,0,1,3}-{3257,5552,0,1,1}-{3260,5558,0,1,5}-{3258,5556,0,1,6}-{3257,5555,0,1,6}-{3260,5559,0,1,7}-{3257,5561,0,1,1}'), (62, '{2769,3198,0,1,7}-{2768,3206,0,1,1}-{2776,3107,0,1,1}-{2794,3121,0,1,3}-{2795,3118,0,1,1}-{2796,3109,0,1,1}-{2808,3112,0,1,6}-{2791,3124,0,1,1}-{2860,3094,0,1,6}-{2854,3086,0,1,6}-{2863,3083,0,1,3}-{2853,3081,0,1,4}-{2859,3079,0,1,4}-{2859,3075,0,1,6}-{2871,3092,0,1,1}-{2867,3094,0,1,1}-{2861,3082,0,1,3}-{2861,3094,0,1,3}-{2863,3081,0,1,2}-{2864,3089,0,1,3}-{2859,3084,0,1,0}-{2850,3060,0,1,6}-{2857,3044,0,1,7}-{2856,3066,0,1,4}-{2784,3030,0,1,4}-{2783,3017,0,1,3}-{2811,2975,0,1,7}-{2815,2987,0,1,5}-{2808,3007,0,1,6}-{2812,3007,0,1,1}-{2885,2950,0,1,4}-{2891,2951,0,1,6}-{2894,2946,0,1,4}-{2928,3022,0,1,3}-{2930,3029,0,1,4}-{2927,3039,0,1,6}-{2928,3043,0,1,0}-{2929,3036,0,1,7}-{2919,3040,0,1,4}-{2934,3045,0,1,2}-{2929,3035,0,1,4}-{2914,3055,0,1,4}-{2922,3059,0,1,3}-{2930,3049,0,1,4}-{2914,3047,0,1,4}-{2935,3049,0,1,1}-{2927,3058,0,1,3}'), (61, '{3321,3145,0,1,3}-{3327,3131,0,1,5}-{3322,3143,0,1,3}-{3182,3878,0,1,6}-{3182,3886,0,1,7}-{3182,3888,0,1,5}-{3175,3888,0,1,4}-{3175,3879,0,1,7}-{3174,3879,0,1,3}-{3174,3882,0,1,0}-{3175,3885,0,1,3}-{3172,3876,0,1,2}-{3172,3894,0,1,1}-{3172,3885,0,1,3}-{3165,3886,0,1,3}-{3165,3896,0,1,1}-{3166,3886,0,1,1}-{3164,3893,0,1,4}-{3163,3881,0,1,4}-{3159,3889,0,1,0}-{3213,9890,0,1,5}-{3210,9886,0,1,4}-{3213,9887,0,1,1}-{3207,9880,0,1,0}-{3255,9870,0,1,4}-{3258,9872,0,1,3}-{3261,9870,0,1,4}-{3156,3248,0,1,4}-{3143,3241,0,1,4}-{3156,3249,0,1,4}-{3175,3248,0,1,7}-{3169,3260,0,1,4}-{3171,3254,0,1,5}-{3162,3246,0,1,6}-{3179,3262,0,1,1}-{3162,3226,0,1,1}-{3166,3222,0,1,1}-{3157,3229,0,1,5}-{3168,3222,0,1,4}-{3211,9622,0,1,2}-{3215,9620,0,1,4}-{3212,9618,0,1,3}-{3217,9617,0,1,3}-{3214,9620,0,1,7}-{2541,3189,0,1,3}-{2542,3187,0,1,6}-{2543,3186,0,1,4}-{2545,3183,0,1,3}-{2545,3183,0,1,3}-{2545,3182,0,1,3}-{2543,3183,0,1,0}-{2543,3182,0,1,3}-{2539,3182,0,1,0}'),