fix: fuldt mål springer det fulde mål over ved tømning (1.62.371)

This commit is contained in:
2026-10-19 11:49:46 +02:00
parent d9ac0216ed
commit 686e52ed96
4 changed files with 15 additions and 9 deletions
+7 -2
View File
@@ -950,7 +950,8 @@ end
-- Én traktor hjem (fra et stoppet/slettet flow): tøm først, så parkering.
-- reason: "stop" (et kørende flow stoppes: vognen huskes) | "afterLoad" (oprydning: intet huskes)
function ADFlowWagons.homeVehicle(adEnv, vehicle, runName, reason)
-- avoidMarkerId: et mål der ikke må bruges som tømmested (det fulde mål vognen lige holdt ved — ADStrayUnload)
function ADFlowWagons.homeVehicle(adEnv, vehicle, runName, reason, avoidMarkerId)
waiting[vehicle] = nil
if ADFlowWagons.shouldRememberOnHome(reason or "stop") then
rememberWagonOf(vehicle) -- vognen sættes af nu: flowet skal kunne finde den igen ved næste start
@@ -970,6 +971,9 @@ function ADFlowWagons.homeVehicle(adEnv, vehicle, runName, reason)
local second = module ~= nil and module.getSecondMarker ~= nil and module:getSecondMarker() or nil
local run = ADRunsController.getRunForVehicle(vehicle)
local targetId = ADFlowWagons.emptyTarget(second ~= nil and second.id or nil, run ~= nil and run.targetWayPointIds or nil)
-- holdt ved et fuldt mål (ADStrayUnload): ikke tilbage til samme mål — direkte til et lager (in-game 19/10 11:46:
-- '1050 Vario 3' og 'Series 8 TTV 5' blev sendt til Fish Food/Oil Mill igen og stod 45 s, før de gik videre)
if reason == "strayFull" then targetId = nil end
local target = targetId ~= nil and adEnv.ADGraphManager:getMapMarkerByWayPointId(targetId) or nil
local cargo, fillType = cargoOf(adEnv, vehicle)
local action = ADFlowWagons.emptyStep("start", {cargo = cargo, hasTarget = target ~= nil})
@@ -978,7 +982,8 @@ function ADFlowWagons.homeVehicle(adEnv, vehicle, runName, reason)
-- sjældent i ét lager — review 19/10: 595.538 l soja kørte ellers bare hjem med læsset)
local state = {stage = action, since = nowMs, runName = runName,
markerId = target ~= nil and target.id or nil, markerName = target ~= nil and target.name or nil,
partial = reason == "strayFull" or reason == "playerClaim"}
partial = reason == "strayFull" or reason == "playerClaim",
triedMarkers = avoidMarkerId ~= nil and {[avoidMarkerId] = true} or nil}
emptying[vehicle] = state
if action == "target" then
ADFieldWork.startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DELIVERTO, target.id, nil, fillType)
+6 -6
View File
@@ -82,17 +82,17 @@ local function stuckAtFullTarget(adEnv, vehicle)
-- plansilo, station uden lager — er aldrig "fuldt"; review 19/10)
local free, capacity = ADSmartPickup.getTargetFreeCapacity(adEnv, vehicle, fillType, false, target.id)
if not ADStrayUnload.isFull(free, capacity) then return false end
return true, tostring(target.name), rest, fillType
return true, tostring(target.name), rest, fillType, target.id
end
local function act(adEnv, vehicle, targetName, rest, fillType, minutes)
local function act(adEnv, vehicle, targetName, rest, fillType, minutes, targetId)
pcall(function() vehicle:stopAutoDrive() end)
local fillName = g_fillTypeManager ~= nil and tostring(g_fillTypeManager:getFillTypeNameByIndex(fillType)) or tostring(fillType)
local text = string.format("'%s' holdt %d min ved fuldt mål '%s' med %.0f l %s — tømmes på et lager med plads (ellers sælges varen; kan intet tage den, køres den hjem med læsset)",
label(vehicle), minutes, targetName, rest, fillName)
Logging.info(ADStrayUnload.LOG_PREFIX .. "%s", text)
if ADFieldJobs ~= nil and ADFieldJobs.notify ~= nil then pcall(ADFieldJobs.notify, text, false) end
ADFlowWagons.homeVehicle(adEnv, vehicle, nil, "strayFull")
ADFlowWagons.homeVehicle(adEnv, vehicle, nil, "strayFull", targetId)
end
function ADStrayUnload.tick(adEnv, dt)
@@ -105,8 +105,8 @@ function ADStrayUnload.tick(adEnv, dt)
local farmId = g_currentMission ~= nil and g_currentMission.getFarmId ~= nil and g_currentMission:getFarmId() or nil
for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles or {}) do
local mine = farmId == nil or (vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() == farmId)
local ok, stuck, targetName, rest, fillType = false, false, nil, nil, nil
if mine and vehicle.ad ~= nil then ok, stuck, targetName, rest, fillType = pcall(stuckAtFullTarget, adEnv, vehicle) end
local ok, stuck, targetName, rest, fillType, targetId = false, false, nil, nil, nil, nil
if mine and vehicle.ad ~= nil then ok, stuck, targetName, rest, fillType, targetId = pcall(stuckAtFullTarget, adEnv, vehicle) end
stuck = ok and stuck == true
-- et kort hul (AD's tippe-flag blinker mellem tip) nulstiller ikke tiden — først efter GRACE_MS (review 19/10)
gap[vehicle] = (not stuck and held[vehicle] ~= nil) and (gap[vehicle] or 0) + elapsed or nil
@@ -121,7 +121,7 @@ function ADStrayUnload.tick(adEnv, dt)
local action = stuck and ADStrayUnload.step({stuck = true, heldMs = held[vehicle], limitMs = (tonumber(minutes) or 0) * 60000}) or "wait"
if action == "act" then
held[vehicle], restMark[vehicle], gap[vehicle] = nil, nil, nil
local okAct, err = pcall(act, adEnv, vehicle, targetName, rest, fillType, minutes)
local okAct, err = pcall(act, adEnv, vehicle, targetName, rest, fillType, minutes, targetId)
if not okAct then Logging.warning(ADStrayUnload.LOG_PREFIX .. "'%s': %s", label(vehicle), tostring(err)) end
end
end
+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.370.0</version>
<version>1.62.371.0</version>
<title>
<en>AD Smart Pickup</en>
</title>