feat(markarbejde): faste maskiner pr. mark (bruges kun dér; marken venter på sin egen); fix: AD-påfyldning får varen sat (kom tom tilbage); AD der stopper undervejs startes igen 2x, ellers hjem til parkering (v1.30.0.0)

FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua

@@ -9,7 +9,7 @@ SmartPickupFrame.FIELD_ROW_KINDS = {
     fieldProduct = true, fieldMode = true, fieldRake = true, fieldStore = true, fleetVehicle = true,
     fieldRigs = true, fieldUnloaders = true, fieldMulch = true, fieldLime = true, fieldSoil = true,
     fieldSow = true, fieldSowFruit = true, fieldRoll = true, fieldFertilize = true, fieldWeed = true,
-    fieldTarget = true, fleetMode = true, fieldStraw = true,
+    fieldTarget = true, fleetMode = true, fieldStraw = true, fieldRig = true,
 }
 SmartPickupFrame.ROLE_KEYS = {
     mower = "spu_field_role_mower", tedder = "spu_field_role_tedder", rake = "spu_field_role_rake",
@@ -277,6 +277,7 @@ function SmartPickupFrame:fillFieldStoreRows(adEnv, info, field)
         fillType = info.harvestFillType
     end
     if fillType == nil then return end
+    self:fillDedicatedRows(adEnv, field)
     self:addTextRow(i18n:getText("spu_field_section_store"))
     local chosen = {}
     for _, id in ipairs(field.plan.storeBuildingIds) do chosen[id] = true end
@@ -358,6 +359,31 @@ function SmartPickupFrame:rigDetails(rig)
     return #parts > 0 and (" — " .. table.concat(parts, " — ")) or ""
 end
 
+-- Faste maskiner til den valgte mark: en fast maskine bruges kun her, og marken venter på sin egen hellere
+-- end at låne en anden med samme opgave. Maskiner der er faste på en anden mark er markeret.
+function SmartPickupFrame:fillDedicatedRows(adEnv, field)
+    local i18n = self.i18n
+    self:addTextRow(i18n:getText("spu_field_section_dedicated"))
+    local owner = {}
+    for fieldId, other in pairs(ADFieldJobs.state.fields) do
+        for _, id in ipairs(other.plan ~= nil and other.plan.rigIds or {}) do owner[id] = fieldId end
+    end
+    local rigs = ADFieldJobs.getRigs(adEnv)
+    table.sort(rigs, function(a, b)
+        local ma, mb = owner[a.id] == field.id, owner[b.id] == field.id
+        if ma ~= mb then return ma end
+        if a.role ~= b.role then return a.role < b.role end
+        return ADFlowView.naturalLess(a.label, b.label)
+    end)
+    for _, rig in ipairs(rigs) do
+        local row = self:addRow(self.vehiclePrefab, {kind = "fieldRig", vehicleId = rig.id})
+        local elsewhere = owner[rig.id] ~= nil and owner[rig.id] ~= field.id
+            and (" — " .. string.format(i18n:getText("spu_field_dedicatedElsewhere"), tostring(owner[rig.id]))) or ""
+        row:getDescendantByName("title"):setText(string.format("    %s — %s%s", tostring(rig.label), self:roleText(rig.role), elsewhere))
+        row:getDescendantByName("option"):setState(owner[rig.id] == field.id and SmartPickupFrame.STATE_ON or SmartPickupFrame.STATE_OFF, false)
+    end
+end
+
 function SmartPickupFrame:fillFleetRows(adEnv)
     local i18n = self.i18n
     self:addTextRow(i18n:getText("spu_field_section_fleet"))
@@ -424,6 +450,15 @@ function SmartPickupFrame:onClickFieldRow(state, data)
             ADFieldJobs.setPlan(id, {mode = isOn and "auto" or "manual"})
         elseif SmartPickupFrame.PLAN_TOGGLES[data.kind] ~= nil then
             ADFieldJobs.setPlan(id, {[SmartPickupFrame.PLAN_TOGGLES[data.kind]] = isOn})
+        elseif data.kind == "fieldRig" then
+            -- fast på denne mark (og fjernes fra en anden mark)
+            local byField = {}
+            for fieldId, other in pairs(ADFieldJobs.state.fields) do byField[fieldId] = other.plan ~= nil and other.plan.rigIds or {} end
+            local updated = ADFieldFleet.dedicate(byField, id, data.vehicleId, isOn)
+            for fieldId, ids in pairs(updated) do
+                local before = table.concat(byField[fieldId] or {}, " ")
+                if before ~= table.concat(ids, " ") then ADFieldJobs.setPlan(fieldId, {rigIds = ids}) end
+            end
         elseif data.kind == "fieldStore" then
             local ids = {}
             for _, buildingId in ipairs(ADFieldJobs.getField(id).plan.storeBuildingIds) do