loottracker: Add master farmer

This commit is contained in:
Owain van Brakel
2019-11-10 04:37:55 +01:00
parent 29bab8ca9d
commit 80b500807a
3 changed files with 15 additions and 3 deletions

View File

@@ -170,6 +170,8 @@ public class LootTrackerPlugin extends Plugin
private static final String GAUNTLET_EVENT = "The Gauntlet"; private static final String GAUNTLET_EVENT = "The Gauntlet";
private static final int GAUNTLET_LOBBY_REGION = 12127; private static final int GAUNTLET_LOBBY_REGION = 12127;
private static final String MASTER_FARMER_EVENT = "Master farmer";
// Chest loot handling // Chest loot handling
private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!"; 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 .*"); private static final Pattern LARRAN_LOOTED_PATTERN = Pattern.compile("You have opened Larran's (big|small) chest .*");
@@ -911,6 +913,12 @@ public class LootTrackerPlugin extends Plugin
int killCount = Integer.parseInt(boss.group(2)); int killCount = Integer.parseInt(boss.group(2));
killCountMap.put(bossName.toUpperCase(), killCount); killCountMap.put(bossName.toUpperCase(), killCount);
} }
if (chatMessage.equals("You pick the Master Farmer's pocket."))
{
eventType = MASTER_FARMER_EVENT;
takeInventorySnapshot();
}
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -968,7 +976,8 @@ public class LootTrackerPlugin extends Plugin
|| HERBIBOAR_EVENT.equals(eventType) || HERBIBOAR_EVENT.equals(eventType)
|| HESPORI_EVENT.equals(eventType) || HESPORI_EVENT.equals(eventType)
|| GAUNTLET_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)) if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY))
{ {

View File

@@ -181,6 +181,10 @@ class LootPanel extends JPanel
switch (name) switch (name)
{ {
case "master farmer":
currentText = "Current pick-pocket count:";
loggedText = "Pickpockets logged:";
break;
case "Wintertodt": case "Wintertodt":
currentText = "Current Killcount:"; currentText = "Current Killcount:";
loggedText = "Crates logged:"; loggedText = "Crates logged:";

View File

@@ -177,9 +177,8 @@ public class ThievingPlugin extends Plugin
session.updateLastThevingAction(); session.updateLastThevingAction();
session.hasSucceeded(); 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 pick-pocket") || message.startsWith("You fail to steal"))
{ {
if (session == null) if (session == null)
{ {