From ce0ec535d18f420384f619dfd69bc153c5b5795e Mon Sep 17 00:00:00 2001 From: Giovanni van der Schelde Date: Tue, 5 Apr 2022 21:53:12 +0200 Subject: [PATCH] chat commands: add shortnames for shayzien agility courses --- .../chatcommands/ChatCommandsPlugin.java | 25 +++++++++--- .../chatcommands/ChatCommandsPluginTest.java | 40 +++++++++++++++++++ 2 files changed, 60 insertions(+), 5 deletions(-) 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 7e41725bee..ef23035963 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 @@ -1967,11 +1967,6 @@ public class ChatCommandsPlugin extends Plugin case "hmt": return "Theatre of Blood Hard Mode"; - // agility course - case "prif": - case "prifddinas": - return "Prifddinas Agility Course"; - // The Gauntlet case "gaunt": case "gauntlet": @@ -2022,6 +2017,26 @@ public class ChatCommandsPlugin extends Plugin case "hs 5": return "Hallowed Sepulchre Floor 5"; + // Prifddinas Agility Course + case "prif": + case "prifddinas": + return "Prifddinas Agility Course"; + + // Shayzien Basic Agility Course + case "shayb": + case "sbac": + case "shayzienbasic": + case "shayzien basic": + return "Shayzien Basic Agility Course"; + + // Shayzien Advanced Agility Course + case "shaya": + case "saac": + case "shayadv": + case "shayadvanced": + case "shayzien advanced": + return "Shayzien Advanced Agility Course"; + // Ape Atoll Agility case "aa": case "ape atoll": 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 a928a5709a..843158dd32 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 @@ -389,6 +389,46 @@ public class ChatCommandsPluginTest verify(configManager).setRSProfileConfiguration("personalbest", "prifddinas agility course", 61.2); } + @Test + public void testShayzienAdvancedAgilityLap() + { + // This sets lastBoss + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Your Shayzien Advanced Agility Course lap count is: 2.", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Lap duration: 1:01 (new personal best).", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + verify(configManager).setRSProfileConfiguration("personalbest", "shayzien advanced agility course", 61.0); + verify(configManager).setRSProfileConfiguration("killcount", "shayzien advanced agility course", 2); + + // Precise times + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Lap duration: 1:01.20 (new personal best).", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + verify(configManager).setRSProfileConfiguration("personalbest", "shayzien advanced agility course", 61.2); + } + + @Test + public void testShayzienBasicAgilityLap() + { + // This sets lastBoss + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Your Shayzien Basic Agility Course lap count is: 2.", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Lap duration: 1:01 (new personal best).", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + verify(configManager).setRSProfileConfiguration("personalbest", "shayzien basic agility course", 61.0); + verify(configManager).setRSProfileConfiguration("killcount", "shayzien basic agility course", 2); + + // Precise times + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Lap duration: 1:01.20 (new personal best).", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + verify(configManager).setRSProfileConfiguration("personalbest", "shayzien basic agility course", 61.2); + } + @Test public void testZukNewPb() {