aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ10a1n15 <45315647+j10a1n15@users.noreply.github.com>2024-10-20 23:49:37 +0200
committerGitHub <noreply@github.com>2024-10-20 23:49:37 +0200
commitc1f2281db5df1868b50c73a6781ff5a79e8f0a37 (patch)
treef4c47eacce058da569d77715a251d8dd29429a2e
parentcd2ada8a83ea4d983ee1283807664923bcab8c4a (diff)
downloadSkyHanni-c1f2281db5df1868b50c73a6781ff5a79e8f0a37.tar.gz
SkyHanni-c1f2281db5df1868b50c73a6781ff5a79e8f0a37.tar.bz2
SkyHanni-c1f2281db5df1868b50c73a6781ff5a79e8f0a37.zip
Fix: Scoreboard Patterns (#2779)
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 42fc1a55e..f26ba1bf6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -109,9 +109,14 @@ object ScoreboardPattern {
// dungeon scoreboard
private val dungeonSb = scoreboardGroup.group("dungeon")
+
+ /**
+ * REGEX-TEST: §8- §c§4Power Dragon§a 497.3M§c❤
+ * REGEX-TEST: §8- §c§4Power Dragon§a 497.3M
+ */
val m7dragonsPattern by dungeonSb.pattern(
"m7dragons",
- "§cNo Alive Dragons|§8- (?:§.)+[\\w\\s]+Dragon§a [\\w,.]+§.❤",
+ "§cNo Alive Dragons|§8- (?:§.)+[\\w\\s]+Dragon§a [\\w,.]+(?:§.❤)?",
)
val keysPattern by dungeonSb.pattern(
"keys",
@@ -336,7 +341,7 @@ object ScoreboardPattern {
)
val bossHealthBarPattern by combatSb.pattern(
"magmabosshealthbar",
- "§.(?:\\d+(?:\\.\\d)?M|\\d+k)§f/§a10M§c❤",
+ "§.[\\w,.]+§f/§a10M§c❤",
)
val bossHPPattern by combatSb.pattern(
"bosshp",