fix missing puzzle regex

2 files changed, 4 insertions, 6 deletions

diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt
index 593288df..a3f99caf 100644
--- a/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt
+++ b/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt
@@ -63,9 +63,9 @@ object ScoreCalculation {
     private var lastRoomScanPos: BlockPos? = null
 
     private val deathsTabPattern = Pattern.compile("§r§a§lDeaths: §r§f\\((?<deaths>\\d+)\\)§r")
-    private val missingPuzzlePattern = Pattern.compile("§r (?<puzzle>.+): §r§7\\[§r§6§l✦§r§7]§r")
+    private val missingPuzzlePattern = Pattern.compile("§r (?<puzzle>.+): §r§7\\[§r§6§l✦§r§7] ?§r")
     private val failedPuzzlePattern =
-        Pattern.compile("§r (?<puzzle>.+): §r§7\\[§r§c§l✖§r§7] §r§f\\((?:§r(?<player>.+))?§r§f\\)§r")
+        Pattern.compile("§r (?<puzzle>.+): §r§7\\[§r§c§l✖§r§7] §r§f(?:\\((?:§r(?<player>.+))?§r§f\\)|\\(§r§f})§r")
     private val secretsFoundPattern = Pattern.compile("§r Secrets Found: §r§b(?<secrets>\\d+)§r")
     private val cryptsPattern = Pattern.compile("§r Crypts: §r§6(?<crypts>\\d+)§r")
 
diff --git a/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt b/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt
index 11a2a8c5..846934c7 100644
--- a/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt
+++ b/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt
@@ -45,7 +45,7 @@ object DungeonListener {
     private val partyCountPattern = Regex("§r {9}§r§b§lParty §r§f\\(([1-5])\\)§r")
     private val classPattern =
         Regex("§r(?:§.)+(?<name>\\w+?) §r§f\\(§r§d(?<class>Archer|Berserk|Healer|Mage|Tank) (?<lvl>\\w+)§r§f\\)§r")
-    private val missingPuzzlePattern = Regex("§r (?<puzzle>.+): §r§7\\[§r§6§l✦§r§7]§r")
+    private val missingPuzzlePattern = Regex("§r (?<puzzle>.+): §r§7\\[§r§6§l✦§r§7] ?§r")
 
     private var ticks = 0
 
@@ -67,9 +67,7 @@ object DungeonListener {
                     TickTask(6) {
                         mc.ingameGUI.chatGUI.printChatMessage(
                             ChatComponentText("§c☠ §lDeaths:§r ${team.sumOf { it.deaths }}\n${
-                                team.sortedByDescending { it.deaths }.filter { it.deaths > 0 }.joinToString(
-                                    separator = "\n"
-                                ) {
+                                team.filter { it.deaths > 0 }.sortedByDescending { it.deaths }.joinToString("\n") {
                                     "  §c☠ ${it.playerName}:§r ${it.deaths}"
                                 }
                             }"