diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 1b3b11a74..8e0559e35 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -664,7 +664,7 @@ AUFTRAG.Category={ --- AUFTRAG class version. -- @field #string version -AUFTRAG.version="1.2.1" +AUFTRAG.version="1.2.2" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -2302,7 +2302,7 @@ function AUFTRAG:NewCAPTUREZONE(OpsZone, Coalition, Speed, Altitude, Formation) params.formation=Formation or "Off Road" params.zone=mission:GetObjective() params.altitude=mission.missionAltitude - params.speed=mission.missionSpeed + params.speed=mission.missionSpeed and UTILS.KmphToMps(mission.missionSpeed) or nil mission.DCStask.params=params @@ -2352,7 +2352,7 @@ function AUFTRAG:NewGROUNDATTACK(Target, Speed, Formation) mission.DCStask=mission:GetDCSMissionTask() - mission.DCStask.params.speed=Speed + mission.DCStask.params.speed=mission.missionSpeed and UTILS.KmphToMps(mission.missionSpeed) or nil mission.DCStask.params.formation=Formation or ENUMS.Formation.Vehicle.Vee return mission @@ -6099,7 +6099,7 @@ function AUFTRAG:GetDCSMissionTask() local param={} param.zone=self:GetObjective() param.altitude=self.missionAltitude - param.speed=self.missionSpeed + param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil DCStask.params=param @@ -6179,7 +6179,7 @@ function AUFTRAG:GetDCSMissionTask() local param={} param.target=self.engageTarget param.altitude=self.missionAltitude - param.speed=self.missionSpeed + param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil param.lastindex=nil DCStask.params=param @@ -6352,7 +6352,7 @@ function AUFTRAG:GetDCSMissionTask() local param={} param.zone=self:GetObjective() param.altitude=self.missionAltitude - param.speed=self.missionSpeed + param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil DCStask.params=param @@ -6388,7 +6388,7 @@ function AUFTRAG:GetDCSMissionTask() local param={} param.zone=self:GetObjective() param.altitude=self.missionAltitude - param.speed=self.missionSpeed + param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil DCStask.params=param @@ -6408,7 +6408,7 @@ function AUFTRAG:GetDCSMissionTask() local param={} param.target=self:GetTargetData() param.action="Wedge" - param.speed=self.missionSpeed + param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil DCStask.params=param diff --git a/Moose Development/Moose/Ops/NavyGroup.lua b/Moose Development/Moose/Ops/NavyGroup.lua index 499ca6b12..1b5bf3dc0 100644 --- a/Moose Development/Moose/Ops/NavyGroup.lua +++ b/Moose Development/Moose/Ops/NavyGroup.lua @@ -1269,7 +1269,7 @@ function NAVYGROUP:onafterUpdateRoute(From, Event, To, n, N, Speed, Depth) if self.verbose>=10 then for i=1,#waypoints do local wp=waypoints[i] --Ops.OpsGroup#OPSGROUP.Waypoint - local text=string.format("%s Waypoint [%d] UID=%d speed=%d", self.groupname, i-1, wp.uid or -1, wp.speed) + local text=string.format("%s Waypoint [%d] UID=%d speed=%d m/s", self.groupname, i-1, wp.uid or -1, wp.speed) self:I(self.lid..text) COORDINATE:NewFromWaypoint(wp):MarkToAll(text) end diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 8ae8c06c9..344a2f975 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -4480,7 +4480,7 @@ function OPSGROUP:_UpdateTask(Task, Mission) -- Set speed. Default max. local speed=self.speedMax and UTILS.KmphToKnots(self.speedMax) or nil if Task.dcstask.params.speed then - speed=Task.dcstask.params.speed + speed=UTILS.MpsToKnots(Task.dcstask.params.speed) end if target then