Merge branch 'FF/Develop' into FF/Fox2

Moose Development/Moose/Wrapper/Airbase.lua

@@ -311,7 +311,7 @@ AIRBASE.PersianGulf = {
 -- @field #number OpenMed 72: Open/Shelter air airplane only.
 -- @field #number OpenBig 104: Open air spawn points. Generally larger but does not guarantee large aircraft are capable of spawning there.
 -- @field #number OpenMedOrBig 176: Combines OpenMed and OpenBig spots.
--- @field #number HelicopterUnsable 216: Combines HelicopterOnly, OpenMed and OpenBig.
+-- @field #number HelicopterUsable 216: Combines HelicopterOnly, OpenMed and OpenBig.
 -- @field #number FighterAircraft 244: Combines Shelter. OpenMed and OpenBig spots. So effectively all spots usable by fixed wing aircraft.
 AIRBASE.TerminalType = {
   Runway=16,
@@ -553,14 +553,14 @@ function AIRBASE:GetParkingSpotsTable(termtype)
   local spots={}
   for _,_spot in pairs(parkingdata) do
     if AIRBASE._CheckTerminalType(_spot.Term_Type, termtype) then
-      self:I({_spot=_spot})
+      self:T2({_spot=_spot})
       local _free=_isfree(_spot)
       local _coord=COORDINATE:NewFromVec3(_spot.vTerminalPos)
       table.insert(spots, {Coordinate=_coord, TerminalID=_spot.Term_Index, TerminalType=_spot.Term_Type, TOAC=_spot.TO_AC, Free=_free, TerminalID0=_spot.Term_Index_0, DistToRwy=_spot.fDistToRW})
     end
   end
   
-  self:I({ spots = spots } )
+  self:T2({ spots = spots } )
   
   return spots
 end
@@ -578,7 +578,7 @@ function AIRBASE:GetFreeParkingSpotsTable(termtype, allowTOAC)
   -- Put coordinates of free spots into table.
   local freespots={}
   for _,_spot in pairs(parkingfree) do
-    if AIRBASE._CheckTerminalType(_spot.Term_Type, termtype) then
+    if AIRBASE._CheckTerminalType(_spot.Term_Type, termtype) and _spot.Term_Index>0 then
       if (allowTOAC and allowTOAC==true) or _spot.TO_AC==false then
         local _coord=COORDINATE:NewFromVec3(_spot.vTerminalPos)
         table.insert(freespots, {Coordinate=_coord, TerminalID=_spot.Term_Index, TerminalType=_spot.Term_Type, TOAC=_spot.TO_AC, Free=true, TerminalID0=_spot.Term_Index_0, DistToRwy=_spot.fDistToRW})
@@ -589,6 +589,31 @@ function AIRBASE:GetFreeParkingSpotsTable(termtype, allowTOAC)
   return freespots
 end
 
+--- Get a table containing the coordinates, terminal index and terminal type of free parking spots at an airbase.
+-- @param #AIRBASE self
+-- @param #number TerminalID The terminal ID of the parking spot.
+-- @return #AIRBASE.ParkingSpot Table free parking spots. Table has the elements ".Coordinate, ".TerminalID", ".TerminalType", ".TOAC", ".Free", ".TerminalID0", ".DistToRwy".
+function AIRBASE:GetParkingSpotData(TerminalID)
+  self:F({TerminalID=TerminalID})
+
+  -- Get parking data.
+  local parkingdata=self:GetParkingSpotsTable()
+  
+  -- Debug output.
+  self:T2({parkingdata=parkingdata})
+  
+  for _,_spot in pairs(parkingdata) do
+    local spot=_spot --#AIRBASE.ParkingSpot
+    self:E({TerminalID=spot.TerminalID,TerminalType=spot.TerminalType})
+    if TerminalID==spot.TerminalID then
+      return spot
+    end
+  end
+  
+  self:E("ERROR: Could not find spot with Terminal ID="..tostring(TerminalID))
+  return nil
+end
+
 --- Place markers of parking spots on the F10 map.
 -- @param #AIRBASE self
 -- @param #AIRBASE.TerminalType termtype Terminal type for which marks should be placed.
@@ -711,7 +736,7 @@ function AIRBASE:FindFreeParkingSpotForAircraft(group, terminaltype, scanradius,
     local _spot=parkingspot.Coordinate   -- Core.Point#COORDINATE
     local _termid=parkingspot.TerminalID
     
-    self:I({_termid=_termid})
+    self:T2({_termid=_termid})
     
     if AIRBASE._CheckTerminalType(parkingspot.TerminalType, terminaltype) then
     
@@ -893,7 +918,7 @@ function AIRBASE:CheckOnRunWay(group, radius, despawn)
 end
 
 --- Get category of airbase.
--- @param #WAREHOUSE self
+-- @param #AIRBASE self
 -- @return #number Category of airbase from GetDesc().category.
 function AIRBASE:GetAirbaseCategory()
   return self:GetDesc().category

Moose Development/Moose/Wrapper/Controllable.lua

@@ -2813,6 +2813,8 @@ function CONTROLLABLE:GetDetectedTargets( DetectVisual, DetectOptical, DetectRad
   return nil
 end
 
+--- Check if a target is detected.
+-- @param Wrapper.Controllable#CONTROLLABLE self
 function CONTROLLABLE:IsTargetDetected( DCSObject, DetectVisual, DetectOptical, DetectRadar, DetectIRST, DetectRWR, DetectDLINK )
   self:F2( self.ControllableName )
 
@@ -2858,7 +2860,7 @@ function CONTROLLABLE:OptionROEHoldFirePossible()
   return nil
 end
 
---- Holding weapons.
+--- Weapons Hold: AI will hold fire under all circumstances.
 -- @param Wrapper.Controllable#CONTROLLABLE self
 -- @return Wrapper.Controllable#CONTROLLABLE self
 function CONTROLLABLE:OptionROEHoldFire()
@@ -2900,7 +2902,7 @@ function CONTROLLABLE:OptionROEReturnFirePossible()
   return nil
 end
 
---- Return fire.
+--- Return Fire: AI will only engage threats that shoot first.
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:OptionROEReturnFire()
@@ -2942,7 +2944,7 @@ function CONTROLLABLE:OptionROEOpenFirePossible()
   return nil
 end
 
---- Openfire.
+--- Open Fire (Only Designated): AI will engage only targets specified in its taskings.
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:OptionROEOpenFire()
@@ -2966,6 +2968,45 @@ function CONTROLLABLE:OptionROEOpenFire()
   return nil
 end
 
+--- Can the CONTROLLABLE attack priority designated targets? Only for AIR!
+-- @param #CONTROLLABLE self
+-- @return #boolean
+function CONTROLLABLE:OptionROEOpenFireWeaponFreePossible()
+  self:F2( { self.ControllableName } )
+
+  local DCSControllable = self:GetDCSObject()
+  if DCSControllable then
+    if self:IsAir() then
+      return true
+    end
+
+    return false
+  end
+
+  return nil
+end
+
+--- Open Fire, Weapons Free (Priority Designated): AI will engage any enemy group it detects, but will prioritize targets specified in the groups tasking.
+-- **Only for AIR units!**
+-- @param #CONTROLLABLE self
+-- @return #CONTROLLABLE self
+function CONTROLLABLE:OptionROEOpenFireWeaponFree()
+  self:F2( { self.ControllableName } )
+
+  local DCSControllable = self:GetDCSObject()
+  if DCSControllable then
+    local Controller = self:_GetController()
+
+    if self:IsAir() then
+      Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.OPEN_FIRE_WEAPON_FREE )
+    end
+
+    return self
+  end
+
+  return nil
+end
+
 --- Can the CONTROLLABLE attack targets of opportunity?
 -- @param #CONTROLLABLE self
 -- @return #boolean
@@ -3238,7 +3279,10 @@ end
 function CONTROLLABLE:OptionRTBBingoFuel( RTB ) --R2.2
   self:F2( { self.ControllableName } )
 
-  RTB = RTB or true
+  --RTB = RTB or true
+  if RTB==nil then
+    RTB=true
+  end
 
   local DCSControllable = self:GetDCSObject()
   if DCSControllable then

Moose Development/Moose/Wrapper/Group.lua

@@ -349,7 +349,8 @@ function GROUP:Destroy( GenerateEvent, delay )
   self:F2( self.GroupName )
   
   if delay and delay>0 then
-    SCHEDULER:New(nil, GROUP.Destroy, {self, GenerateEvent}, delay)
+    --SCHEDULER:New(nil, GROUP.Destroy, {self, GenerateEvent}, delay)
+    self:ScheduleOnce(delay, GROUP.Destroy, self, GenerateEvent)
   else
 
     local DCSGroup = self:GetDCSObject()

Moose Development/Moose/Wrapper/Unit.lua

@@ -612,8 +612,7 @@ end
 
 --- Returns the unit's health. Dead units has health <= 1.0.
 -- @param #UNIT self
--- @return #number The Unit's health value.
--- @return #nil The DCS Unit is not existing or alive.  
+-- @return #number The Unit's health value or -1 if unit does not exist any more.
 function UNIT:GetLife()
   self:F2( self.UnitName )
 
@@ -629,8 +628,7 @@ end
 
 --- Returns the Unit's initial health.
 -- @param #UNIT self
--- @return #number The Unit's initial health value.
--- @return #nil The DCS Unit is not existing or alive.  
+-- @return #number The Unit's initial health value or 0 if unit does not exist any more.  
 function UNIT:GetLife0()
   self:F2( self.UnitName )
 
@@ -644,6 +642,34 @@ function UNIT:GetLife0()
   return 0
 end
 
+--- Returns the unit's relative health.
+-- @param #UNIT self
+-- @return #number The Unit's relative health value, i.e. a number in [0,1] or -1 if unit does not exist any more.
+function UNIT:GetLifeRelative()
+  self:F2(self.UnitName)
+
+  if self and self:IsAlive() then
+    local life0=self:GetLife0()
+    local lifeN=self:GetLife()
+    return lifeN/life0
+  end
+  
+  return -1
+end
+
+--- Returns the unit's relative damage, i.e. 1-life.
+-- @param #UNIT self
+-- @return #number The Unit's relative health value, i.e. a number in [0,1] or 1 if unit does not exist any more.
+function UNIT:GetDamageRelative()
+  self:F2(self.UnitName)
+
+  if self and self:IsAlive() then
+    return 1-self:GetLifeRelative()
+  end
+  
+  return 1
+end
+
 --- Returns the category name of the #UNIT.
 -- @param #UNIT self
 -- @return #string Category name = Helicopter, Airplane, Ground Unit, Ship