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

slayer plugin: support new Turael task completion message

Browse Source
This commit is contained in:
Adam
2020-08-12 10:15:43 -04:00
parent d104c9a3e7
commit 7c19a6c73b
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -462,7 +462,7 @@ public class SlayerPlugin extends Plugin
config.slaughter(slaughterChargeCount); config.slaughter(slaughterChargeCount);
} }
if (chatMsg.endsWith("; return to a Slayer master.")) if (chatMsg.startsWith("You've completed") && (chatMsg.contains("Slayer master") || chatMsg.contains("Slayer Master")))
{ {
Matcher mComplete = CHAT_COMPLETE_MESSAGE.matcher(chatMsg); Matcher mComplete = CHAT_COMPLETE_MESSAGE.matcher(chatMsg);

12
runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
View File

@@ -105,6 +105,7 @@ public class SlayerPluginTest
private static final String TASK_COMPLETE_NO_POINTS = "<col=ef1020>You've completed 3 tasks; return to a Slayer master.</col>"; private static final String TASK_COMPLETE_NO_POINTS = "<col=ef1020>You've completed 3 tasks; return to a Slayer master.</col>";
private static final String TASK_POINTS = "You've completed 9 tasks and received 0 points, giving you a total of 18,000; return to a Slayer master."; private static final String TASK_POINTS = "You've completed 9 tasks and received 0 points, giving you a total of 18,000; return to a Slayer master.";
private static final String TASK_LARGE_STREAK = "You've completed 2,465 tasks and received 15 points, giving you a total of 17,566,000; return to a Slayer master."; private static final String TASK_LARGE_STREAK = "You've completed 2,465 tasks and received 15 points, giving you a total of 17,566,000; return to a Slayer master.";
private static final String TASK_COMPETE_TURAEL = "You've completed 104 tasks. You'll be eligible to earn reward points if you complete tasks from a more advanced Slayer Master.";
private static final String TASK_COMPLETE = "You need something new to hunt."; private static final String TASK_COMPLETE = "You need something new to hunt.";
private static final String TASK_CANCELED = "Your task has been cancelled."; private static final String TASK_CANCELED = "Your task has been cancelled.";
@@ -485,6 +486,17 @@ public class SlayerPluginTest
verify(slayerConfig).points(17_566_000); verify(slayerConfig).points(17_566_000);
} }
@Test
public void testTaskCompleteTurael()
{
ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_COMPETE_TURAEL, null, 0);
slayerPlugin.onChatMessage(chatMessageEvent);
verify(slayerConfig).streak(104);
assertEquals("", slayerPlugin.getTaskName());
assertEquals(0, slayerPlugin.getAmount());
}
@Test @Test
public void testComplete() public void testComplete()
{ {