From 4b05699d6e7aa19d71d47e50d13df92d3a529553 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 3 Jun 2021 08:57:11 -0400 Subject: [PATCH] http-api: add tob hm hiscores --- .../net/runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../runelite/http/api/hiscore/HiscoreResultBuilder.java | 9 +++++---- .../java/net/runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../http/service/hiscore/HiscoreServiceTest.java | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) 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 19331ed50f..6bb87e0909 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 @@ -102,6 +102,7 @@ public class HiscoreResult private Skill gauntlet; private Skill corruptedGauntlet; private Skill theatreOfBlood; + private Skill theatreOfBloodHardMode; private Skill thermonuclearSmokeDevil; private Skill tzKalZuk; private Skill tzTokJad; @@ -260,6 +261,8 @@ public class HiscoreResult return corruptedGauntlet; case THEATRE_OF_BLOOD: return theatreOfBlood; + case THEATRE_OF_BLOOD_HARD_MODE: + return theatreOfBloodHardMode; case THERMONUCLEAR_SMOKE_DEVIL: return thermonuclearSmokeDevil; case TZKAL_ZUK: 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 56834ccf94..33e43cc465 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,13 +123,14 @@ 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.setTempoross(skills.get(index++)); 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.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 54820a2e8b..d005e5a28c 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 @@ -106,6 +106,7 @@ public enum HiscoreSkill THE_GAUNTLET("The Gauntlet", BOSS), THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet", BOSS), THEATRE_OF_BLOOD("Theatre of Blood", BOSS), + THEATRE_OF_BLOOD_HARD_MODE("Theatre of Blood: Hard Mode", BOSS), THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil", BOSS), TZKAL_ZUK("TzKal-Zuk", BOSS), TZTOK_JAD("TzTok-Jad", 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 f22d2c3f5d..27f4766604 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 @@ -107,7 +107,8 @@ public class HiscoreServiceTest + "1234,5678\n" // Tempoross + "-1,-1\n" + "-1,-1\n" - + "-1,-1\n" + + "-1,-1\n" // TOB + + "42,42\n" // TOB: Hard Mode + "29347,130\n" + "723,4\n" + "1264,38\n" @@ -150,6 +151,7 @@ public class HiscoreServiceTest Assert.assertEquals(37, result.getAbyssalSire().getLevel()); Assert.assertEquals(92357, result.getCallisto().getRank()); Assert.assertEquals(5678, result.getTempoross().getLevel()); + Assert.assertEquals(42, result.getTheatreOfBloodHardMode().getLevel()); Assert.assertEquals(5847, result.getZulrah().getLevel()); }