Fix: Custom Scoreboard Error in Dungeon Queue (hannibal002#2441)

j10a1n15 · Sep 3, 2024 · 141d2f3 · 141d2f3
1 parent 602aab4
commit 141d2f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -558,6 +558,7 @@ private fun getEssenceShowWhen(): Boolean = SbPattern.essencePattern.anyMatches(
 
 private fun getQueueLines(): List<String> =
     listOf(getSbLines().first { SbPattern.queuePattern.matches(it) }) +
+        (getSbLines().first { SbPattern.queueTierPattern.matches(it) }) +
         (getSbLines().first { SbPattern.queuePositionPattern.matches(it) })
 
 private fun getQueueShowWhen(): Boolean = SbPattern.queuePattern.anyMatches(getSbLines())

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
@@ -386,6 +386,14 @@ object ScoreboardPattern {
         "queued",
         "Queued:.*",
     )
+
+    /**
+     * REGEX-TEST: Tier: §eFloor VI
+     */
+    val queueTierPattern by miscSb.pattern(
+        "queuetier",
+        "Tier: §e.*",
+    )
     val queuePositionPattern by miscSb.pattern(
         "queueposition",
         "Position: (?:§.)*#\\d+ (?:§.)*Since: (?:§.)*.*",

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -119,6 +119,7 @@ object UnknownLinesHandler {
             SbPattern.riftHotdogEatenPattern,
             SbPattern.mineshaftNotStartedPattern,
             SbPattern.queuePattern,
+            SbPattern.queueTierPattern,
             SbPattern.queuePositionPattern,
             SbPattern.fortunateFreezingBonusPattern,
             SbPattern.riftAveikxPattern,