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:
2026-10-18 18:56:23 +02:00
parent 3924516cbe
commit fae9761f1a
17 changed files with 536 additions and 34 deletions
+36 -10
View File
@@ -149,9 +149,10 @@ function ADFlowWagons.rankWagons(runName, candidates)
return ranked
end
-- Flowet der ejer vognen — som aktiv vogn eller som ekstra vogn (ADWagonSwap: én traktor, flere vogne).
function ADFlowWagons.ownerOf(runs, wagonId)
for _, run in ipairs(runs or {}) do
for _, id in pairs(run.wagons or {}) do
for _, id in ipairs(ADRuns.wagonIdsOf(run)) do
if id == wagonId then return run end
end
end
@@ -257,6 +258,11 @@ local function connectOf(adEnv, wagon)
return marker ~= nil and marker.id or nil
end
-- Vognens Connect-markør (hentepunkt) eller nil — til ADWagonSwap.
function ADFlowWagons.connectFor(adEnv, wagon)
return wagon ~= nil and connectOf(adEnv, wagon) or nil
end
-- Traktorer i stoppede flows er ledige i puljen; traktorer i kørende flows aldrig.
-- s = {hasRun, stopped, carriesFlowWagon, homeTrip} -> må puljen/markarbejde/marksilo låne traktoren?
function ADFlowWagons.tractorFree(s)
@@ -354,7 +360,7 @@ end
-- Frakoblede vogne med parkering, som intet kørende flow holder, og som flowet ikke allerede har givet en traktor.
local function guessFor(adEnv, run, vehicle, tractorId)
local taken = {}
for _, id in pairs(run.wagons or {}) do taken[id] = true end
for _, id in ipairs(ADRuns.wagonIdsOf(run)) do taken[id] = true end
local candidates = {}
local farmId = g_currentMission:getFarmId()
for _, any in pairs(g_currentMission.vehicleSystem.vehicles) do
@@ -479,11 +485,20 @@ function ADFlowWagons.beforeStart(adEnv, run, vehicle)
local current = ADRuns.getRun(ADRunsController.store, runId)
if current == nil or current.stopped then ADHitch.returnHome(adEnv, tractor) return end
if ok then
fetchRetries[tractor] = nil
local result = ADRunsController.startVehicle(adEnv, current, tractor)
if result ~= nil and not result.ok then ADFlowWagons.dropHereAndHome(adEnv, tractor) end
else
Logging.warning(ADFlowWagons.LOG_PREFIX .. "flow '%s': '%s' kunne ikke bytte vogn (%s)", tostring(current.name),
elseif ADFlowWagons.retryFetch(detail, fetchRetries[tractor]) then
-- byttet er nu automatisk (ADWagonSwap): ét nyt forsøg som ved hentning, så traktoren ikke bliver stående
fetchRetries[tractor] = (fetchRetries[tractor] or 0) + 1
waiting[tractor] = runId
Logging.warning(ADFlowWagons.LOG_PREFIX .. "flow '%s': '%s' kunne ikke bytte vogn (%s) — prøver igen", tostring(current.name),
tostring(ADRuns.vehicleLabel(tractor)), tostring(detail))
else
fetchRetries[tractor] = nil
Logging.warning(ADFlowWagons.LOG_PREFIX .. "flow '%s': '%s' kunne ikke bytte vogn (%s) — sætter af og kører hjem", tostring(current.name),
tostring(ADRuns.vehicleLabel(tractor)), tostring(detail))
ADFlowWagons.dropHereAndHome(adEnv, tractor)
end
end) end)
if not okSwap then fetching[vehicle] = nil return true, {vehicle = vehicle, ok = false, reason = "error"} end
@@ -619,15 +634,28 @@ local function isCargoWagon(object)
return ADFlowWagons.isCargoObject(object)
end
-- Gør vognen til traktorens aktive vogn i flowet. Er den en af traktorens ekstra vogne (ADWagonSwap), byttes de, så
-- samme vogn aldrig står både som aktiv og ekstra. -> true når noget ændrede sig.
local function setActiveWagon(run, tractorId, wagonId)
for _, spareId in ipairs((run.spareWagons or {})[tractorId] or {}) do
if spareId == wagonId then
run.wagons, run.spareWagons = ADRuns.swapActive(run.wagons, run.spareWagons, tractorId, wagonId)
return true
end
end
local updated = ADFlowWagons.remember(run.wagons, tractorId, wagonId)
if updated == run.wagons then return false end
run.wagons = updated
return true
end
local function rememberWagonOf(vehicle)
local run = ADRunsController.getRunForVehicle(vehicle)
local rear = run ~= nil and ADHitch.rearImplementsOf(vehicle) or {}
local tractorId = ADRunsController.getVehicleId(vehicle)
local wagonId = rear[1] ~= nil and isCargoWagon(rear[1].object) and ADRunsController.getVehicleId(rear[1].object) or nil
if wagonId == nil or tractorId == nil then return end
local updated = ADFlowWagons.remember(run.wagons, tractorId, wagonId)
if updated ~= run.wagons then
run.wagons = updated
if setActiveWagon(run, tractorId, wagonId) then
Logging.info(ADFlowWagons.LOG_PREFIX .. "flow '%s': '%s' har vognen '%s'", tostring(run.name),
tostring(ADRuns.vehicleLabel(vehicle)), tostring(ADRuns.vehicleLabel(rear[1].object)))
end
@@ -835,9 +863,7 @@ local function rememberAll(adEnv)
local chosenVehicle = chosen ~= nil and findAnyVehicle(chosen) or nil
local keepChoice = chosen ~= wagonId and chosenVehicle ~= nil and not ADFlowWagons.isWorkTool(chosenVehicle)
if wagonId ~= nil and not keepChoice and fetching[vehicle] == nil and emptying[vehicle] == nil then
local updated = ADFlowWagons.remember(run.wagons, vehicleId, wagonId)
if updated ~= run.wagons then
run.wagons = updated
if setActiveWagon(run, vehicleId, wagonId) then
Logging.info(ADFlowWagons.LOG_PREFIX .. "flow '%s': '%s' har vognen '%s'", tostring(run.name),
tostring(ADRuns.vehicleLabel(vehicle)), tostring(ADRuns.vehicleLabel(rear[1].object)))
end