Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Update Ghost Bestiary Tiers #2533

Merged
merged 2 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class BestiaryFormattingConfig {
@ConfigOption(name = "Progress to Max", desc = "Text to show progress when the §eMaxed Bestiary §7option is §aON\n" +
"§e%currentKill% §7is replaced with your current total kill.")
@ConfigEditorText
public String showMax_progress = "%currentKill%/250k (%percentNumber%%)";
public String showMax_progress = "%currentKill%/100k (%percentNumber%%)";
hannibal002 marked this conversation as resolved.
Show resolved Hide resolved

@Expose
@ConfigOption(name = "Progress", desc = "Text to show progress when the §eMaxed Bestiary §7option is §cOFF\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ object GhostCounter {

val etaFormatting = textFormatting.etaFormatting
val remaining: Int = when (config.showMax) {
true -> 250_000 - bestiaryCurrentKill
true -> 100_000 - bestiaryCurrentKill
false -> killNeeded - currentKill
}

Expand Down Expand Up @@ -459,7 +459,7 @@ object GhostCounter {
when (val nextLevel = if (currentLevel >= 25) 26 else currentLevel + 1) {
26 -> {
storage?.bestiaryNextLevel = 26.0
storage?.bestiaryCurrentKill = 250_000.0
storage?.bestiaryCurrentKill = 100_000.0
storage?.bestiaryKillNeeded = 0.0
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,19 @@ object GhostData {
val bestiaryData = mutableMapOf<Int, Int>().apply {
for (i in 1..25) {
this[i] = when (i) {
1 -> 5
2 -> 5
3 -> 5
4 -> 10
5 -> 25
6 -> 50
7 -> 100
8 -> 150
9 -> 150
10 -> 250
11 -> 750
12 -> 1_500
13 -> 2_000
14, 15, 16, 17 -> 2_500
18 -> 3_000
19, 20 -> 3_500
21 -> 25_000
22, 23, 24, 25 -> 50_000
1, 2, 3, 4, 5 -> 4
6 -> 20
7 -> 40
8, 9 -> 60
10 -> 100
11 -> 300
12 -> 600
13 -> 800
14, 15, 16, 17 -> 1_000
18 -> 1_200
19, 20 -> 1_400
21 -> 10_000
22, 23, 24, 25 -> 20_000
else -> 0
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ object GhostFormatting {
base = " &6Bestiary %currentLevel%->%nextLevel%: &b%value%"
openMenu = "§cOpen Bestiary Menu !"
maxed = "%currentKill% (&c&lMaxed!)"
showMax_progress = "%currentKill%/250k (%percentNumber%%)"
showMax_progress = "%currentKill%/100k (%percentNumber%%)"
progress = "%currentKill%/%killNeeded%"
}
with(killHourFormatting) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,5 @@ object GhostUtil {
}

private fun percent(number: Double) =
100.0.coerceAtMost(((number / 250_000) * 100).roundToPrecision(4)).toString()
100.0.coerceAtMost(((number / 100_000) * 100).roundToPrecision(4)).toString()
}
Loading