feat: advarsel når frie marker ikke kan dække kædens/dyrenes behov (v1.62.96)

This commit is contained in:
2026-10-08 19:39:54 +02:00
parent 9924e11278
commit f5ea8f058c
7 changed files with 59 additions and 3 deletions
+32 -2
View File
@@ -330,7 +330,8 @@ local function plan(data, state)
end
-- de ægte opskrifter (ikke kopien): en pauset rod er stadig tændt og må ikke "tændes" og overtages af kæden
local prod = ADChainActions.productions(data.recipes, chain.needRecipes, protected)
return {chain = chain, shortages = shortages, actions = actions, prod = prod, edges = ADChainActions.edges(chain, data.recipes)}
return {chain = chain, shortages = shortages, actions = actions, prod = prod, edges = ADChainActions.edges(chain, data.recipes),
uncovered = ADCropPlan.uncovered(shortages, actions)}
end
local function logInfo(fmt, ...) Logging.info(ADChain.LOG_PREFIX .. fmt, ...) end
@@ -400,7 +401,7 @@ function ADChain.evaluate(adEnv, act)
end
local paused = {}
for key in pairs(state.paused) do paused[key] = true end
ADChain.last = {chain = result.chain, shortages = result.shortages, actions = result.actions, edges = result.edges,
ADChain.last = {chain = result.chain, shortages = result.shortages, actions = result.actions, edges = result.edges, uncovered = result.uncovered,
missingFlows = ADChainActions.missingFlows(result.edges, runs), flowStatus = ADChain.flowStatus(result.edges, runs, ADChain.noVehicle),
paused = paused, userOff = copySet(state.userOff), finalKeep = copySet(state.finalKeep or {}),
sellable = ADChain.sellableRoots(data, result, runs), candidates = ADChain.candidates(data.recipes, state), data = data, fields = data.fields, fieldsIncomplete = data.fieldsIncomplete == true, titles = data.fillTitles, at = ADChain.now, switchCount = ADChain.switchCount,
@@ -444,6 +445,33 @@ function ADChain.notifyProblems(last)
return #fresh
end
-- "Ikke marker nok": tekst pr. udækket mangel (afgrødens/varens titel, produkt, manglende ha).
function ADChain.uncoveredText(entry, titles, textOf)
local name = tostring((titles or {})[entry.key] or (titles or {})[entry.fruit] or entry.key)
local ok, text = pcall(string.format, textOf("spu_chain_notEnoughLand"), name, entry.missingHa or 0)
return ok and text or (name .. ": " .. tostring(entry.missingHa))
end
-- Engangsbesked pr. ny udækket mangel (samme frister som notifyProblems).
ADChain.uncoveredKeys = {}
function ADChain.notifyUncovered(last)
if last == nil or ADChain.now < ADChain.STARTUP_GRACE_MS then return 0 end
if last.fieldsIncomplete or (last.data ~= nil and last.data.partial) then return 0 end
local textOf = function(key) return g_i18n ~= nil and g_i18n:getText(key) or key end
local keys, count = {}, 0
for _, entry in ipairs(last.uncovered or {}) do
keys[entry.key] = true
if not ADChain.uncoveredKeys[entry.key] then
count = count + 1
local text = ADChain.uncoveredText(entry, last.titles, textOf)
Logging.info(ADChain.LOG_PREFIX .. "ikke marker nok: %s", text)
if ADFieldJobs ~= nil and ADFieldJobs.notify ~= nil then ADFieldJobs.notify(text, true) end
end
end
ADChain.uncoveredKeys = keys
return count
end
-- Én besked pr. slukning af en nødvendig produktion (kun fra tick; advarslerne tømmes, når de er meldt).
function ADChain.notifyDependencies(last)
local dependency = last ~= nil and last.dependency or nil
@@ -470,6 +498,8 @@ function ADChain.tick(adEnv, dt)
local last = ADChain.evaluate(adEnv, true)
local ok, err = pcall(ADChain.notifyProblems, last)
if not ok then Logging.warning(ADChain.LOG_PREFIX .. "besked om manglende led fejlede: %s", tostring(err)) end
local okLand, errLand = pcall(ADChain.notifyUncovered, last)
if not okLand then Logging.warning(ADChain.LOG_PREFIX .. "advarsel om for få marker fejlede: %s", tostring(errLand)) end
local okDep, errDep = pcall(ADChain.notifyDependencies, last)
if not okDep then Logging.warning(ADChain.LOG_PREFIX .. "advarsel om slukket produktion fejlede: %s", tostring(errDep)) end
end