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
+14 -2
View File
@@ -433,12 +433,19 @@ local function release(adEnv, vehicle, reason)
local why = reason == "stuck" and "kom ikke i gang på 2 min — stoppet" or "AutoDrive stoppede turen med det samme (rute/læssested?)"
Logging.warning(ADFieldSilos.LOG_PREFIX .. "'%s' ved %s (%s): %s; siloen springes over i 10 min",
tostring(ADRuns.vehicleLabel(vehicle)), tostring(loan.siloName), fillTypeName(loan.fillType), why)
elseif reason == "stopped" then
elseif reason == "stopped" or reason == "broken" then
pcall(vehicle.stopAutoDrive, vehicle)
end
if reason == "broken" then
if ADCpBridge ~= nil then pcall(ADCpBridge.stop, vehicle) end
if ADFieldJobs ~= nil and ADFieldJobs.notify ~= nil then
ADFieldJobs.notify(ADPool.brokenText(vehicle), true)
end
end
logInfo(ADFieldSilos.LOG_PREFIX .. "'%s' frigivet (%s)", tostring(ADRuns.vehicleLabel(vehicle)), tostring(reason))
-- puljevogn bag traktoren: sæt den af på sin plads og kør hjem (ikke når spilleren har overtaget)
if reason ~= "player" and ADHitch ~= nil then
-- ødelagt: ikke hjem, den kan ikke køre (in-game 20/10)
if reason ~= "player" and reason ~= "broken" and ADHitch ~= nil then
local okHome, pooled = pcall(ADHitch.returnHome, adEnv, vehicle)
if not (okHome and pooled) and loan.fetching then
local park = ADFieldWork.parkMarkerId(adEnv, vehicle)
@@ -568,6 +575,11 @@ local function checkLoans(adEnv)
else
local ok, err = pcall(function()
local loan = loans[vehicle]
-- ødelagt undervejs (fx kørt i vandet, in-game 20/10): stop og slip lånet
if ADPool ~= nil and ADPool.isBroken ~= nil and ADPool.isBroken(vehicle) then
release(adEnv, vehicle, "broken")
return
end
-- henter puljevognen: AD holder stille under koblingen — ikke "færdig"; men spilleren kan overtage,
-- og en hentning der ikke bliver færdig (trafik, rute), opgives
if loan.fetching then
+22 -2
View File
@@ -320,6 +320,8 @@ local function isBusyVehicle(vehicle, id)
or (ADLivestock ~= nil and ADLivestock.isBusy ~= nil and ADLivestock.isBusy(vehicle))
-- flow med låst sæt (20/10): pulje, kæder, marksilo og lån rører det aldrig
or (ADFlowWagons ~= nil and ADFlowWagons.isLockedSet ~= nil and ADFlowWagons.isLockedSet(vehicle))
-- ødelagt (fx kørt i vandet, in-game 20/10): spillets AI kan ikke starte den — pulje, kæder, dyr, lån rører den ikke
or (ADPool ~= nil and ADPool.skipBroken ~= nil and ADPool.skipBroken(vehicle))
end
ADFieldWork.isBusyVehicle = isBusyVehicle
@@ -386,11 +388,14 @@ function ADFieldWork.getRigs(adEnv)
-- egen parkeringstur) — den må ikke kapres midt i en anden kørsel
busy = isBusyVehicle(vehicle, id),
-- hvorfor optaget (til loggen, når ingen maskine kan sendes ud)
busyWhy = (state.assignments[id] ~= nil and ("opgave F" .. tostring(state.assignments[id].fieldId)))
busyWhy = (ADPool ~= nil and ADPool.isBroken ~= nil and ADPool.isBroken(vehicle) and "ødelagt — nulstil den i spillets menu")
or (state.assignments[id] ~= nil and ("opgave F" .. tostring(state.assignments[id].fieldId)))
or (isAdActive(vehicle) and not isLoadTrip(vehicle) and "AutoDrive kører") or (ADCpBridge.isWorking(vehicle) and "Courseplay kører")
or (ADFieldSilos ~= nil and ADFieldSilos.isLoaned(vehicle) and "lånt af marksilo-flow")
or (ADPool ~= nil and ADPool.isReturning(vehicle) and "sætter redskab af") or nil,
controlled = isControlledByPlayer(vehicle),
-- ødelagt (busy ovenfor): marken venter ikke på den som sin egen faste maskine (tryPool)
broken = ADPool ~= nil and ADPool.isBroken ~= nil and ADPool.isBroken(vehicle) or nil,
-- manuel transport: spilleren kører den til marken (for bred til vejene med skærebord)
manual = (state.manual or {})[id] == true,
-- AutoDrive-parkering: uden den kører sættet ikke selv — spilleren kører det (ADPlayerTransport)
@@ -985,7 +990,7 @@ local function tryPool(adEnv, field, info, role, decision, candidates, roleAccep
local ownIds, hasOwnForRole = {}, false
for _, id in ipairs(field.plan ~= nil and field.plan.rigIds or {}) do ownIds[id] = true end
for _, candidate in ipairs(candidates) do
if ownIds[candidate.id] and (candidate.role == role or (candidate.roles ~= nil and candidate.roles[role])) then hasOwnForRole = true end
if ownIds[candidate.id] and not candidate.broken and (candidate.role == role or (candidate.roles ~= nil and candidate.roles[role])) then hasOwnForRole = true end
end
if not (ADPool ~= nil and info.markerId ~= nil and ADPool.mayUsePool(decision, hasOwnForRole)
and (why == "noRig" or why == "allBusy" or why == "cannotDo")) then
@@ -2751,8 +2756,23 @@ local PHASE_FOLLOW = {
queuedSwap = followQueuedSwap,
}
-- Ødelagt sæt (in-game 20/10: 'Unloader F6' kørt i vandet, CP startede aldrig og spilleren kunne ikke nulstille det):
-- AD og CP stoppes, opgaven slippes som ved andre fejl og spilleren får besked én gang (opgaven er væk bagefter).
-- Ikke hjem: den kan ikke køre. -> true når opgaven er sluppet
function ADFieldWork.stopIfBroken(assignment)
local vehicle = assignment.vehicle
if ADPool == nil or ADPool.isBroken == nil or not ADPool.isBroken(vehicle) then return false end
assignment.cpStopIntended = true
pcall(stopAd, vehicle)
pcall(ADCpBridge.stop, vehicle)
ADFieldWork.release(assignment)
fail(assignment.fieldId, ADPool.brokenText(vehicle))
return true
end
function ADFieldWork.follow(adEnv, assignment)
local vehicle = assignment.vehicle
if ADFieldWork.stopIfBroken(assignment) then return end
if followGiants(adEnv, assignment, vehicle) then return end
followGiantsArrival(assignment, vehicle)
if followPlayerTakeover(assignment, vehicle) then return end
+2
View File
@@ -483,6 +483,8 @@ local positionOf = ADUtil.positionOf
local function isOwnFree(vehicle, tractorId, run)
if vehicle == nil then return false end
-- ødelagt (fx kørt i vandet, in-game 20/10): AD/CP kan ikke køre den — vækkes ikke
if ADPool ~= nil and ADPool.skipBroken ~= nil and ADPool.skipBroken(vehicle) then return false end
local status = ADFlowWagons ~= nil and ADFlowWagons.statusOf ~= nil and ADFlowWagons.statusOf(vehicle) or nil
local onOwnTrip = ADFlowSleep.isOwnTrip(status)
local otherRun = ADRunsController.getRunForVehicle(vehicle)
+12
View File
@@ -1121,6 +1121,18 @@ local function tickOrphans(adEnv, elapsed)
end
end
-- Ødelagt traktor (ADRunsController.stopBrokenVehicles, in-game 20/10): glem hentning/venten/tømning/hjemtur, så
-- vogn-logikken ikke bliver ved med at starte AD på den. Ingen hjemtur.
function ADFlowWagons.dropVehicle(vehicle)
waiting[vehicle] = nil
emptying[vehicle] = nil
homing[vehicle] = nil
if fetching[vehicle] ~= nil then
fetching[vehicle] = nil
if ADHitch ~= nil and ADHitch.cancel ~= nil then ADHitch.cancel(vehicle) end
end
end
function ADFlowWagons.isEmptying(vehicle)
return emptying[vehicle] ~= nil
end
+3 -1
View File
@@ -341,7 +341,8 @@ local function freeTrailers(adEnv, farmId, typeIndex)
if spec ~= nil and call(vehicle, "getOwnerFarmId") == farmId and jobs[vehicle] == nil
and (vehicle.getAttacherVehicle == nil or vehicle:getAttacherVehicle() == nil)
and (typeIndex == nil or call(vehicle, "getSupportsAnimalType", typeIndex))
and not (ADPlayerClaim ~= nil and ADPlayerClaim.claims(vehicle)) then
and not (ADPlayerClaim ~= nil and ADPlayerClaim.claims(vehicle))
and not (ADPool.skipBroken ~= nil and ADPool.skipBroken(vehicle)) then -- ødelagt kreaturvogn (20/10)
local parkIndex = vehicle.advd ~= nil and vehicle.advd.parkDestination or nil
local park = type(parkIndex) == "number" and parkIndex >= 1 and adEnv.ADGraphManager:getMapMarkerById(parkIndex) or nil
local connect = park ~= nil and ADPool.connectFor(park.name, markers) or nil
@@ -377,6 +378,7 @@ end
-- moddens læssede dyr — brugerønske 19/10 22:21: turen skal fortsætte, når spilleren stiger ud)
local function tractorFree(vehicle, vehicleId, ignoreClaim)
if vehicle == nil or busyVehicles[vehicle] ~= nil or ADPool.isReserved(vehicleId) then return false end
if ADPool.skipBroken ~= nil and ADPool.skipBroken(vehicle) then return false end -- ødelagt (in-game 20/10)
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
if module ~= nil and module:isActive() then return false end
if vehicle.getIsControlled ~= nil and vehicle:getIsControlled() then return false end
+64 -2
View File
@@ -374,6 +374,67 @@ function ADPool.queueOrder(infos, waitingSince)
return waiting
end
-- Ødelagt (Vehicle:setBroken, fx kørt i vandet; gemmes i savegame, kun spillets nulstilling fjerner det): spillets AI-job
-- starter ikke (AIJobVehicle:getCanStartAIVehicle), og et halvt koblet job kan spilleren hverken afbryde eller nulstille.
-- Køretøjet, dets rod eller et påhængt redskab. In-game 20/10: ødelagt 'Unloader F6' sendt til F6 — CP startede aldrig.
-- -> det ødelagte objekt (køretøjet selv eller et påhængt redskab) | nil
function ADPool.brokenUnit(vehicle)
if type(vehicle) ~= "table" then return nil end
local seen = {}
local function broken(object)
if type(object) ~= "table" or seen[object] then return nil end
seen[object] = true
if object.isBroken == true then return object end
if type(object.getAttachedImplements) == "function" then
local ok, list = pcall(object.getAttachedImplements, object)
for _, implement in ipairs(ok and type(list) == "table" and list or {}) do
local found = type(implement) == "table" and broken(implement.object) or nil
if found ~= nil then return found end
end
end
return nil
end
local found = broken(vehicle) or broken(vehicle.rootVehicle)
if found ~= nil then return found end
if type(vehicle.getChildVehicles) == "function" then
local ok, children = pcall(vehicle.getChildVehicles, vehicle)
for _, child in ipairs(ok and type(children) == "table" and children or {}) do
found = broken(child)
if found ~= nil then return found end
end
end
return nil
end
function ADPool.isBroken(vehicle)
return ADPool.brokenUnit(vehicle) ~= nil
end
-- Beskeden til spilleren: navngiver det ødelagte objekt (review: en sund traktor med ødelagt vogn hed "ødelagt")
function ADPool.brokenText(vehicle)
local label = function(object)
return tostring(ADRuns ~= nil and ADRuns.vehicleLabel ~= nil and ADRuns.vehicleLabel(object) or "?")
end
local unit = ADPool.brokenUnit(vehicle)
if unit ~= nil and unit ~= vehicle then
return string.format("'%s' på '%s' er ødelagt (fx kørt i vandet) — nulstil den i spillets menu", label(unit), label(vehicle))
end
return string.format("'%s' er ødelagt (fx kørt i vandet) — nulstil den i spillets menu", label(vehicle))
end
-- Som isBroken, men logger én gang pr. køretøj pr. spil, når det springes over ved udvælgelse (ikke hvert tick).
local brokenLogged = setmetatable({}, {__mode = "k"})
function ADPool.skipBroken(vehicle)
if not ADPool.isBroken(vehicle) then return false end
if not brokenLogged[vehicle] then
brokenLogged[vehicle] = true
local label = ADRuns ~= nil and ADRuns.vehicleLabel ~= nil and ADRuns.vehicleLabel(vehicle) or "?"
local logger = ADLog or Logging
if logger ~= nil then pcall(logger.info, ADPool.LOG_PREFIX .. "'%s' er ødelagt — bruges ikke, før den er nulstillet", tostring(label)) end
end
return true
end
-- Reservationer (i hukommelsen): owner -> {id, ...}. Karantæne: id -> udløbstid.
local reservations, quarantined = {}, {}
@@ -616,7 +677,8 @@ function ADPool.collect(adEnv, isBusy)
-- spillets egen liste: frakoblede redskaber er ikke nødvendigvis i AutoDrive's køretøjsliste
for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles) do
local owned = vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() == farmId
if owned and vehicle.spec_motorized == nil and vehicle.spec_attachable ~= nil and not isAttached(vehicle) then
if owned and vehicle.spec_motorized == nil and vehicle.spec_attachable ~= nil and not isAttached(vehicle)
and not ADPool.skipBroken(vehicle) then -- ødelagt redskab (in-game 20/10)
local park = parkMarker(adEnv, vehicle)
local connect = park ~= nil and ADPool.connectFor(park.name, markers) or nil
local specs = connect ~= nil and ADCpBridge.getSpecs(vehicle) or nil
@@ -646,7 +708,7 @@ function ADPool.collect(adEnv, isBusy)
local park = parkMarker(adEnv, vehicle)
local controlled = vehicle.getIsControlled ~= nil and vehicle:getIsControlled()
if id ~= nil and park ~= nil and vehicle.spec_attacherJoints ~= nil and ADPool.isFreeTractor(attachedRoles(vehicle))
and ADPool.isFreeFromFlows(vehicle) and not controlled and not isBusy(vehicle)
and ADPool.isFreeFromFlows(vehicle) and not controlled and not isBusy(vehicle) and not ADPool.skipBroken(vehicle)
and not ADPool.isReturning(vehicle) and ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id, state.excluded)
and ADPool.canPull(ADPool.ownRole(vehicle))
and ADPool.isPuller({category = categoryOf(vehicle), ownBody = vehicle.spec_trailer ~= nil or vehicle.spec_dischargeable ~= nil}) then
+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)
+3
View File
@@ -1951,6 +1951,9 @@ function ADSmartPickup:update(dt)
if ADRunsController ~= nil and ADRunsController.processStartQueue ~= nil then
pcall(ADRunsController.processStartQueue, getAutoDriveEnv(), dt)
end
if ADRunsController ~= nil and ADRunsController.stopBrokenThrottled ~= nil then
pcall(ADRunsController.stopBrokenThrottled, getAutoDriveEnv(), dt)
end
if ADRunsController ~= nil and ADRunsController.applyVehicleNamesThrottled ~= nil then
pcall(ADRunsController.applyVehicleNamesThrottled, getAutoDriveEnv(), dt)
end
+1
View File
@@ -50,6 +50,7 @@
<text name="spu_reason_noTrailer" text="ingen vogn (kobl en på, eller giv vognens parkering flowets navn)"/>
<text name="spu_reason_cannotCarry" text="vognen kan ikke bære run'ets varer"/>
<text name="spu_reason_farFromNetwork" text="for langt fra vejnettet"/>
<text name="spu_reason_broken" text="ødelagt (fx kørt i vandet) — nulstil den i spillets menu"/>
<text name="spu_reason_noTarget" text="intet mål"/>
<text name="spu_reason_error" text="fejl ved start (se log)"/>
<text name="spu_movedFrom" text="flyttet fra '%s'"/>
+1
View File
@@ -50,6 +50,7 @@
<text name="spu_reason_noTrailer" text="no trailer (attach one, or name the trailer's parking after the flow)"/>
<text name="spu_reason_cannotCarry" text="trailer cannot carry the run's goods"/>
<text name="spu_reason_farFromNetwork" text="too far from the road network"/>
<text name="spu_reason_broken" text="broken (e.g. driven into water) — reset it in the game menu"/>
<text name="spu_reason_noTarget" text="no target"/>
<text name="spu_reason_error" text="start failed (see log)"/>
<text name="spu_movedFrom" text="moved from '%s'"/>
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.401.0</version>
<version>1.62.402.0</version>
<title>
<en>AD Smart Pickup</en>
<de>AD Smart Pickup</de>