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 4f9725261..19a088919 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 @@ -126,6 +126,18 @@ object CatlasConfig : Vigilant( ) var mapVanillaMarker = false + @Property( + name = "Show Own Player Marker On Top", + type = PropertyType.SWITCH, + description = "Always show the player's own head marker above any others on the map.", + category = "Map", + subcategory = "Toggle", + i18nName = "catlas.config.map.toggle.own_marker_on_top", + i18nCategory = "catlas.config.map", + i18nSubcategory = "catlas.config.map.toggle" + ) + var alwaysShowOwnPlayerOnTop = false + @Property( name = "Map Text Scale", type = PropertyType.DECIMAL_SLIDER, 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 3a1cb3d11..289c31fad 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 @@ -266,9 +266,9 @@ object CatlasElement : GuiElement(name = "Dungeon Map", x = 0, y = 0) { private fun renderPlayerHeads() { if (DungeonTimer.bossEntryTime != -1L) return - DungeonListener.team.forEach { (name, teammate) -> - if (!teammate.dead || teammate.mapPlayer.isOurMarker) { - RenderUtils.drawPlayerHead(name, teammate.mapPlayer) + DungeonListener.team.toList().sortedBy { if (CatlasConfig.alwaysShowOwnPlayerOnTop ) it.second.playerName != mc.thePlayer.name else true }.forEach { + if (!it.second.dead || it.second.mapPlayer.isOurMarker) { + RenderUtils.drawPlayerHead(it.first, it.second.mapPlayer) } } } diff --git a/src/main/resources/assets/catlas/lang/en_US.lang b/src/main/resources/assets/catlas/lang/en_US.lang index a6bfc915b..ba7284f65 100644 --- a/src/main/resources/assets/catlas/lang/en_US.lang +++ b/src/main/resources/assets/catlas/lang/en_US.lang @@ -6,6 +6,7 @@ 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.toggle.own_marker_on_top=Show Own Player Marker On Top catlas.config.map.size.map_text_scale=Map Text Scale catlas.config.map.size.player_heads_scale=Player Heads Scale catlas.config.map.size.head_border_scale=Head Border Scale