FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Warehouse v0.2.5

Browse Source
This commit is contained in:
funkyfranky
2018-08-24 21:19:53 +02:00
parent 448110de08
commit 5b7852ef6c
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
View File

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

6
Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
View File

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

11
Moose Development/Moose/Functional/Warehouse.lua
View File

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