fix: vagt holder variabel bredde under arbejdet (v1.62.52)

This commit is contained in:
2026-10-06 20:38:03 +02:00
parent 04d9820b17
commit ffdc21bb2f
4 changed files with 33 additions and 1 deletions
+24
View File
@@ -501,6 +501,30 @@ function ADCpBridge.setVariableWidth(vehicle, target)
return changed
end
-- Vagt under arbejdet: maskinen må ikke springe tilbage til fuld bredde (in-game 6/10: Case 635-høsteren blev stillet
-- til 50 m ved start, men arbejdede bagefter i 120 m på et 50 m-kursus). -> skal bredden stilles igen?
ADCpBridge.WIDTH_GUARD_TOLERANCE = 5
function ADCpBridge.needsWidthReset(current, target)
return type(current) == "number" and current > (target or ADCpBridge.VARIABLE_TARGET_WIDTH) + ADCpBridge.WIDTH_GUARD_TOLERANCE
end
function ADCpBridge.guardVariableWidth(vehicle)
for _, object in ipairs(collect(vehicle)) do
local spec = object.spec_variableWorkWidth
if spec ~= nil and type(spec.sections) == "table" and #spec.sections > 0 and object.setSectionsActive ~= nil
and object.getVariableWorkWidth ~= nil then
local current = currentVariableWidth(object)
if ADCpBridge.needsWidthReset(current, ADCpBridge.VARIABLE_TARGET_WIDTH) then
Logging.warning("ADSmartPickup: bredde: '%s' er sprunget tilbage til %.1f m under arbejdet — stilles igen",
tostring(object.getName ~= nil and object:getName() or "?"), current)
ADCpBridge.setVariableWidth(vehicle)
return true
end
end
end
return false
end
-- Vinhøster uden AI-markører: bredden er vinrækken (3 m = Courseplays vin-gitter for druer).
ADCpBridge.VINE_ROW_WIDTH = 3
function ADCpBridge.widthOrVine(width, hasVineCutter)
+7
View File
@@ -788,6 +788,7 @@ function ADFieldWork.nearestStationMarker(markers, points, maxDistance)
end
ADFieldWork.STATION_MARKER_M = 30
ADFieldWork.WIDTH_GUARD_MS = 10000 -- så tit tjekkes at variabel bredde ikke er sprunget tilbage
-- Stationens læssetriggere i verden (buying-/loading-station) -> {{x, z}}.
local function loadTriggerPoints(station)
@@ -1645,6 +1646,12 @@ function ADFieldWork.follow(adEnv, assignment)
fail(assignment.fieldId, generating and "Courseplay blev ikke færdig med kurset (5 min)" or "Courseplay svarede ikke (60 s)")
end
elseif assignment.phase == "working" then
local t = now()
if t - (assignment.widthCheckAt or 0) >= ADFieldWork.WIDTH_GUARD_MS then
assignment.widthCheckAt = t
local okGuard, errGuard = pcall(ADCpBridge.guardVariableWidth, vehicle)
if not okGuard then Logging.warning("ADSmartPickup: bredde-vagt: %s", tostring(errGuard)) end
end
followWorking(adEnv, field, assignment)
elseif assignment.phase == "awaitingPlayer" then
followManual(adEnv, field, info, assignment)
+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.51.0</version>
<version>1.62.52.0</version>
<title>
<en>AD Smart Pickup</en>
</title>