feat: flows kan låne en ledig traktor + aflæsnings-skub ved trigger undervejs (1.62.364)

This commit is contained in:
2026-10-19 10:37:26 +02:00
parent b1bb5e1ee8
commit 28fb5332c5
13 changed files with 276 additions and 16 deletions
+53 -5
View File
@@ -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", "spareWagons",
"returnBelowPercent", "waitPoolGroup", "vehicleIds", "wagons", "chain", "spareWagons", "borrowWagonId",
}
local function draftFrom(run, isNew)
@@ -93,6 +93,7 @@ local function draftFrom(run, isNew)
draft.isNew = isNew == true
draft.showAllBuildings = false
draft.storeAuto = #draft.storeBuildingIds == 0
draft.borrowTractor = draft.borrowWagonId ~= nil
return draft
end
@@ -176,9 +177,9 @@ end
local SET_VALUES = {
kind = true, ingredientMode = true, sellAtPercent = true, storeAbovePercent = true, sellAbovePercent = true, minSourcePercent = true, loops = true,
returnBelowPercent = true, waitPoolGroup = true,
returnBelowPercent = true, waitPoolGroup = true, borrowWagonId = true,
}
local BOOL_VALUES = {showAllBuildings = true, storeAuto = true, collectRound = true}
local BOOL_VALUES = {showAllBuildings = true, storeAuto = true, collectRound = true, borrowTractor = true}
local LIST_VALUES = {ingredients = true, storeBuildingIds = true, vehicleIds = true}
local function setPolicy(products, name, policy)
@@ -239,7 +240,7 @@ ADFlowGuide.TOOLTIPS = {
policy = "spu_policy_tooltip", ingredientMode = "spu_ingredientMode_tooltip", sellAtPercent = "spu_sellAt_tooltip",
storeAbovePercent = "spu_storeAbove_tooltip", sellAbovePercent = "spu_sellAbove_tooltip", minSourcePercent = "spu_minSource_tooltip",
collectRound = "spu_collectRound_tooltip", loops = "spu_loops_tooltip", returnBelowPercent = "spu_returnBelow_tooltip",
waitPoolGroup = "spu_waitPool_tooltip",
waitPoolGroup = "spu_waitPool_tooltip", borrowTractor = "spu_guide_flow_borrow_tooltip", borrowWagonId = "spu_guide_flow_borrowWagon_tooltip",
}
local function choice(id, title, options, value, item)
@@ -443,10 +444,40 @@ local function rowSpare(guide, tractorId, ownWagon)
return choice("spareWagon", L("spu_guide_flow_spareWagon"), options, current, tractorId)
end
-- Lånevognen: den valgte (flowets egen — også mens en lånt traktor kører med den og den derfor ikke står som ledig),
-- ellers den første ledige vogn der passer til varerne.
function ADFlowGuide.borrowWagon(draft, context)
if draft.borrowWagonId ~= nil and draft.borrowWagonId ~= "" then return draft.borrowWagonId end
local first = ((context or {}).wagons or {})[1]
return first ~= nil and first.id or nil
end
-- Lånt traktor (brugerønske 19/10): kun en vogn vælges; ingen traktor er bundet til flowet.
local function rowsBorrow(guide)
local rows = {toggle("borrowTractor", L("spu_guide_flow_borrow"), true)}
local options, listed = {}, false
local current = ADFlowGuide.borrowWagon(guide.draft, guide.context)
for _, wagon in ipairs(guide.context.wagons or {}) do
table.insert(options, {label = T(tostring(wagon.label)), value = wagon.id})
if wagon.id == current then listed = true end
end
-- flowets vogn er ude at køre (sidder på den lånte traktor): den står ikke som ledig, men er stadig valget
if current ~= nil and not listed then table.insert(options, 1, {label = L("spu_guide_flow_borrowWagonInUse"), value = current}) end
if current == nil then
table.insert(rows, text("spu_guide_flow_noFreeWagon"))
else
table.insert(rows, choice("borrowWagonId", L("spu_guide_flow_borrowWagon"), options, current))
end
table.insert(rows, text("spu_guide_flow_borrowText"))
return rows
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)
local draft, rows = guide.draft, {}
if draft.borrowTractor then return rowsBorrow(guide) end
table.insert(rows, toggle("borrowTractor", L("spu_guide_flow_borrow"), false))
local inRun = chosenSet(draft.vehicleIds)
local entries = {}
local other, blocked = 0, 0
@@ -480,7 +511,7 @@ local function rowsTractors(guide)
end
end
end
if #rows == 0 then table.insert(rows, text("spu_guide_flow_noTractors")) end
if #rows == 1 then table.insert(rows, text("spu_guide_flow_noTractors")) end
if other > 0 then table.insert(rows, text("spu_guide_flow_otherFlows", {other})) end
if blocked > 0 then
-- foldet sammen som standard; linjen med antallet folder navn + grund ud/ind
@@ -578,6 +609,14 @@ local SUMMARY = {
return {group == "" and L("spu_waitPool_all") or T(group)}
end,
tractors = function(guide)
if guide.draft.borrowTractor then
local wagonId = ADFlowGuide.borrowWagon(guide.draft, guide.context)
if wagonId == nil then return {L("spu_guide_flow_sumNoTractors")} end
local known = false
for _, wagon in ipairs(guide.context.wagons or {}) do if wagon.id == wagonId then known = true end end
if not known then return {L("spu_guide_flow_sumBorrowInUse")} end
return {L("spu_guide_flow_sumBorrow", {namesFor({wagonId}, guide.context.wagons, "label")[1]})}
end
local ids = guide.draft.vehicleIds
if #ids == 0 then return {L("spu_guide_flow_sumNoTractors")} end
if #ids > ADFlowGuide.MAX_NAMED_TRACTORS then return {L("spu_guide_flow_sumTractors", {#ids})} end
@@ -620,6 +659,15 @@ function ADFlowGuide.result(guide)
returnBelowPercent = draft.returnBelowPercent, waitPoolGroup = draft.waitPoolGroup or "",
}
if draft.name ~= nil and draft.name:match("%S") then changes.name = draft.name end
-- lånt traktor: ingen faste traktorer (de slippes ved gem), kun vognen huskes; uden ledig vogn = faste traktorer
local borrowWagonId = draft.borrowTractor and ADFlowGuide.borrowWagon(draft, guide.context) or nil
changes.borrowWagonId = borrowWagonId or false
if borrowWagonId ~= nil then
-- spillerens eget flow nu: kæden må ikke regne det som sit tomme flow (slette/lægge sammen/bemande — review 19/10)
changes.chain = ""
return {isNew = draft.isNew == true, runId = draft.id, name = draft.name, kind = draft.kind, changes = changes,
vehicleIds = {}, wagons = {}, spareWagons = {}, borrow = true}
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),
spareWagons = ADFlowGuide.resultSpares(draft)}