From f505eb1097b5d11a5621d7fc1258a9c3f93abb81 Mon Sep 17 00:00:00 2001 From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:24:57 -0400 Subject: [PATCH] feat(catlas)!: add setting to only show room names on puzzles --- .../features/impl/dungeons/catlas/core/CatlasConfig.kt | 4 ++-- .../features/impl/dungeons/catlas/core/CatlasElement.kt | 8 ++------ 2 files changed, 4 insertions(+), 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 index e69b81d5e..1cecd099a 100644 --- 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 index 3877ee4af..1e97a93cb 100644 --- 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() - 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(" ")) }