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
+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