From 1c5c2056144fc9c898d7bb0c7deb599b280e466f Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 3 Dec 2021 16:51:06 +0100 Subject: [PATCH] OpsGroup - corrected speed calculation from DCSTask --- Moose Development/Moose/Ops/OpsGroup.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 001317a92..0f1221c28 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -3573,7 +3573,8 @@ function OPSGROUP:onafterTaskExecute(From, Event, To, Task) --Coordinate:MarkToAll("Random Patrol Zone Coordinate") -- Speed and altitude. - local Speed=UTILS.KmphToKnots(Task.dcstask.params.speed or self.speedCruise) + local Speed=UTILS.MpsToKnots(Task.dcstask.params.speed) or UTILS.KmphToKnots(self.speedCruise) + --local Speed=UTILS.KmphToKnots(Task.dcstask.params.speed or self.speedCruise) local Altitude=Task.dcstask.params.altitude and UTILS.MetersToFeet(Task.dcstask.params.altitude) or nil local currUID=self:GetWaypointCurrent().uid @@ -3609,7 +3610,8 @@ function OPSGROUP:onafterTaskExecute(From, Event, To, Task) local Coordinate=zone:GetRandomCoordinate() -- Speed and altitude. - local Speed=UTILS.KmphToKnots(Task.dcstask.params.speed or self.speedCruise) + local Speed=UTILS.MpsToKnots(Task.dcstask.params.speed) or UTILS.KmphToKnots(self.speedCruise) + --local Speed=UTILS.KmphToKnots(Task.dcstask.params.speed or self.speedCruise) local Altitude=Task.dcstask.params.altitude and UTILS.MetersToFeet(Task.dcstask.params.altitude) or nil --Coordinate:MarkToAll("Recon Waypoint Execute") @@ -4894,7 +4896,8 @@ function OPSGROUP:onafterPassingWaypoint(From, Event, To, Waypoint) local Coordinate=zone:GetRandomCoordinate(nil, nil, surfacetypes) -- Speed and altitude. - local Speed=UTILS.KmphToKnots(task.dcstask.params.speed or self.speedCruise) + local Speed=UTILS.MpsToKnots(task.dcstask.params.speed) or UTILS.KmphToKnots(self.speedCruise) + -- local Speed=UTILS.KmphToKnots(speed or self.speedCruise) local Altitude=UTILS.MetersToFeet(task.dcstask.params.altitude or self.altitudeCruise) local currUID=self:GetWaypointCurrent().uid @@ -4930,7 +4933,8 @@ function OPSGROUP:onafterPassingWaypoint(From, Event, To, Waypoint) local Coordinate=zone:GetRandomCoordinate() -- Speed and altitude. - local Speed=UTILS.KmphToKnots(task.dcstask.params.speed or self.speedCruise) + local Speed=UTILS.MpsToKnots(task.dcstask.params.speed) or UTILS.KmphToKnots(self.speedCruise) + --local Speed=UTILS.KmphToKnots(task.dcstask.params.speed or self.speedCruise) local Altitude=task.dcstask.params.altitude and UTILS.MetersToFeet(task.dcstask.params.altitude) or nil -- Debug.