fix: stoppede flows styrer ikke deres traktorer via AD-krogene — 1.62.183

This commit is contained in:
2026-10-10 08:35:03 +02:00
parent fdfdc7af59
commit e041c47d48
6 changed files with 53 additions and 13 deletions
+11 -1
View File
@@ -9,6 +9,16 @@
-- Hook 1: ADSmartPickup's getNextPickup-wrap kalder choosePickup for udkørsels-traktorer.
-- Hook 2: LoadAtDestinationTask.update/finished (install) — hold, udtag, fremdriftsvagt, runde.
-- Flowet der styrer traktoren nu (et stoppet flow styrer intet — ADRunsController.getActiveRunForVehicle)
local function activeRunOf(vehicle)
local controller = ADRunsController
if controller == nil or controller.getRunForVehicle == nil then return nil end
local run = controller.getRunForVehicle(vehicle)
if run ~= nil and run.stopped then return nil end
return run
end
ADOutbound = {}
ADOutbound.LOG_PREFIX = "ADSmartPickup: "
@@ -81,7 +91,7 @@ local function now()
end
local function getRun(vehicle)
return ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and ADRunsController.getRunForVehicle(vehicle) or nil
return ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and activeRunOf(vehicle) or nil
end
function ADOutbound.isOutboundVehicle(vehicle)
+10 -1
View File
@@ -84,6 +84,15 @@ function ADRunsController.getRunForVehicle(vehicle)
return run
end
-- Flowet der styrer traktoren lige nu: et STOPPET flow styrer intet (in-game 10/10: alle flows stoppet, men
-- forsyningskrogene sendte stadig en lånt tømmevogn efter hvede til Chicken Food). Til AD-krogene; listen/UI bruger
-- getRunForVehicle.
function ADRunsController.getActiveRunForVehicle(vehicle)
local run = ADRunsController.getRunForVehicle(vehicle)
if run ~= nil and run.stopped then return nil end
return run
end
-- ---- store-wrappers (erstatter altid hele store'en; modellen muterer aldrig) ----
function ADRunsController.createRun(name, kind)
@@ -444,7 +453,7 @@ function ADRunsController.adoptLoadedThrottled(adEnv, dt)
if adEnv == nil or adoptTimerMs < ADRunsController.ADOPT_INTERVAL_MS then return end
adoptTimerMs = 0
for _, vehicle in pairs(getFarmVehiclesById(adEnv)) do
local run = ADRunsController.getRunForVehicle(vehicle)
local run = ADRunsController.getActiveRunForVehicle(vehicle)
local stateModule = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
if run ~= nil and (run.kind or "supply") == "supply" and stateModule ~= nil and stateModule:isActive() then
pcall(ADRunsController.ensureNoTargetRotation, adEnv, vehicle)
+16 -6
View File
@@ -8,6 +8,16 @@
-- ingredienser til aflæsningsmålet (fx en TMR-blander). Pr. tur hentes den
-- ingrediens målet mangler mest, fra en silo hvor som helst på kortet.
-- Flowet der styrer traktoren nu (et stoppet flow styrer intet — ADRunsController.getActiveRunForVehicle)
local function activeRunOf(vehicle)
local controller = ADRunsController
if controller == nil or controller.getRunForVehicle == nil then return nil end
local run = controller.getRunForVehicle(vehicle)
if run ~= nil and run.stopped then return nil end
return run
end
ADSmartPickup = {}
-- ADCache-opslag der også virker uden adCache (tests)
@@ -1161,7 +1171,7 @@ function ADSmartPickup.setActivePickup(vehicle, choice)
end
function ADSmartPickup.getIngredientsFor(adEnv, driver)
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(driver) or nil
local run = ADRunsController ~= nil and activeRunOf(driver) or nil
if run ~= nil then
local ingredients = ADRunsController.getRunIngredients(adEnv, run, driver)
if #ingredients > 0 then
@@ -1176,7 +1186,7 @@ end
-- mangler mest; ved ét mål gendannes det (fx efter at forkert last er læsset af i en silo).
-- AD læser først målet når vognen er læsset, så skiftet her gælder for hele turen.
local function chooseRunTarget(adEnv, driver)
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(driver) or nil
local run = ADRunsController ~= nil and activeRunOf(driver) or nil
if run ~= nil and ADRunsController.resolveMarkers ~= nil then
pcall(ADRunsController.resolveMarkers, adEnv, run)
end
@@ -1204,7 +1214,7 @@ local tryOtherRunTargets
-- til det): prøv run'ets ANDRE mål, og skift AD's aflæsningsmål til det første der kan forsynes.
-- Ellers holdt traktoren ved Wait mens fx fire andre DOB'er ved samme biogasanlæg stod tomme.
tryOtherRunTargets = function(adEnv, driver, ingredients)
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(driver) or nil
local run = ADRunsController ~= nil and activeRunOf(driver) or nil
if run == nil or (run.kind or "supply") ~= "supply" then
return nil
end
@@ -1247,7 +1257,7 @@ function ADSmartPickup.choosePickup(adEnv, driver)
if choice == nil then
-- Traktor i et forsynings-run uden noget (tilladt) at hente: hold ved Wait og prøv igen, i stedet
-- for at falde tilbage til mappe-logikken (den henter hvad som helst, fx ensilage i et halvfuldt trug).
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(driver) or nil
local run = ADRunsController ~= nil and activeRunOf(driver) or nil
if run ~= nil and (run.kind or "supply") == "supply" and ADOutbound ~= nil and ADOutbound.holdSupplyVehicle ~= nil then
local replan = function()
local list = ADSmartPickup.getIngredientsFor(adEnv, driver)
@@ -1368,7 +1378,7 @@ local function installLoadWaitHook(adEnv)
local wantedName = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(pickup.fillType) or tostring(pickup.fillType)
Logging.info(ADSmartPickup.LOG_PREFIX .. "'%s' har %.0f l %s på vognen og skulle hente %s — leverer først det den har", tostring(ADRuns.vehicleLabel(loadTask.vehicle)), liters, tostring(cargoName), tostring(wantedName))
-- hører lasten ikke til run'et (fx gødning i et ensilage-run), køres den til en silo der tager den
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(loadTask.vehicle) or nil
local run = ADRunsController ~= nil and activeRunOf(loadTask.vehicle) or nil
if run ~= nil and ADRunsController.findWrongCargoDump ~= nil and ADUnloadWait.setDumpTarget ~= nil then
local stateModule = loadTask.vehicle.ad.stateModule
local current = stateModule.getSecondMarker ~= nil and stateModule:getSecondMarker() or nil
@@ -1412,7 +1422,7 @@ end
-- nil for traktorer uden for en forsyningskørsel (så gælder AD's egen rotation som før).
local stayLogged = setmetatable({}, {__mode = "k"})
function ADSmartPickup.stayAtCurrentPickup(driver)
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and ADRunsController.getRunForVehicle(driver) or nil
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and activeRunOf(driver) or nil
if run == nil or (run.kind or "supply") ~= "supply" then return nil end
local stateModule = driver.ad ~= nil and driver.ad.stateModule or nil
local first = stateModule ~= nil and stateModule.getFirstMarker ~= nil and stateModule:getFirstMarker() or nil
+14 -4
View File
@@ -8,6 +8,16 @@
-- Kun den aktuelle aflæsningsopgaves destination ændres; AutoDrives mål,
-- rotation og loop-tæller røres ikke.
-- Flowet der styrer traktoren nu (et stoppet flow styrer intet — ADRunsController.getActiveRunForVehicle)
local function activeRunOf(vehicle)
local controller = ADRunsController
if controller == nil or controller.getRunForVehicle == nil then return nil end
local run = controller.getRunForVehicle(vehicle)
if run ~= nil and run.stopped then return nil end
return run
end
ADUnloadWait = {}
-- Under dette regnes vognen som tom (AutoDrive selv bruger 0,1 l).
@@ -38,7 +48,7 @@ local function getRestLoad(adEnv, vehicle)
end
local function getWaitPoolGroup(vehicle)
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(vehicle) or nil
local run = ADRunsController ~= nil and activeRunOf(vehicle) or nil
return run ~= nil and run.waitPoolGroup or nil
end
@@ -123,7 +133,7 @@ ADUnloadWait.MIN_FREE_FOR_OTHER_TARGET = 1000
-- Det af run'ets ANDRE mål der tager varen og har mest fri plads (≥ MIN_FREE_FOR_OTHER_TARGET) og vej.
local function findOtherTargetForRest(adEnv, vehicle, fillType, currentId)
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and ADRunsController.getRunForVehicle(vehicle) or nil
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and activeRunOf(vehicle) or nil
if run == nil or (run.kind or "supply") ~= "supply" or vehicle.ad.stateModule.setSecondMarkerByWayPointId == nil then
return nil
end
@@ -275,7 +285,7 @@ local function updateWaiting(adEnv, task, wait, dt)
wait.waitedMs = 0 -- intet lager tager resten lige nu: prøv igen efter endnu en periode
end
-- run'ets "kør hjem under X %" (fri ≥ (100-X) % af kapaciteten), ellers standardreglen
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(vehicle) or nil
local run = ADRunsController ~= nil and activeRunOf(vehicle) or nil
local freeFraction = run ~= nil and run.returnBelowPercent ~= nil and (1 - run.returnBelowPercent / 100) or nil
if free == nil or not ADSupplyPlanner.canUnloadRest(free, rest, capacity, freeFraction) then
if ADLoadSwap ~= nil then
@@ -394,7 +404,7 @@ function ADUnloadWait.adoptOrphans(adEnv)
for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
local stateModule = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
local isActive = stateModule ~= nil and stateModule.isActive ~= nil and stateModule:isActive()
local run = isActive and waits[vehicle] == nil and ADRunsController.getRunForVehicle(vehicle) or nil
local run = isActive and waits[vehicle] == nil and activeRunOf(vehicle) or nil
if run ~= nil and (run.kind or "supply") == "supply" and stateModule.getSecondMarker ~= nil then
local marker = stateModule:getSecondMarker()
local task = vehicle.ad.taskModule ~= nil and vehicle.ad.taskModule.getActiveTask ~= nil and vehicle.ad.taskModule:getActiveTask() or nil
+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.182.0</version>
<version>1.62.183.0</version>
<title>
<en>AD Smart Pickup</en>
</title>