feat: kontrakter bruger kontraktens lånte udstyr først (1.62.215)

This commit is contained in:
2026-10-10 19:10:08 +02:00
parent c3e09e6d3f
commit 77ce959d53
5 changed files with 79 additions and 4 deletions
+43 -1
View File
@@ -42,6 +42,16 @@ function ADContracts.markersAt(entries, placeable)
return ids
end
-- Kontraktens lånte udstyr først (brugerønske 10/10: lånt gødningsspreder blev overset, gårdens egen var optaget).
-- candidates = {{vehicle, ...}}, isLeased(vehicle) -> de lånte, hvis der er nogen; ellers alle.
function ADContracts.preferLeased(candidates, isLeased)
local leased = {}
for _, candidate in ipairs(candidates or {}) do
if isLeased(candidate.vehicle) then table.insert(leased, candidate) end
end
return #leased > 0 and leased or candidates
end
-- tracked/running = {[nøgle] = {fieldId, ...}} -> startede, afsluttede (lister {key, ...})
function ADContracts.diff(tracked, running)
local started, ended = {}, {}
@@ -113,6 +123,34 @@ local function sellMarkerIds(adEnv, placeable, farmId)
return ADContracts.markersAt(entries, placeable)
end
-- Hører køretøjet (eller noget der hænger på det) til kontraktens lånte udstyr?
function ADContracts.isLeasedFor(field, vehicle)
local mission = field ~= nil and field.contractMission or nil
if mission == nil or vehicle == nil then return false end
local leased = {}
for _, item in ipairs(mission.vehicles or {}) do leased[item] = true end
if leased[vehicle] then return true end
for _, child in ipairs(vehicle.getChildVehicles ~= nil and vehicle:getChildVehicles() or {}) do
if leased[child] then return true end
end
return false
end
-- Til loggen: kontraktens lånte udstyr — hvad, koblet eller løst, rolle og fyld.
local function describeLeased(mission)
local parts = {}
for _, vehicle in ipairs(mission.vehicles or {}) do
local root = vehicle.getRootVehicle ~= nil and vehicle:getRootVehicle() or vehicle
local okSpecs, specs = pcall(ADCpBridge.getSpecs, vehicle)
local role = okSpecs and ADFieldFleet.roleFromSpecs(specs) or nil
local okFill, fill = pcall(ADCpBridge.describeFill, vehicle)
table.insert(parts, string.format("'%s' (%s, %s, rolle %s, fyld %s)", ADRuns.vehicleLabel(vehicle),
vehicle.spec_motorized ~= nil and "traktor" or "redskab", root ~= vehicle and ("på '" .. ADRuns.vehicleLabel(root) .. "'") or "løs",
tostring(role or "-"), okFill and tostring(fill) or "?"))
end
return #parts > 0 and table.concat(parts, "; ") or "intet lånt udstyr"
end
local function fruitNameOf(mission)
local index = mission.fruitTypeIndex or mission.fruitType
if type(index) ~= "number" or g_fruitTypeManager == nil then return nil end
@@ -143,7 +181,11 @@ local function start(adEnv, entry, enabled)
ADContracts.fieldIds[entry.fieldId] = true
-- kun kontraktens trin: slået til, intet efterfølgende trin (ADFieldJobs: contract -> done efter trinnet)
local harvest = entry.stage == "harvesting"
local changes = {stage = entry.stage, kind = harvest and "harvest" or "bare", contract = true,
if entry.mission ~= nil then
local okLeased, leasedText = pcall(describeLeased, entry.mission)
ADFieldJobs.log(entry.fieldId, "kontraktens lånte udstyr: %s", okLeased and leasedText or ("fejl: " .. tostring(leasedText)))
end
local changes = {stage = entry.stage, kind = harvest and "harvest" or "bare", contract = true, contractMission = entry.mission,
plan = {mode = enabled and "auto" or "manual", sow = entry.stage == "sowing", sowFruit = entry.fruit or "", straw = "chop"}}
if harvest and entry.mission ~= nil then
-- høst: læssene skal til kontraktens salgssted (ADFieldWork.chooseStore)