From 115924275d76c67d506e895a09e40a14afe81b47 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 10 Nov 2019 06:38:37 +0100 Subject: [PATCH] loottracker: Add master farmer (#1991) --- .../client/plugins/loottracker/LootTrackerPlugin.java | 11 ++++++++++- .../client/plugins/stonedtracker/ui/LootPanel.java | 4 ++++ .../client/plugins/thieving/ThievingPlugin.java | 3 +-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index c1b1e3d1e1..5cb013712f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -170,6 +170,8 @@ public class LootTrackerPlugin extends Plugin private static final String GAUNTLET_EVENT = "The Gauntlet"; private static final int GAUNTLET_LOBBY_REGION = 12127; + private static final String MASTER_FARMER_EVENT = "Master farmer"; + // Chest loot handling private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!"; private static final Pattern LARRAN_LOOTED_PATTERN = Pattern.compile("You have opened Larran's (big|small) chest .*"); @@ -939,6 +941,12 @@ public class LootTrackerPlugin extends Plugin int killCount = Integer.parseInt(boss.group(2)); killCountMap.put(bossName.toUpperCase(), killCount); } + + if (chatMessage.equals("You pick the Master Farmer's pocket.")) + { + eventType = MASTER_FARMER_EVENT; + takeInventorySnapshot(); + } } @SuppressWarnings("unchecked") @@ -1001,7 +1009,8 @@ public class LootTrackerPlugin extends Plugin || HERBIBOAR_EVENT.equals(eventType) || HESPORI_EVENT.equals(eventType) || GAUNTLET_EVENT.equals(eventType) - || WINTERTODT_EVENT.equals(eventType)) + || WINTERTODT_EVENT.equals(eventType) + || MASTER_FARMER_EVENT.equals(eventType)) { if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java index 641c6f7f90..a6adf1b402 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java @@ -181,6 +181,10 @@ class LootPanel extends JPanel switch (name) { + case "master farmer": + currentText = "Current pick-pocket count:"; + loggedText = "Pickpockets logged:"; + break; case "Wintertodt": currentText = "Current Killcount:"; loggedText = "Crates logged:"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java index 9fa1fc47fe..fad58ec12f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java @@ -177,9 +177,8 @@ public class ThievingPlugin extends Plugin session.updateLastThevingAction(); session.hasSucceeded(); - } - else if (message.startsWith("You fail to pickpocket") || message.startsWith("You fail to pick-pocket") || message.startsWith("You fail to steal")) + else if (message.startsWith("You fail to pick") || message.startsWith("You fail to steal")) { if (session == null) {