Airboss v0.9.9.8

2025-08-15 10:47:21 +00:00 · 2019-04-12 21:59:53 +02:00
parent e26b2f4919
commit d4f6ba2bdb
2 changed files with 115 additions and 102 deletions
--- a/Development/Moose/Wrapper/Controllable.lua
+++ b/Development/Moose/Wrapper/Controllable.lua
@@ -830,100 +830,6 @@ function CONTROLLABLE:TaskEPLRS(SwitchOnOff, idx)
  
 end

--- Used in conjunction with the embarking task for a transport helicopter group. The Ground units will move to the specified location and wait to be picked up by a helicopter. 
-- The helicopter will then fly them to their dropoff point defined by another task for the ground forces; DisembarkFromTransport task.
-- The controllable has to be an infantry group!
-- @param #CONTROLLABLE self
-- @param Core.Point#COORDINATE Coordinate Coordinates where AI is expecting to be picked up.
-- @param #number Radius Radius in meters.
-- @return #table Embark to transport task.
-function CONTROLLABLE:TaskEmbarkToTransport(Coordinate, Radius)
-
-  local EmbarkToTransport = {
-   id="EmbarkToTransport ",
-   enabled=true,
-   auto=false,
-   params={
-       x=Coordinate.x,
-       y=Coordinate.z,
-       zoneRadius=Radius,
-       selectedType="UH-1H",
-     }
-   }
-
-  self:E(EmbarkToTransport)
-  return EmbarkToTransport
-end
-
--- Specifies the location an infantry group that is being transported by helicopters will be unloaded at. Used in conjunction with the EmbarkToTransport task.
-- The CONTROLLABLE has to be an infantry group!
-- @param #CONTROLLABLE self
-- @param Core.Point#COORDINATE Coordinate Coordinates where AI is expecting to be picked up.
-- @param #number Radius Radius in meters.
-- @return #table Embark to transport task.
-function CONTROLLABLE:TaskDisembarkFromTransport(Coordinate, Radius)
-
-  local DisembarkFromTransport={
-   id="DisembarkFromTransport",
-   params = {
-     x=Coordinate.x,
-     y=Coordinate.y,
-     zoneRadius=Radius,
-   }}
-
-  return DisembarkFromTransport
-end
-
--- Used in conjunction with the EmbarkToTransport task for a ground infantry group, the controlled helicopter flight will land at the specified coordinates, 
-- pick up boarding troops and transport them to that groups DisembarkFromTransport task.
-- The CONTROLLABLE has to be a helicopter group!
-- @param #CONTROLLABLE self
-- @param Core.Set#SET_GROUP GroupSet Set of groups to be embarked by the controllable.
-- @param Core.Point#COORDINATE Coordinate Coordinate of embarking.
-- @param #number Duration Duration of embarking in seconds. 
-- @return #table Embarking task.
-function CONTROLLABLE:TaskEmbarking(GroupSet, Coordinate, Duration)
-
-  -- Create table of group IDs.
-  local gids={}
-  for _,_group in pairs(GroupSet:GetAliveSet()) do
-    local group=_group --Wrapper.Group#GROUP
-    table.insert(gids, group:GetID())
-  end
-  
-  -- Group ID of controllable.
-  local id=self:GetID()
-  
-  -- Distribution
-  local distribution={}
-  distribution[id]=gids
-  
-  local durationFlag=false
-  if Duration then
-    durationFlag=true
-  else
-    Duration=300
-  end
-
-  local DCStask={
-    id="Embarking",
-    params={
-      selectedTransport=self:GetID(),
-      distributionFlag=true,
-      distribution=distribution,
-      groupsForEmbarking=gids,
-      durationFlag=durationFlag,
-      distribution=distribution,
-      duration=Duration,
-      x=Coordinate.x,
-      y=Coordinate.z,
-    }
-  }
-  
-  self:E(DCStask)
-
-  return DCStask
-end

 -- TASKS FOR AIR CONTROLLABLES
 --- (AIR) Attack a Controllable.
@@ -1892,6 +1798,99 @@ end


 --[[
+--- Used in conjunction with the embarking task for a transport helicopter group. The Ground units will move to the specified location and wait to be picked up by a helicopter. 
+-- The helicopter will then fly them to their dropoff point defined by another task for the ground forces; DisembarkFromTransport task.
+-- The controllable has to be an infantry group!
+-- @param #CONTROLLABLE self
+-- @param Core.Point#COORDINATE Coordinate Coordinates where AI is expecting to be picked up.
+-- @param #number Radius Radius in meters.
+-- @return #table Embark to transport task.
+function CONTROLLABLE:TaskEmbarkToTransport(Coordinate, Radius)
+
+  local EmbarkToTransport = {
+   id="EmbarkToTransport",
+   params={
+       x=Coordinate.x,
+       y=Coordinate.z,
+       zoneRadius=Radius,
+       --selectedType="UH-1H",
+     }
+   }
+
+  self:E(EmbarkToTransport)
+  return EmbarkToTransport
+end
+
+--- Used in conjunction with the EmbarkToTransport task for a ground infantry group, the controlled helicopter flight will land at the specified coordinates, 
+-- pick up boarding troops and transport them to that groups DisembarkFromTransport task.
+-- The CONTROLLABLE has to be a helicopter group!
+-- @param #CONTROLLABLE self
+-- @param Core.Set#SET_GROUP GroupSet Set of groups to be embarked by the controllable.
+-- @param Core.Point#COORDINATE Coordinate Coordinate of embarking.
+-- @param #number Duration Duration of embarking in seconds. 
+-- @return #table Embarking task.
+function CONTROLLABLE:TaskEmbarking(GroupSet, Coordinate, Duration)
+
+  -- Create table of group IDs.
+  local gids={}
+  for _,_group in pairs(GroupSet:GetAliveSet()) do
+    local group=_group --Wrapper.Group#GROUP
+    table.insert(gids, group:GetID())
+  end
+  
+  -- Group ID of controllable.
+  local id=self:GetID()
+  
+  -- Distribution
+  local distribution={}
+  distribution[id]=gids
+  
+  local durationFlag=false
+  if Duration then
+    durationFlag=true
+  else
+    Duration=300
+  end
+
+  local DCStask={
+    id="Embarking",
+    params={
+      selectedTransport=self:GetID(),
+      distributionFlag=true,
+      distribution=distribution,
+      groupsForEmbarking=gids,
+      durationFlag=durationFlag,
+      distribution=distribution,
+      duration=Duration,
+      x=Coordinate.x,
+      y=Coordinate.z,
+    }
+  }
+  
+  self:E(DCStask)
+
+  return DCStask
+end
+
+--- Specifies the location an infantry group that is being transported by helicopters will be unloaded at. Used in conjunction with the EmbarkToTransport task.
+-- The CONTROLLABLE has to be an infantry group!
+-- @param #CONTROLLABLE self
+-- @param Core.Point#COORDINATE Coordinate Coordinates where AI is expecting to be picked up.
+-- @param #number Radius Radius in meters.
+-- @return #table Embark to transport task.
+function CONTROLLABLE:TaskDisembarkFromTransport(Coordinate, Radius)
+
+  local DisembarkFromTransport={
+   id="DisembarkFromTransport",
+   params = {
+     x=Coordinate.x,
+     y=Coordinate.y,
+     zoneRadius=Radius,
+   }}
+
+  return DisembarkFromTransport
+end
+]]

 --- (AIR) Move the controllable to a Vec2 Point, wait for a defined duration and embark a controllable.
 -- @param #CONTROLLABLE self
@@ -1919,8 +1918,7 @@ function CONTROLLABLE:TaskEmbarking( Point, Duration, EmbarkingControllable )
 end

 --- (GROUND) Embark to a Transport landed at a location.
-
--- Move to a defined Vec2 Point, and embark to a controllable when arrived within a defined Radius.
+-- Move to a defined Vec2 Point, and embark to a controllable when arrived within a defined Radius.
 -- @param #CONTROLLABLE self
 -- @param DCS#Vec2 Point The point where to wait.
 -- @param #number Radius The radius of the embarking zone around the Point.
@@ -1940,7 +1938,6 @@ function CONTROLLABLE:TaskEmbarkToTransport( Point, Radius )
  return DCSTask
 end

-]]

 --- This creates a Task element, with an action to call a function as part of a Wrapped Task.
 -- This Task can then be embedded at a Waypoint by calling the method @{#CONTROLLABLE.SetTaskWaypoint}.