summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/rift
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-10-11 11:24:39 +0100
committerGitHub <noreply@github.com>2023-10-11 12:24:39 +0200
commit4f9fe89aac7b97741f7079ab1ad5f7051e0fa7f7 (patch)
tree80d0ba5a1fa2893c0529f0382a99d6a044bc905c /src/main/java/at/hannibal2/skyhanni/features/rift
parent8527d7555ea16becbcfe949413eabfd41c8400c4 (diff)
downloadskyhanni-4f9fe89aac7b97741f7079ab1ad5f7051e0fa7f7.tar.gz
skyhanni-4f9fe89aac7b97741f7079ab1ad5f7051e0fa7f7.tar.bz2
skyhanni-4f9fe89aac7b97741f7079ab1ad5f7051e0fa7f7.zip
More Code Cleanup - When (#531)
code cleanup #531
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/rift')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
index 1c19cdef9..d66973cd3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
@@ -50,17 +50,22 @@ object DanceRoomHelper {
val size = instructions.size
val format = line.format()
- if (index < size && index == lineIndex) {
- val countdown = countdown?.let { "${color.countdown.formatColor()}$it" } ?: ""
- "${now.formatColor()} $format $countdown"
+ when {
+ index < size && index == lineIndex -> {
+ val countdown = countdown?.let { "${color.countdown.formatColor()}$it" } ?: ""
+ "${now.formatColor()} $format $countdown"
- } else if (index + 1 < size && index + 1 == lineIndex) {
- "${next.formatColor()} $format"
+ }
+ index + 1 < size && index + 1 == lineIndex -> {
+ "${next.formatColor()} $format"
- } else if (index + 2 < size && (index + 2..index + config.lineToShow).contains(lineIndex)) {
- "${later.formatColor()} $format"
+ }
+ index + 2 < size && (index + 2..index + config.lineToShow).contains(lineIndex) -> {
+ "${later.formatColor()} $format"
- } else null
+ }
+ else -> null
+ }
}
private fun String.formatColor() = replace("&", "ยง")