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

Merge pull request #3058 from AlexKolpa/fix-total

Browse Source 
Fix setting of hiscore stats after combat level
This commit is contained in:
Adam
2018-05-21 17:56:59 -04:00
committed by GitHub
parent ebb665df45 3be81ae012
commit 71ead2f18a
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -636,22 +636,26 @@ public class HiscorePanel extends PluginPanel
*/ */
if (SKILLS.contains(skill)) if (SKILLS.contains(skill))
{ {
int currentLevel = Experience.getLevelForXp((int) result.getSkill(skill).getExperience()); long experience = result.getSkill(skill).getExperience();
int currentXp = (int) result.getSkill(skill).getExperience(); if (experience >= 0)
int xpForCurrentLevel = Experience.getXpForLevel(currentLevel); {
int xpForNextLevel = currentLevel + 1 <= Experience.MAX_VIRT_LEVEL ? Experience.getXpForLevel(currentLevel + 1) : -1; int currentLevel = Experience.getLevelForXp((int) experience);
int currentXp = (int) result.getSkill(skill).getExperience();
int xpForCurrentLevel = Experience.getXpForLevel(currentLevel);
int xpForNextLevel = currentLevel + 1 <= Experience.MAX_VIRT_LEVEL ? Experience.getXpForLevel(currentLevel + 1) : -1;
double xpGained = currentXp - xpForCurrentLevel; double xpGained = currentXp - xpForCurrentLevel;
double xpGoal = xpForNextLevel != -1 ? xpForNextLevel - xpForCurrentLevel : 100; double xpGoal = xpForNextLevel != -1 ? xpForNextLevel - xpForCurrentLevel : 100;
int progress = (int) ((xpGained / xpGoal) * 100f); int progress = (int) ((xpGained / xpGoal) * 100f);
// had to wrap the bar with an empty div, if i added the margin directly to the bar, it would mess up // had to wrap the bar with an empty div, if i added the margin directly to the bar, it would mess up
content += "<div style = 'margin-top:3px'>" content += "<div style = 'margin-top:3px'>"
+ "<div style = 'background: #070707; border: 1px solid #070707; height: 6px; width: 100%;'>" + "<div style = 'background: #070707; border: 1px solid #070707; height: 6px; width: 100%;'>"
+ "<div style = 'height: 6px; width: " + progress + "%; background: #dc8a00;'>" + "<div style = 'height: 6px; width: " + progress + "%; background: #dc8a00;'>"
+ "</div>" + "</div>"
+ "</div>" + "</div>"
+ "</div>"; + "</div>";
}
} }
return openingTags + content + closingTags; return openingTags + content + closingTags;