Use blood room checkmark instead of watcher message

Fixes score update being delayed as blood room is cleared
Harry282 · Aug 13, 2024 · 651f55e · 651f55e
1 parent 2645218
commit 651f55e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/kotlin/funnymap/features/dungeon/Dungeon.kt b/src/main/kotlin/funnymap/features/dungeon/Dungeon.kt
@@ -88,8 +88,6 @@ object Dungeon {
                 MapUpdate.getPlayers()
                 Info.startTime = System.currentTimeMillis()
             }
-
-            "[BOSS] The Watcher: You have proven yourself. You may pass." -> RunInformation.bloodDone = true
         }
     }
 

diff --git a/src/main/kotlin/funnymap/features/dungeon/MapUpdate.kt b/src/main/kotlin/funnymap/features/dungeon/MapUpdate.kt
@@ -2,9 +2,7 @@ package funnymap.features.dungeon
 
 import funnymap.FunnyMap.mc
 import funnymap.core.DungeonPlayer
-import funnymap.core.map.Door
-import funnymap.core.map.DoorType
-import funnymap.core.map.Unknown
+import funnymap.core.map.*
 import funnymap.utils.MapUtils
 import funnymap.utils.MapUtils.mapX
 import funnymap.utils.MapUtils.mapZ
@@ -115,6 +113,9 @@ object MapUpdate {
 
                 if (mapTile.state.ordinal < room.state.ordinal) {
                     PlayerTracker.roomStateChange(room, room.state, mapTile.state)
+                    if (room is Room && room.data.type == RoomType.BLOOD && mapTile.state == RoomState.GREEN) {
+                        RunInformation.bloodDone = true
+                    }
                     room.state = mapTile.state
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,8 +88,6 @@ object Dungeon { @@
                     MapUpdate.getPlayers()
                     Info.startTime = System.currentTimeMillis()
                 }
-                "[BOSS] The Watcher: You have proven yourself. You may pass." -> RunInformation.bloodDone = true
             }
         }
@@ Expand Down @@