From 55d8bd60220fb863a988a406853c2886c72166c7 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sat, 29 Feb 2020 23:01:10 -0600 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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; }