diff options
| author | David Cole <40234707+DavidArthurCole@users.noreply.github.com> | 2024-10-13 09:54:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-13 15:54:05 +0200 |
| commit | e0ae2e8ad4602b3e96fb6ec39716709f225d2461 (patch) | |
| tree | b70ad5cec46af89dd0f05a61d39027a964c03693 /src/main/java/at/hannibal2/skyhanni/features/combat | |
| parent | 113389a86c769d4d3a547fac5b7440fa8f29bc6f (diff) | |
| download | skyhanni-e0ae2e8ad4602b3e96fb6ec39716709f225d2461.tar.gz skyhanni-e0ae2e8ad4602b3e96fb6ec39716709f225d2461.tar.bz2 skyhanni-e0ae2e8ad4602b3e96fb6ec39716709f225d2461.zip | |
Backend: Detekt Fixes Part 7 (#2667)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/combat')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt index c5804ea37..93f9f0452 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt @@ -42,6 +42,8 @@ object FlareDisplay { private val MAX_FLARE_TIME = 3.minutes + // TODO: Move to repo + @Suppress("MaxLineLength") private val flareSkins = mapOf( "ewogICJ0aW1lc3RhbXAiIDogMTY0NjY4NzMwNjIyMywKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjJlMmJmNmMxZWMzMzAyNDc5MjdiYTYzNDc5ZTU4NzJhYzY2YjA2OTAzYzg2YzgyYjUyZGFjOWYxYzk3MTQ1OCIKICAgIH0KICB9Cn0=" to FlareType.WARNING, diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt index 2ef652e4a..fe14093ef 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt @@ -81,6 +81,8 @@ object GhostCounter { "skillxp", "[+](?<gained>[0-9,.]+) \\((?<current>[0-9,.]+)(?:/(?<total>[0-9,.]+))?\\)", ) + + @Suppress("MaxLineLength") private val combatSectionPattern by patternGroup.pattern( "combatsection", ".*[+](?<gained>[0-9,.]+) (?<skillName>[A-Za-z]+) \\((?<progress>(?<current>[0-9.,]+)/(?<total>[0-9.,]+)|(?<percent>[0-9.]+)%)\\).*", @@ -282,7 +284,8 @@ object GhostCounter { val moneyMadeTips = buildList { for ((name, count, value) in priceMap) { moneyMade += (count.toLong() * value.toLong()) - add("$name: §b${value.addSeparators()} §fx §b${count.addSeparators()} §f= §6${(value.toLong() * count.toLong()).addSeparators()}") + add("$name: §b${value.addSeparators()} §fx §b${count.addSeparators()} §f= " + + "§6${(value.toLong() * count.toLong()).addSeparators()}") } add("§bTotal: §6${moneyMade.addSeparators()}") add("§eClick to copy to clipboard!") |