From 61e85e1402db5457bed075ad1726889c56ba0fe2 Mon Sep 17 00:00:00 2001
From: masterdraco <masterdraco@gmail.com>
Date: Sat, 26 Sep 2026 18:45:25 +0200
Subject: [PATCH] =?UTF-8?q?fix(gui):=20markfl=C3=A5den=20er=20tydeligt=20f?=
 =?UTF-8?q?=C3=A6lles=20for=20alle=20marker=20og=20viser=20'fast=20p=C3=A5?=
 =?UTF-8?q?=20F=E2=80=A6'=20/=20'i=20gang=20p=C3=A5=20F=E2=80=A6';=2050,0?=
 =?UTF-8?q?=20m=20markeres=20ikke=20som=20over=2050=20m;=20rollen=20hedder?=
 =?UTF-8?q?=20g=C3=B8dskning=20(v1.30.1.0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua | 11 +++++++++--
 FS25_ADSmartPickup/l10n/l10n_da.xml            |  5 +++--
 FS25_ADSmartPickup/l10n/l10n_en.xml            |  5 +++--
 FS25_ADSmartPickup/modDesc.xml                 |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua
index 46ba6a7..a5f8828 100644
--- a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua
+++ b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua
@@ -352,10 +352,17 @@ function SmartPickupFrame:rigDetails(rig)
     elseif rig.role == "weeder" then
         table.insert(parts, i18n:getText(rig.mechanical and "spu_field_rig_mechanical" or "spu_field_rig_herbicide"))
     end
-    if (rig.width or 0) > ADFieldModel.CP_MAX_WIDTH then table.insert(parts, i18n:getText("spu_field_tooWideShort")) end
+    -- samme grænse som udsendelsen (50,0 m med afrunding er ikke "over 50 m")
+    if (rig.width or 0) > ADFieldModel.CP_MAX_WIDTH + ADFieldModel.WIDTH_TOLERANCE then table.insert(parts, i18n:getText("spu_field_tooWideShort")) end
     if (rig.width or 0) < ADFieldModel.MIN_WORK_WIDTH and not ADFieldModel.NO_WIDTH_ROLES[rig.role] then table.insert(parts, i18n:getText("spu_field_widthUnknownShort")) end
+    -- fast på en mark (valgt under markens "Faste maskiner") og hvor den arbejder nu
+    for fieldId, field in pairs(ADFieldJobs.state.fields) do
+        for _, id in ipairs(field.plan ~= nil and field.plan.rigIds or {}) do
+            if id == rig.id then table.insert(parts, string.format(i18n:getText("spu_field_dedicatedElsewhere"), tostring(fieldId))) end
+        end
+    end
     local assignment = ADFieldJobs.state.assignments[rig.id]
-    if assignment ~= nil then table.insert(parts, string.format("F%d", assignment.fieldId)) end
+    if assignment ~= nil then table.insert(parts, string.format(i18n:getText("spu_field_rig_working"), tostring(assignment.fieldId))) end
     return #parts > 0 and (" — " .. table.concat(parts, " — ")) or ""
 end
 
diff --git a/FS25_ADSmartPickup/l10n/l10n_da.xml b/FS25_ADSmartPickup/l10n/l10n_da.xml
index ebe82fc..a64c979 100644
--- a/FS25_ADSmartPickup/l10n/l10n_da.xml
+++ b/FS25_ADSmartPickup/l10n/l10n_da.xml
@@ -87,7 +87,8 @@
         <text name="spu_field_noStore" text="ingen silo tager markens vare"/>
         <text name="spu_field_storeAuto" text="intet valgt: nærmeste silo med plads bruges"/>
         <text name="spu_field_fieldSiloNotEmptied" text="! Marksilo %s tømmes ikke hjem — lav et Ud fra bygning-flow"/>
-        <text name="spu_field_section_fleet" text="— Markflåde (flueben = må sendes ud) —"/>
+        <text name="spu_field_section_fleet" text="— Markflåde, fælles for ALLE marker (flueben = må sendes ud; faste maskiner vælges ved marken) —"/>
+        <text name="spu_field_rig_working" text="i gang på F%s"/>
         <text name="spu_field_tooWideShort" text="!! over 50 m"/>
         <text name="spu_field_widthUnknownShort" text="!! bredde ukendt — sæt i Courseplay"/>
         <text name="spu_field_noRigs" text="ingen køretøjer med slåmaskine, vender, river eller læssevogn"/>
@@ -123,7 +124,7 @@
         <text name="spu_field_rig_seeds" text="frø ok"/>
         <text name="spu_field_rigs" text="Maskiner pr. trin (Courseplay multi-tool)"/>
         <text name="spu_field_role_cultivator" text="kultivator"/>
-        <text name="spu_field_role_fertilizer" text="gødningsspreder"/>
+        <text name="spu_field_role_fertilizer" text="gødskning"/>
         <text name="spu_field_role_harvester" text="høster"/>
         <text name="spu_field_role_limer" text="kalkspreder"/>
         <text name="spu_field_role_mulcher" text="stubhakker"/>
diff --git a/FS25_ADSmartPickup/l10n/l10n_en.xml b/FS25_ADSmartPickup/l10n/l10n_en.xml
index 2cbae9f..38fc1b5 100644
--- a/FS25_ADSmartPickup/l10n/l10n_en.xml
+++ b/FS25_ADSmartPickup/l10n/l10n_en.xml
@@ -87,7 +87,8 @@
         <text name="spu_field_noStore" text="no silo takes this field's goods"/>
         <text name="spu_field_storeAuto" text="none chosen: nearest silo with room is used"/>
         <text name="spu_field_fieldSiloNotEmptied" text="! Field silo %s is not emptied home — create an Out of building flow"/>
-        <text name="spu_field_section_fleet" text="— Field fleet (ticked = may be sent out) —"/>
+        <text name="spu_field_section_fleet" text="— Field fleet, shared by ALL fields (ticked = may be sent out; dedicated machines are set per field) —"/>
+        <text name="spu_field_rig_working" text="working on F%s"/>
         <text name="spu_field_tooWideShort" text="!! over 50 m"/>
         <text name="spu_field_widthUnknownShort" text="!! width unknown — set in Courseplay"/>
         <text name="spu_field_noRigs" text="no vehicles with mower, tedder, rake or loading wagon"/>
@@ -123,7 +124,7 @@
         <text name="spu_field_rig_seeds" text="seeds ok"/>
         <text name="spu_field_rigs" text="Machines per step (Courseplay multi-tool)"/>
         <text name="spu_field_role_cultivator" text="cultivator"/>
-        <text name="spu_field_role_fertilizer" text="fertilizer spreader"/>
+        <text name="spu_field_role_fertilizer" text="fertilizing"/>
         <text name="spu_field_role_harvester" text="harvester"/>
         <text name="spu_field_role_limer" text="lime spreader"/>
         <text name="spu_field_role_mulcher" text="mulcher"/>
diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml
index a5e4d7b..bccc863 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.30.0.0</version>
+    <version>1.30.1.0</version>
     <title>
         <en>AD Smart Pickup</en>
     </title>