From f2b7f263876361ef0f7d16197e8aa399d4e53b19 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 30 Jun 2021 04:47:50 -0600 Subject: [PATCH] http-api, rl-client: add phosani's nightmare to hiscores --- .../runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../http/api/hiscore/HiscoreResultBuilder.java | 6 ++---- .../runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../client/plugins/hiscore/HiscorePanel.java | 2 +- .../plugins/hiscore/bosses/phosanis_nightmare.png | Bin 0 -> 492 bytes 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/phosanis_nightmare.png diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java index 6bb87e0909..de52f5c5aa 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java @@ -94,6 +94,7 @@ public class HiscoreResult private Skill krilTsutsaroth; private Skill mimic; private Skill nightmare; + private Skill phosanisNightmare; private Skill obor; private Skill sarachnis; private Skill scorpia; @@ -245,6 +246,8 @@ public class HiscoreResult return mimic; case NIGHTMARE: return nightmare; + case PHOSANIS_NIGHTMARE: + return phosanisNightmare; case OBOR: return obor; case SARACHNIS: diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java index 33e43cc465..6c88ebcd18 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java @@ -119,6 +119,7 @@ class HiscoreResultBuilder hiscoreResult.setKrilTsutsaroth(skills.get(index++)); hiscoreResult.setMimic(skills.get(index++)); hiscoreResult.setNightmare(skills.get(index++)); + hiscoreResult.setPhosanisNightmare(skills.get(index++)); hiscoreResult.setObor(skills.get(index++)); hiscoreResult.setSarachnis(skills.get(index++)); hiscoreResult.setScorpia(skills.get(index++)); @@ -127,10 +128,7 @@ class HiscoreResultBuilder hiscoreResult.setGauntlet(skills.get(index++)); hiscoreResult.setCorruptedGauntlet(skills.get(index++)); hiscoreResult.setTheatreOfBlood(skills.get(index++)); - if (skills.size() >= 82) - { - hiscoreResult.setTheatreOfBloodHardMode(skills.get(index++)); - } + hiscoreResult.setTheatreOfBloodHardMode(skills.get(index++)); hiscoreResult.setThermonuclearSmokeDevil(skills.get(index++)); hiscoreResult.setTzKalZuk(skills.get(index++)); hiscoreResult.setTzTokJad(skills.get(index++)); diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java index d005e5a28c..698bd34e8e 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java @@ -98,6 +98,7 @@ public enum HiscoreSkill KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS), MIMIC("Mimic", BOSS), NIGHTMARE("Nightmare", BOSS), + PHOSANIS_NIGHTMARE("Phosani's Nightmare", BOSS), OBOR("Obor", BOSS), SARACHNIS("Sarachnis", BOSS), SCORPIA("Scorpia", BOSS), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index 64424456ee..25ae9a55b3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -104,7 +104,7 @@ public class HiscorePanel extends PluginPanel GIANT_MOLE, GROTESQUE_GUARDIANS, HESPORI, KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN, KREEARRA, KRIL_TSUTSAROTH, MIMIC, - NIGHTMARE, OBOR, SARACHNIS, + NIGHTMARE, PHOSANIS_NIGHTMARE, OBOR, SARACHNIS, SCORPIA, SKOTIZO, TEMPOROSS, THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, THEATRE_OF_BLOOD_HARD_MODE, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/phosanis_nightmare.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/phosanis_nightmare.png new file mode 100644 index 0000000000000000000000000000000000000000..c0f7645c02c50ca4a8f51792daa69a258ea4e5d0 GIT binary patch literal 492 zcmVik5M4dR=OEU|?r; zP-k6TWot-Ys});bKvY~kNkc7yi$js}!w+p(es=MV=oI(X~MLnHNmk*QI7}>QO zK^YRld1DjB)f|o}HjM2|lnOwVuE=&Fd+a)~?x4CYs0 z1SD`l8k5en5ONLgH(~tC;WlctejmIAANWc5zCWUy?LiJKiRg(jrTlO_CJErKqL#MZ iw|n}GlQx__{>m5gGY{Kv1ji!)0000