From 4352ffb08d4bfffc06adad2a068f375ab9874333 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:59:55 +0100
Subject: Feature: CustomScoreboard (#893)

Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: Thunderblade73 <gaidermarkus@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../area/stillgorechateau/RiftBloodEffigies.kt     | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/rift')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
index cd18de35a..be05e11fb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
@@ -28,15 +28,6 @@ class RiftBloodEffigies {
 
     private val config get() = RiftAPI.config.area.stillgoreChateau.bloodEffigies
 
-    private val patternGroup = RepoPattern.group("rift.area.stillgore.effegies")
-    private val effigiesTimerPattern by patternGroup.pattern(
-        "respawn",
-        "§eRespawn §c(?<time>.*) §7\\(or click!\\)"
-    )
-    private val effegieHeartPattern by patternGroup.pattern(
-        "heart",
-        "Effigies: (?<hearts>.*)"
-    )
 
     private var locations: List<LorenzVec> = emptyList()
     private var effigiesTimes = mapOf(
@@ -48,6 +39,18 @@ class RiftBloodEffigies {
         5 to -1L,
     )
 
+    companion object {
+        private val group = RepoPattern.group("rift.area.stillgore.effegies")
+        val effigiesTimerPattern by group.pattern(
+            "respawn",
+            "§eRespawn §c(?<time>.*) §7\\(or click!\\)"
+        )
+        val heartsPattern by group.pattern(
+            "heart",
+            "Effigies: (?<hearts>((§[7c])?⧯)*)"
+        )
+    }
+
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         effigiesTimes = mapOf(
@@ -74,7 +77,7 @@ class RiftBloodEffigies {
         if (!isEnabled()) return
 
         val line = event.newList.firstOrNull { it.startsWith("Effigies:") } ?: return
-        val hearts = effegieHeartPattern.matchMatcher(line) {
+        val hearts = heartsPattern.matchMatcher(line) {
             group("hearts")
         } ?: return
 
-- 
cgit