From 5b7852ef6cfbc48b69018bed2bac601c31859310 Mon Sep 17 00:00:00 2001 From: funkyfranky Date: Fri, 24 Aug 2018 21:19:53 +0200 Subject: [PATCH] Warehouse v0.2.5 --- Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua | 2 ++ Moose Development/Moose/AI/AI_Cargo_Helicopter.lua | 6 +++++- Moose Development/Moose/Functional/Warehouse.lua | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua index 75ae757bb..5bda17ffe 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua +++ b/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] diff --git a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua index dec71fd3e..540d4b064 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua +++ b/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 ) diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index d13aaf6e5..9dd2a6be9 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/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)