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.3.0w

Browse Source
This commit is contained in:
funkyfranky 2018-08-30 16:40:59 +02:00
parent 6fbf584e81
commit 1ba84003d3
1 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,18 +54,6 @@
-- --
-- === -- ===
-- --
-- # Demo Missions
--
-- ### None.
--
-- ===
--
-- # YouTube Channel
--
-- ### None.
--
-- ===
--
-- ![Banner Image](..\Presentations\WAREHOUSE\Warehouse_Main.jpg) -- ![Banner Image](..\Presentations\WAREHOUSE\Warehouse_Main.jpg)
-- --
-- # The Warehouse Concept -- # The Warehouse Concept
@ -495,7 +483,7 @@ WAREHOUSE.db = {
--- Warehouse class version. --- Warehouse class version.
-- @field #string version -- @field #string version
WAREHOUSE.version="0.3.0" WAREHOUSE.version="0.3.0w"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Warehouse todo list. -- TODO: Warehouse todo list.
@ -1804,17 +1792,11 @@ end
-- @param #string Assignment A keyword or text that -- @param #string Assignment A keyword or text that
function WAREHOUSE:onafterAddRequest(From, Event, To, warehouse, AssetDescriptor, AssetDescriptorValue, nAsset, TransportType, nTransport, Assignment, Prio) function WAREHOUSE:onafterAddRequest(From, Event, To, warehouse, AssetDescriptor, AssetDescriptorValue, nAsset, TransportType, nTransport, Assignment, Prio)
-- Defaults. -- Self request?
nAsset=nAsset or 1 local toself=false
TransportType=TransportType or WAREHOUSE.TransportType.SELFPROPELLED if self.warehouse:GetName()==warehouse:GetName() then
Prio=Prio or 50 toself=true
if nTransport==nil then end
if TransportType==WAREHOUSE.TransportType.SELFPROPELLED then
nTransport=0
else
nTransport=1
end
end
-- Increase id. -- Increase id.
self.queueid=self.queueid+1 self.queueid=self.queueid+1
@ -1832,7 +1814,9 @@ function WAREHOUSE:onafterAddRequest(From, Event, To, warehouse, AssetDescriptor
transporttype=TransportType, transporttype=TransportType,
ntransport=nTransport, ntransport=nTransport,
ndelivered=0, ndelivered=0,
ntransporthome=0 ntransporthome=0,
assets={},
toself=toself,
} --#WAREHOUSE.Queueitem } --#WAREHOUSE.Queueitem
-- Add request to queue. -- Add request to queue.
@ -1884,16 +1868,6 @@ function WAREHOUSE:onbeforeRequest(From, Event, To, Request)
end end
-- Init asset table.
Request.assets={}
-- Init self request.
if self.warehouse:GetName()==Request.warehouse.warehouse:GetName() then
Request.toself=true
else
Request.toself=false
end
return true return true
end end