From b7244a3947ae85cc9155d67531f3f18e8145f995 Mon Sep 17 00:00:00 2001 From: Sebastiaan Vanspauwen Date: Thu, 13 Sep 2018 15:35:30 +0200 Subject: [PATCH 1/2] MTA: Fixed alchemy --- .../client/plugins/mta/alchemy/AlchemyRoom.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index dd7f1965ea..e9d580d8df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -79,7 +79,9 @@ public class AlchemyRoom extends MTARoom private static final int IMAGE_Z_OFFSET = 150; private static final int NUM_CUPBOARDS = 8; - private static final int INFO_START = 5; + private static final int INFO_ITEM_START = 8; + private static final int INFO_POINT_START = 13; + private static final int INFO_LENGTH = 5; private static final int BEST_POINTS = 30; private static final String YOU_FOUND = "You found:"; @@ -286,19 +288,16 @@ public class AlchemyRoom extends MTARoom private AlchemyItem getBest() { - for (int i = 0; i < INFO_START; i++) + for (int i = 0; i < INFO_LENGTH; i++) { - int index = i + INFO_START; - - Widget textWidget = client.getWidget(WidgetID.MTA_ALCHEMY_GROUP_ID, index); - + Widget textWidget = client.getWidget(WidgetID.MTA_ALCHEMY_GROUP_ID, INFO_ITEM_START + i); if (textWidget == null) { return null; } - String item = textWidget.getText().replace(":", ""); - Widget pointsWidget = client.getWidget(WidgetID.MTA_ALCHEMY_GROUP_ID, index + INFO_START); + String item = textWidget.getText(); + Widget pointsWidget = client.getWidget(WidgetID.MTA_ALCHEMY_GROUP_ID, INFO_POINT_START + i); int points = Integer.parseInt(pointsWidget.getText()); if (points == BEST_POINTS) From 25cd7d68e2590dc56d7490186ff16d3c409c3c93 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 13 Sep 2018 13:10:28 -0600 Subject: [PATCH 2/2] Worldmap: Fix Dwarf Cannon start location --- .../runelite/client/plugins/worldmap/QuestStartLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java index 5f194e0073..66dde6666b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java @@ -70,7 +70,7 @@ enum QuestStartLocation DRAGON_SLAYER_II("Dragon Slayer II", new WorldPoint(2456, 2868, 0)), DREAM_MENTOR("Dream Mentor", new WorldPoint(2144, 10346, 0)), DRUIDIC_RITUAL("Druidic Ritual", new WorldPoint(2916, 3484, 0)), - DWARF_CANNON("Dwarf Cannon", new WorldPoint(2466, 3461, 0)), + DWARF_CANNON("Dwarf Cannon", new WorldPoint(2566, 3461, 0)), EADGARS_RUSE("Eadgar's Ruse", new WorldPoint(2896, 3426, 0)), EAGLES_PEAK("Eagles' Peak", new WorldPoint(2605, 3264, 0)), ELEMENTAL_WORKSHOP("Elemental Workshop I & II", new WorldPoint(2714, 3482, 0)),