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

loot tracker: add bird houses

Browse Source
This commit is contained in:
SirGirion
2020-09-26 18:06:19 -04:00
committed by Adam
parent 908c6b4fe4
commit f01dce648a
2 changed files with 57 additions and 0 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

@@ -201,6 +201,20 @@ public class LootTrackerPlugin extends Plugin
private static final String BIRDNEST_EVENT = "Bird nest"; private static final String BIRDNEST_EVENT = "Bird nest";
private static final Set<Integer> BIRDNEST_IDS = ImmutableSet.of(ItemID.BIRD_NEST, ItemID.BIRD_NEST_5071, ItemID.BIRD_NEST_5072, ItemID.BIRD_NEST_5073, ItemID.BIRD_NEST_5074, ItemID.BIRD_NEST_7413, ItemID.BIRD_NEST_13653, ItemID.BIRD_NEST_22798, ItemID.BIRD_NEST_22800); private static final Set<Integer> BIRDNEST_IDS = ImmutableSet.of(ItemID.BIRD_NEST, ItemID.BIRD_NEST_5071, ItemID.BIRD_NEST_5072, ItemID.BIRD_NEST_5073, ItemID.BIRD_NEST_5074, ItemID.BIRD_NEST_7413, ItemID.BIRD_NEST_13653, ItemID.BIRD_NEST_22798, ItemID.BIRD_NEST_22800);
// Birdhouses
private static final Pattern BIRDHOUSE_PATTERN = Pattern.compile("You dismantle and discard the trap, retrieving (?:(?:a|\\d{1,2}) nests?, )?10 dead birds, \\d{1,3} feathers and (\\d,?\\d{1,3}) Hunter XP\\.");
private static final Map<Integer, String> BIRDHOUSE_XP_TO_TYPE = new ImmutableMap.Builder<Integer, String>().
put(280, "Regular Bird House").
put(420, "Oak Bird House").
put(560, "Willow Bird House").
put(700, "Teak Bird House").
put(820, "Maple Bird House").
put(960, "Mahogany Bird House").
put(1020, "Yew Bird House").
put(1140, "Magic Bird House").
put(1200, "Redwood Bird House").
build();
/* /*
* This map is used when a pickpocket target has a different name in the chat message than their in-game name. * This map is used when a pickpocket target has a different name in the chat message than their in-game name.
* Note that if the two NPCs can be found in the same place, there is a chance of race conditions * Note that if the two NPCs can be found in the same place, there is a chance of race conditions
@@ -708,6 +722,23 @@ public class LootTrackerPlugin extends Plugin
{ {
// Player didn't have the key they needed. // Player didn't have the key they needed.
resetEvent(); resetEvent();
return;
}
// Check if message is a birdhouse type
final Matcher matcher = BIRDHOUSE_PATTERN.matcher(message);
if (matcher.matches())
{
final int xp = Integer.parseInt(matcher.group(1));
final String type = BIRDHOUSE_XP_TO_TYPE.get(xp);
if (type == null)
{
log.debug("Unknown bird house type {}", xp);
return;
}
setEvent(LootRecordType.EVENT, type, client.getRealSkillLevel(Skill.HUNTER));
takeInventorySnapshot();
} }
} }
@@ -728,6 +759,7 @@ public class LootTrackerPlugin extends Plugin
|| SEEDPACK_EVENT.equals(eventType) || SEEDPACK_EVENT.equals(eventType)
|| CASKET_EVENT.equals(eventType) || CASKET_EVENT.equals(eventType)
|| BIRDNEST_EVENT.equals(eventType) || BIRDNEST_EVENT.equals(eventType)
|| eventType.endsWith("Bird House")
|| eventType.startsWith("H.A.M. chest") || eventType.startsWith("H.A.M. chest")
|| lootRecordType == LootRecordType.PICKPOCKET) || lootRecordType == LootRecordType.PICKPOCKET)
{ {

25
runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
View File

@@ -289,4 +289,29 @@ public class LootTrackerPluginTest
QueuedMessage queuedMessage = captor.getValue(); QueuedMessage queuedMessage = captor.getValue();
assertEquals("<colNORMAL>Your loot is worth around <colHIGHLIGHT>60,021,020<colNORMAL> coins.", queuedMessage.getRuneLiteFormattedMessage()); assertEquals("<colNORMAL>Your loot is worth around <colHIGHLIGHT>60,021,020<colNORMAL> coins.", queuedMessage.getRuneLiteFormattedMessage());
} }
@Test
public void testBirdhouses()
{
// No bird nests
ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", "You dismantle and discard the trap, retrieving 10 dead birds, 30 feathers and 1140 Hunter XP.", "", 0);
lootTrackerPlugin.onChatMessage(chatMessage);
assertEquals("Magic Bird House", lootTrackerPlugin.eventType);
assertEquals(LootRecordType.EVENT, lootTrackerPlugin.lootRecordType);
// Single bird nest
chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", "You dismantle and discard the trap, retrieving a nest, 10 dead birds, 50 feathers and 700 Hunter XP.", "", 0);
lootTrackerPlugin.onChatMessage(chatMessage);
assertEquals("Teak Bird House", lootTrackerPlugin.eventType);
assertEquals(LootRecordType.EVENT, lootTrackerPlugin.lootRecordType);
// Multiple nests
chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", "You dismantle and discard the trap, retrieving 2 nests, 10 dead birds, 40 feathers and 280 Hunter XP.", "", 0);
lootTrackerPlugin.onChatMessage(chatMessage);
assertEquals("Regular Bird House", lootTrackerPlugin.eventType);
assertEquals(LootRecordType.EVENT, lootTrackerPlugin.lootRecordType);
}
} }