fix(påfyldning): markøren ved triggeren skal høre til stationen (frø/kalk ved Solid Buy) (v1.62.250)

This commit is contained in:
2026-10-16 04:46:52 +02:00
parent b2391042a6
commit ea55da86a5
3 changed files with 41 additions and 21 deletions
+39 -20
View File
@@ -1109,36 +1109,55 @@ ADFieldWork.isServiceMarker = isServiceMarker
-- ADTriggerManager:getMarkerAtStation bruges IKKE: den vil have markøren togets længde + 3..13 m forbi triggeren (et
-- langt sæt fik en anden stations markør: Puma + Kinze 4900 ventede på frø ved "Market Price Liquid Fill Station"), og
-- finder den ingen, OPRETTER den en ny markør med stationens navn (2 ekstra "Buying Station Multifruit", in-game 30/9).
-- Hører markøren til DENNE station? (markør->station-opslaget er det AD-turen faktisk ender ved)
local function markerBelongsTo(adEnv, farmId, markerId, station, placeable)
if ADSmartPickup == nil or ADSmartPickup.getLoadStationAtWayPointId == nil then return false end
local atMarker = ADSmartPickup.getLoadStationAtWayPointId(adEnv, markerId, farmId)
return atMarker ~= nil and (atMarker == station or (placeable ~= nil and atMarker.owningPlaceable == placeable))
end
local function markerAtStation(adEnv, vehicle, station, placeable)
local farmId = vehicle ~= nil and ADSmartPickup ~= nil and ADSmartPickup.getFarmId ~= nil and ADSmartPickup.getFarmId(vehicle) or nil
-- 1) markør ved stationens egne triggere, der hører til stationen. Uden filteret vandt en markør, hvis vej kører
-- GENNEM triggeren videre til nabostationen (in-game 16/10: frø fra "Bulk Fill Station" ved "Liquid Buy Silo")
local points = nil
local okOwn, ownId = pcall(function()
local points = loadTriggerPoints(station)
return ADFieldWork.nearestStationMarker(markerList(adEnv, points, ADFieldWork.STATION_MARKER_M), points, ADFieldWork.STATION_MARKER_M)
points = loadTriggerPoints(station)
local list = {}
for _, entry in ipairs(markerList(adEnv, points, ADFieldWork.STATION_MARKER_M)) do
if not isServiceMarker(entry) and markerBelongsTo(adEnv, farmId, entry.id, station, placeable) then table.insert(list, entry) end
end
return ADFieldWork.nearestStationMarker(list, points, ADFieldWork.STATION_MARKER_M)
end)
if okOwn and ownId ~= nil then return ownId end
local node = placeable ~= nil and placeable.rootNode or nil
if node == nil then return nil end
local px, _, pz = getWorldTranslation(node)
-- først: nærmeste markør som markør->station-opslaget selv kobler til DENNE station (in-game 16/10: frø og kalk fra
-- "Market Price Bulk Fill Station" blev hentet ved "Liquid Buy Silo" 39 m væk — planteren stod der uden at fylde)
local px, pz
if node ~= nil then
local x, _, z = getWorldTranslation(node); px, pz = x, z
end
-- 2) samme filter i større radius (STATION_MATCH_M) om triggerne, rangeret som trin 1 (gennemkørsel, afstand til
-- triggeren); uden kendte triggere: afstand til bygningen
local okMatch, matchId = pcall(function()
local farmId = vehicle ~= nil and ADSmartPickup.getFarmId(vehicle) or nil
local found, foundDistance = nil, ADFieldWork.STATION_MATCH_M * ADFieldWork.STATION_MATCH_M
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
-- P-/Connect-/Wait-markører er aldrig påfyldning
local wayPoint = not isServiceMarker(marker) and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
if wayPoint ~= nil then
local d = (wayPoint.x - px) ^ 2 + (wayPoint.z - pz) ^ 2
if d < foundDistance then
local atMarker = ADSmartPickup.getLoadStationAtWayPointId(adEnv, marker.id, farmId)
local same = atMarker ~= nil and (atMarker == station
or (placeable ~= nil and atMarker.owningPlaceable == placeable))
if same then found, foundDistance = marker.id, d end
end
local around = (points ~= nil and #points > 0) and points or (px ~= nil and {{x = px, z = pz}} or nil)
if around == nil then return nil end
local list = {}
for _, entry in ipairs(markerList(adEnv, around, ADFieldWork.STATION_MATCH_M)) do
local near = false
for _, point in ipairs(around) do
if (entry.x - point.x) ^ 2 + (entry.z - point.z) ^ 2 <= ADFieldWork.STATION_MATCH_M ^ 2 then near = true break end
end
if near and not isServiceMarker(entry) and markerBelongsTo(adEnv, farmId, entry.id, station, placeable) then table.insert(list, entry) end
end
return found
return ADFieldWork.nearestStationMarker(list, around, ADFieldWork.STATION_MATCH_M)
end)
if okMatch and matchId ~= nil then return matchId 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)
end)
if okAny and anyId ~= nil then return anyId end
if px == nil then return nil end
local best, bestDistance = nil, 40 * 40
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
local isWait = ADSupplyPlanner ~= nil and ADSupplyPlanner.isWaitMarker ~= nil and ADSupplyPlanner.isWaitMarker(marker)
+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.249.0</version>
<version>1.62.250.0</version>
<title>
<en>AD Smart Pickup</en>
</title>