From fbd3b2c643050bbcd9084e59b9db0c1407f772b2 Mon Sep 17 00:00:00 2001 From: masterdraco Date: Tue, 29 Sep 2026 20:01:33 +0200 Subject: [PATCH] =?UTF-8?q?fix(fields):=20gemt=20produkt=20(silage/h=C3=B8?= =?UTF-8?q?)=20g=C3=A6lder=20kun=20sl=C3=A5afgr=C3=B8der=20=E2=80=94=20F22?= =?UTF-8?q?=20vinmark=20fortsatte=20som=20'Silage=20+=20s=C3=A5'=20(v1.60.?= =?UTF-8?q?8.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FS25_ADSmartPickup/adFieldModel.lua | 2 ++ FS25_ADSmartPickup/modDesc.xml | 2 +- tests/test_adFieldModel.lua | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/FS25_ADSmartPickup/adFieldModel.lua b/FS25_ADSmartPickup/adFieldModel.lua index 03a334c..591fb7c 100644 --- a/FS25_ADSmartPickup/adFieldModel.lua +++ b/FS25_ADSmartPickup/adFieldModel.lua @@ -89,6 +89,8 @@ end -- Plan "auto": slåafgrøder -> ensilage, alt andet -> høst. function ADFieldModel.product(plan, kind) + -- silage/hø gælder kun slåafgrøder: et gemt produkt fra en fejlklassificeret mark (vinmark F22) ignoreres + if kind ~= nil and kind ~= "mowable" then return "harvest" end if plan.product ~= nil and plan.product ~= "auto" then return plan.product end return kind == "mowable" and "silage" or "harvest" end diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 12595d9..decdb1a 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.60.7.0 + 1.60.8.0 <en>AD Smart Pickup</en> diff --git a/tests/test_adFieldModel.lua b/tests/test_adFieldModel.lua index b0a5e9e..66bf4cc 100644 --- a/tests/test_adFieldModel.lua +++ b/tests/test_adFieldModel.lua @@ -316,5 +316,9 @@ check("M21 stoppet bar mark starter ikke selv", M.shouldStartBare(stoppedBare, " check("M21 Start slipper", M.shouldStartBare(M.with(stoppedBare, {startRequested = true}), "bare"), true) check("M21 ny mål-afgrøde slipper", M.shouldStartBare(M.setTarget(stoppedBare, "BARLEY"), "bare"), true) check("M21 start nulstiller hold (næste sæson starter selv)", M.start(stoppedBare, "bare", {}, "WHEAT").held, nil) +-- gemt produkt (silage/hø) gælder kun slåafgrøder: en vinmark der engang fejlagtigt blev "slåbar" (F22, 29/9) +check("produkt: gemt silage på høstmark -> høst", ADFieldModel.product({product = "silage"}, "harvest"), "harvest") +check("produkt: gemt hø på slåmark -> hø", ADFieldModel.product({product = "hay"}, "mowable"), "hay") +check("produkt: auto på slåmark -> silage", ADFieldModel.product({product = "auto"}, "mowable"), "silage") print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL")) os.exit(failures == 0 and 0 or 1)