aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySkillsWeight.java14
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySlayerWeight.java6
2 files changed, 4 insertions, 16 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySkillsWeight.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySkillsWeight.java
index 3ab912d5..8ed43f6e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySkillsWeight.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySkillsWeight.java
@@ -84,18 +84,6 @@ public class LilySkillsWeight extends SkillsWeight {
}
private double effectiveXP(double xp, double factor) {
- if (xp < SKILLS_LEVEL_60) {
- return xp;
- } else {
- double remainingXP = xp;
- double z = 0;
- for (int i = 0; i <= (int) (xp / SKILLS_LEVEL_60); i++) {
- if (remainingXP >= SKILLS_LEVEL_60) {
- remainingXP -= SKILLS_LEVEL_60;
- z += Math.pow(factor, i);
- }
- }
- return z * SKILLS_LEVEL_60;
- }
+ return Math.pow(xp, factor);
}
}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySlayerWeight.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySlayerWeight.java
index 7ee1d12f..d26597a1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySlayerWeight.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/weight/lily/LilySlayerWeight.java
@@ -57,7 +57,7 @@ public class LilySlayerWeight extends SlayerWeight {
double weight;
switch (slayerName) {
case "zombie":
- weight = (effectiveScore / 8390.64) + (currentSlayerXp / 1000000.0);
+ weight = (effectiveScore / 9250) + (currentSlayerXp / 1000000.0);
break;
case "spider":
weight = (effectiveScore / 7019.57) + ((currentSlayerXp * 1.6) / 1000000);
@@ -66,10 +66,10 @@ public class LilySlayerWeight extends SlayerWeight {
weight = (effectiveScore / 2982.06) + ((currentSlayerXp * 3.6) / 1000000);
break;
case "enderman":
- weight = (effectiveScore / 1118.81) + ((currentSlayerXp * 10.0) / 1000000);
+ weight = (effectiveScore / 996.3003) + ((currentSlayerXp * 10.0) / 1000000);
break;
case "blaze":
- weight = (effectiveScore / 751.281) + ((currentSlayerXp * 15.0) / 1000000);
+ weight = (effectiveScore / 935.0455) + ((currentSlayerXp * 10.0) / 1000000);
break;
default:
return;