fix: ødelagte køretøjer springes over og stoppes (kan ikke nulstilles midt i et job)

This commit is contained in:
2026-10-20 16:10:18 +02:00
parent 7384f23b47
commit 8cadbfffaf
12 changed files with 178 additions and 8 deletions
+54
View File
@@ -1015,6 +1015,11 @@ end
function ADRunsController.validateVehicle(adEnv, run, vehicle)
local carriable = ADRunsController.getCarriableFillTypes(adEnv, vehicle)
local result = {ok = false, carriable = carriable, capacity = getLoadCapacity(adEnv, vehicle), isAutoload = hasAutoload(adEnv, vehicle)}
-- ødelagt (fx kørt i vandet, in-game 20/10): AutoDrive/CP kan ikke køre den
if ADPool ~= nil and ADPool.isBroken ~= nil and ADPool.isBroken(vehicle) then
result.reason = "broken"
return result
end
if run.kind == "outbound" then
return validateOutboundVehicle(adEnv, run, vehicle, result)
end
@@ -1295,6 +1300,11 @@ end
-- og logges med årsag (samme nøgle som fanen viser).
-- Start én traktor i et run: valider, anvend run'et og start AutoDrive. Returnerer resultat-posten.
function ADRunsController.startVehicle(adEnv, run, vehicle)
-- ødelagt: heller ingen vognhentning (beforeStart) — valideringen afviser den
if ADPool ~= nil and ADPool.isBroken ~= nil and ADPool.isBroken(vehicle) then
logInfo(ADRunsController.LOG_PREFIX .. "run '%s': '%s' sprunget over (broken)", tostring(run.name), tostring(ADRuns.vehicleLabel(vehicle)))
return {vehicle = vehicle, ok = false, reason = "broken"}
end
-- solo-traktor med en husket vogn: hent den først (valideringen ville afvise en traktor uden vogn)
if ADFlowWagons ~= nil then
local okWagon, handled, wagonResult = pcall(ADFlowWagons.beforeStart, adEnv, run, vehicle)
@@ -1550,6 +1560,50 @@ function ADRunsController.stopIfRunning(vehicle, reason)
return true
end
-- Kørende flows: en traktor der bliver ødelagt undervejs (fx kørt i vandet, in-game 20/10) stoppes (AD + CP), flowets
-- vogn-logik slipper den, og spilleren får besked én gang pr. køretøj. Ikke hjem: den kan ikke køre. Flowets øvrige
-- traktorer kører videre; den ødelagte startes ikke igen (validateVehicle: "broken").
ADRunsController.BROKEN_CHECK_MS = 2000
local brokenTimerMs = 0
local brokenNotified = setmetatable({}, {__mode = "k"})
function ADRunsController.stopBrokenVehicles(adEnv)
local stopped = 0
if ADPool == nil or ADPool.isBroken == nil then return stopped end
local vehiclesById = getFarmVehiclesById(adEnv)
for _, run in ipairs(ADRunsController.store.runs) do
for _, vehicleId in ipairs(run.vehicleIds or {}) do
local vehicle = vehiclesById[vehicleId]
if vehicle ~= nil and ADPool.isBroken(vehicle) then
local busy = isVehicleActive(vehicle) or (ADCpBridge ~= nil and ADCpBridge.isWorking ~= nil and ADCpBridge.isWorking(vehicle))
or (ADFlowWagons ~= nil and ADFlowWagons.statusOf ~= nil and ADFlowWagons.statusOf(vehicle) ~= nil)
if busy then
if vehicle.ad ~= nil and isVehicleActive(vehicle) then pcall(stopVehicle, vehicle) end
if ADCpBridge ~= nil then pcall(ADCpBridge.stop, vehicle) end
if ADFlowWagons ~= nil and ADFlowWagons.dropVehicle ~= nil then pcall(ADFlowWagons.dropVehicle, vehicle) end
stopped = stopped + 1
end
if not brokenNotified[vehicle] then
brokenNotified[vehicle] = true
local text = ADPool.brokenText(vehicle)
logInfo(ADRunsController.LOG_PREFIX .. "run '%s': %s", tostring(run.name), text)
if busy and ADFieldJobs ~= nil and ADFieldJobs.notify ~= nil then ADFieldJobs.notify(text, true) end
end
elseif vehicle ~= nil then
brokenNotified[vehicle] = nil -- nulstillet: en ny skade siges igen
end
end
end
return stopped
end
function ADRunsController.stopBrokenThrottled(adEnv, dt)
brokenTimerMs = brokenTimerMs + (dt or 0)
if brokenTimerMs < ADRunsController.BROKEN_CHECK_MS then return end
brokenTimerMs = 0
ADRunsController.stopBrokenVehicles(adEnv)
end
-- keepWagons (valgfri): vognene bliver på traktorerne, og ingen kører hjem — dvale pga. gødningsreserven
-- (sættet skal kunne gøde samlet, ADFlowSleep 17/10)
function ADRunsController.stopRun(adEnv, runId, keepWagons)