feat: marker kører Auto som standard; engangs-omlægning af manuelle marker (v1.62.30)

This commit is contained in:
2026-10-05 15:49:28 +02:00
parent 9971cdde8d
commit 5d7b3bebca
6 changed files with 14 additions and 6 deletions
+5 -3
View File
@@ -40,7 +40,8 @@ for stage in pairs(ADFieldModel.ROLES) do KNOWN_STAGES[stage] = true end
KNOWN_STAGES.careLiming = true
local DEFAULT_PLAN = {
mode = "manual", product = "auto", rake = false, rigs = 1, unloaders = 1,
-- auto som standard (brugerønske 5/10); "Gem uden at starte" i markguiden giver manuel
mode = "auto", product = "auto", rake = false, rigs = 1, unloaders = 1,
mulch = false, lime = true, soil = "auto", sow = false, sowFruit = "", roll = false,
fertilize = true, weed = true, targetFruit = "", prepAfterMow = false, straw = "chop",
-- kæde: marken er frigivet til produktionskæden; hvem der valgte målafgrøden ("user"|"chain"|"")
@@ -168,7 +169,8 @@ function ADFieldModel.setTarget(field, fruitName, source, product)
-- kilden huskes kun mens der er et mål; standard er at spilleren valgte det
copy.plan.targetSource = copy.plan.targetFruit ~= "" and (source or "user") or ""
copy.held = nil
copy.plan.mode = copy.plan.targetFruit ~= "" and "auto" or "manual"
-- et mål kører altid automatisk; fjernes målet, bevares markens kørsel
if copy.plan.targetFruit ~= "" then copy.plan.mode = "auto" end
if not ADFieldModel.isWorking(field) and field.stage == "done" then
copy.stage = "idle"
end
@@ -497,7 +499,7 @@ function ADFieldModel.fromRecord(record)
local field = ADFieldModel.newField(record.id)
local plan = field.plan
field.stage = KNOWN_STAGES[record.stage] and record.stage or "idle"
plan.mode = record.mode == "auto" and "auto" or "manual"
plan.mode = record.mode == "manual" and "manual" or "auto"
-- etape 1 gemte "silage"/"hay"; ukendt -> auto
plan.product = PRODUCTS[record.product] and record.product or "auto"
plan.rake = readFlag(record.rake, false)
+5
View File
@@ -70,6 +70,8 @@ function ADFieldStorage.save(state)
end
xmlFile:setString(ADFieldStorage.ROOT .. "#fleetMode", state.fleetMode or "all")
xmlFile:setInt(ADFieldStorage.ROOT .. "#paused", state.paused == true and 1 or 0)
-- marker er auto som standard; flaget gør engangs-omlægningen nedenfor (load) færdig
xmlFile:setInt(ADFieldStorage.ROOT .. "#autoDefault", 1)
local vehicleIndex = 0
for vehicleId in pairs(state.fleet) do
xmlFile:setString(string.format("%s.fleet.vehicle(%d)#id", ADFieldStorage.ROOT, vehicleIndex), vehicleId)
@@ -98,8 +100,11 @@ function ADFieldStorage.load()
if xmlFile == nil then return result end
result.fleetMode = xmlFile:getString(ADFieldStorage.ROOT .. "#fleetMode") == "ticked" and "ticked" or "all"
result.paused = xmlFile:getInt(ADFieldStorage.ROOT .. "#paused") == 1
-- engangs: en fil fra før "auto som standard" (brugerønske 5/10) får alle manuelle marker sat til auto
local migrateAuto = xmlFile:getInt(ADFieldStorage.ROOT .. "#autoDefault") ~= 1
xmlFile:iterate(ADFieldStorage.ROOT .. ".field", function(_, key)
local field = ADFieldModel.fromRecord(ADFieldStorage.readRecord(xmlFile, key))
if migrateAuto then field.plan.mode = "auto" end
if field.id ~= nil then result.fields[field.id] = field end
end)
xmlFile:iterate(ADFieldStorage.ROOT .. ".fleet.vehicle", function(_, key)
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.29.0</version>
<version>1.62.30.0</version>
<title>
<en>AD Smart Pickup</en>
</title>