From 048a74cfd161322e384fbcaaa3fb9a44a5fc3c25 Mon Sep 17 00:00:00 2001 From: sdburns1998 <49877861+sdburns1998@users.noreply.github.com> Date: Thu, 16 May 2019 02:47:20 +0200 Subject: [PATCH] Slayer jewelry Updates Slayer Counter(#257) --- .../client/plugins/slayer/SlayerPlugin.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index a5d859ed7e..a9da3d2040 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -117,6 +117,10 @@ public class SlayerPlugin extends Plugin private static final String CHAT_SUPERIOR_MESSAGE = "A superior foe has appeared..."; private static final Pattern COMBAT_BRACELET_TASK_UPDATE_MESSAGE = Pattern.compile("^You still need to kill (\\d+) monsters to complete your current Slayer assignment"); + private static final String CHAT_BRACELET_SLAUGHTER = "Your bracelet of slaughter prevents your slayer"; + private static final String CHAT_BRACELET_EXPEDITIOUS = "Your expeditious bracelet helps you progress your"; + + //NPC messages private static final Pattern NPC_ASSIGN_MESSAGE = Pattern.compile(".*(?:Your new task is to kill|You are to bring balance to)\\s*(?\\d+) (?.+?)(?: (?:in|on|south of) (?:the )?(?.+))?\\."); private static final Pattern NPC_ASSIGN_BOSS_MESSAGE = Pattern.compile("^Excellent. You're now assigned to kill (?:the )?(.*) (\\d+) times.*Your reward point tally is (.*)\\.$"); @@ -626,6 +630,16 @@ public class SlayerPlugin extends Plugin // Avoid race condition (combat brace message goes through first before XP drop) currentTask.setAmount(currentTask.getAmount() + 1); } + + if (chatMsg.startsWith(CHAT_BRACELET_SLAUGHTER)) + { + currentTask.setAmount(currentTask.getAmount() + 1); + } + + if (chatMsg.startsWith(CHAT_BRACELET_EXPEDITIOUS)) + { + currentTask.setAmount(currentTask.getAmount() - 1); + } } @Subscribe