Skip to content

Commit

Permalink
feat: Scalable CH Map Player Indicator (#521)
Browse files Browse the repository at this point in the history
Signed-off-by: songreaver  <[email protected]>
  • Loading branch information
Kemmisch authored Jan 27, 2025
1 parent 9581bd5 commit ecd98c7
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 5 deletions.
13 changes: 13 additions & 0 deletions src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,17 @@ object Config : Vigilant(
)
var crystalHollowMap = false

@Property(
type = PropertyType.DECIMAL_SLIDER, name = "Crystal Hollows map player arrow scale",
description = "Scale the arrow indicating the player on the crystal hollows map",
category = "Mining", subcategory = "Crystal Hollows",
minF = 0.5f, maxF = 10f, decimalPlaces = 2,
i18nName = "skytils.config.mining.crystal_hollows.player_arrow_scaling",
i18nCategory = "skytils.config.mining",
i18nSubcategory = "skytils.config.mining.crystal_hollows"
)
var crystalHollowsMapPlayerScale = 2.25F

@Property(
type = PropertyType.SWITCH, name = "Crystal Hollows map special places",
description = "Show special places on the map (like Lost Precusor City).",
Expand Down Expand Up @@ -4488,6 +4499,8 @@ object Config : Vigilant(

addDependency("shinyPigLocations", "shinyOrbWaypoints")

addDependency("crystalHollowsMapPlayerScale", "crystalHollowMap")

registerListener("protectItemBINThreshold") { _: String ->
tickTimer(1) {
val numeric = protectItemBINThreshold.replace(Regex("[^0-9]"), "")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ object CHWaypoints {
}
val x = (mc.thePlayer.posX - 202).coerceIn(0.0, 624.0)
val y = (mc.thePlayer.posZ - 202).coerceIn(0.0, 624.0)
val playerScale = Skytils.config.crystalHollowsMapPlayerScale

// player marker code
val wr = UGraphics.getFromTessellator()
Expand All @@ -307,8 +308,8 @@ object CHWaypoints {

// Rotate about the center to match the player's yaw
stack.rotate((mc.thePlayer.rotationYawHead + 180f) % 360f, 0f, 0f, 1f)
stack.scale(1.5f, 1.5f, 1.5f)
stack.translate(-0.125f, 0.125f, 0.0f)
stack.scale(playerScale, playerScale, 1f)
stack.translate((-0.125f*playerScale).toDouble(), (0.125f*playerScale).toDouble(), 0.0)
UGraphics.color4f(1f, 1f, 1f, 1f)
UGraphics.enableAlpha()
val d1 = 0.0
Expand Down Expand Up @@ -403,4 +404,4 @@ object CHWaypoints {
)
}
}
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/skytils/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur Solver
skytils.config.mining.solvers.puzzler_solver=Puzzler Solver
skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=Crystal Hollows Death Waypoints
skytils.config.mining.crystal_hollows.crystal_hollows_map=Crystal Hollows map
skytils.config.mining.crystal_hollows.player_arrow_scaling=Crystal Hollows map player arrow scale
skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=Crystal Hollows map special places
skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=Crystal Hollows waypoints
skytils.config.mining.crystal_hollows.king_yolkar_waypoint=King Yolkar waypoint
Expand Down Expand Up @@ -474,4 +475,4 @@ skytils.config.spam.display=Display
skytils.config.spam.abilities=Abilities
skytils.config.spam.dungeons=Dungeons
skytils.config.spam.miscellaneous=Miscellaneous
skytils.config.spam.fishing=Fishing
skytils.config.spam.fishing=Fishing
3 changes: 2 additions & 1 deletion src/main/resources/assets/skytils/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur的解密器
skytils.config.mining.solvers.puzzler_solver=Puzzler的解密器
skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=水晶矿洞死亡路径点
skytils.config.mining.crystal_hollows.crystal_hollows_map=水晶矿洞地图
skytils.config.mining.crystal_hollows.player_arrow_scaling=水晶矿洞地图人缩放
skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=水晶矿洞地图标记特殊地点
skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=水晶矿洞路径点
skytils.config.mining.crystal_hollows.king_yolkar_waypoint=哥布林王路径点
Expand Down Expand Up @@ -466,4 +467,4 @@ skytils.config.spam.display=显示
skytils.config.spam.abilities=能力
skytils.config.spam.dungeons=地牢
skytils.config.spam.miscellaneous=杂项
skytils.config.spam.fishing=钓鱼
skytils.config.spam.fishing=钓鱼
1 change: 1 addition & 0 deletions src/main/resources/assets/skytils/lang/zh_TW.lang
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur的解答器
skytils.config.mining.solvers.puzzler_solver=Puzzler的解答器
skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=Crystal Hollows死亡路徑點
skytils.config.mining.crystal_hollows.crystal_hollows_map=Crystal Hollows地圖
skytils.config.mining.crystal_hollows.player_arrow_scaling=水晶礦圖人縮放
skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=Crystal Hollows地圖標記特殊地點
skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=Crystal Hollows路徑點
skytils.config.mining.crystal_hollows.king_yolkar_waypoint=哥布林王路徑點
Expand Down

0 comments on commit ecd98c7

Please sign in to comment.