Fixing additional problems with AI cargo helicopters

Moose Development/Moose/AI/AI_Cargo.lua

@@ -179,7 +179,7 @@ function AI_CARGO:onbeforeLoad( Carrier, From, Event, To, PickupZone )
   local Boarding = false
 
   local LoadInterval = 10
-  local LoadDelay = 10
+  local LoadDelay = 0
   local Carrier_List = {}
   local Carrier_Weight = {}
 
@@ -246,7 +246,8 @@ function AI_CARGO:onbeforeLoad( Carrier, From, Event, To, PickupZone )
       end
       
       if not Loaded then
-        -- If the cargo wasn't loaded in one of the carriers, then we need to stop the loading.
+        -- No loading happened, so we need to pickup something else.
+        self.Relocating = false
       end
       
     end
@@ -344,6 +345,7 @@ function AI_CARGO:onafterUnload( Carrier, From, Event, To, DeployZone )
       local CarrierUnit = CarrierUnit -- Wrapper.Unit#UNIT
       Carrier:RouteStop()
       for _, Cargo in pairs( CarrierUnit:GetCargo() ) do
+        self:F( { Cargo = Cargo:GetName(), Isloaded = Cargo:IsLoaded() } )
         if Cargo:IsLoaded() then
           Cargo:__UnBoard( UnboardDelay )
           UnboardDelay = UnboardDelay + UnboardInterval

Moose Development/Moose/AI/AI_Cargo_Helicopter.lua

@@ -358,7 +358,6 @@ function AI_CARGO_HELICOPTER:onafterOrbit( Helicopter, From, Event, To, Coordina
 
   if Helicopter and Helicopter:IsAlive() then
     
-    if not self:IsTransporting() then
     local Route = {}
     
 --          local CoordinateFrom = Helicopter:GetCoordinate()
@@ -390,7 +389,6 @@ function AI_CARGO_HELICOPTER:onafterOrbit( Helicopter, From, Event, To, Coordina
     Helicopter:Route( Route, 0 )
   end
 end
-end
 
 
 
@@ -406,11 +404,18 @@ end
 function AI_CARGO_HELICOPTER:onafterPickedUp( Helicopter, From, Event, To, PickupZone )
   self:F( { Helicopter, From, Event, To } )
   
+  local HasCargo = false
   if Helicopter and Helicopter:IsAlive() then
+    for Cargo, CarrierUnit in pairs( self.Carrier_Cargo ) do
+      HasCargo = true
+      break
+    end
     self.Relocating = false
+    if HasCargo then
       self.Transporting = true
     end
   end
+end