From c415bdc7a4cec9dba7c90fff977a82c0d477fd55 Mon Sep 17 00:00:00 2001
From: masterdraco <masterdraco@gmail.com>
Date: Tue, 29 Sep 2026 23:50:34 +0200
Subject: [PATCH] =?UTF-8?q?fix(marker):=20vinh=C3=B8ster=20=E2=80=94=20lil?=
 =?UTF-8?q?le=20CP-bredde=20erstattes=20af=203=20m=20(v1.60.20.0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  1 +
 FS25_ADSmartPickup/adCpBridge.lua | 12 ++++++++----
 FS25_ADSmartPickup/modDesc.xml    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f428807..0a177b7 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.60 — "Kræver handling" → flow, menuplacering, flow-vogne i guiden
 
+- **1.60.20** Vinhøsterens bredde: også en lille bredde fra Courseplay (under 1,5 m) erstattes af vinrækkens 3 m.
 - **1.60.19** Vinhøster uden kendt arbejdsbredde får vinrækkens 3 m (før "bredde ukendt", og marken blev ikke startet).
 - **1.60.18** Vinhøsterens afgrøde læses fra `inputFruitTypeIndex` (feltnavnet i FS25).
 - **1.60.17** Vinhøstere (fx Grégoire GL86) genkendes som høstere af den afgrøde, de er konfigureret til
diff --git a/FS25_ADSmartPickup/adCpBridge.lua b/FS25_ADSmartPickup/adCpBridge.lua
index e7c0c05..24520bf 100644
--- a/FS25_ADSmartPickup/adCpBridge.lua
+++ b/FS25_ADSmartPickup/adCpBridge.lua
@@ -394,16 +394,20 @@ end
 -- Vinhøster uden AI-markører: bredden er vinrækken (3 m = Courseplays vin-gitter for druer).
 ADCpBridge.VINE_ROW_WIDTH = 3
 function ADCpBridge.widthOrVine(width, hasVineCutter)
-    if hasVineCutter and (width or 0) < 1 then return ADCpBridge.VINE_ROW_WIDTH end
+    -- under markarbejdets minimum (1,5 m) — også en lille bredde fra Courseplay (in-game 29/9: stadig widthUnknown)
+    if hasVineCutter and (width or 0) < 1.5 then return ADCpBridge.VINE_ROW_WIDTH end
     return width
 end
 
 function ADCpBridge.getWorkWidth(vehicle)
-    local cpWidth = courseplayWidth(vehicle)
-    if cpWidth ~= nil then return cpWidth end
-    local best, hasVine = 0, false
+    local hasVine = false
     for _, object in ipairs(collect(vehicle)) do
         if object.spec_vineCutter ~= nil then hasVine = true end
+    end
+    local cpWidth = courseplayWidth(vehicle)
+    if cpWidth ~= nil then return ADCpBridge.widthOrVine(cpWidth, hasVine) end
+    local best = 0
+    for _, object in ipairs(collect(vehicle)) do
         local variable = variableWidth(object)
         if variable ~= nil then
             best = math.max(best, variable)
diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml
index 4463305..b82818a 100644
--- a/FS25_ADSmartPickup/modDesc.xml
+++ b/FS25_ADSmartPickup/modDesc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <modDesc descVersion="107">
     <author>masterdraco</author>
-    <version>1.60.19.0</version>
+    <version>1.60.20.0</version>
     <title>
         <en>AD Smart Pickup</en>
     </title>