fix: ledige flow-traktorer startes, Wait prøver andre mål, staldkobling uden servicemarkører (1.62.235)

This commit is contained in:
2026-10-15 19:00:40 +02:00
parent 6c4969f779
commit b80c33ea93
5 changed files with 119 additions and 15 deletions
+73 -10
View File
@@ -118,6 +118,29 @@ function ADFlowSleep.ownUsable(s)
return s.exists == true and not s.lentOut
end
-- Ledig traktor i et KØRENDE flow (ikke stoppet, ikke i dvale, uendelige runder): AutoDrive slukket, ikke lånt ud og
-- ingen spiller bag rattet. Den første returneres (én start pr. tjek). members = {{id, active, usable, controlled}}.
-- (in-game 15/10: '130 Cow Food and Straw' 2 og 3 holdt stille i timevis, mens nr. 1 ventede med fuldt læs — flowet
-- "kørte", så hverken dvale eller "Start alle" rørte dem)
function ADFlowSleep.pickIdleMember(run, members)
if run == nil or run.stopped or run.sleeping or (run.loops or 0) > 0 then return nil end
for _, member in ipairs(members or {}) do
if not member.active and member.usable and not member.controlled then return member.id end
end
return nil
end
-- Pause efter en start der ikke lykkedes (fx ingen vogn) eller som venter på/henter vognen, så loggen ikke fyldes.
ADFlowSleep.RESTART_FAILED_BACKOFF_MS = 10 * 60 * 1000
-- Har spilleren siddet i traktoren for nylig, er den stoppet med vilje: lad den stå så længe.
ADFlowSleep.MANUAL_GRACE_MS = 10 * 60 * 1000
-- Ingen genstart lige efter indlæsning: AutoDrive genoptager selv aktive traktorer de første sekunder.
ADFlowSleep.RESTART_STARTUP_DELAY_MS = 60 * 1000
function ADFlowSleep.restartNeedsBackoff(result)
return result == nil or not result.ok or result.reason == "waitingWagon" or result.reason == "fetchingWagon"
end
-- ---- spil-adapter ----
local idleSince = {} -- runId -> ms
@@ -176,20 +199,23 @@ local function vehicleState(adEnv, vehicle)
end
-- Vognen (eller lastbilen selv) som planlægningen kan regne med: kapacitet og varer den kan bære.
local function cargoVehicleOf(run, byId)
local function cargoVehicleOf(run, byId, onlyTractorId)
for _, tractorId in ipairs(run.vehicleIds or {}) do
local wagon = findVehicle((run.wagons or {})[tractorId])
if wagon ~= nil then return wagon end
local tractor = byId[tractorId]
if tractor ~= nil and (hasCargoWagon(tractor) or hasOwnBody(tractor)) then return tractor end
if onlyTractorId == nil or tractorId == onlyTractorId then
local wagon = findVehicle((run.wagons or {})[tractorId])
if wagon ~= nil then return wagon end
local tractor = byId[tractorId]
if tractor ~= nil and (hasCargoWagon(tractor) or hasOwnBody(tractor)) then return tractor end
end
end
return nil
end
-- Har det sovende flow en tur nu? -> bool, begrundelse
function ADFlowSleep.hasWork(adEnv, run, byId)
local cargo = cargoVehicleOf(run, byId)
if cargo == nil then return true, "ingen vogn at regne med" end
-- Har flowet en tur nu? -> bool, begrundelse. onlyTractorId: regn med netop den traktors vogn (ledig traktor i et
-- kørende flow — en anden traktors fulde vogn ville aldrig give en tur).
function ADFlowSleep.hasWork(adEnv, run, byId, onlyTractorId)
local cargo = cargoVehicleOf(run, byId, onlyTractorId)
if cargo == nil then return onlyTractorId == nil, "ingen vogn at regne med" end
if run.kind == "outbound" then
local trip = ADOutboundPlanner.plan(ADOutbound.buildPlanInput(adEnv, run, cargo))
return trip ~= nil, trip ~= nil and string.format("%s til %s, vogn '%s'", table.concat(trip.names or {}, "+"),
@@ -316,6 +342,39 @@ local function farmVehiclesById(adEnv)
return byId
end
local restartDue = {} -- runId -> ms hvor næste tjek for ledige traktorer må køre
local lastControlled = setmetatable({}, {__mode = "k"}) -- køretøj -> ms hvor spilleren sidst sad i den
local function restartIdleMember(adEnv, run, byId, now)
local members = {}
for _, id in ipairs(run.vehicleIds or {}) do
local vehicle = byId[id]
if vehicle ~= nil and vehicle.getIsControlled ~= nil and vehicle:getIsControlled() == true then lastControlled[vehicle] = now end
end
if restartDue[run.id] == nil then restartDue[run.id] = now + ADFlowSleep.RESTART_STARTUP_DELAY_MS end
if now < restartDue[run.id] then return end
restartDue[run.id] = now + ADFlowSleep.WAKE_CHECK_MS
for _, id in ipairs(run.vehicleIds or {}) do
local vehicle = byId[id]
if vehicle ~= nil then
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
-- vogn-logikken er i gang (henter, venter på, tømmer eller kører hjem): ikke vores at starte
local wagonBusy = ADFlowWagons ~= nil and ADFlowWagons.statusOf ~= nil and ADFlowWagons.statusOf(vehicle) ~= nil
local recentlyDriven = lastControlled[vehicle] ~= nil and now - lastControlled[vehicle] < ADFlowSleep.MANUAL_GRACE_MS
table.insert(members, {id = id, active = module ~= nil and module.isActive ~= nil and module:isActive(),
usable = not wagonBusy and isOwnFree(vehicle, id, run), controlled = recentlyDriven})
end
end
local id = ADFlowSleep.pickIdleMember(run, members)
if id == nil then return end
local hasWork, why = ADFlowSleep.hasWork(adEnv, run, byId, id)
if not hasWork then return end
Logging.info(ADFlowSleep.LOG_PREFIX .. "'%s': '%s' holder stille i det kørende flow — startes (%s)", tostring(run.name),
tostring(ADRuns.vehicleLabel(byId[id])), tostring(why))
local result = ADRunsController.startVehicle(adEnv, run, byId[id])
if ADFlowSleep.restartNeedsBackoff(result) then restartDue[run.id] = now + ADFlowSleep.RESTART_FAILED_BACKOFF_MS end
end
local function tickRun(adEnv, run, byId, now)
if run.sleeping and run.stopped then
if not ADFlowSleep.isCheckDue(lastCheck[run.id], now, (wakeState[run.id] or {}).falseWakes) then return end
@@ -350,7 +409,11 @@ local function tickRun(adEnv, run, byId, now)
end
end
idleSince[run.id] = ADFlowSleep.track(idleSince[run.id], ADFlowSleep.isIdle({stopped = run.stopped, vehicles = vehicles}), now)
if ADFlowSleep.shouldSleep(idleSince[run.id], now) then sleep(adEnv, run, byId) end
if ADFlowSleep.shouldSleep(idleSince[run.id], now) then
sleep(adEnv, run, byId)
return
end
restartIdleMember(adEnv, run, byId, now)
end
function ADFlowSleep.tick(adEnv, dt)