Merge remote-tracking branch 'origin/master' into develop

Moose Development/Moose/Core/Set.lua

@@ -2149,7 +2149,7 @@ end
 do -- SET_UNIT
   
   ---
-  -- @type SET_UNIT
+  -- @type SET_UNIT SET\_UNIT
   -- @field Core.Timer#TIMER ZoneTimer
   -- @field #number ZoneTimerInterval
   -- @extends Core.Set#SET_BASE
@@ -2301,6 +2301,11 @@ do -- SET_UNIT
 
     self:FilterActive( false )
     
+    --- Count Alive Units
+    -- @function [parent=#SET_UNIT] CountAlive
+    -- @param #SET_UNIT self
+    -- @return #SET_UNIT self
+    
     return self
   end
 
@@ -2503,6 +2508,22 @@ do -- SET_UNIT
     return self
   end
   
+  --- Builds a set of units which exist and are alive.
+  -- @param #SET_UNIT self
+  -- @return #SET_UNIT self
+  function SET_UNIT:FilterAlive()
+    self:FilterFunction(
+      function(unit)
+        if unit and unit:IsExist() and unit:IsAlive() then
+          return true
+        else
+          return false
+        end
+      end
+    )
+    return self
+  end
+
   --- Builds a set of units having a radar of give types.
   -- All the units having a radar of a given type will be included within the set.
   -- @param #SET_UNIT self

Moose Development/Moose/Core/Spawn.lua

@@ -1053,7 +1053,7 @@ end
 -- but they will all follow the same Template route and have the same prefix name.
 -- In other words, this method randomizes between a defined set of groups the template to be used for each new spawn of a group.
 -- @param #SPAWN self
--- @param #string SpawnTemplatePrefixTable A table with the names of the groups defined within the mission editor, from which one will be chosen when a new group will be spawned.
+-- @param #list<#string> SpawnTemplatePrefixTable A table with the names of the groups defined within the mission editor, from which one will be chosen when a new group will be spawned.
 -- @return #SPAWN
 -- @usage
 --

Moose Development/Moose/Ops/CSAR.lua

@@ -293,10 +293,11 @@ CSAR.AircraftType["Bronco-OV-10A"] = 2
 CSAR.AircraftType["MH-60R"] = 10
 CSAR.AircraftType["OH-6A"] = 2
 CSAR.AircraftType["OH58D"] = 2
+CSAR.AircraftType["CH-47Fbl1"] = 30
 
 --- CSAR class version.
 -- @field #string version
-CSAR.version="1.0.25"
+CSAR.version="1.0.26"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list

Moose Development/Moose/Ops/CTLD.lua

@@ -1251,11 +1251,12 @@ CTLD.UnitTypeCapabilities = {
     ["Bronco-OV-10A"] = {type="Bronco-OV-10A", crates= false, troops=true, cratelimit = 0, trooplimit = 5, length = 13, cargoweightlimit = 1450},
     ["OH-6A"] = {type="OH-6A", crates=false, troops=true, cratelimit = 0, trooplimit = 4, length = 7, cargoweightlimit = 550},
     ["OH58D"] = {type="OH58D", crates=false, troops=false, cratelimit = 0, trooplimit = 0, length = 14, cargoweightlimit = 400},
+    ["CH-47Fbl1"] = {type="CH-47Fbl1", crates=true, troops=true, cratelimit = 4, trooplimit = 33, length = 30, cargoweightlimit = 3000},
 }
 
 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.0.55"
+CTLD.version="1.0.56"
 
 --- Instantiate a new CTLD.
 -- @param #CTLD self