ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
ThatGamerBlue
2021-06-04 21:10:58 +01:00
parent cb27a344cf ab5d90fdca
commit 405ab68bf5
8 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java
View File

@@ -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:

9
http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java
View File

@@ -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++));

1
http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java
View File

@@ -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),