fix: puljen tager ikke redskab som en AD-traktor allerede henter (v1.62.128)

This commit is contained in:
2026-10-09 21:54:39 +02:00
parent d6c89893d7
commit 1e8d23adc7
3 changed files with 21 additions and 2 deletions
+19 -1
View File
@@ -474,6 +474,23 @@ function ADPool.isFreeFromFlows(vehicle)
return ADRunsController.getRunForVehicle(vehicle) == nil
end
-- Connect-markører som en aktiv AD-traktor kører hen mod ("Kør til"): redskabet der er på vej til at blive hentet.
-- In-game 9/10: gemt midt i en hentetur — AD fortsatte turen efter indlæsning, men puljen havde glemt reservationen
-- og sendte en anden traktor efter samme Supercis ("noAttachable").
local function connectTargets(adEnv)
local targets = {}
pcall(function()
for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
if module ~= nil and module:isActive() and module:getMode() == adEnv.AutoDrive.MODE_DRIVETO then
local marker = module:getFirstMarker()
if marker ~= nil and marker.id ~= nil then targets[marker.id] = true end
end
end
end)
return targets
end
local function isAttached(vehicle)
return vehicle.getAttacherVehicle ~= nil and vehicle:getAttacherVehicle() ~= nil
end
@@ -509,6 +526,7 @@ function ADPool.collect(adEnv, isBusy)
local markers = adEnv.ADGraphManager:getMapMarkers()
local farmId = g_currentMission:getFarmId()
local implements, tractors = {}, {}
local targeted = connectTargets(adEnv)
-- spillets egen liste: frakoblede redskaber er ikke nødvendigvis i AutoDrive's køretøjsliste
for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles) do
local owned = vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() == farmId
@@ -518,7 +536,7 @@ function ADPool.collect(adEnv, isBusy)
local specs = connect ~= nil and ADCpBridge.getSpecs(vehicle) or nil
local role = specs ~= nil and ADPool.roleOf(specs) or nil
local held = role ~= nil and ADFlowWagons ~= nil and ADFlowWagons.isHeldWagon(ADRunsController.getVehicleId(vehicle))
if role ~= nil and not held then
if role ~= nil and not held and not targeted[connect.id] then
local x, z = positionOf(vehicle)
local carries, capacity = ADPool.cargoOf(vehicle)
table.insert(implements, {carries = carries, capacity = capacity,
+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.127.0</version>
<version>1.62.128.0</version>
<title>
<en>AD Smart Pickup</en>
</title>