Skip to content

Feat: Show own marker on top #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft

Feat: Show own marker on top #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd51329
Update CatlasConfig.kt
Kemmisch Apr 15, 2025
9087972
Update en_US.lang
Kemmisch Apr 15, 2025
bbeae05
Update RenderUtils.kt
Kemmisch Apr 15, 2025
8949340
Update CatlasElement.kt
Kemmisch Apr 16, 2025
d245eac
Update RenderUtils.kt
Kemmisch Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasElement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/catlas/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down