feat(marker): mål-afgrøde pr. mark ('vælg mark + afgrøde, glem den') + brug alle ledige maskiner (standard)

FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua

@@ -9,6 +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,
 }
 SmartPickupFrame.ROLE_KEYS = {
     mower = "spu_field_role_mower", tedder = "spu_field_role_tedder", rake = "spu_field_role_rake",
@@ -62,12 +63,36 @@ function SmartPickupFrame:fieldStatusText(field, info)
     if decision ~= nil and decision.care ~= nil and not ADFieldModel.isWorking(field) then
         text = text .. " — " .. string.format(self.i18n:getText("spu_field_careNeed"), self.i18n:getText("spu_field_stage_" .. decision.care))
     end
+    local target = field.plan.targetFruit
+    if target ~= nil and target ~= "" and info.kind == "bare" and field.stage == "idle" and not ADFieldJobs.environment().plantable(target) then
+        text = text .. " — " .. string.format(self.i18n:getText("spu_field_waitSowing"), self:fruitTitle(target))
+    end
     local reason = self:fieldReasonText(field.reason)
     if reason ~= nil then text = text .. ": " .. reason end
     return text
 end
 
+-- Hvad moden gør med marken frem mod mål-afgrøden (én linje under valget).
+function SmartPickupFrame:targetSummary(field, info)
+    local target = self:fruitTitle(field.plan.targetFruit)
+    if info.kind == "bare" then
+        return string.format(self.i18n:getText("spu_field_target_bare"), target)
+    end
+    if info.fruitName == field.plan.targetFruit and info.kind == "mowable" then
+        return string.format(self.i18n:getText("spu_field_target_keep"), target)
+    end
+    return string.format(self.i18n:getText("spu_field_target_switch"), tostring(info.cropTitle or "-"), target)
+end
+
+function SmartPickupFrame:fruitTitle(name)
+    local fruit = g_fruitTypeManager ~= nil and name ~= nil and name ~= "" and g_fruitTypeManager:getFruitTypeByName(name) or nil
+    return fruit ~= nil and fruit.fillType ~= nil and tostring(fruit.fillType.title) or tostring(name)
+end
+
 function SmartPickupFrame:fieldPlanText(field, info)
+    if field.plan.targetFruit ~= nil and field.plan.targetFruit ~= "" then
+        return "-> " .. self:fruitTitle(field.plan.targetFruit)
+    end
     local text = self.i18n:getText(ADFieldView.planKey(field.plan, info.kind))
     if field.plan.rake and info.kind == "mowable" then text = text .. " + " .. self.i18n:getText("spu_field_plan_rake") end
     if field.plan.sow and info.kind ~= "mowable" then text = text .. " + " .. self.i18n:getText("spu_field_plan_sow") end
@@ -116,9 +141,9 @@ local function numberTexts(from, to)
     return texts, values
 end
 
--- Afgrøder der kan sås (første valg: samme som den høstede).
-function SmartPickupFrame:sowFruitChoices()
-    local texts, values = {self.i18n:getText("spu_field_sowSame")}, {""}
+-- Afgrøder der kan sås (første valg: samme som den høstede / ingen mål-afgrøde).
+function SmartPickupFrame:sowFruitChoices(firstKey)
+    local texts, values = {self.i18n:getText(firstKey or "spu_field_sowSame")}, {""}
     for _, fruit in ipairs(g_fruitTypeManager ~= nil and g_fruitTypeManager.fruitTypes or {}) do
         if fruit.allowsSeeding ~= false and fruit.fillType ~= nil and fruit.name ~= nil then
             table.insert(texts, tostring(fruit.fillType.title or fruit.name))
@@ -165,7 +190,14 @@ function SmartPickupFrame:fillFieldDetail(adEnv, info)
     local yesNo = {i18n:getText("ui_no"), i18n:getText("ui_yes")}
     local crop = info.kind == "bare" and i18n:getText("spu_field_bare") or tostring(info.cropTitle or "-")
     self:addTextRow(string.format(i18n:getText("spu_field_section"), info.id, crop))
-    self:addToggleRow("fieldMode", i18n:getText("spu_field_mode"), {i18n:getText("spu_field_mode_manual"), i18n:getText("spu_field_mode_auto")}, plan.mode == "auto")
+    local targetTexts, targetValues = self:sowFruitChoices("spu_field_target_none")
+    self:addChoiceRow("fieldTarget", i18n:getText("spu_field_target"), targetTexts, targetValues, plan.targetFruit or "")
+    local hasTarget = plan.targetFruit ~= nil and plan.targetFruit ~= ""
+    if hasTarget then
+        self:addTextRow("    " .. self:targetSummary(field, info))
+    else
+        self:addToggleRow("fieldMode", i18n:getText("spu_field_mode"), {i18n:getText("spu_field_mode_manual"), i18n:getText("spu_field_mode_auto")}, plan.mode == "auto")
+    end
     local rigTexts, rigValues = numberTexts(1, ADFieldModel.MAX_RIGS)
     self:addChoiceRow("fieldRigs", i18n:getText("spu_field_rigs"), rigTexts, rigValues, plan.rigs or 1)
     if info.kind == "mowable" then
@@ -182,10 +214,14 @@ function SmartPickupFrame:fillFieldDetail(adEnv, info)
         local soilTexts = {}
         for _, value in ipairs(SmartPickupFrame.SOIL_VALUES) do table.insert(soilTexts, i18n:getText("spu_field_soil_" .. value)) end
         self:addChoiceRow("fieldSoil", i18n:getText("spu_field_soil"), soilTexts, SmartPickupFrame.SOIL_VALUES, plan.soil or "auto")
-        self:addToggleRow("fieldSow", i18n:getText("spu_field_sow"), yesNo, plan.sow == true)
-        if plan.sow then
-            local fruitTexts, fruitValues = self:sowFruitChoices()
-            self:addChoiceRow("fieldSowFruit", i18n:getText("spu_field_sowFruit"), fruitTexts, fruitValues, plan.sowFruit or "")
+        if not hasTarget then
+            self:addToggleRow("fieldSow", i18n:getText("spu_field_sow"), yesNo, plan.sow == true)
+            if plan.sow then
+                local fruitTexts, fruitValues = self:sowFruitChoices()
+                self:addChoiceRow("fieldSowFruit", i18n:getText("spu_field_sowFruit"), fruitTexts, fruitValues, plan.sowFruit or "")
+            end
+        end
+        if hasTarget or plan.sow then
             self:addToggleRow("fieldRoll", i18n:getText("spu_field_roll"), yesNo, plan.roll == true)
         end
     end
@@ -286,6 +322,8 @@ end
 function SmartPickupFrame:fillFleetRows(adEnv)
     local i18n = self.i18n
     self:addTextRow(i18n:getText("spu_field_section_fleet"))
+    local useAll = ADFieldJobs.state.fleetMode ~= "ticked"
+    self:addToggleRow("fleetMode", i18n:getText("spu_field_fleetAll"), {i18n:getText("ui_no"), i18n:getText("ui_yes")}, useAll)
     local rigs = ADFieldJobs.getRigs(adEnv)
     table.sort(rigs, function(a, b)
         if a.role ~= b.role then return a.role < b.role end
@@ -332,6 +370,12 @@ function SmartPickupFrame:onClickFieldRow(state, data)
         local id = frame.selectedFieldId
         if data.kind == "fleetVehicle" then
             ADFieldJobs.toggleFleet(data.vehicleId)
+        elseif data.kind == "fleetMode" then
+            ADFieldJobs.setFleetMode(isOn and "all" or "ticked")
+        elseif id == nil then
+            return
+        elseif data.kind == "fieldTarget" then
+            ADFieldJobs.setTarget(id, data.values ~= nil and data.values[state] or "")
         elseif id == nil then
             return
         elseif SmartPickupFrame.PLAN_CHOICES[data.kind] ~= nil then