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

Revert "hiscore panel: fix total level breakage"

Browse Source
This commit is contained in:
Lotto
2018-04-16 23:01:57 +02:00
parent 0c14613fa4
commit 17413db715
2 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,29 +27,29 @@ package net.runelite.http.api.hiscore;
public enum HiscoreSkill public enum HiscoreSkill
{ {
OVERALL("Overall"), OVERALL("Overall"),
ATTACK("Attack", true), ATTACK("Attack"),
DEFENCE("Defence", true), DEFENCE("Defence"),
STRENGTH("Strength", true), STRENGTH("Strength"),
HITPOINTS("Hitpoints", true), HITPOINTS("Hitpoints"),
RANGED("Ranged", true), RANGED("Ranged"),
PRAYER("Prayer", true), PRAYER("Prayer"),
MAGIC("Magic", true), MAGIC("Magic"),
COOKING("Cooking", true), COOKING("Cooking"),
WOODCUTTING("Woodcutting", true), WOODCUTTING("Woodcutting"),
FLETCHING("Fletching", true), FLETCHING("Fletching"),
FISHING("Fishing", true), FISHING("Fishing"),
FIREMAKING("Firemaking", true), FIREMAKING("Firemaking"),
CRAFTING("Crafting", true), CRAFTING("Crafting"),
SMITHING("Smithing", true), SMITHING("Smithing"),
MINING("Mining", true), MINING("Mining"),
HERBLORE("Herblore", true), HERBLORE("Herblore"),
AGILITY("Agility", true), AGILITY("Agility"),
THIEVING("Thieving", true), THIEVING("Thieving"),
SLAYER("Slayer", true), SLAYER("Slayer"),
FARMING("Farming", true), FARMING("Farming"),
RUNECRAFT("Runecraft", true), RUNECRAFT("Runecraft"),
HUNTER("Hunter", true), HUNTER("Hunter"),
CONSTRUCTION("Construction", true), CONSTRUCTION("Construction"),
CLUE_SCROLL_EASY("Clue Scrolls (easy)"), CLUE_SCROLL_EASY("Clue Scrolls (easy)"),
CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"), CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"),
CLUE_SCROLL_ALL("Clue Scrolls (all)"), CLUE_SCROLL_ALL("Clue Scrolls (all)"),
@@ -61,26 +61,14 @@ public enum HiscoreSkill
CLUE_SCROLL_MASTER("Clue Scrolls (master)"); CLUE_SCROLL_MASTER("Clue Scrolls (master)");
private final String name; private final String name;
private final boolean virtualLevels;
HiscoreSkill(String name) HiscoreSkill(String name)
{
this(name, false);
}
HiscoreSkill(String name, boolean virtualLevels)
{ {
this.name = name; this.name = name;
this.virtualLevels = virtualLevels;
} }
public String getName() public String getName()
{ {
return name; return name;
} }
public boolean hasVirtualLevels()
{
return virtualLevels;
}
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
View File

@@ -550,7 +550,7 @@ public class HiscorePanel extends PluginPanel
Skill s = result.getSkill(skill); Skill s = result.getSkill(skill);
int level; int level;
if (config.virtualLevels() && skill.hasVirtualLevels()) if (config.virtualLevels() && s.getExperience() >= 0)
{ {
level = Experience.getLevelForXp((int) s.getExperience()); level = Experience.getLevelForXp((int) s.getExperience());
} }