CSAR/CTLD basic support for MH-60R

Moose Development/Moose/Ops/CSAR.lua

@@ -290,10 +290,11 @@ CSAR.AircraftType["Bell-47"] = 2
 CSAR.AircraftType["UH-60L"] = 10
 CSAR.AircraftType["AH-64D_BLK_II"] = 2
 CSAR.AircraftType["Bronco-OV-10A"] = 2
+CSAR.AircraftType["MH-60R"] = 10
 
 --- CSAR class version.
 -- @field #string version
-CSAR.version="1.0.19"
+CSAR.version="1.0.20"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list

Moose Development/Moose/Ops/CTLD.lua

@@ -1226,13 +1226,14 @@ CTLD.UnitTypeCapabilities = {
     ["Hercules"] = {type="Hercules", crates=true, troops=true, cratelimit = 7, trooplimit = 64, length = 25, cargoweightlimit = 19000}, -- 19t cargo, 64 paratroopers. 
     --Actually it's longer, but the center coord is off-center of the model.
     ["UH-60L"] = {type="UH-60L", crates=true, troops=true, cratelimit = 2, trooplimit = 20, length = 16, cargoweightlimit = 3500}, -- 4t cargo, 20 (unsec) seats
+    ["MH-60R"] = {type="MH-60R", crates=true, troops=true, cratelimit = 2, trooplimit = 20, length = 16, cargoweightlimit = 3500}, -- 4t cargo, 20 (unsec) seats
     ["AH-64D_BLK_II"] = {type="AH-64D_BLK_II", crates=false, troops=true, cratelimit = 0, trooplimit = 2, length = 17, cargoweightlimit = 200}, -- 2 ppl **outside** the helo
     ["Bronco-OV-10A"] = {type="Bronco-OV-10A", crates= false, troops=true, cratelimit = 0, trooplimit = 5, length = 13, cargoweightlimit = 1450},
 }
 
 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.0.47"
+CTLD.version="1.0.48"
 
 --- Instantiate a new CTLD.
 -- @param #CTLD self

Moose Development/Moose/Utilities/Utils.lua

@@ -2237,6 +2237,11 @@ function UTILS.IsLoadingDoorOpen( unit_name )
          return true -- no doors on this one ;)
       end
       
+      if type_name == "MH-60R" and (unit:getDrawArgumentValue(403) > 0 or unit:getDrawArgumentValue(403) == -1) then
+        BASE:T(unit_name .. " cargo door is open")
+        return true
+      end
+      
       return false
 
   end -- nil

Moose Development/Moose/Wrapper/Controllable.lua

@@ -3871,6 +3871,10 @@ end
 -- @param #CONTROLLABLE self
 -- @param #table WayPoints If WayPoints is given, then use the route.
 -- @return #CONTROLLABLE self
+-- @usage Intended Workflow is:
+-- mygroup:WayPointInitialize()
+-- mygroup:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
+-- mygroup:WayPointExecute()
 function CONTROLLABLE:WayPointInitialize( WayPoints )
   self:F( { WayPoints } )
 
@@ -3902,9 +3906,15 @@ end
 -- @param #number WayPointIndex When defining multiple WayPoint functions for one WayPoint, use WayPointIndex to set the sequence of actions.
 -- @param #function WayPointFunction The waypoint function to be called when the controllable moves over the waypoint. The waypoint function takes variable parameters.
 -- @return #CONTROLLABLE self
+-- @usage Intended Workflow is:
+-- mygroup:WayPointInitialize()
+-- mygroup:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
+-- mygroup:WayPointExecute()
 function CONTROLLABLE:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
   self:F2( { WayPoint, WayPointIndex, WayPointFunction } )
-
+  if not self.WayPoints then
+    self:WayPointInitialize()
+  end
   table.insert( self.WayPoints[WayPoint].task.params.tasks, WayPointIndex )
   self.WayPoints[WayPoint].task.params.tasks[WayPointIndex] = self:TaskFunction( WayPointFunction, arg )
   return self
@@ -3917,6 +3927,10 @@ end
 -- @param #number WayPoint The WayPoint from where to execute the mission.
 -- @param #number WaitTime The amount seconds to wait before initiating the mission.
 -- @return #CONTROLLABLE self
+-- @usage Intended Workflow is:
+-- mygroup:WayPointInitialize()
+-- mygroup:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
+-- mygroup:WayPointExecute()
 function CONTROLLABLE:WayPointExecute( WayPoint, WaitTime )
   self:F( { WayPoint, WaitTime } )