fix: Stop alt og parkér sender også ledige køretøjer hjem; græsmark på såning spoles tilbage til slåning (v1.62.75)

This commit is contained in:
2026-10-08 09:28:48 +02:00
parent 678ceb1e8b
commit 96eb0ed0da
5 changed files with 61 additions and 2 deletions
+42 -1
View File
@@ -1186,6 +1186,46 @@ function ADRunsController.queueStartAll(adEnv)
return summary
end
-- Ledige køretøjer uden for flows/markarbejde (ADRuns.sweepHomeAction): stopper manuelle AD-ture og lægger dem
-- i toPark. Returnerer antal stoppede.
local function ownParkDistance(adEnv, vehicle)
local index = vehicle.advd ~= nil and vehicle.advd.parkDestination or nil
local marker = type(index) == "number" and index >= 1 and adEnv.ADGraphManager:getMapMarkerById(index) or nil
local wayPoint = marker ~= nil and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
if wayPoint == nil or vehicle.rootNode == nil then return nil end
local x, _, z = getWorldTranslation(vehicle.rootNode)
return math.sqrt((x - wayPoint.x) ^ 2 + (z - wayPoint.z) ^ 2)
end
local function sweepIdleHome(adEnv, seen, toPark)
local stopped = 0
for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
if vehicle.ad ~= nil and not (ADPool ~= nil and ADPool.isReturning(vehicle)) then
local okParks, parks = false, nil
if ADHitch ~= nil then okParks, parks = pcall(ADHitch.poolParkIds, adEnv, vehicle) end
local action = ADRuns.sweepHomeAction({
seen = seen[vehicle] == true,
controlled = vehicle.getIsControlled ~= nil and vehicle:getIsControlled() == true,
adActive = isVehicleActive(vehicle),
aiActive = vehicle.getIsAIActive ~= nil and vehicle:getIsAIActive() == true,
implementParks = okParks and #parks or 0,
ownParkDistance = ownParkDistance(adEnv, vehicle),
})
if action ~= "skip" then
seen[vehicle] = true
if isVehicleActive(vehicle) then
stopVehicle(vehicle)
stopped = stopped + 1
end
Logging.info(ADRunsController.LOG_PREFIX .. "Stop alt og parkér: '%s' ledig -> %s",
tostring(ADRuns.vehicleLabel(vehicle)), action)
table.insert(toPark, vehicle)
end
end
end
return stopped
end
-- Stop alt og parkér (Oversigt): flows, markarbejde og marksilo-lån stoppes, køretøjerne sendes til deres
-- AD-parkeringspunkt, og moden sættes på pause (gemmes), så intet starter igen før "Start alle".
-- Høstere med manuel transport parkeres ikke (må ikke køre på vejen med skærebord). Returnerer
@@ -1218,11 +1258,12 @@ function ADRunsController.stopAllAndPark(adEnv)
elseif stopped.manual then
table.insert(summary.manual, tostring(ADRuns.vehicleLabel(stopped.vehicle)))
elseif not seen[stopped.vehicle] then
seen[stopped.vehicle] = true
table.insert(toPark, stopped.vehicle)
end
seen[stopped.vehicle] = true
end
end
summary.stopped = summary.stopped + sweepIdleHome(adEnv, seen, toPark)
if ADFieldSilos ~= nil and ADFieldSilos.stopAll ~= nil then pcall(ADFieldSilos.stopAll, adEnv) end
if ADFieldJobs ~= nil and ADFieldJobs.setPaused ~= nil then ADFieldJobs.setPaused(true) end
for _, vehicle in ipairs(toPark) do