diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-06-19 10:42:39 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-06-19 10:42:39 +0200 |
commit | b8e2d8cfc6ed0c5a3dfa0f36f1eb9c8b6ed028f8 (patch) | |
tree | e2d6ee60c940f97af9d5aa656ac0aaab4b5e38d5 /src/main/java | |
parent | 81e6801b2507cbb10ede6fba4f1d9ee6ef92f219 (diff) | |
download | skyhanni-b8e2d8cfc6ed0c5a3dfa0f36f1eb9c8b6ed028f8.tar.gz skyhanni-b8e2d8cfc6ed0c5a3dfa0f36f1eb9c8b6ed028f8.tar.bz2 skyhanni-b8e2d8cfc6ed0c5a3dfa0f36f1eb9c8b6ed028f8.zip |
Show Ghost counter per default only in The Mist
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/GhostCounter.java | 5 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounter.java b/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounter.java index e0dd11e62..955253f96 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounter.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounter.java @@ -1,6 +1,5 @@ package at.hannibal2.skyhanni.config.features; -import akka.actor.Kill; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.*; @@ -82,7 +81,7 @@ public class GhostCounter { "Ghost Killed.\n" + "§e%session% §7is replaced with Ghost killed") @ConfigEditorText - public String ghostKiledFormat = " &6Ghost Killed: &b%value% &7(%session%)"; + public String ghostKilledFormat = " &6Ghost Killed: &b%value% &7(%session%)"; @Expose @ConfigOption(name = "Sorrows", desc = "Sorrows drop line.\n" + @@ -308,7 +307,7 @@ public class GhostCounter { @Expose @ConfigOption(name = "Show only in The Mist", desc = "Show the overlay only when you are in The Mist.") @ConfigEditorBoolean - public boolean onlyOnMist = false; + public boolean onlyOnMist = true; @Expose @ConfigOption(name = "Maxed Bestiary", desc = "Show progress to max bestiary instead of next level.") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt index 8440cf244..0be9f0655 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt @@ -23,7 +23,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.LorenzUtils.chat import at.hannibal2.skyhanni.utils.LorenzUtils.clickableChat -import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber @@ -196,7 +195,7 @@ object GhostCounter { } addAsSingletonList(Utils.chromaStringByColourCode(config.textFormatting.titleFormat.replace("&", "§"))) - addAsSingletonList(config.textFormatting.ghostKiledFormat.formatText(KILLS.getInt(), KILLS.getInt(true))) + addAsSingletonList(config.textFormatting.ghostKilledFormat.formatText(KILLS.getInt(), KILLS.getInt(true))) addAsSingletonList(config.textFormatting.sorrowsFormat.formatText(SORROWCOUNT.getInt(), SORROWCOUNT.getInt(true))) addAsSingletonList(config.textFormatting.ghostSinceSorrowFormat.formatText(GHOSTSINCESORROW.getInt())) addAsSingletonList(config.textFormatting.ghostKillPerSorrowFormat.formatText(value)) @@ -512,7 +511,7 @@ object GhostCounter { if (list.size == 30) { with(config.textFormatting) { titleFormat = list[0] - ghostKiledFormat = list[1] + ghostKilledFormat = list[1] sorrowsFormat = list[2] ghostSinceSorrowFormat = list[3] ghostKillPerSorrowFormat = list[4] @@ -557,7 +556,7 @@ object GhostCounter { val list = mutableListOf<String>() with(config.textFormatting) { list.add(titleFormat) - list.add(ghostKiledFormat) + list.add(ghostKilledFormat) list.add(sorrowsFormat) list.add(ghostSinceSorrowFormat) list.add(ghostKillPerSorrowFormat) @@ -606,7 +605,7 @@ object GhostCounter { fun resetFormatting() { with(config.textFormatting) { titleFormat = "&6Ghost Counter" - ghostKiledFormat = " &6Ghost Killed: &b%value% &7(%session%)" + ghostKilledFormat = " &6Ghost Killed: &b%value% &7(%session%)" sorrowsFormat = " &6Sorrow: &b%value% &7(%session%)" ghostSinceSorrowFormat = " &6Ghost since Sorrow: &b%value%" ghostKillPerSorrowFormat = " &6Ghosts/Sorrow: &b%value%" |