From 5c7f7ba072c461c101205fcc7058a77bb846d1c3 Mon Sep 17 00:00:00 2001 From: masterdraco Date: Thu, 24 Sep 2026 23:34:57 +0200 Subject: [PATCH] =?UTF-8?q?fix(bygninger):=20palleskure=20bruger=20n=C3=A6?= =?UTF-8?q?rmeste=20mark=C3=B8r=20til=20afl=C3=A6sning=20(drop-reglen=20fr?= =?UTF-8?q?a=201.18.5=20valgte=20'Chicken=20Storage=20Pickup'=20uden=20vej?= =?UTF-8?q?)=20(v1.19.8.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FS25_ADSmartPickup/adBuildings.lua | 3 ++- FS25_ADSmartPickup/modDesc.xml | 2 +- docs/BRUGERMANUAL.md | 4 ++-- docs/USER_MANUAL.md | 4 ++-- tests/test_adBuildings.lua | 11 +++++++++++ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/FS25_ADSmartPickup/adBuildings.lua b/FS25_ADSmartPickup/adBuildings.lua index 6cb903d..8bc62c7 100644 --- a/FS25_ADSmartPickup/adBuildings.lua +++ b/FS25_ADSmartPickup/adBuildings.lua @@ -341,7 +341,8 @@ local function build(adEnv, farmId) end table.sort(loadMarkers, function(a, b) return ADBuildings.naturalLess(a.name, b.name) end) end - local unloadMarker = unloadMarkerFor(adEnv, unloadNodes, loadMarkers, kind ~= "silo") + -- siloer og palleskure læsser og aflæsser samme sted: altid nærmeste markør + local unloadMarker = unloadMarkerFor(adEnv, unloadNodes, loadMarkers, kind ~= "silo" and kind ~= "objectStorage") -- silo der kun kan FYLDES (fx drive-on-bunker der fodrer en biogas-fermentor): aflæsning, -- ingen læssestation -> et forsyningsmål, aldrig en kilde local isFillOnlySilo = kind == "silo" and loadMarkers[1] == nil and #loadGroups == 0 and unloadMarker ~= nil diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 82eceba..8dadbc2 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.19.7.0 + 1.19.8.0 <en>AD Smart Pickup</en> diff --git a/docs/BRUGERMANUAL.md b/docs/BRUGERMANUAL.md index 1d9251c..c6c3f57 100644 --- a/docs/BRUGERMANUAL.md +++ b/docs/BRUGERMANUAL.md @@ -1,6 +1,6 @@ # AD Smart Pickup — brugermanual -Version 1.19.7 · Farming Simulator 25 · tillæg til AutoDrive +Version 1.19.8 · Farming Simulator 25 · tillæg til AutoDrive *English version: [USER_MANUAL.md](USER_MANUAL.md)* @@ -94,7 +94,7 @@ Markøren skal højst være **40 m** fra bygningens trigger. udleveringsområde, præcis som når du læsser manuelt. - **Separat drop og pickup:** har en fabrik både en pickup- og en drop-markør, bruges drop til aflæsning, også når pickup står tættere på aflæsningstriggeren. Drop-markøren må højst stå 25 m - fra triggeren. Siloer bruger altid deres egen nærmeste markør. + fra triggeren. Siloer og palleskure bruger altid deres egen nærmeste markør. - **Markørnavne:** navnene er frie. Moden viser bygningens eget navn i menuen og markørens navn i parentes. diff --git a/docs/USER_MANUAL.md b/docs/USER_MANUAL.md index 82e6df1..5c68f5a 100644 --- a/docs/USER_MANUAL.md +++ b/docs/USER_MANUAL.md @@ -1,6 +1,6 @@ # AD Smart Pickup — user manual -Version 1.19.7 · Farming Simulator 25 · add-on for AutoDrive +Version 1.19.8 · Farming Simulator 25 · add-on for AutoDrive *Dansk version: [BRUGERMANUAL.md](BRUGERMANUAL.md)* @@ -96,7 +96,7 @@ The marker must be at most **40 m** from the building's trigger. storage's output area, just like when you load by hand. - **Separate drop and pickup:** if a factory has both a pickup and a drop marker, drop is used for unloading, even when pickup is closer to the unloading trigger. The drop marker must be within - 25 m of the trigger. Silos always use their own nearest marker. + 25 m of the trigger. Silos and pallet sheds always use their own nearest marker. - **Marker names:** names are free. The menu shows the building's own name and the marker's name. ### Wait points diff --git a/tests/test_adBuildings.lua b/tests/test_adBuildings.lua index 314edcb..3c104df 100644 --- a/tests/test_adBuildings.lua +++ b/tests/test_adBuildings.lua @@ -223,5 +223,16 @@ do check("B-SCAN finder n1 og n2, ikke for dybt", table.concat(nodes, ","), "n1,n2") end +-- B-SHED: palleskur læsser og aflæsser samme sted — aflæsningsmarkøren er den nærmeste (ikke "den anden") +do + local shedX = placeable("shedX", "Bale & Pallet Storage", 12000, 0, {spec_objectStorage = {objectInfos = {}, capacity = 4000}}) + addMarker(71, "Chicken Storage Unload", "Chicken", 12010, 0) -- 10 m + addMarker(72, "Chicken Storage Pickup", "Chicken", 12018, 0) -- 18 m + ADBuildings.invalidate() + local byShed = {} + for _, b in ipairs(ADBuildings.list(adEnv, 1)) do byShed[b.id] = b end + check("B-SHED aflæsning = nærmeste (Unload)", byShed.shedX.unloadMarker and byShed.shedX.unloadMarker.id, 71) +end + print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL")) os.exit(failures == 0 and 0 or 1)