Warehouse v0.2.5

Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua

@@ -368,6 +368,8 @@ end
 -- @param #AI_CARGO_DISPATCHER self
 function AI_CARGO_DISPATCHER:onafterMonitor()
 
+  env.info("FF number of cargo set = "..self.SetCargo:Count())
+
   for CarrierGroupName, Carrier in pairs( self.SetCarrier:GetSet() ) do
     local Carrier = Carrier -- Wrapper.Group#GROUP
     local AI_Cargo = self.AI_Cargo[Carrier]

Moose Development/Moose/AI/AI_Cargo_Helicopter.lua

@@ -642,7 +642,11 @@ function AI_CARGO_HELICOPTER:onafterPickup( Helicopter, From, Event, To, Coordin
 
   if Helicopter and Helicopter:IsAlive() ~= nil then
 
-    Helicopter:Activate()
+    --Helicopter:Activate()
+    
+    env.info("FF route pickup")
+    
+    Coordinate:MarkToAll("helo pickupcoord")
 
     self.RoutePickup = true
     Coordinate.y = math.random( 50, 500 )

Moose Development/Moose/Functional/Warehouse.lua

@@ -1628,6 +1628,9 @@ function WAREHOUSE:onafterRequest(From, Event, To, Request)
 
   -- Dependent on transport type, spawn the transports and set up the dispatchers.
   if Request.transporttype==WAREHOUSE.TransportType.AIRPLANE then
+    ----------------
+    --- AIRPLANE ---
+    ----------------
   
     -- Spawn the transport groups.    
     for i=1,Request.ntransport do
@@ -1662,6 +1665,9 @@ function WAREHOUSE:onafterRequest(From, Event, To, Request)
     CargoTransport = AI_CARGO_DISPATCHER_AIRPLANE:New(TransportSet, CargoGroups, PickupAirbaseSet, DeployAirbaseSet)
 
   elseif Request.transporttype==WAREHOUSE.TransportType.HELICOPTER then
+    ------------------
+    --- HELICOPTER ---
+    ------------------
 
     -- Spawn the transport groups.
     for i=1,Request.ntransport do
@@ -1702,6 +1708,9 @@ function WAREHOUSE:onafterRequest(From, Event, To, Request)
     --CargoTransport:SetHomeZone(self.spawnzone)
 
   elseif Request.transporttype==WAREHOUSE.TransportType.APC then
+    -----------
+    --- APC ---
+    -----------
 
     -- Spawn the transport groups.
     for i=1,Request.ntransport do
@@ -1733,7 +1742,7 @@ function WAREHOUSE:onafterRequest(From, Event, To, Request)
     end
 
     -- Define dispatcher for this task.
-    CargoTransport = AI_CARGO_DISPATCHER_APC:NewWithZones(TransportSet, CargoGroups, DeployZoneSet, 0)
+    CargoTransport = AI_CARGO_DISPATCHER_APC:New(TransportSet, CargoGroups, DeployZoneSet, 0)
     
     -- Set home zone.
     CargoTransport:SetHomeZone(self.spawnzone)