feat: flows kan låne en ledig traktor + aflæsnings-skub ved trigger undervejs (1.62.364)

This commit is contained in:
2026-10-19 10:37:26 +02:00
parent b1bb5e1ee8
commit 28fb5332c5
13 changed files with 276 additions and 16 deletions
+53 -5
View File
@@ -69,7 +69,7 @@ end
local RUN_FIELDS = {
"id", "name", "kind", "sourceBuildingIds", "targetBuildingIds", "storeBuildingIds", "products",
"ingredientMode", "ingredients", "sellAtPercent", "storeAbovePercent", "sellAbovePercent", "minSourcePercent", "collectRound", "loops",
"returnBelowPercent", "waitPoolGroup", "vehicleIds", "wagons", "chain", "spareWagons",
"returnBelowPercent", "waitPoolGroup", "vehicleIds", "wagons", "chain", "spareWagons", "borrowWagonId",
}
local function draftFrom(run, isNew)
@@ -93,6 +93,7 @@ local function draftFrom(run, isNew)
draft.isNew = isNew == true
draft.showAllBuildings = false
draft.storeAuto = #draft.storeBuildingIds == 0
draft.borrowTractor = draft.borrowWagonId ~= nil
return draft
end
@@ -176,9 +177,9 @@ end
local SET_VALUES = {
kind = true, ingredientMode = true, sellAtPercent = true, storeAbovePercent = true, sellAbovePercent = true, minSourcePercent = true, loops = true,
returnBelowPercent = true, waitPoolGroup = true,
returnBelowPercent = true, waitPoolGroup = true, borrowWagonId = true,
}
local BOOL_VALUES = {showAllBuildings = true, storeAuto = true, collectRound = true}
local BOOL_VALUES = {showAllBuildings = true, storeAuto = true, collectRound = true, borrowTractor = true}
local LIST_VALUES = {ingredients = true, storeBuildingIds = true, vehicleIds = true}
local function setPolicy(products, name, policy)
@@ -239,7 +240,7 @@ ADFlowGuide.TOOLTIPS = {
policy = "spu_policy_tooltip", ingredientMode = "spu_ingredientMode_tooltip", sellAtPercent = "spu_sellAt_tooltip",
storeAbovePercent = "spu_storeAbove_tooltip", sellAbovePercent = "spu_sellAbove_tooltip", minSourcePercent = "spu_minSource_tooltip",
collectRound = "spu_collectRound_tooltip", loops = "spu_loops_tooltip", returnBelowPercent = "spu_returnBelow_tooltip",
waitPoolGroup = "spu_waitPool_tooltip",
waitPoolGroup = "spu_waitPool_tooltip", borrowTractor = "spu_guide_flow_borrow_tooltip", borrowWagonId = "spu_guide_flow_borrowWagon_tooltip",
}
local function choice(id, title, options, value, item)
@@ -443,10 +444,40 @@ local function rowSpare(guide, tractorId, ownWagon)
return choice("spareWagon", L("spu_guide_flow_spareWagon"), options, current, tractorId)
end
-- Lånevognen: den valgte (flowets egen — også mens en lånt traktor kører med den og den derfor ikke står som ledig),
-- ellers den første ledige vogn der passer til varerne.
function ADFlowGuide.borrowWagon(draft, context)
if draft.borrowWagonId ~= nil and draft.borrowWagonId ~= "" then return draft.borrowWagonId end
local first = ((context or {}).wagons or {})[1]
return first ~= nil and first.id or nil
end
-- Lånt traktor (brugerønske 19/10): kun en vogn vælges; ingen traktor er bundet til flowet.
local function rowsBorrow(guide)
local rows = {toggle("borrowTractor", L("spu_guide_flow_borrow"), true)}
local options, listed = {}, false
local current = ADFlowGuide.borrowWagon(guide.draft, guide.context)
for _, wagon in ipairs(guide.context.wagons or {}) do
table.insert(options, {label = T(tostring(wagon.label)), value = wagon.id})
if wagon.id == current then listed = true end
end
-- flowets vogn er ude at køre (sidder på den lånte traktor): den står ikke som ledig, men er stadig valget
if current ~= nil and not listed then table.insert(options, 1, {label = L("spu_guide_flow_borrowWagonInUse"), value = current}) end
if current == nil then
table.insert(rows, text("spu_guide_flow_noFreeWagon"))
else
table.insert(rows, choice("borrowWagonId", L("spu_guide_flow_borrowWagon"), options, current))
end
table.insert(rows, text("spu_guide_flow_borrowText"))
return rows
end
-- Traktorer: flowets egne først, så de ledige. Traktorer i andre flows og blokerede (vognen passer ikke)
-- skjules med en linje hver.
local function rowsTractors(guide)
local draft, rows = guide.draft, {}
if draft.borrowTractor then return rowsBorrow(guide) end
table.insert(rows, toggle("borrowTractor", L("spu_guide_flow_borrow"), false))
local inRun = chosenSet(draft.vehicleIds)
local entries = {}
local other, blocked = 0, 0
@@ -480,7 +511,7 @@ local function rowsTractors(guide)
end
end
end
if #rows == 0 then table.insert(rows, text("spu_guide_flow_noTractors")) end
if #rows == 1 then table.insert(rows, text("spu_guide_flow_noTractors")) end
if other > 0 then table.insert(rows, text("spu_guide_flow_otherFlows", {other})) end
if blocked > 0 then
-- foldet sammen som standard; linjen med antallet folder navn + grund ud/ind
@@ -578,6 +609,14 @@ local SUMMARY = {
return {group == "" and L("spu_waitPool_all") or T(group)}
end,
tractors = function(guide)
if guide.draft.borrowTractor then
local wagonId = ADFlowGuide.borrowWagon(guide.draft, guide.context)
if wagonId == nil then return {L("spu_guide_flow_sumNoTractors")} end
local known = false
for _, wagon in ipairs(guide.context.wagons or {}) do if wagon.id == wagonId then known = true end end
if not known then return {L("spu_guide_flow_sumBorrowInUse")} end
return {L("spu_guide_flow_sumBorrow", {namesFor({wagonId}, guide.context.wagons, "label")[1]})}
end
local ids = guide.draft.vehicleIds
if #ids == 0 then return {L("spu_guide_flow_sumNoTractors")} end
if #ids > ADFlowGuide.MAX_NAMED_TRACTORS then return {L("spu_guide_flow_sumTractors", {#ids})} end
@@ -620,6 +659,15 @@ function ADFlowGuide.result(guide)
returnBelowPercent = draft.returnBelowPercent, waitPoolGroup = draft.waitPoolGroup or "",
}
if draft.name ~= nil and draft.name:match("%S") then changes.name = draft.name end
-- lånt traktor: ingen faste traktorer (de slippes ved gem), kun vognen huskes; uden ledig vogn = faste traktorer
local borrowWagonId = draft.borrowTractor and ADFlowGuide.borrowWagon(draft, guide.context) or nil
changes.borrowWagonId = borrowWagonId or false
if borrowWagonId ~= nil then
-- spillerens eget flow nu: kæden må ikke regne det som sit tomme flow (slette/lægge sammen/bemande — review 19/10)
changes.chain = ""
return {isNew = draft.isNew == true, runId = draft.id, name = draft.name, kind = draft.kind, changes = changes,
vehicleIds = {}, wagons = {}, spareWagons = {}, borrow = true}
end
return {isNew = draft.isNew == true, runId = draft.id, name = draft.name, kind = draft.kind, changes = changes,
vehicleIds = ADGuide.deepCopy(draft.vehicleIds), wagons = ADFlowGuide.resultWagons(draft),
spareWagons = ADFlowGuide.resultSpares(draft)}
+122 -4
View File
@@ -38,8 +38,35 @@ function ADFlowSleep.track(since, isIdle, nowMs)
return since or nowMs
end
function ADFlowSleep.shouldSleep(since, nowMs)
return since ~= nil and nowMs - since >= ADFlowSleep.SLEEP_AFTER_MS
function ADFlowSleep.shouldSleep(since, nowMs, afterMs)
return since ~= nil and nowMs - since >= (afterMs or ADFlowSleep.SLEEP_AFTER_MS)
end
-- Flow med lånt traktor (brugerønske 19/10: "burde der ikke være en option ... lån et ledigt køretøj, specielt med
-- sådan en som honning" — for at spare på økonomien): flowet ejer kun sin vogn (run.borrowWagonId). Har det en tur,
-- låner det en ledig traktor, der henter vognen ved Connect; efter turen sover det hurtigt, vognen sættes på plads, og
-- traktoren slippes igen (ikke låst til flowet som en fast traktor).
ADFlowSleep.BORROW_SLEEP_AFTER_MS = 2 * 60 * 1000
function ADFlowSleep.sleepAfterMs(run)
return (run ~= nil and run.borrowWagonId ~= nil) and ADFlowSleep.BORROW_SLEEP_AFTER_MS or ADFlowSleep.SLEEP_AFTER_MS
end
-- s = {borrow, stopped, sleeping, hasTractor, tractorBusy} -> "await" (startet uden traktor: vent i dvale på en tur) |
-- "release" (stoppet/sovende, og traktoren er færdig med vognen) | nil
function ADFlowSleep.borrowAction(s)
if not s.borrow then return nil end
if not s.hasTractor then return (not s.stopped) and "await" or nil end
if (s.stopped or s.sleeping) and not s.tractorBusy then return "release" end
return nil
end
-- Traktoren der lånes. Sidder vognen allerede på en traktor, er det den — hvis den er ledig, ellers ingen (en anden
-- kan ikke hente vognen). Ellers bedst egnede ledige (som ved opvågning). s = {attacher = {id, free} | nil, candidates,
-- wagon, bestFit} -> {id, …} eller nil
function ADFlowSleep.chooseBorrowed(s)
if s.attacher ~= nil then return s.attacher.free and s.attacher or nil end
return ADFlowSleep.chooseTractor({candidates = s.candidates, wagon = s.wagon, bestFit = s.bestFit})
end
-- Holdes et salgs-flow tilbage af gødningsreserven ("… reserveret til markerne (183 ha)")? Så er der intet at
@@ -319,6 +346,8 @@ local function cargoVehicleOf(run, byId, onlyTractorId)
if tractor ~= nil and (hasCargoWagon(tractor) or hasOwnBody(tractor)) then return tractor end
end
end
-- lånt traktor: ingen traktor endnu — planen regner med flowets vogn
if onlyTractorId == nil and #(run.vehicleIds or {}) == 0 and run.borrowWagonId ~= nil then return findVehicle(run.borrowWagonId) end
return nil
end
@@ -488,7 +517,69 @@ local function lentOutWithWagon(run, byId)
return nil
end
local function carriesWagon(vehicle, wagonId)
for _, implement in ipairs(vehicle ~= nil and ADHitch.rearImplementsOf(vehicle) or {}) do
if ADRunsController.getVehicleId(implement.object) == wagonId then return true end
end
return false
end
-- Lånt traktor til flowets vogn: sættes på flowet (vehicleIds + vogn) — opvågningen starter den så som en solo-traktor
-- med husket vogn (henter vognen ved Connect). -> true når der er en traktor
local function staffBorrowed(adEnv, run, now)
local wagon = findVehicle(run.borrowWagonId)
if wagon == nil then
noteNoWork(run, string.format("flowets vogn (%s) findes ikke længere", tostring(run.borrowWagonId)), now)
return false
end
local wagonName = tostring(ADRuns.vehicleLabel(wagon))
local attacher = wagon.getAttacherVehicle ~= nil and wagon:getAttacherVehicle() or nil
local attacherInfo = nil
if attacher ~= nil then
local id = ADRunsController.getVehicleId(attacher)
local module = attacher.ad ~= nil and attacher.ad.stateModule or nil
local free = id ~= nil and ADRunsController.getRunForVehicle(attacher) == nil and not (module ~= nil and module:isActive())
and not (attacher.getIsControlled ~= nil and attacher:getIsControlled()) and not ADFieldWork.isBusyVehicle(attacher, id)
attacherInfo = {id = id, name = tostring(ADRuns.vehicleLabel(attacher)), free = free}
end
local candidates = {}
if attacherInfo == nil then
local okFree, list = pcall(freeTractors, adEnv, {})
candidates = okFree and list or {}
end
local x, z = positionOf(wagon)
local okHp, neededHp = pcall(ADPool.readNeededHp, wagon)
local chosen = ADFlowSleep.chooseBorrowed({attacher = attacherInfo, candidates = candidates,
wagon = {x = x, z = z, neededHp = okHp and neededHp or nil},
bestFit = function(list, implement) return ADPool.bestFit(list, implement, "unloader") end})
if chosen == nil then
noteNoWork(run, attacherInfo ~= nil and string.format("vognen '%s' sidder på '%s', som er optaget", wagonName, attacherInfo.name)
or string.format("ingen ledig traktor kan trække '%s'", wagonName), now)
return false
end
run.vehicleIds = {chosen.id}
run.wagons = {[chosen.id] = run.borrowWagonId}
run.spareWagons = {}
Logging.info(ADFlowSleep.LOG_PREFIX .. "'%s' låner '%s' til vognen '%s'", tostring(run.name), tostring(chosen.name or chosen.id), wagonName)
return true
end
local borrowRetryAt = {} -- runId -> ms: lånt traktor kunne ikke starte — ikke låne igen før (review 19/10: ellers blev en
-- ny puljetraktor hentet og sendt hjem ved hvert vågn-tjek)
local function wake(adEnv, run, byId, why)
if run.borrowWagonId ~= nil and #(run.vehicleIds or {}) == 0 then
local now = nowMs()
if borrowRetryAt[run.id] ~= nil and now < borrowRetryAt[run.id] then
noteNoWork(run, string.format("lånt traktor kunne ikke starte — prøver igen om %d min",
math.ceil((borrowRetryAt[run.id] - now) / 60000)), now)
return
end
borrowRetryAt[run.id] = nil
local okStaff, staffed = pcall(staffBorrowed, adEnv, run, nowMs())
if not okStaff then logOnce("borrow:" .. tostring(run.id), string.format("'%s': lån af traktor fejlede: %s", tostring(run.name), tostring(staffed))) end
if not (okStaff and staffed) then return end
end
local busySet = lentOutWithWagon(run, byId)
if busySet ~= nil then
local text = string.format("sættet '%s' er lånt ud (gøder)", tostring(busySet))
@@ -539,6 +630,7 @@ local function wake(adEnv, run, byId, why)
for _, result in ipairs(results or {}) do table.insert(reasons, tostring(result.reason)) end
ADRunsController.stopRun(adEnv, run.id)
run.sleeping = true
if run.borrowWagonId ~= nil then borrowRetryAt[run.id] = nowMs() + ADFlowSleep.RESTART_FAILED_BACKOFF_MS end
Logging.info(ADFlowSleep.LOG_PREFIX .. "'%s' kunne ikke starte (%s) — sover videre", tostring(run.name), table.concat(reasons, ", "))
end
end
@@ -569,7 +661,7 @@ local function sleep(adEnv, run, byId, why, keepWagons)
sleepReason[run.id] = nil
reasonLogged[run.id] = nil
Logging.info(ADFlowSleep.LOG_PREFIX .. "'%s' sover — %s; %s%s",
tostring(run.name), why or string.format("intet at lave i %d min", math.floor(ADFlowSleep.SLEEP_AFTER_MS / 60000)),
tostring(run.name), why or string.format("intet at lave i %d min", math.floor(ADFlowSleep.sleepAfterMs(run) / 60000)),
keepWagons and "sættet bliver samlet og er ledigt til markflåden (gødning)" or "traktor og vogn er ledige til andet", falseWakes > 0
and string.format(" (vågnede uden tur %d gang(e) i træk — næste tjek om %d min)", falseWakes, math.floor(ADFlowSleep.wakeBackoffMs(falseWakes) / 60000)) or "")
end
@@ -710,7 +802,33 @@ local function cancelSleepIfPaused()
end
end
-- Flow med lånt traktor: startet uden traktor -> dvale (vågn-tjekket låner en, når der er en tur); stoppet/sovende
-- og traktoren færdig med vognen (sat på plads, ingen tømning/hjemtur fra flow-vognene) -> traktoren slippes.
local function tickBorrow(run, byId)
if run.borrowWagonId == nil then return end
local ids = run.vehicleIds or {}
local busy = false
for _, id in ipairs(ids) do
local vehicle = byId[id]
local status = vehicle ~= nil and ADFlowWagons ~= nil and ADFlowWagons.statusOf ~= nil and ADFlowWagons.statusOf(vehicle) or nil
if status ~= nil or carriesWagon(vehicle, run.borrowWagonId) then busy = true end
end
local action = ADFlowSleep.borrowAction({borrow = true, stopped = run.stopped, sleeping = run.sleeping, hasTractor = #ids > 0, tractorBusy = busy})
if action == "await" then
run.stopped, run.sleeping = true, true
lastCheck[run.id], idleSince[run.id] = nil, nil
Logging.info(ADFlowSleep.LOG_PREFIX .. "'%s' venter på en tur — en ledig traktor lånes, når der er en", tostring(run.name))
elseif action == "release" then
local names = {}
for _, id in ipairs(ids) do table.insert(names, byId[id] ~= nil and tostring(ADRuns.vehicleLabel(byId[id])) or tostring(id)) end
run.vehicleIds, run.wagons, run.spareWagons = {}, {}, {}
Logging.info(ADFlowSleep.LOG_PREFIX .. "'%s' slipper den lånte traktor '%s' — vognen står på sin plads, traktoren er ledig",
tostring(run.name), table.concat(names, ", "))
end
end
local function tickRun(adEnv, run, byId, now)
tickBorrow(run, byId)
if run.sleeping and run.stopped then
if not ADFlowSleep.isCheckDue(lastCheck[run.id], now, (wakeState[run.id] or {}).falseWakes) then return end
local hasParked = next(run.parkedLoaded or {}) ~= nil
@@ -777,7 +895,7 @@ local function tickRun(adEnv, run, byId, now)
end
local idle = ADFlowSleep.isIdle({stopped = run.stopped, vehicles = vehicles})
idleSince[run.id] = ADFlowSleep.track(idleSince[run.id], idle, now)
if ADFlowSleep.shouldSleep(idleSince[run.id], now) then
if ADFlowSleep.shouldSleep(idleSince[run.id], now, ADFlowSleep.sleepAfterMs(run)) then
sleep(adEnv, run, byId)
return
end
+13
View File
@@ -176,6 +176,13 @@ function ADRuns.wagonIdsOf(run)
for _, list in pairs((run or {}).spareWagons or {}) do
for _, id in ipairs(list) do table.insert(ids, id) end
end
-- lånevognen (flow uden fast traktor) er flowets, også mens ingen traktor er lånt
local borrowed = (run or {}).borrowWagonId
if borrowed ~= nil then
local listed = false
for _, id in ipairs(ids) do if id == borrowed then listed = true end end
if not listed then table.insert(ids, borrowed) end
end
return ids
end
@@ -211,6 +218,7 @@ local function copyRun(run)
chainIdle = run.chainIdle == true or nil, -- kæden oprettede flowet uden traktor (bemandes senere)
spareWagons = ADRuns.copySpares(run.spareWagons),
parkedLoaded = ADRuns.copyParked(run.parkedLoaded),
borrowWagonId = run.borrowWagonId, -- flow uden fast traktor: vognen en lånt traktor henter (ADFlowSleep)
}
end
@@ -329,6 +337,9 @@ function ADRuns.updateRun(store, runId, changes)
if changes.minSourcePercent ~= nil then run.minSourcePercent = clampRange(changes.minSourcePercent, ADRuns.DEFAULT_MIN_SOURCE_PERCENT, ADRuns.MIN_MIN_SOURCE_PERCENT, ADRuns.MAX_MIN_SOURCE_PERCENT) end
if changes.collectRound ~= nil then run.collectRound = changes.collectRound == true end
if changes.chain ~= nil then run.chain = tostring(changes.chain) end
-- false = flowet har igen faste traktorer
if changes.borrowWagonId == false then run.borrowWagonId = nil
elseif type(changes.borrowWagonId) == "string" and changes.borrowWagonId ~= "" then run.borrowWagonId = changes.borrowWagonId end
return new
end
@@ -602,6 +613,7 @@ function ADRuns.toRecords(store)
chainIdle = run.chainIdle and 1 or 0,
spareWagons = ADRuns.serializeSpares(run.spareWagons),
parkedLoaded = ADRuns.serializeParked(run.parkedLoaded),
borrowWagon = run.borrowWagonId or "",
}
end
return records
@@ -664,6 +676,7 @@ function ADRuns.fromRecords(records)
chainIdle = ADRuns.parseChainIdle(record),
spareWagons = ADRuns.parseSpares(record.spareWagons),
parkedLoaded = ADRuns.parseParked(record.parkedLoaded), -- nil i gemme fra før feltet -> tom
borrowWagonId = (record.borrowWagon ~= nil and record.borrowWagon ~= "") and record.borrowWagon or nil,
})
store.nextId = math.max(store.nextId, id + 1)
end
+8 -2
View File
@@ -1340,7 +1340,11 @@ function ADRunsController.queueStartAll(adEnv)
local vehiclesById = getFarmVehiclesById(adEnv)
local queue = {}
for _, run in ipairs(ADRunsController.store.runs) do
if #run.vehicleIds > 0 then
if run.borrowWagonId ~= nil then
-- lånt traktor: "tændt" = venter i dvale på en tur (ADFlowSleep låner en traktor). En traktor der stadig er på vej
-- hjem, hentes ikke tilbage uden en tur (review 19/10) — den slippes, og vågn-tjekket låner igen ved arbejde
if run.stopped and not run.sleeping then run.sleeping = true end
elseif #run.vehicleIds > 0 then
local action = ADRuns.startAllAction(ADRunsController.getRunStatus(adEnv, run).isRunning, run.stopped == true)
if action ~= "queue" then
summary.alreadyRunning = summary.alreadyRunning + 1
@@ -1586,7 +1590,9 @@ end
function ADRunsController.startAllRuns(adEnv)
local summary = {runsStarted = 0, alreadyRunning = 0, vehiclesStarted = 0, results = {}}
for _, run in ipairs(ADRunsController.store.runs) do
if #run.vehicleIds > 0 then
if run.borrowWagonId ~= nil then
if run.stopped and not run.sleeping then run.sleeping = true end
elseif #run.vehicleIds > 0 then
local action = ADRuns.startAllAction(ADRunsController.getRunStatus(adEnv, run).isRunning, run.stopped == true)
if action ~= "queue" then
summary.alreadyRunning = summary.alreadyRunning + 1
+3
View File
@@ -61,6 +61,8 @@ function ADRunsStorage.writeRecords(xmlFile, records)
xmlFile:setString(key .. "#spareWagons", record.spareWagons or "")
-- vogne parkeret med læs (ADFlowWagons, 19/10)
xmlFile:setString(key .. "#parkedLoaded", record.parkedLoaded or "")
-- lånt traktor: flowets vogn (19/10)
xmlFile:setString(key .. "#borrowWagon", record.borrowWagon or "")
for vehicleIndex, vehicleId in ipairs(record.vehicleIds) do
xmlFile:setString(string.format("%s.vehicle(%d)#id", key, vehicleIndex - 1), vehicleId)
end
@@ -100,6 +102,7 @@ function ADRunsStorage.readRecords(xmlFile)
chainIdle = xmlFile:getInt(key .. "#chainIdle"), -- nil i gemme fra før feltet
spareWagons = xmlFile:getString(key .. "#spareWagons"),
parkedLoaded = xmlFile:getString(key .. "#parkedLoaded"), -- nil i gemme fra før feltet
borrowWagon = xmlFile:getString(key .. "#borrowWagon"), -- nil i gemme fra før feltet
vehicleIds = {},
}
xmlFile:iterate(key .. ".vehicle", function(_, vehicleKey)
+28 -1
View File
@@ -15,6 +15,7 @@ ADUnloadKick.NEAR_END_WP = 2 -- AD-stoppet så mange vejpunkter før e
local watch = setmetatable({}, {__mode = "k"}) -- [vehicle] = {stillMs, startFill}
local kicks = setmetatable({}, {__mode = "k"}) -- [vehicle] = {times...}
local told = setmetatable({}, {__mode = "k"}) -- [vehicle] = true: spilleren har fået besked om, at skub ikke hjalp
local timerMs = 0
local nowMs = 0
@@ -34,6 +35,17 @@ function ADUnloadKick.shouldKick(s)
return (s.recentKicks or 0) < ADUnloadKick.MAX_KICKS
end
-- Ren: står vognen "ved målet"? s = {current, count, stopping, tipping}. Sidste punkt; AD stoppet selv tæt på enden;
-- eller AD stoppet selv for at tippe ved en trigger undervejs (in-game 19/10 10:10: 'Chicken Food' stod 15 min ved
-- vejpunkt 2 af 5 med tipper=true og 259.388 l hvede, der ikke faldt — før talte kun de sidste 2 punkter)
-- reached = AD's målNået (ruten er så ryddet: wp=0/nil — in-game 19/10 'Sheep Food' ved Sheep 1 Food blev aldrig skubbet)
function ADUnloadKick.isAtEnd(s)
if s.reached == true then return true end
if s.current == nil or (s.count or 0) <= 0 then return false end
if s.current >= s.count then return true end
return s.stopping == true and (s.current >= s.count - ADUnloadKick.NEAR_END_WP or s.tipping == true)
end
local function name(vehicle)
local ok, text = pcall(vehicle.getName, vehicle)
return ok and tostring(text) or "?"
@@ -69,7 +81,9 @@ local function stateOf(vehicle)
-- AD venter selv på AutoLoad-/balleaflæsning
alWait = task ~= nil and task.state ~= nil and task.state == 3,
unloading = task ~= nil and task.taskType == ADUnloadKick.UNLOAD_TASK,
atEnd = current ~= nil and count > 0 and (current >= count or (stopping and current >= count - ADUnloadKick.NEAR_END_WP)),
atEnd = ADUnloadKick.isAtEnd({current = current, count = count, stopping = stopping,
reached = dpm ~= nil and dpm.isTargetReached ~= nil and dpm:isTargetReached() == true,
tipping = ad.trailerModule ~= nil and ad.trailerModule.isUnloading == true}),
paused = dpm ~= nil and dpm.isPaused == true,
obstacle = cdm ~= nil and cdm.detectedObstable == true,
traffic = cdm ~= nil and cdm.trafficVehicle ~= nil,
@@ -148,11 +162,24 @@ function ADUnloadKick.tick(adEnv, dt)
w.stillMs = w.stillMs + elapsed
end
s.fill, s.filledToUnload = fillOf(AD, vehicle)
-- læsset falder: tæl forfra fra det nye niveau (review 19/10: et stop efter en delvis tømning blev aldrig skubbet)
if s.fill < w.startFill - 1 then w.startFill, w.stillMs = s.fill, 0 end
s.startFill, s.stillMs = w.startFill, w.stillMs
s.recentKicks = recentKicks(vehicle)
-- moddens egen flow-vogn: målet er valgt af moden, og den husker det efter genstarten
s.managed = ADRunsController ~= nil and ADRunsController.getActiveRunForVehicle ~= nil
and ADRunsController.getActiveRunForVehicle(vehicle) ~= nil
-- skub opbrugt og stadig intet: spilleren får besked én gang (review 19/10: ellers to genstarte hvert 10. min for evigt)
if s.recentKicks >= ADUnloadKick.MAX_KICKS and ADUnloadKick.shouldKick({unloading = true, atEnd = true, fill = s.fill,
filledToUnload = s.filledToUnload, managed = s.managed, startFill = s.startFill, stillMs = s.stillMs, recentKicks = 0})
and not told[vehicle] then
told[vehicle] = true
local text = string.format("'%s' står ved aflæsningen med %.0f l, der ikke kommer af — tjek målet/vognen", tostring(ADRuns ~= nil and ADRuns.vehicleLabel(vehicle) or name(vehicle)), s.fill)
Logging.info("ADSmartPickup: %s (AutoDrive genstartet %d gange uden virkning)", text, s.recentKicks)
if ADFieldJobs ~= nil and ADFieldJobs.notify ~= nil then pcall(ADFieldJobs.notify, text, true) end
elseif s.recentKicks < ADUnloadKick.MAX_KICKS then
told[vehicle] = nil
end
if ADUnloadKick.shouldKick(s) then
local ok, err = pcall(kick, AD, vehicle, s.filledToUnload == false)
table.insert(kicks[vehicle], nowMs)
@@ -444,15 +444,20 @@ function SmartPickupFrame:saveFlowGuide(guide, start)
local result = ADFlowGuide.result(guide)
local runId = result.runId
local oldIds = {}
local wasBorrow = false
if result.isNew then
runId = ADRunsController.createRun(result.name, result.kind).id
else
local existing = ADRuns.getRun(ADRunsController.store, runId)
if existing == nil then return end
oldIds = existing.vehicleIds
wasBorrow = existing.borrowWagonId ~= nil
end
ADRunsController.updateRun(runId, result.changes)
local added, removed = ADFlowGuide.vehicleChanges(oldIds, result.vehicleIds)
-- lånt traktor: en traktor flowet har lånt lige nu, kører turen færdig (slippes af ADFlowSleep) — rør den ikke
local keepBorrowed = result.borrow and wasBorrow
local added, removed = {}, {}
if not keepBorrowed then added, removed = ADFlowGuide.vehicleChanges(oldIds, result.vehicleIds) end
for _, id in ipairs(removed) do
local vehicle = adEnv ~= nil and ADRunsController.findVehicleById(adEnv, id) or nil
if vehicle ~= nil then
@@ -467,7 +472,8 @@ function SmartPickupFrame:saveFlowGuide(guide, start)
end
-- solo-traktorernes vogne fra guiden: flowet husker dem straks og henter dem ved Connect ved start
local savedRun = ADRuns.getRun(ADRunsController.store, runId)
if savedRun ~= nil then
if savedRun ~= nil and result.borrow then savedRun.chainIdle = nil end
if savedRun ~= nil and not keepBorrowed then
local wagons = ADRuns.copyWagons(savedRun.wagons)
for tractorId, wagonId in pairs(result.wagons or {}) do wagons[tractorId] = wagonId end
savedRun.wagons = wagons
@@ -477,7 +483,12 @@ function SmartPickupFrame:saveFlowGuide(guide, start)
ADRunsController.resolveMarkers(adEnv, ADRuns.getRun(ADRunsController.store, runId))
self.selectedRunId = runId
local saved = string.format(self.i18n:getText("spu_guide_flow_saved"), tostring(result.name))
if start and adEnv ~= nil and not ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, runId)).isRunning then
if start and adEnv ~= nil and result.borrow then
-- ingen traktor at starte: flowet venter i dvale og låner en, når der er en tur (ADFlowSleep)
local run = ADRuns.getRun(ADRunsController.store, runId)
if run ~= nil and run.stopped then run.sleeping = true end
self:showOverride(saved .. " — " .. self.i18n:getText("spu_guide_flow_borrowStarted"))
elseif start and adEnv ~= nil and not ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, runId)).isRunning then
local started, skipped, reasons = self:summarizeStartResults(ADRunsController.startRun(adEnv, runId))
self:showOverride(saved .. " — " .. string.format(self.i18n:getText("spu_status_started"), started, skipped), reasons)
else
+9
View File
@@ -29,6 +29,15 @@
<text name="spu_status_error" text="Fejl: %s"/>
<text name="spu_guide_flow_wagon" text=" ↳ Vogn"/>
<text name="spu_guide_flow_noFreeWagon" text=" ↳ ingen ledig vogn (frakoblet, med Connect-markør, kan bære varen)"/>
<text name="spu_guide_flow_borrow" text="Lån en ledig traktor"/>
<text name="spu_guide_flow_borrow_tooltip" text="Ja: ingen traktor er bundet til flowet — kun dets vogn. Når der er en tur, henter den bedst egnede ledige traktor vognen ved dens Connect-markør, kører turen, sætter vognen på plads og er så fri igen. Sparer traktorer til flows med lange pauser (honning, uld, vinter)."/>
<text name="spu_guide_flow_borrowWagon" text="Vogn"/>
<text name="spu_guide_flow_borrowWagon_tooltip" text="Vognen den lånte traktor henter. Frakoblet, med egen parkering og Connect-markør, kan bære varen."/>
<text name="spu_guide_flow_borrowWagonInUse" text="Flowets vogn (ude at køre)"/>
<text name="spu_guide_flow_borrowText" text=" ↳ En ledig traktor lånes til hver tur og slippes bagefter"/>
<text name="spu_guide_flow_sumBorrow" text="lånt traktor + %s"/>
<text name="spu_guide_flow_sumBorrowInUse" text="lånt traktor + flowets vogn"/>
<text name="spu_guide_flow_borrowStarted" text="venter på en tur og låner så en ledig traktor"/>
<text name="spu_guide_flow_spareWagon" text=" ↳ Ekstra vogn (skifter mellem ture)"/>
<text name="spu_guide_flow_noSpare" text="ingen"/>
<text name="spu_guide_flow_soloText" text="%s — ingen vogn bagpå: henter en ledig vogn"/>
+9
View File
@@ -29,6 +29,15 @@
<text name="spu_status_error" text="Error: %s"/>
<text name="spu_guide_flow_wagon" text=" ↳ Trailer"/>
<text name="spu_guide_flow_noFreeWagon" text=" ↳ no free trailer (detached, with a Connect marker, able to carry the goods)"/>
<text name="spu_guide_flow_borrow" text="Borrow a free tractor"/>
<text name="spu_guide_flow_borrow_tooltip" text="Yes: no tractor is tied to this flow — only its trailer. When there is a trip, the best-suited free tractor fetches the trailer at its Connect marker, drives the trip, parks the trailer and is released again. Saves tractors for flows with long gaps (honey, wool, winter)."/>
<text name="spu_guide_flow_borrowWagon" text="Trailer"/>
<text name="spu_guide_flow_borrowWagon_tooltip" text="The trailer the borrowed tractor fetches. Detached, with its own parking and a Connect marker, able to carry the goods."/>
<text name="spu_guide_flow_borrowWagonInUse" text="The flow's trailer (out on a trip)"/>
<text name="spu_guide_flow_borrowText" text=" ↳ A free tractor is borrowed for each trip and released afterwards"/>
<text name="spu_guide_flow_sumBorrow" text="borrowed tractor + %s"/>
<text name="spu_guide_flow_sumBorrowInUse" text="borrowed tractor + the flow's trailer"/>
<text name="spu_guide_flow_borrowStarted" text="waits for a trip, then borrows a free tractor"/>
<text name="spu_guide_flow_spareWagon" text=" ↳ Extra trailer (swaps between trips)"/>
<text name="spu_guide_flow_noSpare" text="none"/>
<text name="spu_guide_flow_soloText" text="%s — no trailer attached: fetches a free trailer"/>
+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.363.0</version>
<version>1.62.364.0</version>
<title>
<en>AD Smart Pickup</en>
</title>