feat: gylle-flow holdt af reserven sover med vognen på — sættet er ledigt for markflåden som gødningsmaskine (også efter genindlæsning; vækkes ikke mens det gøder); puljen må låne sovende flows vogne; rutecache: 100 ms budget pr. frame efter AD-netredigering (4,5 s frys) — 1.62.311+312
This commit is contained in:
@@ -583,7 +583,8 @@ function ADPool.collect(adEnv, isBusy)
|
||||
local connect = park ~= nil and ADPool.connectFor(park.name, markers) or nil
|
||||
local specs = connect ~= nil and ADCpBridge.getSpecs(vehicle) or nil
|
||||
local role = specs ~= nil and ADPool.roleOf(specs) or nil
|
||||
local held = role ~= nil and ADFlowWagons ~= nil and ADFlowWagons.isHeldWagon(ADRunsController.getVehicleId(vehicle))
|
||||
-- flowvogne: kun et sovende flows vogn må lånes (ADFlowWagons.isLendable)
|
||||
local held = role ~= nil and ADFlowWagons ~= nil and ADFlowWagons.isLendableWagon ~= nil and not ADFlowWagons.isLendableWagon(ADRunsController.getVehicleId(vehicle))
|
||||
if role ~= nil and not held and not targeted[connect.id] then
|
||||
local x, z = positionOf(vehicle)
|
||||
local carries, capacity = ADPool.cargoOf(vehicle)
|
||||
@@ -640,7 +641,7 @@ function ADPool.overview(adEnv)
|
||||
attachedTo = attacher ~= nil and ADRuns.vehicleLabel(attacher) or nil,
|
||||
quarantineMin = id ~= nil and ADPool.quarantineMinutes(id, nowMs) or 0,
|
||||
reserved = id ~= nil and ADPool.isReserved(id),
|
||||
flowName = id ~= nil and ADFlowWagons ~= nil and ADFlowWagons.isHeldWagon(id)
|
||||
flowName = id ~= nil and ADFlowWagons ~= nil and ADFlowWagons.isLendableWagon ~= nil and not ADFlowWagons.isLendableWagon(id)
|
||||
and tostring(ADFlowWagons.ownerOf(ADRunsController.store.runs, id).name) or nil,
|
||||
})
|
||||
table.insert(implements, {id = id, label = ADRuns.vehicleLabel(vehicle), role = role, status = key, arg = arg})
|
||||
|
||||
Reference in New Issue
Block a user