fix: saltruten overtager salttraktoren efter genindlæsning

This commit is contained in:
2026-10-21 01:39:48 +02:00
parent f54e853f67
commit 3e30b30c92
3 changed files with 22 additions and 2 deletions
+20 -1
View File
@@ -247,10 +247,23 @@ local function driverFree(vehicle)
if id == nil or ADPool.isReserved(id) then return false end
if ADPool.skipBroken ~= nil and ADPool.skipBroken(vehicle) then return false end
local module = vehicle.ad.stateModule
if module ~= nil and module:isActive() then return false end
local adActive = module ~= nil and module:isActive()
if vehicle.getIsControlled ~= nil and vehicle:getIsControlled() then return false end
if ADPlayerClaim ~= nil and ADPlayerClaim.claims(vehicle) then return false end
if ADHitch.isBusy ~= nil and ADHitch.isBusy(vehicle) then return false end
if adActive then
-- salttraktoren kører en AutoDrive-tur uden saltruten (genoptaget efter indlæsning — saltjobbet gemmes ikke,
-- brugerønske 21/10 01:37: "lav det så den overtager"): saltruten tager den, hvis den ellers er fri
if not ADSaltRoute.carriesSpreader(vehicle, attachedObjects, 0) then return false end
if ADRunsController.getRunForVehicle ~= nil and ADRunsController.getRunForVehicle(vehicle) ~= nil then return false end
if ADFieldJobs ~= nil and ADFieldJobs.state ~= nil and (ADFieldJobs.state.assignments or {})[id] ~= nil then return false end
if ADCpBridge ~= nil and ADCpBridge.isWorking ~= nil and ADCpBridge.isWorking(vehicle) then return false end
-- lån/hjemtur/tømning der startede før sprederen blev koblet på, overtages ikke (review)
if ADFieldSilos ~= nil and ADFieldSilos.isLoaned ~= nil and ADFieldSilos.isLoaned(vehicle) then return false end
if ADPool.isReturning ~= nil and ADPool.isReturning(vehicle) then return false end
if ADFlowWagons ~= nil and ADFlowWagons.isEmptying ~= nil and ADFlowWagons.isEmptying(vehicle) then return false end
return true
end
-- markarbejdets optaget-regel uden saltlåsen (ellers var vores egen salttraktor altid "optaget")
ownCheck = true
local ok, busy = pcall(function() return ADFieldWork ~= nil and ADFieldWork.isBusyVehicle ~= nil and ADFieldWork.isBusyVehicle(vehicle, id) end)
@@ -473,6 +486,12 @@ local function startJob(adEnv, info, tractor, route)
local driverId = ADRunsController.getVehicleId(job.driver)
ADPool.reserve(job, {info.id, driverId})
notify(string.format("der ligger sne — '%s' salter %d steder (gårdene først)", vname(info.spreader), #route))
-- overtaget AutoDrive-tur (genoptaget efter indlæsning): stop den, saltruten sender sine egne mål
local module = job.driver ~= nil and job.driver.ad ~= nil and job.driver.ad.stateModule or nil
if module ~= nil and module:isActive() then
logInfo(ADSaltRoute.LOG_PREFIX .. "'%s' kørte en AutoDrive-tur — saltruten overtager", vname(job.driver))
pcall(job.driver.stopAutoDrive, job.driver)
end
if info.connectId == nil then
beginRoute(adEnv)
return