From 976ecd8f6b3dc9806b7fceacddf97b3161bad8bb Mon Sep 17 00:00:00 2001 From: dekvall Date: Thu, 6 Feb 2020 16:43:41 +0100 Subject: [PATCH] hiscores: add nightmare boss --- .../runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../http/api/hiscore/HiscoreResultBuilder.java | 1 + .../runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../http/service/hiscore/HiscoreServiceTest.java | 1 + .../client/plugins/hiscore/HiscorePanel.java | 12 ++++++------ .../client/plugins/hiscore/bosses/nightmare.png | Bin 0 -> 811 bytes 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/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 576b20a39f..aae95b9b83 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 @@ -92,6 +92,7 @@ public class HiscoreResult private Skill kreearra; private Skill krilTsutsaroth; private Skill mimic; + private Skill nightmare; private Skill obor; private Skill sarachnis; private Skill scorpia; @@ -237,6 +238,8 @@ public class HiscoreResult return krilTsutsaroth; case MIMIC: return mimic; + case NIGHTMARE: + return nightmare; 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 3ea03502bd..430755e7dd 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 @@ -117,6 +117,7 @@ class HiscoreResultBuilder hiscoreResult.setKreearra(skills.get(index++)); hiscoreResult.setKrilTsutsaroth(skills.get(index++)); hiscoreResult.setMimic(skills.get(index++)); + hiscoreResult.setNightmare(skills.get(index++)); hiscoreResult.setObor(skills.get(index++)); hiscoreResult.setSarachnis(skills.get(index++)); hiscoreResult.setScorpia(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 ac57522a5b..e20fafac0f 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 @@ -96,6 +96,7 @@ public enum HiscoreSkill KREEARRA("Kree'Arra", BOSS), KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS), MIMIC("Mimic", BOSS), + NIGHTMARE("Nightmare", BOSS), OBOR("Obor", BOSS), SARACHNIS("Sarachnis", BOSS), SCORPIA("Scorpia", BOSS), diff --git a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java index ee91740e17..d825d3047b 100644 --- a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java @@ -98,6 +98,7 @@ public class HiscoreServiceTest + "10170,184\n" + "8064,202\n" + "6936,2\n" + + "2335,9\n" + "-1,-1\n" + "-1,-1\n" + "19779,22\n" 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 fa2a72f92a..4e67a0868c 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 @@ -105,12 +105,12 @@ public class HiscorePanel extends PluginPanel GIANT_MOLE, GROTESQUE_GUARDIANS, HESPORI, KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN, KREEARRA, KRIL_TSUTSAROTH, MIMIC, - OBOR, SARACHNIS, SCORPIA, - SKOTIZO, THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, - THEATRE_OF_BLOOD, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, - TZTOK_JAD, VENENATIS, VETION, - VORKATH, WINTERTODT, ZALCANO, - ZULRAH + NIGHTMARE, OBOR, SARACHNIS, + SCORPIA, SKOTIZO, THE_GAUNTLET, + THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, THERMONUCLEAR_SMOKE_DEVIL, + TZKAL_ZUK, TZTOK_JAD, VENENATIS, + VETION, VORKATH, WINTERTODT, + ZALCANO, ZULRAH ); @Inject diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nightmare.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nightmare.png new file mode 100644 index 0000000000000000000000000000000000000000..22907bb92fa8a2b1cfe2892e74ef1e40dfdaff73 GIT binary patch literal 811 zcmV+`1JwM9P)0nT6(TMe9V8egG#VWu8X_tnA|@gx zEFvm2CMqy0E;TAOKrAvjE-o@KH9RsoKs7u=IX^}^LP|YFO+ZLdLP}IaE;U0#NJULn zMo?NvNKQ#oTuMq&Ofo!7RbEY3Voo(ZP*7G-T4Yf+KvFkAQa4FbTxV2XYE@NRRyspg zVQg1dT~}joSUg5qSz%gQVO%{)U0r2eYIa^;Wnf@uVq$7$W^QR|aA|3BYe-&fZFO#L zcW_K&aBz8Xae8ucdv#D}c6NVwcz}3#fqHs_dwYd@e1&{`hJAg9e}9RAfs2EKjf8}b zg@uoXhLDF_cZi6SiHenri=k6?a}kD8E>o05{Al$4*9m7$iGqnn$kot>$m zpsb>zucV}}rKPc_r?RT5wyPCetgN@KuDP$Ty0Njlwzj{^7;DuUar-rl4-8OF00007 zbW%=J000gwrNiOq*^O5K00C=BL_t(2Q&rOYTftBm2XIV0 zN+Oa_DMj~-f4`lx)id88&*!}F`<%VgXf-H=4#?3FS~(i6`dDQc(0Pz!X)&M0q5!(z zk3>R2wo($a+v@-*fbR40IL9$`tLKa(kYIPIV|0a z699-m7!*34&e8r}%x;Cp*Yb1>52ev)#C-oyb~|jHt>F?3_ho6gm*yy`qT1fYB^d6i z49m?^E{D|u;Z0>3jmOaH!3g_GQdZ0A9Ble?G7tc?i!jb}ZqlC3EW)~9ltFr5d*|sb z#kff7AeVquzcK@W#ua$^j4x2L=f%9qWJ=)gh@b|{&mS!5a8$&cK|h@_Ai=Gi&f)u) z$K@^;@_L(X$%F(|n57H_#^Wi~ZBk~Wb^s_4eM~03ftJr_G#ce?;Z}mMAqe3>G#ri! pE6Nt7cZ}^-z1ne^nw-Et!!J0iIfM2CWiJ2#002ovPDHLkV1kj)P|*MY literal 0 HcmV?d00001