feat(catlas)!: add setting to only show room names on puzzles

Skytils · Aug 15, 2024 · f505eb1 · f505eb1
1 parent b71a359
commit f505eb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
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
@@ -197,11 +197,11 @@ object CatlasConfig : Vigilant(
         type = PropertyType.SELECTOR,
         description = "Shows names of rooms on map.",
         category = "Rooms",
-        options = ["None", "Puzzles / Trap", "All"],
+        options = ["None", "Puzzles", "Puzzles / Trap", "All"],
         i18nName = "catlas.config.rooms..room_names",
         i18nCategory = "catlas.config.rooms"
     )
-    var mapRoomNames = 1
+    var mapRoomNames = 2
 
     @Property(
         name = "Center Room Names",

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
@@ -184,14 +184,10 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) {
 
             val name = mutableListOf<String>()
 
-            if (CatlasConfig.mapRoomNames != 0 && Utils.equalsOneOf(
-                    roomType,
-                    RoomType.PUZZLE,
-                    RoomType.TRAP
-                ) || CatlasConfig.mapRoomNames == 2 && Utils.equalsOneOf(
+            if ((CatlasConfig.mapRoomNames != 0 && roomType == RoomType.PUZZLE) || (CatlasConfig.mapRoomNames >= 2 && roomType == RoomType.TRAP) || (CatlasConfig.mapRoomNames == 3 && Utils.equalsOneOf(
                     roomType,
                     RoomType.NORMAL, RoomType.RARE, RoomType.CHAMPION
-                )
+                ))
             ) {
                 name.addAll(room.data.name.split(" "))
             }