aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiZe_ <superhize@hotmail.com>2023-08-19 13:30:55 +0200
committerGitHub <noreply@github.com>2023-08-19 13:30:55 +0200
commitd001f0bbda3a16c765ac877db19ff1cf9398dc3d (patch)
tree3c38c5c30d7ca79aeb9bccc0086e0e4a83c879d2
parent672c0521f0f5cdd84d7e24ac8d1a7343092e63c3 (diff)
downloadskyhanni-d001f0bbda3a16c765ac877db19ff1cf9398dc3d.tar.gz
skyhanni-d001f0bbda3a16c765ac877db19ff1cf9398dc3d.tar.bz2
skyhanni-d001f0bbda3a16c765ac877db19ff1cf9398dc3d.zip
Merge pull request #391
* small fix
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt
index 76a46b320..ca7a6116b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt
@@ -35,7 +35,6 @@ object BestiaryData {
private val catList = mutableListOf<Category>()
private val progressPattern = "(?<current>[0-9kKmMbB,.]+)/(?<needed>[0-9kKmMbB,.]+$)".toPattern()
private val titlePattern = "^(?:\\(\\d+/\\d+\\) )?(Bestiary|.+) ➜ (.+)$".toPattern()
- private var lastclicked = 0L
private var inInventory = false
private var isCategory = false
private var indexes = listOf(
@@ -241,16 +240,16 @@ object BestiaryData {
private fun getMobHover(mob: BestiaryMob) = listOf(
"§6Name: §b${mob.name}",
"§6Level: §b${mob.level} ${if (!config.replaceRoman) "§7(${mob.level.romanToDecimalIfNeeded()})" else ""}",
- "§6Total Kills: §b${mob.actualRealTotalKill.addSeparators()}",
- "§6Kills needed to max: §b${mob.killNeededToMax().addSeparators()}",
- "§6Kills needed to next lvl: §b${mob.killNeededToNextLevel().addSeparators()}",
- "§6Current kill to next level: §b${mob.currentKillToNextLevel.addSeparators()}",
- "§6Kill needed for next level: §b${mob.killNeededForNextLevel.addSeparators()}",
- "§6Current kill to max: §b${mob.killToMax.addSeparators()}",
+ "§6Total Kills: §b${mob.actualRealTotalKill.formatNumber()}",
+ "§6Kills needed to max: §b${mob.killNeededToMax().formatNumber()}",
+ "§6Kills needed to next lvl: §b${mob.killNeededToNextLevel().formatNumber()}",
+ "§6Current kill to next level: §b${mob.currentKillToNextLevel.formatNumber()}",
+ "§6Kill needed for next level: §b${mob.killNeededForNextLevel.formatNumber()}",
+ "§6Current kill to max: §b${mob.killToMax.formatNumber()}",
"§6Percent to max: §b${mob.percentToMaxFormatted()}",
"§6Percent to tier: §b${mob.percentToTierFormatted()}",
"",
- "§7More infos thing"
+ "§7More info thing"
)
private fun getMobLine(
@@ -262,7 +261,7 @@ object BestiaryData {
text += " §7- "
text += "${mob.name} ${mob.level.romanOrInt()} "
text += if (isMaxed) {
- "§c§lMAXED! §7(§b${mob.actualRealTotalKill.addSeparators()}§7 kills)"
+ "§c§lMAXED! §7(§b${mob.actualRealTotalKill.formatNumber()}§7 kills)"
} else {
when (displayType) {
0, 1 -> {
@@ -321,7 +320,7 @@ object BestiaryData {
newDisplay.addButton(
prefix = "§7Number Type: ",
- getName = NumberType.entries[if (config.replaceRoman) 1 else 0].type,
+ getName = NumberType.entries[if (config.replaceRoman) 0 else 1].type,
onChange = {
config.replaceRoman = !config.replaceRoman
update()