fix(høst): høstere får CP "Stop for unloading" slået til — tømmevognen kørte i ring (v1.62.262)

This commit is contained in:
2026-10-16 13:47:58 +02:00
parent 3581021b71
commit 77c21696a7
4 changed files with 30 additions and 1 deletions
+14
View File
@@ -1147,6 +1147,20 @@ local function applyUnloaderOffset(vehicle)
end)
end
-- Høsteren skal stoppe ved fuld tank, ellers kan CP's tømmevogn ikke tømme den: med "Stop for unloading" fra
-- regner tømmevognen en fuld, holdende høster for kørende (willWaitForUnloadToFinish) og kører i ring
-- (in-game 16/10 F38: CR11 "Needs to be unloaded", EDK 650 cirklede med "not in a good position to unload").
-- Returnerer true når indstillingen blev slået til nu.
function ADCpBridge.ensureStopForUnload(harvester)
if harvester == nil or harvester.getCpSettings == nil then return false end
local ok, changed = pcall(function()
local setting = harvester:getCpSettings().stopForUnload
if setting == nil or setting:getValue() == true then return false end
return setting:setValue(true) ~= true -- setValue returnerer "failed"
end)
return ok and changed == true
end
-- Aflæsningsvogn under høst: Courseplays combine-unloader (bevist i AI-Bonden). Vognen venter ved
-- (waitX, waitZ) — markens F-markør — følger høsteren på marken og kører fuld til station. station =
-- den station Smart Pickups silovalg fandt; findes den ikke i Courseplays liste, bruges nærmeste.
+14
View File
@@ -244,6 +244,16 @@ local function parkMarkerId(adEnv, vehicle)
end
ADFieldWork.parkMarkerId = parkMarkerId
-- Høster på marken skal stoppe ved fuld tank, så CP's tømmevogn kan tømme den (ADCpBridge.ensureStopForUnload).
-- Spillerens egne (manuelle) høstere røres ikke. Indstillingen bliver stående (brugerønske 16/10).
local function ensureHarvesterStops(assignment)
if assignment.role ~= "harvester" or assignment.manual then return end
if ADCpBridge.ensureStopForUnload(assignment.vehicle) then
log(assignment.fieldId, "'%s': Courseplay \"Stop for unloading\" slået til (ellers kører tømmevognen i ring)",
ADRuns.vehicleLabel(assignment.vehicle))
end
end
local function restLoad(adEnv, vehicle)
local ok, level = pcall(function()
return (adEnv.AutoDrive.getAllFillLevels(adEnv.AutoDrive.getAllUnits(vehicle)))
@@ -1547,6 +1557,9 @@ local function beginUnloader(adEnv, field, info, assignment)
local waitX, waitZ = markerPoint ~= nil and markerPoint.x or point.x, markerPoint ~= nil and markerPoint.z or point.z
local wait = ADFieldJobs.waitSpot(info.verts, waitX, waitZ, info.x, info.z, ADFieldWork.UNLOADER_WAIT_INSET_M, ADFieldWork.UNLOADER_WAIT_SIDE_M)
if wait ~= nil then waitX, waitZ = wait.x, wait.z end
for _, other in pairs(ADFieldJobs.state.assignments) do
if other.fieldId == field.id then ensureHarvesterStops(other) end
end
local handle, err = ADCpBridge.startUnloader(vehicle, point.x, point.z, waitX, waitZ, station, function(ok, reason)
if ok then
assignment.phase = "working"
@@ -1766,6 +1779,7 @@ local function beginWork(adEnv, field, info, assignment)
elseif assignment.role == "harvester" then
note(field.id, {harvestVehicleId = assignment.vehicleId})
rememberCourse(field, "harvester", vehicle)
ensureHarvesterStops(assignment)
end
if assignment.leader and (assignment.groupSize or 1) > 1 then
rememberCourse(field, field.stage, vehicle)
+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.261.0</version>
<version>1.62.262.0</version>
<title>
<en>AD Smart Pickup</en>
</title>