fix: stationsmarkør vælges efter AD-vej gennem triggeren (v1.62.48)

This commit is contained in:
2026-10-06 17:03:29 +02:00
parent 6b8477e1a3
commit b63083aca3
3 changed files with 72 additions and 10 deletions
+70 -9
View File
@@ -750,15 +750,37 @@ local function isServiceMarker(marker)
or string.find(name, "%f[%a]wait%f[%A]") ~= nil or string.find(group, "%f[%a]wait%f[%A]") ~= nil
end
-- markers = {{id, name, group, x, z}}, points = triggerpositioner {{x, z}} -> id på nærmeste læssemarkør inden for
-- maxDistance m af en af triggerne, ellers nil.
ADFieldWork.THROUGH_TRIGGER_M = 3 -- AD-vejen før markøren kører gennem triggeren, hvis et punkt er så tæt på
-- Kører AD-vejen ind til markøren gennem en af triggerne? marker.approach = {{x, z}} (punkter bagud fra markøren).
local function drivesThrough(marker, points)
local limit = ADFieldWork.THROUGH_TRIGGER_M ^ 2
for _, p in ipairs(marker.approach or {}) do
for _, point in ipairs(points) do
if (p.x - point.x) ^ 2 + (p.z - point.z) ^ 2 <= limit then return true end
end
end
return false
end
-- markers = {{id, name, group, x, z, approach?}}, points = triggerpositioner {{x, z}} -> id på læssemarkøren inden
-- for maxDistance m af en af triggerne, ellers nil. En markør hvis AD-vej kører GENNEM triggeren foretrækkes for den
-- blot nærmeste (in-game 6/10: sprøjten til den blå væsketank holdt ved "Palleskur 2 load" på nabosporet, 0,5 m
-- tættere end "Buy All" lige efter tankene).
function ADFieldWork.nearestStationMarker(markers, points, maxDistance)
local best, bestDistance = nil, maxDistance * maxDistance
points = points or {}
local best, bestDistance, bestThrough = nil, maxDistance * maxDistance, false
for _, marker in ipairs(markers or {}) do
if not isServiceMarker(marker) then
for _, point in ipairs(points or {}) do
local d = (marker.x - point.x) ^ 2 + (marker.z - point.z) ^ 2
if d < bestDistance then best, bestDistance = marker.id, d end
local nearest = math.huge
for _, point in ipairs(points) do
nearest = math.min(nearest, (marker.x - point.x) ^ 2 + (marker.z - point.z) ^ 2)
end
if nearest <= maxDistance * maxDistance then
local through = drivesThrough(marker, points)
if (through and not bestThrough) or (through == bestThrough and nearest < bestDistance) then
best, bestDistance, bestThrough = marker.id, nearest, through
end
end
end
end
@@ -780,12 +802,50 @@ local function loadTriggerPoints(station)
return points
end
local function markerList(adEnv)
ADFieldWork.APPROACH_M = 40 -- så langt bagud ad AD-vejen ledes der efter triggeren
-- Punkterne AD kører igennem ind til markøren (bagud ad incoming, op til APPROACH_M).
local function approachPoints(adEnv, startId)
local points, seen, queue = {}, {[startId] = true}, {{id = startId, d = 0}}
local head = 1
while head <= #queue and #points < 600 do
local item = queue[head]
head = head + 1
local wayPoint = adEnv.ADGraphManager:getWayPointById(item.id)
if wayPoint ~= nil then
table.insert(points, {x = wayPoint.x, z = wayPoint.z})
for _, prevId in ipairs(wayPoint.incoming or {}) do
local prev = not seen[prevId] and adEnv.ADGraphManager:getWayPointById(prevId) or nil
if prev ~= nil then
seen[prevId] = true
local step = math.sqrt((prev.x - wayPoint.x) ^ 2 + (prev.z - wayPoint.z) ^ 2)
-- et punkt pr. meter mellem knuderne (AD-knuder ligger flere meter fra hinanden)
for t = 1, math.floor(step) do
local f = t / step
table.insert(points, {x = wayPoint.x + (prev.x - wayPoint.x) * f, z = wayPoint.z + (prev.z - wayPoint.z) * f})
end
if item.d + step <= ADFieldWork.APPROACH_M then table.insert(queue, {id = prevId, d = item.d + step}) end
end
end
end
end
return points
end
-- points: kun markører inden for nearM af et af punkterne får deres AD-vej med (approach)
local function markerList(adEnv, points, nearM)
local list = {}
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
local wayPoint = adEnv.ADGraphManager:getWayPointById(marker.id)
if wayPoint ~= nil then
table.insert(list, {id = marker.id, name = marker.name, group = marker.group, x = wayPoint.x, z = wayPoint.z})
local entry = {id = marker.id, name = marker.name, group = marker.group, x = wayPoint.x, z = wayPoint.z}
for _, point in ipairs(points or {}) do
if (wayPoint.x - point.x) ^ 2 + (wayPoint.z - point.z) ^ 2 <= (nearM or 0) ^ 2 then
entry.approach = approachPoints(adEnv, marker.id)
break
end
end
table.insert(list, entry)
end
end
return list
@@ -798,7 +858,8 @@ end
-- finder den ingen, OPRETTER den en ny markør med stationens navn (2 ekstra "Buying Station Multifruit", in-game 30/9).
local function markerAtStation(adEnv, vehicle, station, placeable)
local okOwn, ownId = pcall(function()
return ADFieldWork.nearestStationMarker(markerList(adEnv), loadTriggerPoints(station), ADFieldWork.STATION_MARKER_M)
local points = loadTriggerPoints(station)
return ADFieldWork.nearestStationMarker(markerList(adEnv, points, ADFieldWork.STATION_MARKER_M), points, ADFieldWork.STATION_MARKER_M)
end)
if okOwn and ownId ~= nil then return ownId end
local node = placeable ~= nil and placeable.rootNode or nil
+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.47.0</version>
<version>1.62.48.0</version>
<title>
<en>AD Smart Pickup</en>
</title>