ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add Herbiboar support to the Loottracker (#8663)

Browse Source 
Close #6136
This commit is contained in:
zaydsalah
2019-04-29 16:03:13 -04:00
committed by Tomas Slusny
parent cb96ae03cc
commit 0258260024
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
View File

@@ -99,6 +99,10 @@ public class LootTrackerPlugin extends Plugin
private static final Pattern CLUE_SCROLL_PATTERN = Pattern.compile("You have completed [0-9]+ ([a-z]+) Treasure Trails."); private static final Pattern CLUE_SCROLL_PATTERN = Pattern.compile("You have completed [0-9]+ ([a-z]+) Treasure Trails.");
private static final int THEATRE_OF_BLOOD_REGION = 12867; private static final int THEATRE_OF_BLOOD_REGION = 12867;
// Herbiboar loot handling
private static final String HERBIBOAR_LOOTED_MESSAGE = "You harvest herbs from the herbiboar, whereupon it escapes.";
private static final String HERBIBOR_EVENT = "Herbiboar";
// 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 Map<Integer, String> CHEST_EVENT_TYPES = ImmutableMap.of( private static final Map<Integer, String> CHEST_EVENT_TYPES = ImmutableMap.of(
@@ -389,14 +393,15 @@ public class LootTrackerPlugin extends Plugin
} }
eventType = CHEST_EVENT_TYPES.get(regionID); eventType = CHEST_EVENT_TYPES.get(regionID);
takeInventorySnapshot();
final ItemContainer itemContainer = client.getItemContainer(InventoryID.INVENTORY); return;
if (itemContainer != null) }
{
inventorySnapshot = HashMultiset.create(); if (message.equals(HERBIBOAR_LOOTED_MESSAGE))
Arrays.stream(itemContainer.getItems()) {
.forEach(item -> inventorySnapshot.add(item.getId(), item.getQuantity())); eventType = HERBIBOR_EVENT;
} takeInventorySnapshot();
return; return;
} }
@@ -433,7 +438,7 @@ public class LootTrackerPlugin extends Plugin
@Subscribe @Subscribe
public void onItemContainerChanged(ItemContainerChanged event) public void onItemContainerChanged(ItemContainerChanged event)
{ {
if (eventType != null && CHEST_EVENT_TYPES.containsValue(eventType)) if (eventType != null && (CHEST_EVENT_TYPES.containsValue(eventType) || HERBIBOR_EVENT.equals(eventType)))
{ {
if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY))
{ {
@@ -445,6 +450,17 @@ public class LootTrackerPlugin extends Plugin
} }
} }
private void takeInventorySnapshot()
{
final ItemContainer itemContainer = client.getItemContainer(InventoryID.INVENTORY);
if (itemContainer != null)
{
inventorySnapshot = HashMultiset.create();
Arrays.stream(itemContainer.getItems())
.forEach(item -> inventorySnapshot.add(item.getId(), item.getQuantity()));
}
}
private void processChestLoot(String chestType, ItemContainer inventoryContainer) private void processChestLoot(String chestType, ItemContainer inventoryContainer)
{ {
if (inventorySnapshot != null) if (inventorySnapshot != null)