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

Update Warehouse.lua

Browse Source 
- Added born check. Helps with delayed spawning on carriers.
This commit is contained in:
Frank 2020-09-15 01:13:11 +02:00
parent 717842b276
commit a00c198bcc
1 changed files with 168 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1552,7 +1552,7 @@
WAREHOUSE = { WAREHOUSE = {
ClassName = "WAREHOUSE", ClassName = "WAREHOUSE",
Debug = false, Debug = false,
verbosity = 2, verbosity = 0,
lid = nil, lid = nil,
Report = true, Report = true,
warehouse = nil, warehouse = nil,
@ -3473,6 +3473,8 @@ function WAREHOUSE:_JobDone()
for _,request in pairs(self.pending) do for _,request in pairs(self.pending) do
local request=request --#WAREHOUSE.Pendingitem local request=request --#WAREHOUSE.Pendingitem
if request.born then
-- Count number of cargo groups. -- Count number of cargo groups.
local ncargo=0 local ncargo=0
if request.cargogroupset then if request.cargogroupset then
@ -3637,7 +3639,7 @@ function WAREHOUSE:_JobDone()
end end
end end
end -- born check
end -- loop over requests end -- loop over requests
-- Remove pending requests if done. -- Remove pending requests if done.
@ -5158,7 +5160,7 @@ end
-- @param #WAREHOUSE.Pendingitem request The request of the dead asset. -- @param #WAREHOUSE.Pendingitem request The request of the dead asset.
function WAREHOUSE:onafterAssetSpawned(From, Event, To, group, asset, request) function WAREHOUSE:onafterAssetSpawned(From, Event, To, group, asset, request)
local text=string.format("Asset %s from request id=%d was spawned!", asset.spawngroupname, request.uid) local text=string.format("Asset %s from request id=%d was spawned!", asset.spawngroupname, request.uid)
self:I(self.lid..text) self:T(self.lid..text)
-- Sete asset state to spawned. -- Sete asset state to spawned.
asset.spawned=true asset.spawned=true
@ -5169,22 +5171,23 @@ function WAREHOUSE:onafterAssetSpawned(From, Event, To, group, asset, request)
local assetitem=_asset --#WAREHOUSE.Assetitem local assetitem=_asset --#WAREHOUSE.Assetitem
-- Debug info. -- Debug info.
self:I(self.lid..string.format("Asset %s spawned %s as %s", assetitem.templatename, tostring(assetitem.spawned), tostring(assetitem.spawngroupname))) self:T(self.lid..string.format("Asset %s spawned %s as %s", assetitem.templatename, tostring(assetitem.spawned), tostring(assetitem.spawngroupname)))
if assetitem.spawned then if assetitem.spawned then
n=n+1 n=n+1
else else
self:I(self.lid.."FF What?! This should not happen!") -- Now this can happend if multiple groups need to be spawned in one request.
--self:I(self.lid.."FF What?! This should not happen!")
end end
end end
-- Trigger event. -- Trigger event.
if n==request.nasset+request.ntransport then if n==request.nasset+request.ntransport then
self:I(self.lid..string.format("All assets %d (ncargo=%d + ntransport=%d) of request rid=%d spawned. Calling RequestSpawned", n, request.nasset, request.ntransport, request.uid)) self:T(self.lid..string.format("All assets %d (ncargo=%d + ntransport=%d) of request rid=%d spawned. Calling RequestSpawned", n, request.nasset, request.ntransport, request.uid))
self:RequestSpawned(request, request.cargogroupset, request.transportgroupset) self:RequestSpawned(request, request.cargogroupset, request.transportgroupset)
else else
self:I(self.lid..string.format("Not all assets %d (ncargo=%d + ntransport=%d) of request rid=%d spawned YET", n, request.nasset, request.ntransport, request.uid)) self:T(self.lid..string.format("Not all assets %d (ncargo=%d + ntransport=%d) of request rid=%d spawned YET", n, request.nasset, request.ntransport, request.uid))
end end
end end
@ -5795,7 +5798,7 @@ function WAREHOUSE:_SpawnAssetPrepareTemplate(asset, alias)
template.lateActivation=false template.lateActivation=false
if asset.missionTask then if asset.missionTask then
self:I(self.lid..string.format("Setting mission task to %s", tostring(asset.missionTask))) self:T(self.lid..string.format("Setting mission task to %s", tostring(asset.missionTask)))
template.task=asset.missionTask template.task=asset.missionTask
end end
@ -6122,9 +6125,11 @@ function WAREHOUSE:_OnEventBirth(EventData)
if asset and request then if asset and request then
-- Debug message. -- Debug message.
self:I(self.lid..string.format("Warehouse %s captured event birth of request ID=%d, asset ID=%d, unit %s spawned=%s", self.alias, request.uid, asset.uid, EventData.IniUnitName, tostring(asset.spawned))) self:T(self.lid..string.format("Warehouse %s captured event birth of request ID=%d, asset ID=%d, unit %s spawned=%s", self.alias, request.uid, asset.uid, EventData.IniUnitName, tostring(asset.spawned)))
-- Set born to true.
request.born=true
-- Birth is triggered for each unit. We need to make sure not to call this too often! -- Birth is triggered for each unit. We need to make sure not to call this too often!
if not asset.spawned then if not asset.spawned then
@ -6150,7 +6155,7 @@ function WAREHOUSE:_OnEventBirth(EventData)
-- Asset spawned FSM function. -- Asset spawned FSM function.
--self:__AssetSpawned(1, group, asset, request) --self:__AssetSpawned(1, group, asset, request)
env.info(string.format("FF asset spawned %s, %s", asset.spawngroupname, EventData.IniUnitName)) --env.info(string.format("FF asset spawned %s, %s", asset.spawngroupname, EventData.IniUnitName))
self:AssetSpawned(group, asset, request) self:AssetSpawned(group, asset, request)
end end