mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Warehouse v0.3.0w
This commit is contained in:
parent
6fbf584e81
commit
1ba84003d3
@ -54,18 +54,6 @@
|
||||
--
|
||||
-- ===
|
||||
--
|
||||
-- # Demo Missions
|
||||
--
|
||||
-- ### None.
|
||||
--
|
||||
-- ===
|
||||
--
|
||||
-- # YouTube Channel
|
||||
--
|
||||
-- ### None.
|
||||
--
|
||||
-- ===
|
||||
--
|
||||
-- 
|
||||
--
|
||||
-- # The Warehouse Concept
|
||||
@ -495,7 +483,7 @@ WAREHOUSE.db = {
|
||||
|
||||
--- Warehouse class version.
|
||||
-- @field #string version
|
||||
WAREHOUSE.version="0.3.0"
|
||||
WAREHOUSE.version="0.3.0w"
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- TODO: Warehouse todo list.
|
||||
@ -1804,17 +1792,11 @@ end
|
||||
-- @param #string Assignment A keyword or text that
|
||||
function WAREHOUSE:onafterAddRequest(From, Event, To, warehouse, AssetDescriptor, AssetDescriptorValue, nAsset, TransportType, nTransport, Assignment, Prio)
|
||||
|
||||
-- Defaults.
|
||||
nAsset=nAsset or 1
|
||||
TransportType=TransportType or WAREHOUSE.TransportType.SELFPROPELLED
|
||||
Prio=Prio or 50
|
||||
if nTransport==nil then
|
||||
if TransportType==WAREHOUSE.TransportType.SELFPROPELLED then
|
||||
nTransport=0
|
||||
else
|
||||
nTransport=1
|
||||
end
|
||||
end
|
||||
-- Self request?
|
||||
local toself=false
|
||||
if self.warehouse:GetName()==warehouse:GetName() then
|
||||
toself=true
|
||||
end
|
||||
|
||||
-- Increase id.
|
||||
self.queueid=self.queueid+1
|
||||
@ -1832,7 +1814,9 @@ function WAREHOUSE:onafterAddRequest(From, Event, To, warehouse, AssetDescriptor
|
||||
transporttype=TransportType,
|
||||
ntransport=nTransport,
|
||||
ndelivered=0,
|
||||
ntransporthome=0
|
||||
ntransporthome=0,
|
||||
assets={},
|
||||
toself=toself,
|
||||
} --#WAREHOUSE.Queueitem
|
||||
|
||||
-- Add request to queue.
|
||||
@ -1884,16 +1868,6 @@ function WAREHOUSE:onbeforeRequest(From, Event, To, Request)
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user