weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

WAREHOUSE

Browse Source
This commit is contained in:
funkyfranky 2018-08-08 01:13:39 +02:00
parent 86e4654474
commit a71c7dc181
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ function AI_CARGO_AIRPLANE:New( Airplane, CargoSet )
self:AddTransition( "Unboarding", "Unloaded", "Unloaded" ) self:AddTransition( "Unboarding", "Unloaded", "Unloaded" )
self:AddTransition( "*", "Landed", "*" ) self:AddTransition( "*", "Landed", "*" )
self:AddTransition( "*", "Home" , "*" )
self:AddTransition( "*", "Destroyed", "Destroyed" ) self:AddTransition( "*", "Destroyed", "Destroyed" )
@ -528,4 +529,3 @@ function AI_CARGO_AIRPLANE:Route( Airplane, Airbase, Speed, Uncontrolled )
end end
end end
end end

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

@ -532,8 +532,7 @@ function WAREHOUSE:onafterRequest(From, Event, To, Airbase, AssetDescriptor, Ass
-- Pickup and depoly locations. -- Pickup and depoly locations.
local PickupAirbaseSet = SET_AIRBASE:New():AddAirbase(self.homebase) local PickupAirbaseSet = SET_AIRBASE:New():AddAirbase(self.homebase)
local DeployAirbaseSet = SET_AIRBASE:New():AddAirbase(Airbase) local DeployAirbaseSet = SET_AIRBASE:New():AddAirbase(Airbase)
local DeployZoneSet = SET_ZONE:New():AddZonesByName(Airbase:GetZone():GetName()) local DeployZoneSet = SET_ZONE:New():FilterPrefixes( "Deploy" ):FilterStart()
local CargoTransport --AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER local CargoTransport --AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
-- Filter the requested transport assets. -- Filter the requested transport assets.
@ -634,7 +633,7 @@ function WAREHOUSE:onafterRequest(From, Event, To, Airbase, AssetDescriptor, Ass
-- Spawn plane at airport in uncontrolled state. -- Spawn plane at airport in uncontrolled state.
-- TODO: check terminal type. -- TODO: check terminal type.
local spawngroup=SPAWN:NewWithAlias(_assetitem.templatename,_alias):InitUnControlled(false):SpawnAtAirbase(self.homebase, SPAWN.Takeoff.Cold, nil, AIRBASE.TerminalType.HelicopterUsable, false) local spawngroup=SPAWN:NewWithAlias(_assetitem.templatename,_alias):InitUnControlled(false):SpawnAtAirbase(self.homebase, SPAWN.Takeoff.Hot, nil, AIRBASE.TerminalType.HelicopterUsable, false)
if spawngroup then if spawngroup then
-- Set state of warehouse so we can retrieve it later. -- Set state of warehouse so we can retrieve it later.
@ -779,6 +778,13 @@ function WAREHOUSE:onafterRequest(From, Event, To, Airbase, AssetDescriptor, Ass
--- Function called when cargo has arrived and was unloaded. --- Function called when cargo has arrived and was unloaded.
function CargoTransport:OnAfterUnloaded(From, Event, To, Carrier, Cargo) function CargoTransport:OnAfterUnloaded(From, Event, To, Carrier, Cargo)
env.info("FF: OnAfterUnloaded")
self:E({From=From})
self:E({Event=Event})
self:E({To=To})
self:E({Carrier=Carrier})
self:E({Cargo=Cargo})
-- Get group obejet. -- Get group obejet.
local group=Cargo:GetObject() --Wrapper.Group#GROUP local group=Cargo:GetObject() --Wrapper.Group#GROUP