fix(påfyldning): lager uden egen markør låner ikke nabostationens (v1.62.256)

This commit is contained in:
2026-10-16 06:10:04 +02:00
parent d4d34ae670
commit 78e45ca2c3
3 changed files with 30 additions and 10 deletions
+28 -9
View File
@@ -1225,19 +1225,34 @@ local function stationPoints()
return stationPointsCache.list
end
local function markerBelongsTo(adEnv, farmId, markerId, station, placeable)
-- Stationen hvis påfyldningstrigger ligger nærmest markøren (inden for STATION_MATCH_M), eller nil.
local function markerOwner(adEnv, markerId)
local wayPoint = adEnv.ADGraphManager:getWayPointById(markerId)
if wayPoint == nil then return false end
if wayPoint == nil then return nil end
local best, bestDistance = nil, math.huge
for _, entry in ipairs(stationPoints()) do
local candidate = entry.station
for _, point in ipairs(entry.points) do
local d = (point.x - wayPoint.x) ^ 2 + (point.z - wayPoint.z) ^ 2
if d < bestDistance then best, bestDistance = candidate, d end
if d < bestDistance then best, bestDistance = entry.station, d end
end
end
if best == nil or bestDistance > ADFieldWork.STATION_MATCH_M * ADFieldWork.STATION_MATCH_M then return false end
return best == station or (placeable ~= nil and best.owningPlaceable == placeable)
if best == nil or bestDistance > ADFieldWork.STATION_MATCH_M * ADFieldWork.STATION_MATCH_M then return nil end
return best
end
local function sameStation(a, station, placeable)
return a ~= nil and (a == station or (placeable ~= nil and a.owningPlaceable == placeable))
end
local function markerBelongsTo(adEnv, farmId, markerId, station, placeable)
return sameStation(markerOwner(adEnv, markerId), station, placeable)
end
-- Hører markøren til en ANDEN station? (trin 3/4 må ikke låne nabostationens markør — in-game 16/10: gårdens lager
-- "Farma 500 + Obi 1000" fik "Liquid Buy Silo", og sprederne holdt dér uden at blive fyldt)
local function markerOfOther(adEnv, markerId, station, placeable)
local owner = markerOwner(adEnv, markerId)
return owner ~= nil and not sameStation(owner, station, placeable)
end
local function markerAtStationRaw(adEnv, vehicle, station, placeable)
@@ -1277,8 +1292,12 @@ local function markerAtStationRaw(adEnv, vehicle, station, placeable)
if okMatch and matchId ~= nil then return matchId, 2 end
-- 3) som før: markør ved triggerne (også gennemkørsel), ellers nærmeste ikke-Wait markør inden for 40 m af bygningen
local okAny, anyId = pcall(function()
return ADFieldWork.nearestStationMarker(markerList(adEnv, points or loadTriggerPoints(station), ADFieldWork.STATION_MARKER_M),
points or loadTriggerPoints(station), ADFieldWork.STATION_MARKER_M)
local pts = points or loadTriggerPoints(station)
local list = {}
for _, entry in ipairs(markerList(adEnv, pts, ADFieldWork.STATION_MARKER_M)) do
if not markerOfOther(adEnv, entry.id, station, placeable) then table.insert(list, entry) end
end
return ADFieldWork.nearestStationMarker(list, pts, ADFieldWork.STATION_MARKER_M)
end)
if okAny and anyId ~= nil then return anyId, 3 end
if px == nil then return nil end
@@ -1288,7 +1307,7 @@ local function markerAtStationRaw(adEnv, vehicle, station, placeable)
local wayPoint = not isWait and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
if wayPoint ~= nil then
local d = (wayPoint.x - px) ^ 2 + (wayPoint.z - pz) ^ 2
if d < bestDistance then best, bestDistance = marker.id, d end
if d < bestDistance and not markerOfOther(adEnv, marker.id, station, placeable) then best, bestDistance = marker.id, d end
end
end
return best, 4