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 v0.3.7

Browse Source 
Added global warehouse table.
Fixed bugs for prending queue
This commit is contained in:
funkyfranky 2018-09-06 23:20:47 +02:00
parent 012122e8da
commit 3f875ce276
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -931,7 +931,7 @@ WAREHOUSE.db = {
--- Warehouse class version. --- Warehouse class version.
-- @field #string version -- @field #string version
WAREHOUSE.version="0.3.6w" WAREHOUSE.version="0.3.7"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Warehouse todo list. -- TODO: Warehouse todo list.
@ -3058,7 +3058,7 @@ function WAREHOUSE:_SpawnAssetRequest(Request)
elseif _assetitem.category==Group.Category.SHIP then elseif _assetitem.category==Group.Category.SHIP then
-- Spawn naval assets. -- Spawn naval assets.
_group=self:_SpawnAssetGroundNaval(_assetitem, Request, self.portzone) _group=self:_SpawnAssetGroundNaval(_alias,_assetitem, Request, self.portzone)
else else
self:E(self.wid.."ERROR: Unknown asset category!") self:E(self.wid.."ERROR: Unknown asset category!")
@ -4868,16 +4868,19 @@ end
-- @param #WAREHOUSE.Pendingitem request Request -- @param #WAREHOUSE.Pendingitem request Request
-- @return #WAREHOUSE.Pendingitem The request belonging to this group. -- @return #WAREHOUSE.Pendingitem The request belonging to this group.
function WAREHOUSE:_GroupIsTransport(group, request) function WAREHOUSE:_GroupIsTransport(group, request)
if request.transportgroupset then
local transporters=request.transportgroupset:GetSetObjects() local transporters=request.transportgroupset:GetSetObjects()
local groupname=group:GetName() local groupname=group:GetName()
for _,transport in pairs(transporters) do for _,transport in pairs(transporters) do
if transport:GetName()==groupname then if transport:GetName()==groupname then
return true return true
end
end end
end end
return false return false
end end