From ee216e0c434ffbde4c2296992571e9cc29887a5d Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 11 Apr 2019 20:28:54 -0400 Subject: [PATCH] http api: update for beginner clues Co-authored-by: Robin Rijkeboer --- .../runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../http/api/hiscore/HiscoreResultBuilder.java | 15 ++++++++------- .../runelite/http/api/hiscore/HiscoreSkill.java | 5 +++-- .../http/service/hiscore/HiscoreServiceTest.java | 6 ++++-- 4 files changed, 18 insertions(+), 11 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 2e1a5bfe8b..9af6f6e4b9 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 @@ -57,6 +57,7 @@ public class HiscoreResult private Skill bountyHunterHunter; private Skill bountyHunterRogue; private Skill clueScrollAll; + private Skill clueScrollBeginner; private Skill clueScrollEasy; private Skill clueScrollMedium; private Skill clueScrollHard; @@ -122,6 +123,8 @@ public class HiscoreResult return getBountyHunterRogue(); case CLUE_SCROLL_ALL: return getClueScrollAll(); + case CLUE_SCROLL_BEGINNER: + return getClueScrollBeginner(); case CLUE_SCROLL_EASY: return getClueScrollEasy(); case CLUE_SCROLL_MEDIUM: 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 37beca0ae1..a6117160a4 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 @@ -79,13 +79,14 @@ public class HiscoreResultBuilder hiscoreResult.setConstruction(skills.get(23)); hiscoreResult.setBountyHunterHunter(skills.get(24)); hiscoreResult.setBountyHunterRogue(skills.get(25)); - hiscoreResult.setClueScrollAll(skills.get(26)); - hiscoreResult.setClueScrollEasy(skills.get(27)); - hiscoreResult.setClueScrollMedium(skills.get(28)); - hiscoreResult.setClueScrollHard(skills.get(29)); - hiscoreResult.setClueScrollElite(skills.get(30)); - hiscoreResult.setClueScrollMaster(skills.get(31)); - hiscoreResult.setLastManStanding(skills.get(32)); + hiscoreResult.setLastManStanding(skills.get(26)); + hiscoreResult.setClueScrollAll(skills.get(27)); + hiscoreResult.setClueScrollBeginner(skills.get(28)); + hiscoreResult.setClueScrollEasy(skills.get(29)); + hiscoreResult.setClueScrollMedium(skills.get(30)); + hiscoreResult.setClueScrollHard(skills.get(31)); + hiscoreResult.setClueScrollElite(skills.get(32)); + hiscoreResult.setClueScrollMaster(skills.get(33)); return hiscoreResult; } } 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 ae745522d0..db043dfcfb 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 @@ -52,13 +52,14 @@ public enum HiscoreSkill CONSTRUCTION("Construction"), BOUNTY_HUNTER_HUNTER("Bounty Hunter - Hunter"), BOUNTY_HUNTER_ROGUE("Bounty Hunter - Rogue"), + LAST_MAN_STANDING("Last Man Standing"), CLUE_SCROLL_ALL("Clue Scrolls (all)"), + CLUE_SCROLL_BEGINNER("Clue Scrolls (beginner)"), CLUE_SCROLL_EASY("Clue Scrolls (easy)"), CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"), CLUE_SCROLL_HARD("Clue Scrolls (hard)"), CLUE_SCROLL_ELITE("Clue Scrolls (elite)"), - CLUE_SCROLL_MASTER("Clue Scrolls (master)"), - LAST_MAN_STANDING("Last Man Standing"); + CLUE_SCROLL_MASTER("Clue Scrolls (master)"); private final String name; 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 17074fc898..9cda0a54ed 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 @@ -62,13 +62,14 @@ public class HiscoreServiceTest + "492790,1,0\n" + "-1,-1\n" + "73,1738\n" + + "-1,-1\n" + "531,1432\n" + + "324,212\n" + "8008,131\n" + "1337,911\n" + "42,14113\n" + "1,777\n" - + "254,92\n" - + "-1,-1"; + + "254,92\n"; private final MockWebServer server = new MockWebServer(); @@ -97,6 +98,7 @@ public class HiscoreServiceTest Assert.assertEquals(159727L, result.getFishing().getExperience()); Assert.assertEquals(492790, result.getConstruction().getRank()); Assert.assertEquals(1432, result.getClueScrollAll().getLevel()); + Assert.assertEquals(324, result.getClueScrollBeginner().getRank()); Assert.assertEquals(8008, result.getClueScrollEasy().getRank()); Assert.assertEquals(911, result.getClueScrollMedium().getLevel()); Assert.assertEquals(42, result.getClueScrollHard().getRank());