feat(Catlas): Show map before dungon start

Skytils · Feb 24, 2025 · 22ae343 · 22ae343
1 parent f25a957
commit 22ae343
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/Catlas.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/Catlas.kt
@@ -34,6 +34,7 @@ import gg.skytils.skytilsmod.features.impl.dungeons.catlas.handlers.DungeonScann
 import gg.skytils.skytilsmod.features.impl.dungeons.catlas.handlers.MapUpdater
 import gg.skytils.skytilsmod.features.impl.dungeons.catlas.handlers.MimicDetector
 import gg.skytils.skytilsmod.features.impl.dungeons.catlas.utils.MapUtils
+import gg.skytils.skytilsmod.features.impl.dungeons.catlas.utils.ScanUtils
 import gg.skytils.skytilsmod.utils.RenderUtil
 import gg.skytils.skytilsmod.utils.Utils
 import net.minecraft.network.play.server.S34PacketMaps
@@ -79,6 +80,12 @@ object Catlas {
         if (DungeonScanner.shouldScan) {
             DungeonScanner.scan()
         }
+
+        if (CatlasConfig.mapShowBeforeStart && DungeonTimer.dungeonStartTime == -1L) {
+            ScanUtils.getRoomFromPos(mc.thePlayer.position)?.uniqueRoom?.let {
+                DungeonInfo.preStartVisitedRooms.add(it)
+            }
+        }
     }
 
     @SubscribeEvent

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasConfig.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasConfig.kt
@@ -91,6 +91,18 @@ object CatlasConfig : Vigilant(
     )
     var mapHideInBoss = false
 
+    @Property(
+        name = "Show Before Start",
+        type = PropertyType.SWITCH,
+        description = "Shows the map before the dungeon starts.",
+        category = "Map",
+        subcategory = "Toggle",
+        i18nName = "catlas.config.map.toggle.show_before_start",
+        i18nCategory = "catlas.config.map",
+        i18nSubcategory = "catlas.config.map.toggle"
+    )
+    var mapShowBeforeStart = false
+
     @Property(
         name = "Show Player Names",
         type = PropertyType.SELECTOR,

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasElement.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasElement.kt
@@ -80,7 +80,7 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) {
         GlStateManager.pushMatrix()
         GlStateManager.translate(MapUtils.startCorner.first.toFloat(), MapUtils.startCorner.second.toFloat(), 0f)
 
-        val connectorSize = DungeonMapColorParser.quarterRoom
+        val connectorSize = (DungeonMapColorParser.quarterRoom.takeUnless { it == -1 } ?: 4)
         val checkmarkSize = when (CatlasConfig.mapCheckmark) {
             1 -> 8.0 // default
             else -> 10.0 // neu
@@ -89,7 +89,8 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) {
         for (y in 0..10) {
             for (x in 0..10) {
                 val tile = DungeonInfo.dungeonList[y * 11 + x]
-                if (tile is Unknown || tile.state == RoomState.UNDISCOVERED) continue
+
+                if (tile is Unknown || (tile.state == RoomState.UNDISCOVERED && !isAlwaysVisible(tile))) continue
 
                 val xOffset = (x shr 1) * (MapUtils.mapRoomSize + connectorSize)
                 val yOffset = (y shr 1) * (MapUtils.mapRoomSize + connectorSize)
@@ -131,6 +132,15 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) {
         GlStateManager.popMatrix()
     }
 
+    private fun isAlwaysVisible(tile: Tile): Boolean {
+        if (!CatlasConfig.mapShowBeforeStart || DungeonTimer.dungeonStartTime != -1L) return false
+
+        return when (tile) {
+            is Room -> tile.uniqueRoom in DungeonInfo.preStartVisitedRooms
+            else -> false
+        }
+    }
+
     private fun renderText() {
         GlStateManager.pushMatrix()
         GlStateManager.translate(MapUtils.startCorner.first.toFloat(), MapUtils.startCorner.second.toFloat(), 0f)
@@ -142,8 +152,8 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) {
 
         DungeonInfo.uniqueRooms.forEach { unq ->
             val room = unq.mainRoom
-            if (room.state == RoomState.UNDISCOVERED || room.state == RoomState.UNOPENED) return@forEach
-            val size = MapUtils.mapRoomSize + DungeonMapColorParser.quarterRoom
+            if ((room.state == RoomState.UNDISCOVERED || room.state == RoomState.UNOPENED) && !isAlwaysVisible(room)) return@forEach
+            val size = MapUtils.mapRoomSize + (DungeonMapColorParser.quarterRoom.takeUnless { it == -1 } ?: 4)
             val checkPos = unq.getCheckmarkPosition()
             val namePos = unq.getNamePosition()
             val xOffsetCheck = (checkPos.first / 2f) * size
@@ -276,7 +286,7 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) {
 
     override fun render() {
         if (!toggled || SBInfo.mode != SkyblockIsland.Dungeon.mode || mc.thePlayer == null || mc.theWorld == null) return
-        if (DungeonTimer.dungeonStartTime == -1L) return
+        if (DungeonTimer.dungeonStartTime == -1L && !CatlasConfig.mapShowBeforeStart) return
         if (CatlasConfig.mapHideInBoss && DungeonTimer.bossEntryTime != -1L) return
         mc.mcProfiler.startSection("border")
 

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/handlers/DungeonInfo.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/handlers/DungeonInfo.kt
@@ -38,6 +38,8 @@ object DungeonInfo {
     var dungeonMap: MapData? = null
     var guessMapData: MapData? = null
 
+    val preStartVisitedRooms = mutableSetOf<UniqueRoom>()
+
     fun reset() {
         dungeonList.fill(Unknown(0, 0))
         roomCount = 0
@@ -53,5 +55,7 @@ object DungeonInfo {
 
         dungeonMap = null
         guessMapData = null
+
+        preStartVisitedRooms.clear()
     }
 }
diff --git a/src/main/resources/assets/catlas/lang/en_US.lang b/src/main/resources/assets/catlas/lang/en_US.lang
@@ -3,6 +3,7 @@ catlas.config.map.toggle.rotate_map=Rotate Map
 catlas.config.map.toggle.center_map=Center Map
 catlas.config.map.toggle.dynamic_rotate=Dynamic Rotate
 catlas.config.map.toggle.hide_in_boss=Hide In Boss
+catlas.config.map.toggle.show_before_start=Show Before Start
 catlas.config.map.toggle.show_player_names=Show Player Names
 catlas.config.map.toggle.vanilla_head_marker=Vanilla Head Marker
 catlas.config.map.size.map_text_scale=Map Text Scale