From 2b363037562fcb5d54d463dc4049441096625f5d Mon Sep 17 00:00:00 2001 From: masterdraco Date: Tue, 6 Oct 2026 19:40:31 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20salgsmark=C3=B8r=20skal=20k=C3=B8re=20ge?= =?UTF-8?q?nnem=20stationens=20trigger=20(v1.62.50)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + FS25_ADSmartPickup/adFieldWork.lua | 8 ++++---- FS25_ADSmartPickup/adSmartPickup.lua | 16 ++++++++++++++++ FS25_ADSmartPickup/adSources.lua | 25 ++++++++++++++++++++++--- FS25_ADSmartPickup/modDesc.xml | 2 +- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0a25a8..b35f226 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ står i [docs/BRUGERMANUAL.md](docs/BRUGERMANUAL.md) (dansk) og [docs/USER_MANUA ## 1.62 — Kæder slås selv til +- **1.62.50** Rettet: har et salgssted flere AD-markører, bruges kun dem hvis AD-vej kører gennem stationens trigger. Mælkebilerne solgte ved væskemarkedet via "Palleskur 2 load" på nabosporet og holdt ved palleskuret i stedet for ved tanken. - **1.62.49** Rettet: ved påkobling vælges et redskab der står lige bag krogen frem for et nærmere i nabobåsen ude til siden. To traktorer kunne ikke hente K105 ved "Connect P Kalkspreder 1", fordi såmaskinen ved siden af var 1–2 m nærmere. - **1.62.48** Rettet: købe-/læssestationens AD-markør vælges nu blandt dem hvis AD-vej kører gennem stationens trigger; kun findes ingen, tages den nærmeste. Sprøjten til den blå væsketank holdt ved "Palleskur 2 load" på nabosporet, fordi den lå 0,5 m tættere end "Buy All". - **1.62.47** Rettet: 1.62.46 satte Courseplays bredde med en værdi der ikke stod præcis i Courseplays 0,1 m-liste, så den blev stille afvist. Nu rundes til 0,1 m og sættes med setFloatValue; fejler det, skrives det i loggen. diff --git a/FS25_ADSmartPickup/adFieldWork.lua b/FS25_ADSmartPickup/adFieldWork.lua index 374a796..cd84c95 100644 --- a/FS25_ADSmartPickup/adFieldWork.lua +++ b/FS25_ADSmartPickup/adFieldWork.lua @@ -753,7 +753,7 @@ end 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) +function ADFieldWork.drivesThrough(marker, points) local limit = ADFieldWork.THROUGH_TRIGGER_M ^ 2 for _, p in ipairs(marker.approach or {}) do for _, point in ipairs(points) do @@ -777,7 +777,7 @@ function ADFieldWork.nearestStationMarker(markers, points, maxDistance) 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) + local through = ADFieldWork.drivesThrough(marker, points) if (through and not bestThrough) or (through == bestThrough and nearest < bestDistance) then best, bestDistance, bestThrough = marker.id, nearest, through end @@ -805,7 +805,7 @@ end 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) +function ADFieldWork.approachPoints(adEnv, startId) local points, seen, queue = {}, {[startId] = true}, {{id = startId, d = 0}} local head = 1 while head <= #queue and #points < 600 do @@ -841,7 +841,7 @@ local function markerList(adEnv, points, nearM) 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) + entry.approach = ADFieldWork.approachPoints(adEnv, marker.id) break end end diff --git a/FS25_ADSmartPickup/adSmartPickup.lua b/FS25_ADSmartPickup/adSmartPickup.lua index 1798942..40da879 100644 --- a/FS25_ADSmartPickup/adSmartPickup.lua +++ b/FS25_ADSmartPickup/adSmartPickup.lua @@ -227,6 +227,22 @@ local function getUnloadCandidates() return list end +-- Stationens aflæsningstriggere i verden -> {{x, z}} +function ADSmartPickup.unloadTriggerPoints(station) + local points = {} + for _, trigger in pairs(station ~= nil and station.unloadTriggers or {}) do + for _, field in ipairs(UNLOAD_TRIGGER_NODE_FIELDS) do + local node = trigger[field] + if node ~= nil and entityExists(node) then + local x, _, z = getWorldTranslation(node) + table.insert(points, {x = x, z = z}) + break + end + end + end + return points +end + local function getUnloadStationAtMarker(adEnv, wayPoint, farmId) return getClosestStation(adEnv, getUnloadCandidates(), "unloadTriggers", UNLOAD_TRIGGER_NODE_FIELDS, wayPoint, farmId) end diff --git a/FS25_ADSmartPickup/adSources.lua b/FS25_ADSmartPickup/adSources.lua index a515dda..8594c2b 100644 --- a/FS25_ADSmartPickup/adSources.lua +++ b/FS25_ADSmartPickup/adSources.lua @@ -654,15 +654,34 @@ function ADSources.getSellMarkers(adEnv, farmId) return cacheGet("sellMarkers", tostring(farmId), 10000, function() return ADSources.findSellMarkers(adEnv, farmId) end) end -function ADSources.findSellMarkers(adEnv, farmId) +-- entries = {{marker, station, through}} -> samme liste, men har en station flere markører, beholdes kun dem +-- hvis AD-vej kører gennem stationens trigger (findes nogen). In-game 6/10: mælkebilerne solgte ved væske- +-- markedet via "Palleskur 2 load" på nabosporet (lavere waypoint-id end "Buy All") og holdt ved palleskuret. +function ADSources.pickStationMarkers(entries) + local hasThrough = {} + for _, entry in ipairs(entries) do + if entry.through then hasThrough[entry.station] = true end + end local result = {} + for _, entry in ipairs(entries) do + if entry.through or not hasThrough[entry.station] then table.insert(result, entry) end + end + return result +end + +function ADSources.findSellMarkers(adEnv, farmId) + local entries = {} for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do local station = ADSmartPickup.getUnloadStationAtWayPointId(adEnv, marker.id, farmId) if station ~= nil and ADPrices.isSellingStation(station) and not ADSources.isSellBlocked(station) then - table.insert(result, {marker = marker, station = station}) + local okThrough, through = pcall(function() + return ADFieldWork.drivesThrough({approach = ADFieldWork.approachPoints(adEnv, marker.id)}, + ADSmartPickup.unloadTriggerPoints(station)) + end) + table.insert(entries, {marker = marker, station = station, through = okThrough and through == true}) end end - return result + return ADSources.pickStationMarkers(entries) end -- ---- paller til lager: objektlager (palleskur) som mål ---- diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index afc31ca..886e5a7 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.62.49.0 + 1.62.50.0 <en>AD Smart Pickup</en>