feat: morgenbriefing ved dagsskifte (1.62.204)

This commit is contained in:
2026-10-10 18:06:40 +02:00
parent e7da81df18
commit f081833c11
9 changed files with 129 additions and 1 deletions
+108
View File
@@ -0,0 +1,108 @@
-- AD Briefing
-- Morgenbriefing (brugerønske 10/10): når en ny dag starter i spillet, en kort oversigt — hvad er i gang, hvad venter
-- på spilleren, hvilke marker slået fra der er klar eller trænger til pleje, og hvad mangler på gården.
-- Indstillingen morningBriefing: 0 = fra, 1 = besked i hjørnet, 2 = pop-up. Ren logik øverst, spil-adapter nederst.
ADBriefing = {}
local function fieldList(ids)
local parts = {}
for _, id in ipairs(ids or {}) do table.insert(parts, "F" .. tostring(id)) end
return table.concat(parts, ", ")
end
function ADBriefing.isNewDay(lastDay, day)
return lastDay ~= nil and day ~= nil and day ~= lastDay
end
-- s = {working = {{fieldId, stage}}, awaiting = {{fieldId, label}}, readyOff = {fieldId}, careOff = {{fieldId, care}},
-- missing = {{role, fieldIds}}}; roleName(role) -> tekst. Returnerer teksten eller nil (intet at sige).
function ADBriefing.compose(s, roleName)
local lines = {}
local working = {}
for _, entry in ipairs(s.working or {}) do
table.insert(working, string.format("F%s %s", tostring(entry.fieldId), ADManualTransport.stageVerb(entry.stage)))
end
if #working > 0 then table.insert(lines, "I gang: " .. table.concat(working, ", ")) end
for _, entry in ipairs(s.awaiting or {}) do
table.insert(lines, string.format("Venter på dig: kør '%s' til F%s", tostring(entry.label), tostring(entry.fieldId)))
end
if #(s.readyOff or {}) > 0 then
table.insert(lines, "Klar, men slået fra: " .. fieldList(s.readyOff) .. " — slå dem til i Marker, hvis moden skal tage dem")
end
local care = {}
for _, entry in ipairs(s.careOff or {}) do
table.insert(care, string.format("F%s %s", tostring(entry.fieldId), ADManualTransport.stageVerb(entry.care)))
end
if #care > 0 then table.insert(lines, "Trænger til pleje (slået fra): " .. table.concat(care, ", ")) end
for _, entry in ipairs(s.missing or {}) do
table.insert(lines, string.format("Mangler: %s til %s", tostring(roleName ~= nil and roleName(entry.role) or entry.role),
fieldList(entry.fieldIds)))
end
if #lines == 0 then return nil end
return table.concat(lines, "\n")
end
-- ---- spil-adapter ----
ADBriefing.lastDay = nil
local function currentDay()
local env = g_currentMission ~= nil and g_currentMission.environment or nil
if env == nil then return nil end
return env.currentMonotonicDay or env.currentDay
end
local function collect()
local s = {working = {}, awaiting = {}, readyOff = {}, careOff = {}, missing = {}}
local missingByRole = {}
for _, info in ipairs(ADFields.list()) do
local field = ADFieldJobs.getField(info.id)
local awaiting = ADFieldJobs.awaitingPlayer(info.id)
if awaiting ~= nil then
table.insert(s.awaiting, {fieldId = info.id, label = ADRuns.vehicleLabel(awaiting.vehicle)})
elseif ADFieldModel.isWorking(field) then
table.insert(s.working, {fieldId = info.id, stage = field.stage})
local reason = type(field.reason) == "table" and field.reason or nil
if reason ~= nil and reason.key == "spu_field_reason_noRig" and reason.role ~= nil then
if missingByRole[reason.role] == nil then
missingByRole[reason.role] = {role = reason.role, fieldIds = {}}
table.insert(s.missing, missingByRole[reason.role])
end
table.insert(missingByRole[reason.role].fieldIds, info.id)
end
elseif not ADFieldModel.isEnabled(field) then
local decision = ADFieldJobs.lastDecision[info.id]
if field.stage == "ready" then
table.insert(s.readyOff, info.id)
elseif decision ~= nil and decision.care ~= nil then
table.insert(s.careOff, {fieldId = info.id, care = decision.care})
end
end
end
return s
end
local function roleName(role)
local key = "spu_field_role_" .. tostring(role)
if g_i18n == nil or (g_i18n.hasText ~= nil and not g_i18n:hasText(key)) then return role end
return g_i18n:getText(key)
end
-- Kaldes fra markarbejdets tick (efter opstarten): viser briefingen ved dagsskifte.
function ADBriefing.tick()
local day = currentDay()
local isNew = ADBriefing.isNewDay(ADBriefing.lastDay, day)
ADBriefing.lastDay = day
if not isNew then return end
local mode = ADSettings ~= nil and ADSettings.get("morningBriefing") or 2
if mode == 0 then return end
local text = ADBriefing.compose(collect(), roleName)
if text == nil then return end
Logging.info("ADSmartPickup: morgenbriefing:\n%s", text)
if mode == 2 and InfoDialog ~= nil and InfoDialog.show ~= nil then
pcall(InfoDialog.show, "Smart Pickup — god morgen\n\n" .. text)
else
pcall(function() g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_INFO, "Smart Pickup: " .. text:gsub("\n", " · ")) end)
end
end
+4
View File
@@ -748,6 +748,10 @@ function ADFieldJobs.tick(adEnv, dt)
-- lidt efter start, og indtil da ligner de maskiner ledige (in-game 26/9: kultivatoren blev taget midt
-- i spillerens eget CP-job 45 s efter indlæsning)
if ADFieldJobs.now < ADFieldJobs.STARTUP_GRACE_MS then return end
if ADBriefing ~= nil then
local okBrief, errBrief = pcall(ADBriefing.tick)
if not okBrief then Logging.warning(ADFieldJobs.LOG_PREFIX .. "morgenbriefing: %s", tostring(errBrief)) end
end
-- Stop alt og parkér: intet sendes ud og intet genstartes, før spilleren trykker Start alle — undtagen
-- marker spilleren har genoptaget enkeltvis ([Start] i Fields-listen, ADFieldJobs.setFieldResumed)
local paused, resumed = ADFieldJobs.state.paused, ADFieldJobs.state.resumed or {}
+4
View File
@@ -17,6 +17,10 @@ ADSettings.KEYS = {
-- spillerkørsel (maskiner uden parkering): 1 = pop-up man klikker væk, 0 = kun i statusvinduet
playerPopup = {default = 1, min = 0, max = 1, choices = {1, 0}, labels = {"spu_set_playerPopup_on", "spu_set_playerPopup_off"},
text = "1/0: besked når du skal køre en maskine til eller fra en mark — 1 = pop-up, 0 = kun i statusvinduet"},
-- morgenbriefing ved dagsskifte: 2 = pop-up, 1 = besked i hjørnet, 0 = fra
morningBriefing = {default = 2, min = 0, max = 2, choices = {2, 1, 0},
labels = {"spu_set_morningBriefing_popup", "spu_set_morningBriefing_notice", "spu_set_morningBriefing_off"},
text = "0/1/2: oversigt når en ny dag starter — 2 = pop-up, 1 = besked i hjørnet, 0 = fra"},
troughRefillPercent = {default = 100, min = 10, max = 100, perBuilding = true, choices = {30, 40, 50, 60, 70, 80, 90, 100}, format = "%s %%",
text = "%: forsyningen kører først, når staldens trug er fyldt højst så meget (100 = så snart der er plads til et læs)"},
}
+4
View File
@@ -544,6 +544,10 @@
<text name="spu_set_globalHelp" text="Pr. stald nedenfor: &quot;som globalt&quot; bruger værdien ovenfor."/>
<text name="spu_set_perBarnTitle" text="%s — pr. stald"/>
<text name="spu_set_asGlobal" text="som globalt"/>
<text name="spu_set_morningBriefing" text="Morgenbriefing"/>
<text name="spu_set_morningBriefing_popup" text="Pop-up"/>
<text name="spu_set_morningBriefing_notice" text="Besked i hjørnet"/>
<text name="spu_set_morningBriefing_off" text="Fra"/>
<text name="spu_set_playerPopup" text="Besked når du skal køre en maskine"/>
<text name="spu_set_playerPopup_on" text="Pop-up"/>
<text name="spu_set_playerPopup_off" text="Kun statusvinduet"/>
+4
View File
@@ -544,6 +544,10 @@
<text name="spu_set_globalHelp" text="Per barn below: &quot;as global&quot; uses the value above."/>
<text name="spu_set_perBarnTitle" text="%s — per barn"/>
<text name="spu_set_asGlobal" text="as global"/>
<text name="spu_set_morningBriefing" text="Morning briefing"/>
<text name="spu_set_morningBriefing_popup" text="Pop-up"/>
<text name="spu_set_morningBriefing_notice" text="Corner message"/>
<text name="spu_set_morningBriefing_off" text="Off"/>
<text name="spu_set_playerPopup" text="Message when you must drive a machine"/>
<text name="spu_set_playerPopup_on" text="Pop-up"/>
<text name="spu_set_playerPopup_off" text="Status window only"/>
+2 -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.203.0</version>
<version>1.62.204.0</version>
<title>
<en>AD Smart Pickup</en>
</title>
@@ -75,6 +75,7 @@
<sourceFile filename="adChainRun.lua"/>
<sourceFile filename="adChainView.lua"/>
<sourceFile filename="adShopAdvice.lua"/>
<sourceFile filename="adBriefing.lua"/>
<sourceFile filename="adStatusView.lua"/>
<sourceFile filename="adStatusHud.lua"/>
<sourceFile filename="adSmartPickup.lua"/>