From 7735120f25b18a54326c85a12d2928de81c8f014 Mon Sep 17 00:00:00 2001
From: FlightControl_Master <sven.van.de.velde@telenet.be>
Date: Sat, 7 Apr 2018 14:21:34 +0200
Subject: [PATCH] Progress on AI_CARGO_TROOPS

---
 Moose Development/Moose/Cargo/CargoUnit.lua   | 53 +++++++++++--------
 Moose Development/Moose/Core/Set.lua          | 13 +++++
 .../Moose/Wrapper/Controllable.lua            |  4 +-
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/Moose Development/Moose/Cargo/CargoUnit.lua b/Moose Development/Moose/Cargo/CargoUnit.lua
index 2ba33aa4b..5ac185277 100644
--- a/Moose Development/Moose/Cargo/CargoUnit.lua	
+++ b/Moose Development/Moose/Cargo/CargoUnit.lua	
@@ -231,7 +231,11 @@ do -- CARGO_UNIT
     local NearRadius = NearRadius or 25
     
     self.CargoInAir = self.CargoObject:InAir()
-  
+    
+    local Desc = self.CargoObject:GetDesc()
+    local MaxSpeed = Desc.speedMaxOffRoad
+    local TypeName = Desc.typeName
+    
     self:T( self.CargoInAir )
   
     -- Only move the group to the carrier when the cargo is not in the air
@@ -240,28 +244,33 @@ do -- CARGO_UNIT
       if self:IsNear( CargoCarrier:GetPointVec2(), NearRadius ) then
         self:Load( CargoCarrier, NearRadius, ... )
       else
-        local Speed = 90
-        local Angle = 180
-        local Distance = 5
+        if MaxSpeed and MaxSpeed == 0 or TypeName and TypeName == "Stinger comm" then
+          self:Load( CargoCarrier, NearRadius, ... )
+        else
+          
+          local Speed = 90
+          local Angle = 180
+          local Distance = 5
+          
+          NearRadius = NearRadius or 25
         
-        NearRadius = NearRadius or 25
-      
-        local CargoCarrierPointVec2 = CargoCarrier:GetPointVec2()
-        local CargoCarrierHeading = CargoCarrier:GetHeading() -- Get Heading of object in degrees.
-        local CargoDeployHeading = ( ( CargoCarrierHeading + Angle ) >= 360 ) and ( CargoCarrierHeading + Angle - 360 ) or ( CargoCarrierHeading + Angle )
-        local CargoDeployPointVec2 = CargoCarrierPointVec2:Translate( Distance, CargoDeployHeading )
-      
-        local Points = {}
-      
-        local PointStartVec2 = self.CargoObject:GetPointVec2()
-      
-        Points[#Points+1] = PointStartVec2:WaypointGround( Speed )
-        Points[#Points+1] = CargoDeployPointVec2:WaypointGround( Speed )
-      
-        local TaskRoute = self.CargoObject:TaskRoute( Points )
-        self.CargoObject:SetTask( TaskRoute, 2 )
-        self:__Boarding( -1, CargoCarrier, NearRadius )
-        self.RunCount = 0
+          local CargoCarrierPointVec2 = CargoCarrier:GetPointVec2()
+          local CargoCarrierHeading = CargoCarrier:GetHeading() -- Get Heading of object in degrees.
+          local CargoDeployHeading = ( ( CargoCarrierHeading + Angle ) >= 360 ) and ( CargoCarrierHeading + Angle - 360 ) or ( CargoCarrierHeading + Angle )
+          local CargoDeployPointVec2 = CargoCarrierPointVec2:Translate( Distance, CargoDeployHeading )
+        
+          local Points = {}
+        
+          local PointStartVec2 = self.CargoObject:GetPointVec2()
+        
+          Points[#Points+1] = PointStartVec2:WaypointGround( Speed )
+          Points[#Points+1] = CargoDeployPointVec2:WaypointGround( Speed )
+        
+          local TaskRoute = self.CargoObject:TaskRoute( Points )
+          self.CargoObject:SetTask( TaskRoute, 2 )
+          self:__Boarding( -1, CargoCarrier, NearRadius )
+          self.RunCount = 0
+        end
       end
     end
     
diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 939973fd1..58c24bcce 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -4131,6 +4131,19 @@ function SET_CARGO:New() --R2.1
   return self
 end
 
+
+--- (R2.1) Add CARGO to SET_CARGO.
+-- @param Core.Set#SET_CARGO self
+-- @param Cargo.Cargo#CARGO Cargo A single cargo.
+-- @return self
+function SET_CARGO:AddCargo( Cargo ) --R2.4
+
+  self:Add( Cargo:GetName(), Cargo )
+    
+  return self
+end
+
+
 --- (R2.1) Add CARGOs to SET_CARGO.
 -- @param Core.Set#SET_CARGO self
 -- @param #string AddCargoNames A single name or an array of CARGO names.
diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua
index 1847a16cd..f5b414e60 100644
--- a/Moose Development/Moose/Wrapper/Controllable.lua	
+++ b/Moose Development/Moose/Wrapper/Controllable.lua	
@@ -1892,7 +1892,7 @@ end
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE
 function CONTROLLABLE:RouteStop()
-  self:F2()
+  self:F("RouteStop")
   
   local CommandStop = self:CommandStopRoute( true )
   self:SetCommand( CommandStop )
@@ -1903,7 +1903,7 @@ end
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE
 function CONTROLLABLE:RouteResume()
-  self:F2()
+  self:F("RouteResume")
   
   local CommandResume = self:CommandStopRoute( false )
   self:SetCommand( CommandResume )