fix: ledige flow-traktorer startes, Wait prøver andre mål, staldkobling uden servicemarkører (1.62.235)

This commit is contained in:
2026-10-15 19:00:40 +02:00
parent 6c4969f779
commit b80c33ea93
5 changed files with 119 additions and 15 deletions
+18 -4
View File
@@ -197,6 +197,20 @@ function ADBuildings.compare(a, b)
return ADBuildings.naturalLess(ma, mb)
end
-- Servicemarkører (tank/værksted) hører aldrig til en bygning, selv når de står nærmest: Kostald 2 fik "Refuel Point"
-- 27 m frem for "Cattle Barn 2 Feed" 31 m (in-game 15/10). Ikke "fuel"/"diesel" — de matcher "Biodiesel"-fabrikker.
local SERVICE_WORDS = {"refuel", "repair", "værksted", "tankstation", "gas station"}
function ADBuildings.isServiceMarker(name)
local lower = tostring(name or ""):lower()
for _, word in ipairs(SERVICE_WORDS) do if lower:find(word, 1, true) then return true end end
return false
end
-- Kan markøren høre til en bygning? Hverken Wait-punkt eller servicemarkør.
function ADBuildings.isCandidateMarker(marker)
return not ADSupplyPlanner.isWaitMarker(marker) and not ADBuildings.isServiceMarker(marker.name)
end
-- Nærmeste ikke-Wait-markør til en af noderne, ≤ MAX_MARKER_DISTANCE.
local function nearestMarker(adEnv, nodes)
local best, bestDistance = nil, ADBuildings.MAX_MARKER_DISTANCE
@@ -209,7 +223,7 @@ local function nearestMarker(adEnv, nodes)
if x ~= nil then table.insert(positions, {x = x, z = z}) end
end
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
if not ADSupplyPlanner.isWaitMarker(marker) then
if ADBuildings.isCandidateMarker(marker) then
local wayPoint = adEnv.ADGraphManager:getWayPointById(marker.id)
if wayPoint ~= nil then
for _, position in ipairs(positions) do
@@ -239,7 +253,7 @@ local function markerCandidates(adEnv, nodes)
if x ~= nil then table.insert(positions, {x = x, z = z}) end
end
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
local wayPoint = not ADSupplyPlanner.isWaitMarker(marker) and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
local wayPoint = ADBuildings.isCandidateMarker(marker) and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
if wayPoint ~= nil then
local nearest = nil
for _, position in ipairs(positions) do
@@ -310,7 +324,7 @@ local function closestMarkers(adEnv, nodes, count)
if x ~= nil then table.insert(positions, {x = x, z = z}) end
end
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
local wayPoint = not ADSupplyPlanner.isWaitMarker(marker) and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
local wayPoint = ADBuildings.isCandidateMarker(marker) and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
if wayPoint ~= nil then
local nearest = nil
for _, position in ipairs(positions) do
@@ -351,7 +365,7 @@ local function unloadMarkerFor(adEnv, nodes, loadMarkers, allowSkipLoad)
end
local best, bestOther, nearbyAll = nil, nil, {}
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
if not ADSupplyPlanner.isWaitMarker(marker) then
if ADBuildings.isCandidateMarker(marker) then
local wayPoint = adEnv.ADGraphManager:getWayPointById(marker.id)
if wayPoint ~= nil then
for _, position in ipairs(positions) do