From e48a8235602ab7528be1b15ffe6e76c5f3894d77 Mon Sep 17 00:00:00 2001
From: Applevangelist <post@tniedermeier.com>
Date: Wed, 25 Oct 2023 08:46:52 +0200
Subject: [PATCH] #EASYGCICAP, CONTROLLABLE, OPSGROUP, AUFTRAG * Changed patrol
 race track alt to be ASL not AGL by default

---
 Moose Development/Moose/Ops/Auftrag.lua          | 4 ++--
 Moose Development/Moose/Ops/EasyGCICAP.lua       | 4 ++--
 Moose Development/Moose/Ops/OpsGroup.lua         | 2 +-
 Moose Development/Moose/Wrapper/Controllable.lua | 9 ++++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua
index a1d234fbe..92511531c 100644
--- a/Moose Development/Moose/Ops/Auftrag.lua	
+++ b/Moose Development/Moose/Ops/Auftrag.lua	
@@ -1055,8 +1055,8 @@ end
 --- **[AIR]** Create an enhanced orbit race track mission. Planes will keep closer to the track.
 -- @param #AUFTRAG self
 -- @param Core.Point#COORDINATE Coordinate Where to start the race track.
--- @param #number Altitude (Optional) Altitude in feet. Defaults to 20,000ft.
--- @param #number Speed (Optional) Speed in knots. Defaults to 300kn.
+-- @param #number Altitude (Optional) Altitude in feet. Defaults to 20,000ft ASL.
+-- @param #number Speed (Optional) Speed in knots. Defaults to 300kn TAS.
 -- @param #number Heading (Optional) Heading in degrees, 0 to 360. Defaults to 90 degree (East).
 -- @param #number Leg (Optional) Leg of the race track in NM. Defaults to 10nm.
 -- @param #number Formation (Optional) Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation).
diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua
index 0633f8b23..0d2ce7d99 100644
--- a/Moose Development/Moose/Ops/EasyGCICAP.lua	
+++ b/Moose Development/Moose/Ops/EasyGCICAP.lua	
@@ -569,8 +569,8 @@ end
 -- @param #EASYGCICAP self
 -- @param #string AirbaseName Name of the Wing's airbase
 -- @param Core.Point#COORDINATE Coordinate.
--- @param #number Altitude Defaults to 25000 feet.
--- @param #number Speed  Defaults to 300 knots.
+-- @param #number Altitude Defaults to 25000 feet ASL.
+-- @param #number Speed  Defaults to 300 knots TAS.
 -- @param #number Heading Defaults to 90 degrees (East).
 -- @param #number LegLength Defaults to 15 NM.
 -- @return #EASYGCICAP self
diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua
index 0ba09f730..3ae97c282 100644
--- a/Moose Development/Moose/Ops/OpsGroup.lua	
+++ b/Moose Development/Moose/Ops/OpsGroup.lua	
@@ -4481,7 +4481,7 @@ function OPSGROUP:_UpdateTask(Task, Mission)
           Task.dcstask.params.TrackFormation = self.TrackFormation
       --]]
       local aircraft = self:GetGroup()
-      aircraft:PatrolRaceTrack(Task.dcstask.params.TrackPoint1,Task.dcstask.params.TrackPoint2,Task.dcstask.params.TrackAltitude,Task.dcstask.params.TrackSpeed,Task.dcstask.params.TrackFormation,1)
+      aircraft:PatrolRaceTrack(Task.dcstask.params.TrackPoint1,Task.dcstask.params.TrackPoint2,Task.dcstask.params.TrackAltitude,Task.dcstask.params.TrackSpeed,Task.dcstask.params.TrackFormation,false,1)
     end
     
   elseif Task.dcstask.id==AUFTRAG.SpecialTask.HOVER then
diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua
index 20abf3e2a..89e3541f8 100644
--- a/Moose Development/Moose/Wrapper/Controllable.lua	
+++ b/Moose Development/Moose/Wrapper/Controllable.lua	
@@ -5337,9 +5337,10 @@ end
 -- @param #number Altitude (Optional) Altitude in meters. Defaults to the altitude of the coordinate.
 -- @param #number Speed (Optional) Speed in kph. Defaults to 500 kph.
 -- @param #number Formation (Optional) Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation).
+-- @param #boolean AGL (Optional) If true, set altitude to above ground level (AGL), not above sea level (ASL).
 -- @param #number Delay  (Optional) Set the task after delay seconds only.
 -- @return #CONTROLLABLE self
-function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation, Delay)
+function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation, AGL, Delay)
 
   local PatrolGroup = self -- Wrapper.Group#GROUP
   
@@ -5361,8 +5362,10 @@ function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation
    
    -- Calculate the new Route
    if Altitude then
-     FromCoord:SetAltitude(Altitude)
-     ToCoord:SetAltitude(Altitude)
+     local asl = true
+     if AGL then asl = false end
+     FromCoord:SetAltitude(Altitude, asl)
+     ToCoord:SetAltitude(Altitude, asl)
    end
             
    -- Create a "air waypoint", which is a "point" structure that can be given as a parameter to a Task