Add option to select preferred unit of length for distance displays (#1774)

fixes #1770

this is a draft rn since it's untested, will test later

---------

Co-authored-by: Tim Goll <github@timgoll.de>

Author: wgetJane

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 
 ## Unreleased
 
+### Added
+
+- Added option to select preferred unit of length for distance displays (by @wgetJane)
+
 ### Changed
 - Updated Russian and English localization files (by @Satton2)
 

gamemodes/terrortown/entities/entities/ttt_beacon.lua

@@ -252,7 +252,7 @@ if CLIENT then
         local owner = ent:GetOriginator()
         local nick = IsValid(owner) and owner:Nick() or "---"
 
-        local distance = math.Round(util.HammerUnitsToMeters(mvData:GetEntityDistance()), 1)
+        local distance = util.DistanceToString(mvData:GetEntityDistance(), 1)
 
         mvData:EnableText()
 

gamemodes/terrortown/entities/entities/ttt_c4/shared.lua

@@ -843,7 +843,7 @@ else -- CLIENT
         local nick = IsValid(owner) and owner:Nick() or "---"
 
         local time = util.SimpleTime(ent:GetExplodeTime() - CurTime(), "%02i:%02i")
-        local distance = math.Round(util.HammerUnitsToMeters(mvData:GetEntityDistance()), 1)
+        local distance = util.DistanceToString(mvData:GetEntityDistance(), 1)
 
         mvData:EnableText()
 

gamemodes/terrortown/entities/entities/ttt_radio.lua

@@ -352,7 +352,7 @@ if CLIENT then
         local originator = ent:GetOriginator()
         local nick = IsValid(originator) and originator:Nick() or "---"
 
-        local distance = math.Round(util.HammerUnitsToMeters(mvData:GetEntityDistance()), 1)
+        local distance = util.DistanceToString(mvData:GetEntityDistance(), 1)
 
         mvData:EnableText()
 

gamemodes/terrortown/entities/weapons/weapon_ttt_wtester.lua

@@ -576,12 +576,8 @@ if CLIENT then
                 local vectorToPos = targetPos - scannerPos
                 local angleToPos = vectorToPos:Angle()
                 local arrowRotation = angleToPos.yaw - EyeAngles().yaw
-                local distance = tostring(
-                    math.Round(
-                        util.HammerUnitsToMeters(LocalPlayer():EyePos():Distance(targetPos)),
-                        0
-                    )
-                ) .. "m"
+                local distance =
+                    util.DistanceToString(LocalPlayer():EyePos():Distance(targetPos), 0)
 
                 surface.SetDrawColor(96, 255, 96, 255)
                 surface.SetMaterial(dna_screen_arrow)

lua/terrortown/entities/items/item_ttt_radar/cl_init.lua

@@ -119,9 +119,7 @@ local function DrawTarget(tgt, size, offset, no_shrink)
 
     -- Drawing full size?
     if sz == size then
-        local text = tostring(
-            math.Round(util.HammerUnitsToMeters(LocalPlayer():EyePos():Distance(tgt.pos)), 0)
-        ) .. "m"
+        local text = util.DistanceToString(LocalPlayer():EyePos():Distance(tgt.pos), 0)
         local w, h = surface.GetTextSize(text)
 
         -- Show range to target

lua/terrortown/lang/de.lua

@@ -2070,11 +2070,11 @@ L.flaregun_help_primary = "Körper/Entität verbrennen"
 
 -- 2023-12-14
 L.marker_vision_owner = "Besitzer: {owner}"
-L.marker_vision_distance = "Distanz: {distance}m"
-L.marker_vision_distance_collapsed = "{distance}m"
+L.marker_vision_distance = "Distanz: {distance}"
+L.marker_vision_distance_collapsed = "{distance}"
 
 L.c4_marker_vision_time = "Explosionszeit: {time}"
-L.c4_marker_vision_collapsed = "{time} / {distance}m"
+L.c4_marker_vision_collapsed = "{time} / {distance}"
 
 L.c4_marker_vision_safe_zone = "Bombensicherheitszone"
 L.c4_marker_vision_damage_zone = "Bombenschadenszone"
@@ -2801,3 +2801,14 @@ L.label_voice_activation_mode_toggle_enabled = "Umschalten (Aktiviert zum Start)
 --Plays sounds to distract or deceive.
 --
 --Place the radio somewhere, and then remotely interact with it to choose sounds to play.]]
+
+-- 2025-02-21
+L.length_in_meters = "{length}m"
+--L.length_in_yards = "{length}yd"
+--L.length_in_feet = "{length}ft"
+
+--L.label_distance_unit = "Preferred unit of length for distance displays"
+--L.choice_distance_unit_0 = "Inches"
+--L.choice_distance_unit_1 = "Meters"
+--L.choice_distance_unit_2 = "Yards"
+--L.choice_distance_unit_3 = "Feet"

lua/terrortown/lang/en.lua

@@ -2076,11 +2076,11 @@ L.flaregun_help_primary = "Burn body/entity"
 
 -- 2023-12-14
 L.marker_vision_owner = "Owner: {owner}"
-L.marker_vision_distance = "Distance: {distance}m"
-L.marker_vision_distance_collapsed = "{distance}m"
+L.marker_vision_distance = "Distance: {distance}"
+L.marker_vision_distance_collapsed = "{distance}"
 
 L.c4_marker_vision_time = "Detonation time: {time}"
-L.c4_marker_vision_collapsed = "{time} / {distance}m"
+L.c4_marker_vision_collapsed = "{time} / {distance}"
 
 L.c4_marker_vision_safe_zone = "Bomb safe zone"
 L.c4_marker_vision_damage_zone = "Bomb damage zone"
@@ -2807,3 +2807,14 @@ L.radio_desc = [[
 Plays sounds to distract or deceive.
 
 Place the radio somewhere, and then remotely interact with it to choose sounds to play.]]
+
+-- 2025-02-21
+L.length_in_meters = "{length}m"
+L.length_in_yards = "{length}yd"
+L.length_in_feet = "{length}ft"
+
+L.label_distance_unit = "Preferred unit of length for distance displays"
+L.choice_distance_unit_0 = "Inches"
+L.choice_distance_unit_1 = "Meters"
+L.choice_distance_unit_2 = "Yards"
+L.choice_distance_unit_3 = "Feet"

lua/terrortown/lang/es.lua

@@ -2076,11 +2076,11 @@ L.search_eyes = "Gracias a tus habilidades de detective, has identificado que la
 
 -- 2023-12-14
 --L.marker_vision_owner = "Owner: {owner}"
---L.marker_vision_distance = "Distance: {distance}m"
---L.marker_vision_distance_collapsed = "{distance}m"
+--L.marker_vision_distance = "Distance: {distance}"
+--L.marker_vision_distance_collapsed = "{distance}"
 
 --L.c4_marker_vision_time = "Detonation time: {time}"
---L.c4_marker_vision_collapsed = "{time} / {distance}m"
+--L.c4_marker_vision_collapsed = "{time} / {distance}"
 
 --L.c4_marker_vision_safe_zone = "Bomb safe zone"
 --L.c4_marker_vision_damage_zone = "Bomb damage zone"
@@ -2807,3 +2807,14 @@ L.decoy_help_primary = "Colocar el señuelo"
 --Plays sounds to distract or deceive.
 --
 --Place the radio somewhere, and then remotely interact with it to choose sounds to play.]]
+
+-- 2025-02-21
+--L.length_in_meters = "{length}m"
+--L.length_in_yards = "{length}yd"
+--L.length_in_feet = "{length}ft"
+
+--L.label_distance_unit = "Preferred unit of length for distance displays"
+--L.choice_distance_unit_0 = "Inches"
+--L.choice_distance_unit_1 = "Meters"
+--L.choice_distance_unit_2 = "Yards"
+--L.choice_distance_unit_3 = "Feet"

lua/terrortown/lang/fr.lua

@@ -2070,11 +2070,11 @@ L.flaregun_help_primary = "Brûler un corps/une entité"
 
 -- 2023-12-14
 L.marker_vision_owner = "Propriétaire : {owner}"
-L.marker_vision_distance = "Distance : {distance}m"
-L.marker_vision_distance_collapsed = "{distance}m"
+L.marker_vision_distance = "Distance : {distance}"
+L.marker_vision_distance_collapsed = "{distance}"
 
 L.c4_marker_vision_time = "Temps avant détonation : {time}"
-L.c4_marker_vision_collapsed = "{time} / {distance}m"
+L.c4_marker_vision_collapsed = "{time} / {distance}"
 
 L.c4_marker_vision_safe_zone = "Zone hors de portée du C4"
 L.c4_marker_vision_damage_zone = "Zone de dégâts du C4"
@@ -2801,3 +2801,14 @@ L.vehicle_enter = "Appuyez sur [{usekey}] pour entrer dans le véhicule"
 --Plays sounds to distract or deceive.
 --
 --Place the radio somewhere, and then remotely interact with it to choose sounds to play.]]
+
+-- 2025-02-21
+L.length_in_meters = "{length}m"
+--L.length_in_yards = "{length}yd"
+--L.length_in_feet = "{length}ft"
+
+--L.label_distance_unit = "Preferred unit of length for distance displays"
+--L.choice_distance_unit_0 = "Inches"
+--L.choice_distance_unit_1 = "Meters"
+--L.choice_distance_unit_2 = "Yards"
+--L.choice_distance_unit_3 = "Feet"