diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-27 10:15:30 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-27 10:15:30 +0200 |
commit | e2163e490a56ea4471a8e59e9ec1182b2fd52570 (patch) | |
tree | 9eb23c94c87c7b0a039c7b23b681a1647201a948 /src/main/java/at/hannibal2/skyhanni/features/misc | |
parent | 39adca7678bb675e6917b35c1de699c6a0bd55dc (diff) | |
download | skyhanni-e2163e490a56ea4471a8e59e9ec1182b2fd52570.tar.gz skyhanni-e2163e490a56ea4471a8e59e9ec1182b2fd52570.tar.bz2 skyhanni-e2163e490a56ea4471a8e59e9ec1182b2fd52570.zip |
removed wildcards from imports v2
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt | 15 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostData.kt | 65 |
2 files changed, 46 insertions, 34 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt index 21aec4018..074edf217 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt @@ -15,7 +15,20 @@ import at.hannibal2.skyhanni.events.PurseChangeCause import at.hannibal2.skyhanni.events.PurseChangeEvent import at.hannibal2.skyhanni.events.TabListUpdateEvent import at.hannibal2.skyhanni.features.bazaar.BazaarApi.Companion.getBazaarData -import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.* +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.BAGOFCASH +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.GHOSTLYBOOTS +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.GHOSTSINCESORROW +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.KILLCOMBO +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.KILLCOMBOCOINS +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.KILLS +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.MAXKILLCOMBO +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.PLASMACOUNT +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.SCAVENGERCOINS +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.SKILLXPGAINED +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.SORROWCOUNT +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.TOTALDROPS +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.VOLTACOUNT +import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.entries import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.bestiaryData import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostUtil.formatBestiary import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostUtil.formatText diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostData.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostData.kt index b67dea5d0..e56e0a7ff 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostData.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostData.kt @@ -1,48 +1,47 @@ package at.hannibal2.skyhanni.features.misc.ghostcounter -import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData.Option.* import java.util.regex.Pattern import kotlin.math.roundToInt object GhostData { private var session = mutableMapOf( - KILLS to 0.0, - SORROWCOUNT to 0.0, - VOLTACOUNT to 0.0, - PLASMACOUNT to 0.0, - GHOSTLYBOOTS to 0.0, - BAGOFCASH to 0.0, - TOTALDROPS to 0.0, - SCAVENGERCOINS to 0.0, - MAXKILLCOMBO to 0.0, - SKILLXPGAINED to 0.0 + Option.KILLS to 0.0, + Option.SORROWCOUNT to 0.0, + Option.VOLTACOUNT to 0.0, + Option.PLASMACOUNT to 0.0, + Option.GHOSTLYBOOTS to 0.0, + Option.BAGOFCASH to 0.0, + Option.TOTALDROPS to 0.0, + Option.SCAVENGERCOINS to 0.0, + Option.MAXKILLCOMBO to 0.0, + Option.SKILLXPGAINED to 0.0 ) 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 - else -> 0 - } + 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 + else -> 0 } + } } enum class Option(val pattern: Pattern? = null) { |