feat: flows kan låne en ledig traktor + aflæsnings-skub ved trigger undervejs (1.62.364)
This commit is contained in:
@@ -176,6 +176,13 @@ function ADRuns.wagonIdsOf(run)
|
||||
for _, list in pairs((run or {}).spareWagons or {}) do
|
||||
for _, id in ipairs(list) do table.insert(ids, id) end
|
||||
end
|
||||
-- lånevognen (flow uden fast traktor) er flowets, også mens ingen traktor er lånt
|
||||
local borrowed = (run or {}).borrowWagonId
|
||||
if borrowed ~= nil then
|
||||
local listed = false
|
||||
for _, id in ipairs(ids) do if id == borrowed then listed = true end end
|
||||
if not listed then table.insert(ids, borrowed) end
|
||||
end
|
||||
return ids
|
||||
end
|
||||
|
||||
@@ -211,6 +218,7 @@ local function copyRun(run)
|
||||
chainIdle = run.chainIdle == true or nil, -- kæden oprettede flowet uden traktor (bemandes senere)
|
||||
spareWagons = ADRuns.copySpares(run.spareWagons),
|
||||
parkedLoaded = ADRuns.copyParked(run.parkedLoaded),
|
||||
borrowWagonId = run.borrowWagonId, -- flow uden fast traktor: vognen en lånt traktor henter (ADFlowSleep)
|
||||
}
|
||||
end
|
||||
|
||||
@@ -329,6 +337,9 @@ function ADRuns.updateRun(store, runId, changes)
|
||||
if changes.minSourcePercent ~= nil then run.minSourcePercent = clampRange(changes.minSourcePercent, ADRuns.DEFAULT_MIN_SOURCE_PERCENT, ADRuns.MIN_MIN_SOURCE_PERCENT, ADRuns.MAX_MIN_SOURCE_PERCENT) end
|
||||
if changes.collectRound ~= nil then run.collectRound = changes.collectRound == true end
|
||||
if changes.chain ~= nil then run.chain = tostring(changes.chain) end
|
||||
-- false = flowet har igen faste traktorer
|
||||
if changes.borrowWagonId == false then run.borrowWagonId = nil
|
||||
elseif type(changes.borrowWagonId) == "string" and changes.borrowWagonId ~= "" then run.borrowWagonId = changes.borrowWagonId end
|
||||
return new
|
||||
end
|
||||
|
||||
@@ -602,6 +613,7 @@ function ADRuns.toRecords(store)
|
||||
chainIdle = run.chainIdle and 1 or 0,
|
||||
spareWagons = ADRuns.serializeSpares(run.spareWagons),
|
||||
parkedLoaded = ADRuns.serializeParked(run.parkedLoaded),
|
||||
borrowWagon = run.borrowWagonId or "",
|
||||
}
|
||||
end
|
||||
return records
|
||||
@@ -664,6 +676,7 @@ function ADRuns.fromRecords(records)
|
||||
chainIdle = ADRuns.parseChainIdle(record),
|
||||
spareWagons = ADRuns.parseSpares(record.spareWagons),
|
||||
parkedLoaded = ADRuns.parseParked(record.parkedLoaded), -- nil i gemme fra før feltet -> tom
|
||||
borrowWagonId = (record.borrowWagon ~= nil and record.borrowWagon ~= "") and record.borrowWagon or nil,
|
||||
})
|
||||
store.nextId = math.max(store.nextId, id + 1)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user