From 0f17ecdaeadacc93cb4a16e6903b6208251ac852 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 6 Jan 2021 14:27:01 -0500 Subject: [PATCH] http-api: add soul wars hiscores --- .../main/java/net/runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../net/runelite/http/api/hiscore/HiscoreResultBuilder.java | 1 + .../main/java/net/runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../net/runelite/http/service/hiscore/HiscoreServiceTest.java | 2 ++ 4 files changed, 7 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 aae95b9b83..949a022254 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 @@ -65,6 +65,7 @@ public class HiscoreResult private Skill clueScrollElite; private Skill clueScrollMaster; private Skill lastManStanding; + private Skill soulWarsZeal; private Skill abyssalSire; private Skill alchemicalHydra; private Skill barrowsChests; @@ -184,6 +185,8 @@ public class HiscoreResult return getClueScrollMaster(); case LAST_MAN_STANDING: return getLastManStanding(); + case SOUL_WARS_ZEAL: + return getSoulWarsZeal(); case ABYSSAL_SIRE: return abyssalSire; case ALCHEMICAL_HYDRA: 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 430755e7dd..5631a5b713 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 @@ -87,6 +87,7 @@ class HiscoreResultBuilder hiscoreResult.setClueScrollElite(skills.get(index++)); hiscoreResult.setClueScrollMaster(skills.get(index++)); hiscoreResult.setLastManStanding(skills.get(index++)); + hiscoreResult.setSoulWarsZeal(skills.get(index++)); // seasonal doesn't have boss hiscores if (index < skills.size()) { 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 e20fafac0f..caebed437d 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 @@ -69,6 +69,7 @@ public enum HiscoreSkill CLUE_SCROLL_ELITE("Clue Scrolls (elite)", ACTIVITY), CLUE_SCROLL_MASTER("Clue Scrolls (master)", ACTIVITY), LAST_MAN_STANDING("Last Man Standing", ACTIVITY), + SOUL_WARS_ZEAL("Soul Wars Zeal", ACTIVITY), ABYSSAL_SIRE("Abyssal Sire", BOSS), ALCHEMICAL_HYDRA("Alchemical Hydra", BOSS), BARROWS_CHESTS("Barrows Chests", 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 d825d3047b..1a9e79a7f4 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 @@ -71,6 +71,7 @@ public class HiscoreServiceTest + "1,777\n" + "254,92\n" + "-1,-1\n" // lms + + "1,241\n" // soul wars + "24870,37\n" + "15020,388\n" + "50463,147\n" @@ -150,6 +151,7 @@ public class HiscoreServiceTest Assert.assertEquals(777, result.getClueScrollElite().getLevel()); Assert.assertEquals(254, result.getClueScrollMaster().getRank()); Assert.assertEquals(-1, result.getLastManStanding().getLevel()); + Assert.assertEquals(241, result.getSoulWarsZeal().getLevel()); Assert.assertEquals(2460, result.getLeaguePoints().getLevel()); Assert.assertEquals(37, result.getAbyssalSire().getLevel()); Assert.assertEquals(92357, result.getCallisto().getRank());