feat: indstillinger waitHomeMinutes + troughRefillPercent (v1.62.143)

This commit is contained in:
2026-10-10 03:42:04 +02:00
parent 00674277e6
commit 9fb6b97b52
11 changed files with 55 additions and 6 deletions
+20
View File
@@ -145,6 +145,12 @@ function ADUnloadWait.isStaleDestination(taskDestination, targetId, hasMarkerAtD
return taskDestination ~= targetId and not hasMarkerAtDestination
end
-- Er ventetiden ved Wait udløbet? minutes = 0 slår reglen fra.
function ADUnloadWait.waitHomeDue(waitedMs, minutes)
local limit = tonumber(minutes) or 0
return limit > 0 and (waitedMs or 0) >= limit * 60000
end
local function startWaiting(adEnv, task)
local vehicle = task.vehicle
-- Kun "fremme ved målet". At AD stadig regner vognen som aflæssende (isActiveAtTrigger)
@@ -254,6 +260,20 @@ local function updateWaiting(adEnv, task, wait, dt)
free = 0
end
wait.isRejected = isRejected
-- ventetid ved Wait (ADSettings "waitHomeMinutes", pr. stald): udløbet -> resten køres hjem i gårdens lager
wait.waitedMs = (wait.waitedMs or 0) + (dt or 0)
local homeBuilding = ADBuildings ~= nil and ADBuildings.byMarker ~= nil and ADBuildings.byMarker(adEnv, g_currentMission:getFarmId(), home, "unload") or nil
local waitMinutes = ADSettings ~= nil and ADSettings.get("waitHomeMinutes", homeBuilding ~= nil and homeBuilding.id or nil) or 0
if ADUnloadWait.waitHomeDue(wait.waitedMs, waitMinutes) and ADLoadSwap ~= nil and ADLoadSwap.findDumpMarker ~= nil then
local marker = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, home, function(markerId) return hasRouteTo(adEnv, vehicle, markerId) end)
if marker ~= nil then
release(vehicle)
redirectForUnload(task, marker.id)
Logging.info(ADUnloadWait.LOG_PREFIX .. "'%s' har ventet %d min ved %s — kører resten (%.0f l) hjem i %s", tostring(ADRuns.vehicleLabel(vehicle)), math.floor(wait.waitedMs / 60000), tostring(wait.waitMarker.name), rest, tostring(marker.name))
return
end
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 freeFraction = run ~= nil and run.returnBelowPercent ~= nil and (1 - run.returnBelowPercent / 100) or nil