fix: markflåden 'brug alle' kan udelukke enkelte maskiner med fluebenet (v1.62.32)

This commit is contained in:
2026-10-05 18:41:06 +02:00
parent defbf136f4
commit be2630457f
9 changed files with 34 additions and 13 deletions
+4 -2
View File
@@ -149,9 +149,11 @@ function ADFieldFleet.pickMany(candidates, role, n, x, z, requiredWidth, accept)
end
-- Må sættet sendes ud? "all" (standard): alle ledige maskiner; "ticked": kun med flueben.
function ADFieldFleet.isEnabled(mode, enabledIds, id)
-- "ticked": kun maskiner med flueben. Ellers ("all"): alle undtagen dem spilleren har fjernet fluebenet fra
-- (excludedIds; brugerønske 5/10 — før kunne en enkelt maskine ikke tages ud i "brug alle").
function ADFieldFleet.isEnabled(mode, enabledIds, id, excludedIds)
if mode == "ticked" then return (enabledIds or {})[id] == true end
return true
return (excludedIds or {})[id] ~= true
end
function ADFieldFleet.toggle(enabledIds, id)
+9 -2
View File
@@ -17,7 +17,7 @@ ADFieldJobs.MAX_PASSES = 2
-- fleetMode: "all" = alle ledige maskiner (standard, "vælg og glem"), "ticked" = kun med flueben
-- courseRecords: vehicleId -> post i kursus-registret (ADCourseCache)
-- manual: {[vehicleId] = true} = høstere spilleren selv kører til marken (for brede til vejene)
ADFieldJobs.state = {fields = {}, fleet = {}, assignments = {}, fleetMode = "all", courseRecords = {}, manual = {}}
ADFieldJobs.state = {fields = {}, fleet = {}, excluded = {}, assignments = {}, fleetMode = "all", courseRecords = {}, manual = {}}
-- mark-id -> {mower = kursus, rake = kursus, <trin> = fælles multi-tool-kursus}: kopier (kun i hukommelsen;
-- efter genindlæsning hentes slå-/rivekurset fra maskinen, som CP selv gemmer kurset på)
ADFieldJobs.courses = {}
@@ -282,6 +282,7 @@ function ADFieldJobs.load()
if ok then
ADFieldJobs.state.fields, ADFieldJobs.state.fleet = loaded.fields, loaded.fleet
ADFieldJobs.state.fleetMode = loaded.fleetMode or "all"
ADFieldJobs.state.excluded = loaded.excluded or {}
ADFieldJobs.state.courseRecords = loaded.courseRecords or {}
ADFieldJobs.state.manual = loaded.manual or {}
ADFieldJobs.state.paused = loaded.paused == true
@@ -352,8 +353,14 @@ function ADFieldJobs.toggleManual(vehicleId)
ADFieldJobs.save()
end
-- Fluebenet i markflåden: i "kun med flueben" slås maskinen til/fra; i "brug alle" udelukkes den/tages med igen.
function ADFieldJobs.toggleFleet(vehicleId)
ADFieldJobs.state.fleet = ADFieldFleet.toggle(ADFieldJobs.state.fleet, vehicleId)
local state = ADFieldJobs.state
if state.fleetMode == "ticked" then
state.fleet = ADFieldFleet.toggle(state.fleet, vehicleId)
else
state.excluded = ADFieldFleet.toggle(state.excluded, vehicleId)
end
ADFieldJobs.save()
end
+10 -1
View File
@@ -77,6 +77,11 @@ function ADFieldStorage.save(state)
xmlFile:setString(string.format("%s.fleet.vehicle(%d)#id", ADFieldStorage.ROOT, vehicleIndex), vehicleId)
vehicleIndex = vehicleIndex + 1
end
local excludedIndex = 0
for vehicleId in pairs(state.excluded or {}) do
xmlFile:setString(string.format("%s.excluded.vehicle(%d)#id", ADFieldStorage.ROOT, excludedIndex), vehicleId)
excludedIndex = excludedIndex + 1
end
local manualIndex = 0
for vehicleId in pairs(state.manual or {}) do
xmlFile:setString(string.format("%s.manual.vehicle(%d)#id", ADFieldStorage.ROOT, manualIndex), vehicleId)
@@ -93,7 +98,7 @@ function ADFieldStorage.save(state)
end
function ADFieldStorage.load()
local result = {fields = {}, fleet = {}, fleetMode = "all", courseRecords = {}, manual = {}, paused = false}
local result = {fields = {}, fleet = {}, excluded = {}, fleetMode = "all", courseRecords = {}, manual = {}, paused = false}
local path = ADFieldStorage.getPath()
if path == nil or not fileExists(path) then return result end
local xmlFile = XMLFile.load("ADSmartPickupFields", path)
@@ -111,6 +116,10 @@ function ADFieldStorage.load()
local id = xmlFile:getString(key .. "#id")
if id ~= nil and id ~= "" then result.fleet[id] = true end
end)
xmlFile:iterate(ADFieldStorage.ROOT .. ".excluded.vehicle", function(_, key)
local id = xmlFile:getString(key .. "#id")
if id ~= nil and id ~= "" then result.excluded[id] = true end
end)
xmlFile:iterate(ADFieldStorage.ROOT .. ".manual.vehicle", function(_, key)
local id = xmlFile:getString(key .. "#id")
if id ~= nil and id ~= "" then result.manual[id] = true end
+1 -1
View File
@@ -152,7 +152,7 @@ function ADFieldWork.getRigs(adEnv)
local x, z = vehiclePosition(vehicle)
local rig = {
id = id, vehicle = vehicle, role = role, label = ADRuns.vehicleLabel(vehicle),
enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id),
enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id, state.excluded),
-- optaget: vores egen opgave, eller AutoDrive/Courseplay kører den allerede (fx spillerens
-- egen parkeringstur) — den må ikke kapres midt i en anden kørsel
busy = isBusyVehicle(vehicle, id),
+3 -3
View File
@@ -435,7 +435,7 @@ function ADPool.collect(adEnv, isBusy)
local controlled = vehicle.getIsControlled ~= nil and vehicle:getIsControlled()
if id ~= nil and park ~= nil and vehicle.spec_attacherJoints ~= nil and #ADHitch.rearImplementsOf(vehicle) == 0
and ADPool.isFreeFromFlows(vehicle) and not controlled and not isBusy(vehicle)
and not ADPool.isReturning(vehicle) and ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id)
and not ADPool.isReturning(vehicle) and ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id, state.excluded)
and ADPool.canPull(ADPool.ownRole(vehicle))
and ADPool.isPuller({category = categoryOf(vehicle), ownBody = vehicle.spec_trailer ~= nil or vehicle.spec_dischargeable ~= nil}) then
local x, z = positionOf(vehicle)
@@ -489,7 +489,7 @@ function ADPool.overview(adEnv)
local rear = ADHitch.rearImplementsOf(vehicle)
local key, arg = ADPool.tractorStatus({
hasPark = parkMarker(adEnv, vehicle) ~= nil,
enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id),
enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id, state.excluded),
controlled = vehicle.getIsControlled ~= nil and vehicle:getIsControlled(),
returning = ADPool.isReturning(vehicle),
fieldId = assignment ~= nil and assignment.fieldId or nil,
@@ -498,7 +498,7 @@ function ADPool.overview(adEnv)
hitched = #rear > 0,
})
table.insert(tractors, {id = id, label = ADRuns.vehicleLabel(vehicle), hp = tractorHpOf(vehicle), status = key, arg = arg,
enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id)})
enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id, state.excluded)})
end
end
return implements, tractors
+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.31.0</version>
<version>1.62.32.0</version>
<title>
<en>AD Smart Pickup</en>
</title>