chat commands: fix !lvl cox cm
The command could not work before because the capitalize in longBossName would produce a capital Of causing the hiscore skill name to not match. This normalizes from the hiscore name by removing : to compare it to our internal boss names.
This commit is contained in:
@@ -2044,6 +2044,7 @@ public class ChatCommandsPlugin extends Plugin
|
|||||||
return "Chambers of Xeric 24+ players";
|
return "Chambers of Xeric 24+ players";
|
||||||
|
|
||||||
// Chambers of Xeric Challenge Mode
|
// Chambers of Xeric Challenge Mode
|
||||||
|
case "chambers of xeric: challenge mode":
|
||||||
case "cox cm":
|
case "cox cm":
|
||||||
case "xeric cm":
|
case "xeric cm":
|
||||||
case "chambers cm":
|
case "chambers cm":
|
||||||
@@ -2433,7 +2434,9 @@ public class ChatCommandsPlugin extends Plugin
|
|||||||
}
|
}
|
||||||
for (HiscoreSkill skill : HiscoreSkill.values())
|
for (HiscoreSkill skill : HiscoreSkill.values())
|
||||||
{
|
{
|
||||||
if (skill.getName().equals(s))
|
// longBossName the skill name to normalize from hiscore name
|
||||||
|
// to our internal name (removing the colon)
|
||||||
|
if (longBossName(skill.getName()).equals(s))
|
||||||
{
|
{
|
||||||
return skill;
|
return skill;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -618,7 +618,7 @@ public class ChatCommandsPluginTest
|
|||||||
|
|
||||||
HiscoreResult hiscoreResult = new HiscoreResult();
|
HiscoreResult hiscoreResult = new HiscoreResult();
|
||||||
hiscoreResult.setPlayer(PLAYER_NAME);
|
hiscoreResult.setPlayer(PLAYER_NAME);
|
||||||
hiscoreResult.setZulrah(new Skill(10, 1000, -1));
|
hiscoreResult.setChambersOfXericChallengeMode(new Skill(10, 1000, -1));
|
||||||
|
|
||||||
when(hiscoreClient.lookup(eq(PLAYER_NAME), nullable(HiscoreEndpoint.class))).thenReturn(hiscoreResult);
|
when(hiscoreClient.lookup(eq(PLAYER_NAME), nullable(HiscoreEndpoint.class))).thenReturn(hiscoreResult);
|
||||||
|
|
||||||
@@ -628,9 +628,9 @@ public class ChatCommandsPluginTest
|
|||||||
chatMessage.setType(ChatMessageType.PUBLICCHAT);
|
chatMessage.setType(ChatMessageType.PUBLICCHAT);
|
||||||
chatMessage.setName(PLAYER_NAME);
|
chatMessage.setName(PLAYER_NAME);
|
||||||
chatMessage.setMessageNode(messageNode);
|
chatMessage.setMessageNode(messageNode);
|
||||||
chatCommandsPlugin.playerSkillLookup(chatMessage, "!lvl zulrah");
|
chatCommandsPlugin.playerSkillLookup(chatMessage, "!lvl cox cm");
|
||||||
|
|
||||||
verify(messageNode).setRuneLiteFormatMessage("<colNORMAL>Level <colHIGHLIGHT>Zulrah: 1000<colNORMAL> Rank: <colHIGHLIGHT>10");
|
verify(messageNode).setRuneLiteFormatMessage("<colNORMAL>Level <colHIGHLIGHT>Chambers of Xeric: Challenge Mode: 1000<colNORMAL> Rank: <colHIGHLIGHT>10");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user