diff --git a/FS25_ADSmartPickup/adOutbound.lua b/FS25_ADSmartPickup/adOutbound.lua index 29b502a..4e0c2dd 100644 --- a/FS25_ADSmartPickup/adOutbound.lua +++ b/FS25_ADSmartPickup/adOutbound.lua @@ -330,7 +330,10 @@ function ADOutbound.buildPlanInput(adEnv, run, vehicle) clearWarning(vehicle, "sell:" .. product.name) end end - if wantsStore(product.policy) then + -- lagermål søges kun når kilden har noget af varen (ellers advarsler om æg før der er spawnet æg) + local available = 0 + for _, source in ipairs(product.sources) do available = available + (source.available or 0) end + if wantsStore(product.policy) and available > 0 then product.store = findStoreMarker(adEnv, vehicle, product, capacity, sources, nil, run) end end diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index ae90d0f..ea70003 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.19.5.0 + 1.19.6.0 <en>AD Smart Pickup</en> diff --git a/docs/BRUGERMANUAL.md b/docs/BRUGERMANUAL.md index eea3030..624e71d 100644 --- a/docs/BRUGERMANUAL.md +++ b/docs/BRUGERMANUAL.md @@ -1,6 +1,6 @@ # AD Smart Pickup — brugermanual -Version 1.19.5 · Farming Simulator 25 · tillæg til AutoDrive +Version 1.19.6 · Farming Simulator 25 · tillæg til AutoDrive *English version: [USER_MANUAL.md](USER_MANUAL.md)* diff --git a/docs/USER_MANUAL.md b/docs/USER_MANUAL.md index 6da7621..8cf0284 100644 --- a/docs/USER_MANUAL.md +++ b/docs/USER_MANUAL.md @@ -1,6 +1,6 @@ # AD Smart Pickup — user manual -Version 1.19.5 · Farming Simulator 25 · add-on for AutoDrive +Version 1.19.6 · Farming Simulator 25 · add-on for AutoDrive *Dansk version: [BRUGERMANUAL.md](BRUGERMANUAL.md)* diff --git a/tests/test_adOutbound.lua b/tests/test_adOutbound.lua index 53a14ba..89fbec7 100644 --- a/tests/test_adOutbound.lua +++ b/tests/test_adOutbound.lua @@ -599,5 +599,19 @@ do ADRunsController.getStoreMarkers, ADLoadSwap.findForcedDumpMarker = nil, nil end +-- O-empty: ingen vare ved kilden (æggene er ikke spawnet endnu) -> intet lagermål søges, ingen advarsel +do + sources[42] = {kind = "husbandry", wayPointId = 42, station = nil, name = "Chicken Coop"} + products[42] = {{fillType = SUGAR, name = "SUGAR", title = "Æg", available = 0, level = 0, capacity = 0, isPallet = false}} + local vE = newVehicle("Æg", 0, 0, 20000) + runs[vE] = outboundRun(80, {42}, {{fillType = "SUGAR", policy = "store"}}) + local storeLookups = 0 + local dumpBefore = ADLoadSwap.findDumpMarker + ADLoadSwap.findDumpMarker = function(...) storeLookups = storeLookups + 1 return nil, "ingen" end + ADOutbound.buildPlanInput(adEnv, runs[vE], vE) + check("O-empty intet lagermål søgt uden vare", storeLookups, 0) + ADLoadSwap.findDumpMarker = dumpBefore +end + print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL")) os.exit(failures == 0 and 0 or 1)