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 2a2465de3b..521cfc77e7 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 @@ -86,8 +86,8 @@ public class SlayerPlugin extends Plugin private static final Pattern CHAT_COMPLETE_MESSAGE = Pattern.compile("[\\d]+(?:,[\\d]+)?"); private static final String CHAT_CANCEL_MESSAGE = "Your task has been cancelled."; private static final String CHAT_SUPERIOR_MESSAGE = "A superior foe has appeared..."; - private static final String CHAT_BRACELET_SLAUGHTER = "Your bracelet of slaughter prevents your slayer count decreasing."; - private static final String CHAT_BRACELET_EXPEDITIOUS = "Your expeditious bracelet helps you progress your slayer task faster."; + 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"; private static final String CHAT_BRACELET_SLAUGHTER_CHARGE = "Your bracelet of slaughter has "; private static final String CHAT_BRACELET_EXPEDITIOUS_CHARGE = "Your expeditious bracelet has "; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java index 18aa07f78d..a79edfe177 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java @@ -64,6 +64,9 @@ public class SlayerPluginTest private static final String BRACLET_SLAUGHTER = "Your bracelet of slaughter prevents your slayer count decreasing."; private static final String BRACLET_EXPEDITIOUS = "Your expeditious bracelet helps you progress your slayer task faster."; + private static final String BRACLET_SLAUGHTER_V2 = "Your bracelet of slaughter prevents your slayer count decreasing. It has one charge left"; + private static final String BRACLET_EXPEDITIOUS_V2 = "Your expeditious bracelet helps you progress your slayer task faster. It has one charge left."; + private static final String CHAT_BRACELET_SLAUGHTER_CHARGE = "Your bracelet of slaughter has 12 charges left."; private static final String CHAT_BRACELET_EXPEDITIOUS_CHARGE = "Your expeditious bracelet has 12 charges left."; @@ -208,6 +211,16 @@ public class SlayerPluginTest slayerPlugin.setSlaughterChargeCount(-1); slayerPlugin.onGameTick(new GameTick()); assertEquals(30, slayerPlugin.getSlaughterChargeCount()); + + chatMessageEvent = new ChatMessage(SERVER, "", BRACLET_SLAUGHTER_V2, null); + + slayerPlugin.setAmount(42); + slayerPlugin.setSlaughterChargeCount(2); + + slayerPlugin.onChatMessage(chatMessageEvent); + + assertEquals(1, slayerPlugin.getSlaughterChargeCount()); + assertEquals(43, slayerPlugin.getAmount()); } @Test @@ -241,5 +254,15 @@ public class SlayerPluginTest slayerPlugin.setExpeditiousChargeCount(-1); slayerPlugin.onGameTick(new GameTick()); assertEquals(30, slayerPlugin.getExpeditiousChargeCount()); + + chatMessageEvent = new ChatMessage(SERVER, "", BRACLET_EXPEDITIOUS_V2, null); + + slayerPlugin.setAmount(42); + slayerPlugin.setExpeditiousChargeCount(2); + + slayerPlugin.onChatMessage(chatMessageEvent); + + assertEquals(41, slayerPlugin.getAmount()); + assertEquals(1, slayerPlugin.getExpeditiousChargeCount()); } }