fix: græs/kløver/lucerne regnes med 3 slæt om året i kæde og Alt automatisk — 1.62.284

This commit is contained in:
2026-10-17 02:43:19 +02:00
parent 6e380377a1
commit 18c725d02a
4 changed files with 24 additions and 6 deletions
+6 -3
View File
@@ -141,15 +141,17 @@ end
-- products = {[nøgle] = {fruit, product, fruits}}, skip = {[afgrøde] = true} (kan ikke være mål),
-- factor = overskud (1.1 = 10 % ekstra til silo-buffer; nil = 1).
-- -> {{key, fruit, product, fruits, needHa}} største først
function ADAutoCrop.needs(demand, yields, products, skip, factor)
-- cutsOf(afgrøde) -> antal høst pr. år (nil = 1); kæden og knappen bruger samme ADCropPlan.cutsPerYear
function ADAutoCrop.needs(demand, yields, products, skip, factor, cutsOf)
local list = {}
for key, perMonth in pairs(demand or {}) do
local perHa = (yields or {})[key] or 0
local spec = (products or {})[key]
local fruit = spec ~= nil and spec.fruit or key
if perHa > 0 and (perMonth or 0) > 0 and not (skip or {})[fruit] then
local cuts = math.max(1, (cutsOf ~= nil and cutsOf(fruit)) or 1)
table.insert(list, {key = key, fruit = fruit, product = spec ~= nil and spec.product or nil,
fruits = spec ~= nil and spec.fruits or nil, needHa = perMonth * 12 / perHa * (factor or 1)})
fruits = spec ~= nil and spec.fruits or nil, needHa = perMonth * 12 / (perHa * cuts) * (factor or 1)})
end
end
table.sort(list, function(a, b)
@@ -235,7 +237,8 @@ local function farmPlanInput(adEnv)
-- delvist læst (opskrifter/stalde/forbrug): behovet ville være for lavt, og jorden gik til salg
if data.partial then return nil, "gården blev kun delvist læst" end
local surplus = ADSettings ~= nil and ADSettings.get("farmSurplusPercent") or 0
local needs = ADAutoCrop.needs(chain.fieldDemand, data.yields, chain.fieldProducts, data.unswitchable, 1 + (tonumber(surplus) or 0) / 100)
local needs = ADAutoCrop.needs(chain.fieldDemand, data.yields, chain.fieldProducts, data.unswitchable, 1 + (tonumber(surplus) or 0) / 100,
ADCropPlan.cutsPerYear)
local fields = {}
for _, entry in ipairs(data.fields or {}) do
if not ADFieldJobs.getField(entry.id).contract then table.insert(fields, entry) end