aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/Danker/features
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2021-03-09 23:59:23 -0500
committerbowser0000 <bowser0000@gmail.com>2021-03-09 23:59:23 -0500
commit5f815a090401a6fdc1ef462596a9902a0a01d0be (patch)
tree0f3f99179594765a08623ac96fbdce977c2173e5 /src/main/java/me/Danker/features
parentec35b6f8d7583f9c92eb212bfe4cf8d2206fc403 (diff)
downloadSkyblockMod-5f815a090401a6fdc1ef462596a9902a0a01d0be.tar.gz
SkyblockMod-5f815a090401a6fdc1ef462596a9902a0a01d0be.tar.bz2
SkyblockMod-5f815a090401a6fdc1ef462596a9902a0a01d0be.zip
Add combat 60 support
Diffstat (limited to 'src/main/java/me/Danker/features')
-rw-r--r--src/main/java/me/Danker/features/Skill50Display.java2
-rw-r--r--src/main/java/me/Danker/features/SkillTracker.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/me/Danker/features/Skill50Display.java b/src/main/java/me/Danker/features/Skill50Display.java
index 511bb16..3b73cf9 100644
--- a/src/main/java/me/Danker/features/Skill50Display.java
+++ b/src/main/java/me/Danker/features/Skill50Display.java
@@ -36,7 +36,7 @@ public class Skill50Display {
double currentXp = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
int limit;
int totalXp;
- if (section.contains("Farming") || section.contains("Enchanting") || section.contains("Mining")) {
+ if (section.contains("Farming") || section.contains("Enchanting") || section.contains("Mining") || section.contains("Combat")) {
limit = 60;
totalXp = 111672425;
} else {
diff --git a/src/main/java/me/Danker/features/SkillTracker.java b/src/main/java/me/Danker/features/SkillTracker.java
index 15e9fdd..60eb632 100644
--- a/src/main/java/me/Danker/features/SkillTracker.java
+++ b/src/main/java/me/Danker/features/SkillTracker.java
@@ -63,7 +63,7 @@ public class SkillTracker {
}
timeSinceGained = System.currentTimeMillis() / 1000;
- int limit = section.contains("Farming") || section.contains("Enchanting") || section.contains("Mining") ? 60 : 50;
+ int limit = section.contains("Farming") || section.contains("Enchanting") || section.contains("Mining") || section.contains("Combat") ? 60 : 50;
double currentXP = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
int xpToLevelUp = Integer.parseInt(section.substring(section.indexOf("/") + 1, section.indexOf(")")).replaceAll(",", ""));
xpLeft = xpToLevelUp - currentXP;