From 43e2446798b99a8fd00768acbab6889c691c37bb Mon Sep 17 00:00:00 2001 From: Jim Frode Nilsen Date: Wed, 27 Mar 2019 23:48:53 +0100 Subject: [PATCH] chat commands: add herbiboar kc --- .../plugins/chatcommands/ChatCommandsPlugin.java | 4 +++- .../plugins/chatcommands/ChatCommandsPluginTest.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index e7e22cdae3..72f4aec414 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -81,7 +81,7 @@ import org.apache.commons.text.WordUtils; public class ChatCommandsPlugin extends Plugin { private static final float HIGH_ALCHEMY_CONSTANT = 0.6f; - private static final Pattern KILLCOUNT_PATTERN = Pattern.compile("Your (.+) kill count is: (\\d+)"); + private static final Pattern KILLCOUNT_PATTERN = Pattern.compile("Your (.+) (?:kill|harvest) count is: (\\d+)"); private static final Pattern RAIDS_PATTERN = Pattern.compile("Your completed (.+) count is: (\\d+)"); private static final Pattern WINTERTODT_PATTERN = Pattern.compile("Your subdued Wintertodt count is: (\\d+)"); private static final Pattern BARROWS_PATTERN = Pattern.compile("Your Barrows chest count is: (\\d+)"); @@ -1108,6 +1108,8 @@ public class ChatCommandsPlugin extends Plugin return "Wintertodt"; case "barrows": return "Barrows Chests"; + case "herbi": + return "Herbiboar"; // cox case "cox": diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java index cc6703db91..57615b907a 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java @@ -130,6 +130,17 @@ public class ChatCommandsPluginTest verify(configManager).setConfiguration("killcount.adam", "barrows chests", 277); } + @Test + public void testHerbiboar() + { + when(client.getUsername()).thenReturn("Adam"); + + ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your herbiboar harvest count is: 4091.", null, 0); + chatCommandsPlugin.onChatMessage(chatMessageEvent); + + verify(configManager).setConfiguration("killcount.adam", "herbiboar", 4091); + } + @Test public void testPersonalBest() {