aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung/dungeonsguide
diff options
context:
space:
mode:
authorsyeyoung <cyougn06@naver.com>2021-12-19 15:38:25 +0900
committersyeyoung <cyougn06@naver.com>2021-12-19 15:38:25 +0900
commitef92a621e5a5033677fe7c372bbdbebdf7d58396 (patch)
tree5e047c78804736c1645ec4204acd9e67c7123a83 /src/main/java/kr/syeyoung/dungeonsguide
parentf3238060717b001d6721915e696f30875c2ad0c2 (diff)
downloadSkyblock-Dungeons-Guide-ef92a621e5a5033677fe7c372bbdbebdf7d58396.tar.gz
Skyblock-Dungeons-Guide-ef92a621e5a5033677fe7c372bbdbebdf7d58396.tar.bz2
Skyblock-Dungeons-Guide-ef92a621e5a5033677fe7c372bbdbebdf7d58396.zip
- Ceil total secrets
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureWarningOnPortal.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java4
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureWarningOnPortal.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureWarningOnPortal.java
index 2c852fdd..1ee76e91 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureWarningOnPortal.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureWarningOnPortal.java
@@ -122,7 +122,7 @@ public class FeatureWarningOnPortal extends SimpleFeature implements StyledTextP
texts.add(new StyledText("Total Secrets","field_name"));
texts.add(new StyledText(": ","field_separator"));
texts.add(new StyledText(scoreCalculation.getSecrets() +"/" + scoreCalculation.getEffectiveTotalSecrets()+" of "+scoreCalculation.getTotalSecrets(),"field_value"));
- texts.add(new StyledText(" ("+(int)(scoreCalculation.getSecrets() / (float)scoreCalculation.getEffectiveTotalSecrets() * 100.0f)+"% "+(int)(scoreCalculation.getSecrets() / (float)scoreCalculation.getEffectiveTotalSecrets() * 40.0f)+" Explorer)\n","field_etc"));
+ texts.add(new StyledText(" ("+(int)(scoreCalculation.getSecrets() / (float)scoreCalculation.getEffectiveTotalSecrets() * 100.0f)+"% "+(int)Math.ceil(scoreCalculation.getSecrets() / (float)scoreCalculation.getEffectiveTotalSecrets() * 40.0f)+" Explorer)\n","field_etc"));
texts.add(new StyledText("Crypts","field_name"));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
index 95ccd689..6f3189e6 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
@@ -269,7 +269,7 @@ public class FeatureDungeonScore extends TextHUDFeature {
fullyCleared = completed >= getTotalRooms() && context.getMapProcessor().getUndiscoveredRoom() == 0;
explorer += MathHelper.clamp_int((int) Math.floor(6.0 / 10.0 * (context.getMapProcessor().getUndiscoveredRoom() != 0 ? getPercentage() : completed / total * 100)), 0, 60);
- explorer += MathHelper.clamp_int((int) Math.floor(40 * (secrets = FeatureRegistry.DUNGEON_SECRETS.getSecretsFound()) / (totalSecrets * context.getSecretPercentage())),0,40);
+ explorer += MathHelper.clamp_int((int) Math.floor(40 * (secrets = FeatureRegistry.DUNGEON_SECRETS.getSecretsFound()) / Math.ceil(totalSecrets * context.getSecretPercentage())),0,40);
}
int time = 0;
{
@@ -297,7 +297,7 @@ public class FeatureDungeonScore extends TextHUDFeature {
}
// amazing thing
- return new ScoreCalculation(skill, explorer, time, bonus, tombs, fullyCleared, secrets, totalSecrets, (int) (totalSecrets * context.getSecretPercentage()), totalSecretsKnown, deaths);
+ return new ScoreCalculation(skill, explorer, time, bonus, tombs, fullyCleared, secrets, totalSecrets, (int)Math.ceil (totalSecrets * context.getSecretPercentage()), totalSecretsKnown, deaths);
}
public String getLetter(int score) {
if (score <= 99) return "D";
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java
index b35d93d9..57174669 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java
@@ -70,7 +70,7 @@ public class FeatureDungeonSecrets extends TextHUDFeature {
}
public int getTotalSecretsInt() {
- if (getSecretsFound() != 0) return (int) (getSecretsFound() / getSecretPercentage() * 100);
+ if (getSecretsFound() != 0) return (int) Math.ceil (getSecretsFound() / getSecretPercentage() * 100);
DungeonContext context = skyblockStatus.getContext();
int totalSecrets = 0;
for (DungeonRoom dungeonRoom : context.getDungeonRoomList()) {
@@ -136,7 +136,7 @@ public class FeatureDungeonSecrets extends TextHUDFeature {
actualBit.add(new StyledText(": ","separator"));
actualBit.add(new StyledText(getSecretsFound() +"","currentSecrets"));
actualBit.add(new StyledText("/","separator2"));
- actualBit.add(new StyledText((int)(getTotalSecretsInt() * DungeonsGuide.getDungeonsGuide().getSkyblockStatus().getContext().getSecretPercentage())+" of "+getTotalSecretsInt(),"totalSecrets"));
+ actualBit.add(new StyledText((int)Math.ceil(getTotalSecretsInt() * DungeonsGuide.getDungeonsGuide().getSkyblockStatus().getContext().getSecretPercentage())+" of "+getTotalSecretsInt(),"totalSecrets"));
actualBit.add(new StyledText(getTotalSecrets().contains("+") ? "+" : "","unknown"));
return actualBit;
}