feat: gylle som gødning — flåden foretrækker gyllevogn når lageret dækker mindst X % af markens behov (indstilling, 80 %), salg holder markernes resterende behov tilbage (loft 80 % af tankkapacitet), påfyldning nærmeste tank med helt læs først — 1.62.305

This commit is contained in:
2026-10-17 10:18:34 +02:00
parent 2d7b696821
commit 244f98109b
13 changed files with 308 additions and 23 deletions
+18 -3
View File
@@ -317,6 +317,8 @@ function ADFieldWork.getRigs(adEnv)
width = ADCpBridge.getWorkWidth(vehicle), x = x, z = z,
-- tom spreder kan flere ting (gødning og kalk): alle dens roller
roles = ADPool.rolesOf(role, specs.sprayRoles), filledRole = specs.filledRole, dumpable = specs.dumpable,
-- varer sprederen/gyllevognen kan tage (gylle som gødning: egne varer foretrækkes)
sprayNames = specs.sprayNames,
}
if role == "harvester" then
rig.fruits = ADCpBridge.getHarvestFruits(vehicle) or {}
@@ -806,10 +808,23 @@ end
-- Flådens valg: ét sæt, eller flere til multi-tool. -> {rig...} | nil, why, args
local function pickRigs(candidates, role, decision, info, required, accept)
if (decision.count or 1) > 1 then
return ADFieldFleet.pickMany(candidates, role, decision.count, info.x, info.z, required, accept)
-- gylle som gødning: spreder/gyllevogn med gårdens egne varer først, når lageret dækker markens behov
local prefer = nil
if role == "fertilizer" and ADFieldFertilizer ~= nil and ADFieldFertilizer.preferCandidate ~= nil then
local first = candidates[1] ~= nil and candidates[1].vehicle or nil
local farmId = first ~= nil and first.getOwnerFarmId ~= nil and first:getOwnerFarmId() or nil
local areaHa = ADFields ~= nil and ADFields.polygonAreaHa ~= nil and info.verts ~= nil and ADFields.polygonAreaHa(info.verts) or 0
local okP, result = pcall(ADFieldFertilizer.preferCandidate, farmId, areaHa)
if not okP and not ADFieldFertilizer.preferFailed then
ADFieldFertilizer.preferFailed = true
Logging.warning(ADFieldFertilizer.LOG_PREFIX .. "fortrinsreglen fejlede: %s", tostring(result))
end
prefer = okP and result or nil
end
local rig, why, args = ADFieldFleet.pick(candidates, role, info.x, info.z, required, accept)
if (decision.count or 1) > 1 then
return ADFieldFleet.pickMany(candidates, role, decision.count, info.x, info.z, required, accept, prefer)
end
local rig, why, args = ADFieldFleet.pick(candidates, role, info.x, info.z, required, accept, prefer)
return rig ~= nil and {rig} or nil, why, args
end