Merge branch 'pr_13375'

This commit is contained in:
Max Weber
2021-03-24 06:18:51 -06:00
6 changed files with 15 additions and 5 deletions

View File

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

View File

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

View File

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

View File

@@ -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());
}

View File

@@ -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 = {

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B