From 29dbb949c99cd36eceba60b4444718ec930aa3e0 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 22 Mar 2021 10:23:58 -0400 Subject: [PATCH 1/2] http-api: add Tempoross hiscores --- .../java/net/runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../net/runelite/http/api/hiscore/HiscoreResultBuilder.java | 4 ++++ .../main/java/net/runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../net/runelite/http/service/hiscore/HiscoreServiceTest.java | 2 ++ 4 files changed, 10 insertions(+) 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 949a022254..19331ed50f 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 @@ -98,6 +98,7 @@ public class HiscoreResult private Skill sarachnis; private Skill scorpia; private Skill skotizo; + private Skill tempoross; private Skill gauntlet; private Skill corruptedGauntlet; private Skill theatreOfBlood; @@ -251,6 +252,8 @@ public class HiscoreResult return scorpia; case SKOTIZO: return skotizo; + case TEMPOROSS: + return tempoross; case THE_GAUNTLET: return gauntlet; case THE_CORRUPTED_GAUNTLET: 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 5631a5b713..56834ccf94 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 @@ -123,6 +123,10 @@ class HiscoreResultBuilder hiscoreResult.setSarachnis(skills.get(index++)); hiscoreResult.setScorpia(skills.get(index++)); hiscoreResult.setSkotizo(skills.get(index++)); + if (skills.size() >= 81) + { + hiscoreResult.setTempoross(skills.get(index++)); + } hiscoreResult.setGauntlet(skills.get(index++)); hiscoreResult.setCorruptedGauntlet(skills.get(index++)); hiscoreResult.setTheatreOfBlood(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 caebed437d..54820a2e8b 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 @@ -102,6 +102,7 @@ public enum HiscoreSkill SARACHNIS("Sarachnis", BOSS), SCORPIA("Scorpia", BOSS), SKOTIZO("Skotizo", BOSS), + TEMPOROSS("Tempoross", BOSS), THE_GAUNTLET("The Gauntlet", BOSS), THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet", BOSS), THEATRE_OF_BLOOD("Theatre of Blood", 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 1a9e79a7f4..fb84ee63a4 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 @@ -104,6 +104,7 @@ public class HiscoreServiceTest + "-1,-1\n" + "19779,22\n" + "58283,10\n" + + "1234,5678\n" // Tempoross + "-1,-1\n" + "-1,-1\n" + "-1,-1\n" @@ -155,6 +156,7 @@ public class HiscoreServiceTest Assert.assertEquals(2460, result.getLeaguePoints().getLevel()); Assert.assertEquals(37, result.getAbyssalSire().getLevel()); Assert.assertEquals(92357, result.getCallisto().getRank()); + Assert.assertEquals(5678, result.getTempoross().getLevel()); Assert.assertEquals(5847, result.getZulrah().getLevel()); } From ae1b9ad0cbb32b4713ed90d8035bf3e4bc02bc19 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 22 Mar 2021 10:24:28 -0400 Subject: [PATCH 2/2] hiscore panel: add Tempoross --- .../client/plugins/hiscore/HiscorePanel.java | 10 +++++----- .../client/plugins/hiscore/bosses/tempoross.png | Bin 0 -> 469 bytes 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/tempoross.png 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 25191a428f..d3e006f3f1 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 @@ -107,11 +107,11 @@ public class HiscorePanel extends PluginPanel KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN, KREEARRA, KRIL_TSUTSAROTH, MIMIC, 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 + SCORPIA, SKOTIZO, TEMPOROSS, + THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, + THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, TZTOK_JAD, + VENENATIS, VETION, VORKATH, + WINTERTODT, ZALCANO, ZULRAH ); private static final HiscoreEndpoint[] ENDPOINTS = { diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/tempoross.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/tempoross.png new file mode 100644 index 0000000000000000000000000000000000000000..7aebcc5471933aadee794abe866b37b4c6abd5b7 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^5NNo)832_C|aNwPi5m{9qR9F(2 zU+9;fZ5I~hpO^2Qnd6n7WgQZ3_54|4XLmwNM|5LLR83t-NkvFmxo>u^dt!=vLW)aV zl0#&yrC*?xpRa|Fx2e0kzO###on7X%nW??~@$DV4ZLOi@RS|`yfmwNuQE`SIUL3r< z851YR^h`)@YV|KK3n(n}FD&xRFY-vuc27;WOG~wkj&XSh z%~<>&=wjxQAirRSY0}{w3hRK}3!W~HAsXkmp1a<6$UuZ8;9Z~W@^T?2#f8)FE-nA} z|FDNcgxe$DLV24{GN;QPOFJ{X$bI{rJ)g&U{q^5ZZH{RR?s2@&8>4$=R>jNze;0li z|Dm+1VamME3Qw}j^Jn_*W##N}`=}A)vijtWP5oL&mRZKVGl`CPGi3=^Mwl8)vawld z&Rk7}N#9BrZ9ej%WFdp&`G#DpwbeI#>bPe!cRY}Y3`{*JV{`CK;M&~7niqdGPW1NJ zy+Z%Zlj*-3XSQ6M^Gd@j#M9#Z)5l*rgo?DE->fk(Kf8d}af%DmZcyZSy85}Sb4q9e E0E3per2qf` literal 0 HcmV?d00001