feat: statusvinduet viser redskaber der mangler på gården (rødt), ikke kø (v1.62.23)

This commit is contained in:
2026-10-05 10:17:24 +02:00
parent b21e948792
commit 50d972df93
8 changed files with 92 additions and 9 deletions
+3
View File
@@ -557,6 +557,9 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
end
if poolWhy == "noPoolTractor" and why ~= "allBusy" then
why, args = poolWhy, poolArgs
elseif poolWhy == "poolBusy" then
-- puljeredskabet hentes til en anden mark: kø (gul), ikke "ingen maskine" (rød)
why, args = "allBusy", nil
end
end
if #offNetwork > 0 and (why == "cannotDo" or why == "noRig") then
+5 -4
View File
@@ -194,13 +194,14 @@ function ADPool.pairFor(role, fieldX, fieldZ, implements, tractors, blocked, acc
for _, tractor in ipairs(tractors or {}) do
if not blocked[tractor.id] and not tractor.offNetwork then table.insert(free, tractor) end
end
local candidates = {}
local candidates, sawBlocked = {}, false
for _, implement in ipairs(implements or {}) do
if hasRole(implement, role) and not blocked[implement.id] and (accept == nil or accept(implement)) then
table.insert(candidates, implement)
if hasRole(implement, role) and (accept == nil or accept(implement)) then
if blocked[implement.id] then sawBlocked = true else table.insert(candidates, implement) end
end
end
if #candidates == 0 then return nil, "noPoolImplement" end
-- poolBusy: redskabet findes, men er reserveret/i karantæne — marken står i kø, intet mangler på gården
if #candidates == 0 then return nil, sawBlocked and "poolBusy" or "noPoolImplement" end
if #free == 0 then return nil, "noPoolTractor" end
table.sort(candidates, function(a, b)
return distanceSq(a.x, a.z, fieldX, fieldZ) < distanceSq(b.x, b.z, fieldX, fieldZ)
+27 -1
View File
@@ -177,6 +177,31 @@ function ADStatusHud.fieldEntries(proxy)
return entries
end
-- Redskaber der mangler på gården: marker i gang hvis seneste udsendelse fejlede med noRig (rollen findes slet
-- ikke) eller cannotDo (ingen af dem kan opgaven, fx afgrøden). Én rød linje pr. rolle med markerne. Kø (allBusy,
-- venter på traktor, puljeredskab hentet til anden mark) står kun gult på marklinjen, ikke her.
function ADStatusHud.missingEntries(proxy)
local entries = {}
if ADFields == nil or ADFieldJobs == nil or ADFieldModel == nil or ADStatusView == nil or proxy == nil then return entries end
local paused = type(ADFieldJobs.state) == "table" and ADFieldJobs.state.paused == true
local found = {}
for _, info in ipairs(ADFields.list()) do
local field = ADFieldJobs.getField(info.id)
local reason = field ~= nil and type(field.reason) == "table" and field.reason or nil
local resumed = ADFieldJobs.isFieldResumed ~= nil and ADFieldJobs.isFieldResumed(info.id)
if reason ~= nil and reason.key ~= nil and ADFieldModel.isWorking(field) and (not paused or resumed) then
local kind = reason.key:match("^spu_field_reason_(%w+)$")
table.insert(found, {fieldId = info.id, role = reason.role, kind = kind})
end
end
for _, group in ipairs(ADStatusView.groupMissing(found)) do
local roleName = proxy.roleText ~= nil and guarded("roleText", proxy.roleText, proxy, group.role) or tostring(group.role)
local ok, text = pcall(string.format, textOf("spu_status_missing_" .. group.kind), roleName, ADStatusView.fieldList(group.fieldIds))
table.insert(entries, {text = ok and text or textOf("spu_status_missing_" .. group.kind), level = "error"})
end
return entries
end
-- Kæder med manglende led + ventende forslag + slukkede nødvendige fabrikker (samme punkter og tekster som
-- "Kræver handling"; de to sidste står under Advarsler).
function ADStatusHud.chainEntries(proxy)
@@ -224,7 +249,8 @@ end
function ADStatusHud.snapshot(adEnv)
local proxy = frameProxy()
local snapshot = {flows = {}, fields = {}, chains = {}, warnings = {}}
local snapshot = {missing = {}, flows = {}, fields = {}, chains = {}, warnings = {}}
snapshot.missing = guarded("missing", ADStatusHud.missingEntries, proxy) or {}
if adEnv ~= nil then
snapshot.flows = guarded("flows", ADStatusHud.flowEntries, adEnv, proxy) or {}
end
+49 -3
View File
@@ -1,9 +1,10 @@
-- AD Status View
-- Ren logik for statusvinduet på skærmen (slås til/fra med en tast, se adStatusHud.lua): øjebliksbilledet
-- -> færdige linjer {text, level, header}. Sektioner i fast rækkefølge Flows/Marker/Kæder/Advarsler, kun med
-- indhold; højst maxLines linjer (resten "+k mere"); hver tekst højst MAX_CHARS tegn (UTF-8-sikkert, "..").
-- -> færdige linjer {text, level, header}. Sektioner i fast rækkefølge Mangler/Flows/Marker/Kæder/Advarsler, kun med
-- indhold (Mangler øverst, så den aldrig skæres væk); højst maxLines linjer (resten "+k mere"); hver tekst højst MAX_CHARS tegn (UTF-8-sikkert, "..").
--
-- snapshot = {
-- missing = {{text, level}}, -- standard rød; redskab der slet ikke findes på gården (ikke optaget)
-- flows = {{vehicle, action, fillPercent (0-100|nil), level}},
-- fields = {{fieldId, work, vehicle|nil, progress (0-1|nil), level}},
-- chains = {{text, level}}, -- standard rød
@@ -23,6 +24,7 @@ ADStatusView.ELLIPSIS = ".."
local LEVELS = {running = true, waiting = true, error = true, stopped = true}
local SECTIONS = {
{key = "missing", header = "spu_status_missing", defaultLevel = "error"},
{key = "flows", header = "spu_status_flows", defaultLevel = "running"},
{key = "fields", header = "spu_status_fields", defaultLevel = "running"},
{key = "chains", header = "spu_status_chains", defaultLevel = "error"},
@@ -73,6 +75,50 @@ local function percentText(value)
return string.format("%d %%", math.floor(value + 0.5))
end
-- ---- manglende redskaber ----
-- Markårsager der betyder "findes ikke på gården" (noRig) eller "ingen af dem kan opgaven" (cannotDo).
-- allBusy/noPoolTractor/poolBusy er kø og vises ikke her.
ADStatusView.MISSING_KINDS = {noRig = 1, cannotDo = 2}
-- {{fieldId, role, kind}} -> {{kind, role, fieldIds}}: én gruppe pr. art+rolle, noRig før cannotDo, roller
-- alfabetisk, marker sorteret uden dubletter. Poster uden rolle eller med anden art springes over.
function ADStatusView.groupMissing(entries)
local byKey, groups = {}, {}
for _, entry in ipairs(entries or {}) do
if entry.role ~= nil and ADStatusView.MISSING_KINDS[entry.kind] ~= nil then
local key = entry.kind .. ":" .. tostring(entry.role)
local group = byKey[key]
if group == nil then
group = {kind = entry.kind, role = entry.role, fieldIds = {}, seen = {}}
byKey[key] = group
table.insert(groups, group)
end
if not group.seen[entry.fieldId] then
group.seen[entry.fieldId] = true
table.insert(group.fieldIds, entry.fieldId)
end
end
end
for _, group in ipairs(groups) do
group.seen = nil
table.sort(group.fieldIds, function(a, b) return (tonumber(a) or 0) < (tonumber(b) or 0) end)
end
table.sort(groups, function(a, b)
local ka, kb = ADStatusView.MISSING_KINDS[a.kind], ADStatusView.MISSING_KINDS[b.kind]
if ka ~= kb then return ka < kb end
return tostring(a.role) < tostring(b.role)
end)
return groups
end
-- {7, 12} -> "F7, F12"
function ADStatusView.fieldList(fieldIds)
local parts = {}
for _, id in ipairs(fieldIds or {}) do table.insert(parts, "F" .. tostring(id)) end
return table.concat(parts, ", ")
end
-- ---- linjer pr. sektion ----
local function flowText(entry)
@@ -94,7 +140,7 @@ local function plainText(entry)
return ADStatusView.fit(entry.text or "", ADStatusView.MAX_CHARS)
end
local TEXT_OF_SECTION = {flows = flowText, fields = fieldText, chains = plainText, warnings = plainText}
local TEXT_OF_SECTION = {missing = plainText, flows = flowText, fields = fieldText, chains = plainText, warnings = plainText}
local function levelOf(entry, default)
return LEVELS[entry.level] and entry.level or default
+3
View File
@@ -641,6 +641,9 @@
<text name="spu_status_fields" text="Marker"/>
<text name="spu_status_chains" text="Kæder"/>
<text name="spu_status_warnings" text="Advarsler"/>
<text name="spu_status_missing" text="Mangler på gården"/>
<text name="spu_status_missing_noRig" text="%s til %s"/>
<text name="spu_status_missing_cannotDo" text="%s der kan opgaven: %s"/>
<text name="spu_status_more" text="+%d mere"/>
<text name="spu_status_idle" text="Smart Pickup: intet kører lige nu"/>
<text name="spu_status_act_fetch" text="henter %s ved %s"/>
+3
View File
@@ -641,6 +641,9 @@
<text name="spu_status_fields" text="Fields"/>
<text name="spu_status_chains" text="Chains"/>
<text name="spu_status_warnings" text="Warnings"/>
<text name="spu_status_missing" text="Missing on the farm"/>
<text name="spu_status_missing_noRig" text="%s for %s"/>
<text name="spu_status_missing_cannotDo" text="%s able to do the job: %s"/>
<text name="spu_status_more" text="+%d more"/>
<text name="spu_status_idle" text="Smart Pickup: nothing running right now"/>
<text name="spu_status_act_fetch" text="fetching %s at %s"/>
+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.22.0</version>
<version>1.62.23.0</version>
<title>
<en>AD Smart Pickup</en>
</title>