From df6ff252c99c99aa12790ef72fc5abaa1d4c84c0 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:48:58 +0200
Subject: Fix: Powder Percentage CW Conflict (#2186)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
.idea/dictionaries/default_user.xml | 2 +-
src/main/java/at/hannibal2/skyhanni/data/HotmData.kt | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index 64c012a13..29903e658 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -273,4 +273,4 @@
yolkar
-
\ No newline at end of file
+
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index f86cc1de8..f3a2189b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -409,9 +409,13 @@ enum class HotmData(
"Heart of the Mountain",
)
+ /**
+ * REGEX-TEST: §5§o§7Level 1§8/50 §7(§b0 §l0%§7):skull:
+ * REGEX-TEST: §7Level 1§8/50
+ */
private val levelPattern by patternGroup.pattern(
"perk.level",
- "§(?.)Level (?\\d+).*",
+ "(?:§.)*§(?.)Level (?\\d+).*",
)
private val notUnlockedPattern by patternGroup.pattern(
@@ -426,7 +430,7 @@ enum class HotmData(
private val disabledPattern by patternGroup.pattern(
"perk.disabled",
"§c§lDISABLED|§7§eClick to select!",
- ) // unused for now since the assumption is when enabled isn't found it is disabled,
+ ) // unused for now since the assumption is when enabled isn't found, it is disabled,
// but the value might be useful in the future or for debugging
val perkCostPattern by patternGroup.pattern(
--
cgit