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

chat commands: support boss shortnames for !lvl

Browse Source
This commit is contained in:
Adam
2022-04-06 10:22:15 -04:00
parent fa3de54b2e
commit bdf556f4bd
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/hiscore/HiscoreSkill.java
View File

@@ -94,7 +94,7 @@ public enum HiscoreSkill
KALPHITE_QUEEN("Kalphite Queen", BOSS), KALPHITE_QUEEN("Kalphite Queen", BOSS),
KING_BLACK_DRAGON("King Black Dragon", BOSS), KING_BLACK_DRAGON("King Black Dragon", BOSS),
KRAKEN("Kraken", BOSS), KRAKEN("Kraken", BOSS),
KREEARRA("Kree'Arra", BOSS), KREEARRA("Kree'arra", BOSS),
KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS), KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS),
MIMIC("Mimic", BOSS), MIMIC("Mimic", BOSS),
NEX("Nex", BOSS), NEX("Nex", BOSS),

26
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
View File

@@ -1339,13 +1339,8 @@ public class ChatCommandsPlugin extends Plugin
search = message.substring(LEVEL_COMMAND_STRING.length() + 1); search = message.substring(LEVEL_COMMAND_STRING.length() + 1);
} }
search = SkillAbbreviations.getFullName(search); final HiscoreSkill skill = findHiscoreSkill(search);
final HiscoreSkill skill; if (skill == null)
try
{
skill = HiscoreSkill.valueOf(search.toUpperCase());
}
catch (IllegalArgumentException i)
{ {
return; return;
} }
@@ -2171,4 +2166,21 @@ public class ChatCommandsPlugin extends Plugin
return WordUtils.capitalize(boss); return WordUtils.capitalize(boss);
} }
} }
private static HiscoreSkill findHiscoreSkill(String search)
{
String s = SkillAbbreviations.getFullName(search);
if (s == search)
{
s = longBossName(search);
}
for (HiscoreSkill skill : HiscoreSkill.values())
{
if (skill.getName().equals(s))
{
return skill;
}
}
return null;
}
} }