From 50f3954a3c0e15eb18ae864bbd28e0b645aa9d1b Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 7 May 2024 17:39:25 +0200
Subject: Fix: Fixed more Double Objective Instances in Custom Scoreboard
 (#1731)

---
 .../skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt      | 1 +
 .../skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt     | 6 +++++-
 .../skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt
index 7acee4ddc..a70174887 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt
@@ -504,6 +504,7 @@ private fun getRiftLines() = getSbLines().filter { line ->
         || SbPattern.riftHotdogEatenPattern.matches(line)
         || SbPattern.riftAveikxPattern.matches(line)
         || SbPattern.riftHayEatenPattern.matches(line)
+        || SbPattern.cluesPattern.matches(line)
 }
 
 private fun getEssenceLines(): List<String> = listOf(getSbLines().first { SbPattern.essencePattern.matches(it) })
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 bbe5f990d..fdc2232be 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
@@ -351,7 +351,7 @@ object ScoreboardPattern {
     // collection of lines that just randomly exist and I have no clue how on earth to effectively remove them
     val wtfAreThoseLinesPattern by miscSb.pattern(
         "wtfarethoselines",
-        "^(§eMine 10 Rubies|§eKill 100 Automatons|§eFind a Jungle Key)$"
+        "^(§eMine \\d+ .*|§eKill 100 Automatons|§eFind a Jungle Key|§eFind the \\d+ Missing Pieces?|§eTalk to the Goblin King)$"
     )
     val darkAuctionCurrentItemPattern by miscSb.pattern(
         "darkauction.currentitem",
@@ -419,6 +419,10 @@ object ScoreboardPattern {
         "hayeaten",
         "^Hay Eaten: §.[\\d,.]+/[\\d,.]+\$"
     )
+    val cluesPattern by riftSb.pattern(
+        "clues",
+        "Clues: §.\\d+/\\d+"
+    )
 
     // Stats from the tablist
     private val tablistGroup = group.group("tablist")
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
index 7a33387e8..da50f3a21 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -120,6 +120,7 @@ object UnknownLinesHandler {
             SbPattern.riftAveikxPattern,
             SbPattern.riftHayEatenPattern,
             SbPattern.fossilDustPattern,
+            SbPattern.cluesPattern,
         )
 
         unknownLines = unknownLines.filterNot { line ->
-- 
cgit