From 736c210f29aad4caed45878a54869ac757b9ab95 Mon Sep 17 00:00:00 2001 From: skelsoft <9147770-skelsoft@users.noreply.gitlab.com> Date: Wed, 30 Jun 2021 01:51:47 +0000 Subject: [PATCH] Fix: Fletching EXP corrections, 3a/infinity gear requirement corrections --- Server/data/configs/item_configs.json | 30 +++++++++++-------- Server/data/configs/shops.json | 16 +++++----- .../interaction/object/BarrowsBoatPlugin.java | 2 +- .../entity/skill/fletching/Fletching.java | 12 ++++---- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index 45f18fb2d..ad5446673 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -39771,6 +39771,7 @@ "name": "Mystic hat", "tradeable": "true", "archery_ticket_price": "0", + "hat": true, "id": "4089", "bonuses": "0,0,0,4,0,0,0,0,4,0,4,0,0,0,0" }, @@ -39909,6 +39910,7 @@ "name": "Mystic hat", "tradeable": "true", "archery_ticket_price": "0", + "hat": true, "id": "4099", "bonuses": "0,0,0,4,0,0,0,0,4,0,4,0,0,0,0" }, @@ -40047,6 +40049,7 @@ "name": "Mystic hat", "tradeable": "true", "archery_ticket_price": "0", + "hat": true, "id": "4109", "bonuses": "0,0,0,4,0,0,0,0,4,0,4,0,0,0,0" }, @@ -66990,7 +66993,7 @@ "id": "6915" }, { - "requirements": "{1,50}-{6,25}", + "requirements": "{1,25}-{6,50}", "ge_buy_limit": "10", "examine": "Mystical robes.", "durability": null, @@ -67017,7 +67020,7 @@ "id": "6917" }, { - "requirements": "{1,50}-{6,25}", + "requirements": "{1,25}-{6,50}", "ge_buy_limit": "10", "examine": "A mystic hat.", "durability": null, @@ -67030,6 +67033,7 @@ "name": "Infinity hat", "tradeable": "true", "archery_ticket_price": "0", + "hat": true, "id": "6918", "bonuses": "0,0,0,6,0,0,0,0,6,0,7,0,0,0,0" }, @@ -67043,7 +67047,7 @@ "id": "6919" }, { - "requirements": "{1,50}-{6,25}", + "requirements": "{1,25}-{6,50}", "ge_buy_limit": "10", "examine": "Mystical boots.", "durability": null, @@ -67069,7 +67073,7 @@ "id": "6921" }, { - "requirements": "{1,50}-{6,25}", + "requirements": "{1,25}-{6,50}", "ge_buy_limit": "10", "examine": "Mystical gloves.", "durability": null, @@ -67094,7 +67098,7 @@ "id": "6923" }, { - "requirements": "{1,50}-{6,25}", + "requirements": "{1,25}-{6,50}", "ge_buy_limit": "10", "examine": "Mystical robes.", "durability": null, @@ -92943,7 +92947,7 @@ "id": "10329" }, { - "requirements": "{1,65}-{4,45}", + "requirements": "{1,45}-{4,65}", "ge_buy_limit": "2", "examine": "Ancient range protection crafted from white dragonhide.", "durability": null, @@ -92971,7 +92975,7 @@ "id": "10331" }, { - "requirements": "{1,65}-{4,45}", + "requirements": "{1,45}-{4,65}", "ge_buy_limit": "2", "examine": "Fabulously ancient range protection crafted from white dragonhide.", "durability": null, @@ -92999,7 +93003,7 @@ }, { "remove_head": "true", - "requirements": "{1,65}-{4,45}", + "requirements": "{1,45}-{4,65}", "ge_buy_limit": "5000", "examine": "Ancient range protection crafted from white dragonhide.", "durability": null, @@ -93026,7 +93030,7 @@ "id": "10335" }, { - "requirements": "{1,65}-{4,45}", + "requirements": "{1,45}-{4,65}", "ge_buy_limit": "2", "examine": "Fabulously ancient range protection crafted from white dragonhide.", "durability": null, @@ -93052,7 +93056,7 @@ "id": "10337" }, { - "requirements": "{1,65}-{6,30}", + "requirements": "{1,30}-{6,65}", "ge_buy_limit": "2", "examine": "Ancient mage protection enchanted in the Third-Age.", "durability": null, @@ -93080,7 +93084,7 @@ "id": "10339" }, { - "requirements": "{1,65}-{6,30}", + "requirements": "{1,30}-{6,65}", "ge_buy_limit": "2", "examine": "Ancient mage protection enchanted in the Third-Age.", "durability": null, @@ -93108,7 +93112,7 @@ }, { "remove_head": "true", - "requirements": "{1,65}-{6,30}", + "requirements": "{1,30}-{6,65}", "ge_buy_limit": "2", "examine": "Ancient mage protection enchanted in the Third-Age.", "durability": null, @@ -93134,7 +93138,7 @@ "id": "10343" }, { - "requirements": "{1,65}-{6,30}", + "requirements": "{1,30}-{6,65}", "ge_buy_limit": "2", "examine": "Ancient mage protection enchanted in the Third-Age.", "durability": null, diff --git a/Server/data/configs/shops.json b/Server/data/configs/shops.json index 2423c17b3..d3411eda0 100644 --- a/Server/data/configs/shops.json +++ b/Server/data/configs/shops.json @@ -55,7 +55,7 @@ }, { "npcs": "591", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "true", "id": "7", @@ -307,7 +307,7 @@ }, { "npcs": "516", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "true", "id": "36", @@ -316,7 +316,7 @@ }, { "npcs": "560", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "true", "id": "37", @@ -1963,7 +1963,7 @@ }, { "npcs": "2564", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "false", "id": "222", @@ -1981,7 +1981,7 @@ }, { "npcs": "578", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "false", "id": "224", @@ -2053,7 +2053,7 @@ }, { "npcs": "1282", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "false", "id": "232", @@ -2062,7 +2062,7 @@ }, { "npcs": "1315", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "false", "id": "233", @@ -2089,7 +2089,7 @@ }, { "npcs": "4856", - "high_alch": "1", + "high_alch": "0", "currency": "995", "general_store": "false", "id": "236", diff --git a/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java index a4c7ed9a0..16656b4d4 100644 --- a/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java @@ -30,7 +30,7 @@ public class BarrowsBoatPlugin extends OptionHandler { switch (option) { case "board": final Location dest = node.getId() == 6970 ? new Location(3522, 3285, 0) : new Location(3500, 3380, 0); - final String name = node.getId() == 6970 ? "Mort'on." : "the swamp"; + final String name = node.getId() == 6970 ? "Mort'ton." : "the swamp"; player.lock(); player.getInterfaceManager().open(new Component(321)); GameWorld.getPulser().submit(new Pulse(7, player) { diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java b/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java index a3493c8b4..6b393bca0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java @@ -128,7 +128,7 @@ public class Fletching { WILLOW_LONGBOW((byte) 1,58,847,40, 41.5, new Animation(6686)), MAPLE_SHORTBOW((byte) 1,64,853,50, 50, new Animation(6681)), MAPLE_LONGBOW((byte) 1,62,851,55, 58.3, new Animation(6687)), - YEW_SHORTBOW((byte) 1,68,857,65, 66, new Animation(6682)), + YEW_SHORTBOW((byte) 1,68,857,65, 67.5, new Animation(6682)), YEW_LONGBOW((byte) 1,66,855,70, 75, new Animation(6688)), MAGIC_SHORTBOW((byte) 1,72,861,80, 83.3, new Animation(6683)), MAGIC_LONGBOW((byte) 1,70,859,85, 91.5, new Animation(6689)), @@ -163,12 +163,12 @@ public class Fletching { } } public enum GemBolts { - OPAL(877, org.rs09.consts.Items.OPAL_1609, 45, 879, 11, 1.5), + OPAL(877, org.rs09.consts.Items.OPAL_1609, 45, 879, 11, 1.6), PEARL(9140, org.rs09.consts.Items.OYSTER_PEARL_411, 46, 880, 41, 3.2), PEARLS(9140, org.rs09.consts.Items.OYSTER_PEARLS_413, 46, 880, 41, 3.2), JADE(9139, org.rs09.consts.Items.JADE_1611, 9187, 9335, 26, 2.4), RED_TOPAZ(9141, org.rs09.consts.Items.RED_TOPAZ_1613, 9188, 9336, 48, 3.9), - SAPPHIRE(9142, org.rs09.consts.Items.SAPPHIRE_1607, 9189, 9337, 56, 4), + SAPPHIRE(9142, org.rs09.consts.Items.SAPPHIRE_1607, 9189, 9337, 56, 4.7), EMERALD(9142, org.rs09.consts.Items.EMERALD_1605, 9190, 9338, 58, 5.5), RUBY(9143, org.rs09.consts.Items.RUBY_1603, 9191, 9339, 63, 6.3), DIAMOND(9143, org.rs09.consts.Items.DIAMOND_1601, 9192, 9340, 65, 7), @@ -192,10 +192,10 @@ public class Fletching { IRON_ARROW(40, 884, 15, 3.8), STEEL_ARROW(41, 886, 30, 6.3), MITHRIL_ARROW(42, 888, 45, 8.8), - ADAMANT_ARROW(43, 890, 60, 10), + ADAMANT_ARROW(43, 890, 60, 11.3), RUNE_ARROW(44, 892, 75, 13.8), DRAGON_ARROW(11237, 11212, 90, 16.3), - BROAD_ARROW(13278, 4160, 52, 10); + BROAD_ARROW(13278, 4160, 52, 15); public int unfinished,finished,level; public double experience; @@ -294,7 +294,7 @@ public class Fletching { } public enum FletchingItems { //Standard logs - ARROW_SHAFT(52, 15, 1, 15), + ARROW_SHAFT(52, 5, 1, 15), SHORT_BOW(50, 5, 5, 1), LONG_BOW(48, 10, 10, 1), WOODEN_STOCK(9440, 6, 9, 1),