feat: én traktor, flere vogne i samme flow — skifter vogn mellem ture; kæden laver kombinerede flows (1.62.337)
Brugerønske 18/10 18:36: færre traktorer. spareWagons pr. traktor, ADWagonSwap vurderer vognene før hver tur og bruger flowets vognbytte.
This commit is contained in:
@@ -69,7 +69,7 @@ end
|
||||
local RUN_FIELDS = {
|
||||
"id", "name", "kind", "sourceBuildingIds", "targetBuildingIds", "storeBuildingIds", "products",
|
||||
"ingredientMode", "ingredients", "sellAtPercent", "storeAbovePercent", "sellAbovePercent", "minSourcePercent", "collectRound", "loops",
|
||||
"returnBelowPercent", "waitPoolGroup", "vehicleIds", "wagons", "chain",
|
||||
"returnBelowPercent", "waitPoolGroup", "vehicleIds", "wagons", "chain", "spareWagons",
|
||||
}
|
||||
|
||||
local function draftFrom(run, isNew)
|
||||
@@ -88,6 +88,7 @@ local function draftFrom(run, isNew)
|
||||
draft.loops = draft.loops or 0
|
||||
draft.waitPoolGroup = draft.waitPoolGroup or ""
|
||||
draft.wagons = draft.wagons or {}
|
||||
draft.spareWagons = draft.spareWagons or {}
|
||||
draft.collectRound = draft.collectRound == true
|
||||
draft.isNew = isNew == true
|
||||
draft.showAllBuildings = false
|
||||
@@ -146,6 +147,10 @@ function ADFlowGuide.assignWagons(draft, context)
|
||||
for _, id in ipairs(draft.vehicleIds or {}) do chosen[id] = true end
|
||||
for _, wagon in ipairs((context or {}).wagons or {}) do offered[wagon.id] = true end
|
||||
local wagons, used = {}, {}
|
||||
-- ekstra vogne er optaget (én traktor, flere vogne): de gives ikke til en anden traktor
|
||||
for tractorId, list in pairs(draft.spareWagons or {}) do
|
||||
if chosen[tractorId] then for _, id in ipairs(list) do used[id] = true end end
|
||||
end
|
||||
for tractorId, wagonId in pairs(draft.wagons or {}) do
|
||||
local valid = chosen[tractorId] and (not solo[tractorId] or offered[wagonId])
|
||||
if valid and not used[wagonId] then
|
||||
@@ -204,6 +209,15 @@ function ADFlowGuide.choose(guide, id, value)
|
||||
elseif id == "wagon" then
|
||||
draft.wagons = ADGuide.deepCopy(draft.wagons or {})
|
||||
draft.wagons[value.item] = value.value
|
||||
-- valgt som aktiv: ikke længere ekstra
|
||||
draft.spareWagons = ADGuide.deepCopy(draft.spareWagons or {})
|
||||
local list = {}
|
||||
for _, spareId in ipairs(draft.spareWagons[value.item] or {}) do if spareId ~= value.value then table.insert(list, spareId) end end
|
||||
draft.spareWagons[value.item] = list
|
||||
elseif id == "spareWagon" then
|
||||
-- én ekstra vogn pr. traktor i guiden ("" = ingen); traktoren skifter mellem ture (ADWagonSwap)
|
||||
draft.spareWagons = ADGuide.deepCopy(draft.spareWagons or {})
|
||||
draft.spareWagons[value.item] = (value.value ~= nil and value.value ~= "") and {value.value} or {}
|
||||
elseif id == "buildings" then
|
||||
local key = draft.kind == "outbound" and "sourceBuildingIds" or "targetBuildingIds"
|
||||
draft[key] = ADGuide.toggleItem(draft[key], value.item, value.on)
|
||||
@@ -385,6 +399,10 @@ local function rowWagon(guide, tractorId, ownWagon)
|
||||
for otherId, wagonId in pairs(wagons) do
|
||||
if otherId ~= tractorId then usedByOthers[wagonId] = true end
|
||||
end
|
||||
-- andre traktorers ekstra vogne er også optaget
|
||||
for otherId, list in pairs(guide.draft.spareWagons or {}) do
|
||||
if otherId ~= tractorId then for _, id in ipairs(list) do usedByOthers[id] = true end end
|
||||
end
|
||||
local options = {}
|
||||
-- vognen der hænger på traktoren nu står først (vælg en anden for at bytte ved næste start)
|
||||
if ownWagon ~= nil and ownWagon.id ~= nil then table.insert(options, {label = T(tostring(ownWagon.label)), value = ownWagon.id}) end
|
||||
@@ -398,6 +416,25 @@ local function rowWagon(guide, tractorId, ownWagon)
|
||||
return choice("wagon", L("spu_guide_flow_wagon"), options, current, tractorId)
|
||||
end
|
||||
|
||||
-- Ekstra vogn under en traktor med vogn (én traktor, flere vogntyper): "ingen" + ledige vogne, der hverken er en
|
||||
-- traktors aktive vogn eller en anden traktors ekstra vogn. nil = ingen ledige at vælge imellem.
|
||||
local function rowSpare(guide, tractorId, ownWagon)
|
||||
local draft = guide.draft
|
||||
local taken = {}
|
||||
for _, wagonId in pairs(draft.wagons or {}) do taken[wagonId] = true end
|
||||
if ownWagon ~= nil and ownWagon.id ~= nil then taken[ownWagon.id] = true end
|
||||
for otherId, list in pairs(draft.spareWagons or {}) do
|
||||
if otherId ~= tractorId then for _, id in ipairs(list) do taken[id] = true end end
|
||||
end
|
||||
local options = {{label = L("spu_guide_flow_noSpare"), value = ""}}
|
||||
for _, wagon in ipairs(guide.context.wagons or {}) do
|
||||
if not taken[wagon.id] then table.insert(options, {label = T(tostring(wagon.label)), value = wagon.id}) end
|
||||
end
|
||||
if #options == 1 then return nil end
|
||||
local current = ((draft.spareWagons or {})[tractorId] or {})[1] or ""
|
||||
return choice("spareWagon", L("spu_guide_flow_spareWagon"), options, current, tractorId)
|
||||
end
|
||||
|
||||
-- Traktorer: flowets egne først, så de ledige. Traktorer i andre flows og blokerede (vognen passer ikke)
|
||||
-- skjules med en linje hver.
|
||||
local function rowsTractors(guide)
|
||||
@@ -428,6 +465,11 @@ local function rowsTractors(guide)
|
||||
if entry.state == "in" and (solo[entry.id] or own ~= nil) then
|
||||
local wagonRow = rowWagon(guide, entry.id, own)
|
||||
if wagonRow ~= nil then table.insert(rows, wagonRow) end
|
||||
-- kun forsyningsflows skifter vogn mellem ture
|
||||
if not isOut(guide) and wagonRow ~= nil and wagonRow.type == "choice" then
|
||||
local spareRow = rowSpare(guide, entry.id, own)
|
||||
if spareRow ~= nil then table.insert(rows, spareRow) end
|
||||
end
|
||||
end
|
||||
end
|
||||
if #rows == 0 then table.insert(rows, text("spu_guide_flow_noTractors")) end
|
||||
@@ -571,7 +613,8 @@ function ADFlowGuide.result(guide)
|
||||
}
|
||||
if draft.name ~= nil and draft.name:match("%S") then changes.name = draft.name end
|
||||
return {isNew = draft.isNew == true, runId = draft.id, name = draft.name, kind = draft.kind, changes = changes,
|
||||
vehicleIds = ADGuide.deepCopy(draft.vehicleIds), wagons = ADFlowGuide.resultWagons(draft)}
|
||||
vehicleIds = ADGuide.deepCopy(draft.vehicleIds), wagons = ADFlowGuide.resultWagons(draft),
|
||||
spareWagons = ADFlowGuide.resultSpares(draft)}
|
||||
end
|
||||
|
||||
-- Vogne for de valgte traktorer (til run.wagons ved gem).
|
||||
@@ -583,6 +626,15 @@ function ADFlowGuide.resultWagons(draft)
|
||||
return wagons
|
||||
end
|
||||
|
||||
-- Ekstra vogne for de valgte traktorer (til run.spareWagons ved gem); tomme lister udelades.
|
||||
function ADFlowGuide.resultSpares(draft)
|
||||
local chosen, spares = chosenSet(draft.vehicleIds), {}
|
||||
for tractorId, list in pairs(draft.spareWagons or {}) do
|
||||
if chosen[tractorId] and #list > 0 then spares[tractorId] = ADGuide.deepCopy(list) end
|
||||
end
|
||||
return spares
|
||||
end
|
||||
|
||||
-- Traktorer der skal tildeles/fjernes efter gem.
|
||||
function ADFlowGuide.vehicleChanges(oldIds, newIds)
|
||||
local old, new = chosenSet(oldIds), chosenSet(newIds)
|
||||
|
||||
Reference in New Issue
Block a user