From 0e40dc70b2e5bcf3910def281c7c0f7342944c58 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 16 May 2024 09:34:03 +0200 Subject: [PATCH] xxx --- Moose Development/Moose/Ops/PlayerTask.lua | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua index e0c7f8c60..0964d7f9a 100644 --- a/Moose Development/Moose/Ops/PlayerTask.lua +++ b/Moose Development/Moose/Ops/PlayerTask.lua @@ -1213,6 +1213,9 @@ do -- AIRDEFENSE = "Airdefense", -- SAM = "SAM", -- GROUP = "Group", +-- ELEVATION = "\nTarget Elevation: %s %s", +-- METER = "meter", +-- FEET = "feet", -- }, -- -- e.g. @@ -1419,6 +1422,9 @@ PLAYERTASKCONTROLLER.Messages = { THREATMEDIUM = "medium", THREATLOW = "low", THREATTEXT = "%s\nThreat: %s\nTargets left: %d\nCoord: %s", + ELEVATION = "\nTarget Elevation: %s %s", + METER = "meter", + FEET = "feet", THREATTEXTTTS = "%s, %s. Target information for %s. Threat level %s. Targets left %d. Target location %s.", MARKTASK = "%s, %s, copy, task %03d location marked on map!", SMOKETASK = "%s, %s, copy, task %03d location smoked!", @@ -1499,6 +1505,9 @@ PLAYERTASKCONTROLLER.Messages = { THREATMEDIUM = "mittel", THREATLOW = "niedrig", THREATTEXT = "%s\nGefahrstufe: %s\nZiele: %d\nKoord: %s", + ELEVATION = "\nZiel Höhe: %s %s", + METER = "Meter", + FEET = "Fuss", THREATTEXTTTS = "%s, %s. Zielinformation zu %s. Gefahrstufe %s. Ziele %d. Zielposition %s.", MARKTASK = "%s, %s, verstanden, Zielposition %03d auf der Karte markiert!", SMOKETASK = "%s, %s, verstanden, Zielposition %03d mit Rauch markiert!", @@ -1561,7 +1570,7 @@ PLAYERTASKCONTROLLER.Messages = { --- PLAYERTASK class version. -- @field #string version -PLAYERTASKCONTROLLER.version="0.1.65" +PLAYERTASKCONTROLLER.version="0.1.66" --- Create and run a new TASKCONTROLLER instance. -- @param #PLAYERTASKCONTROLLER self @@ -3182,7 +3191,8 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client) local ttsname = self.gettext:GetEntry("TASKNAMETTS",self.locale) local taskname = string.format(tname,task.Type,task.PlayerTaskNr) local ttstaskname = string.format(ttsname,task.TTSType,task.PlayerTaskNr) - local Coordinate = task.Target:GetCoordinate() or COORDINATE:New(0,0,0) + local Coordinate = task.Target:GetCoordinate() or COORDINATE:New(0,0,0) -- Core.Point#COORDINATE + local Elevation = Coordinate:GetLandHeight() or 0 -- meters local CoordText = "" local CoordTextLLDM = nil if self.Type ~= PLAYERTASKCONTROLLER.Type.A2A then @@ -3207,6 +3217,15 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client) local ThreatGraph = "[" .. string.rep( "■", ThreatLevel ) .. string.rep( "□", 10 - ThreatLevel ) .. "]: "..ThreatLevel local ThreatLocaleText = self.gettext:GetEntry("THREATTEXT",self.locale) text = string.format(ThreatLocaleText, taskname, ThreatGraph, targets, CoordText) + local settings = _DATABASE:GetPlayerSettings(playername) or _SETTINGS -- Core.Settings#SETTINGS + local elevationmeasure = self.gettext:GetEntry("METER",self.locale) + if settings:IsMetric()() then + elevationmeasure = self.gettext:GetEntry("METER",self.locale) + Elevation = math.floor(UTILS.MetersToFeet(Elevation)) + end + -- ELEVATION = "\nTarget Elevation: %s %s", + local elev = self.gettext:GetEntry("ELEVATION",self.locale) + text = text .. string.format(elev,tostring(math.floor(Elevation)),elevationmeasure) -- Prec bombing if task.Type == AUFTRAG.Type.PRECISIONBOMBING and self.precisionbombing then if self.LasingDrone and self.LasingDrone.playertask then