fix: morgenbriefingens pop-up vises først efter søvn, uden åbne dialoger og 3 s efter opvågning — låste al input i spillet — 1.62.300

In-game 17/10 3x: dagsskiftet sker under søvn (timeScale 5000), InfoDialog
åbnede oven i søvndialogen, OK efterlod input i en knude. ADBriefing.pending +
mayShow(sleeping, guiVisible, awakeMs); tick(dt) fra adFieldJobs med TICK_MS.
This commit is contained in:
2026-10-17 09:10:27 +02:00
parent f027402fdf
commit 2fd40f5929
4 changed files with 54 additions and 17 deletions
+51 -15
View File
@@ -107,24 +107,60 @@ local function roleName(role)
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 fruitName = function(name)
local fruit = g_fruitTypeManager ~= nil and g_fruitTypeManager.getFruitTypeByName ~= nil and g_fruitTypeManager:getFruitTypeByName(name) or nil
return fruit ~= nil and fruit.fillType ~= nil and fruit.fillType.title ~= nil and tostring(fruit.fillType.title) or tostring(name)
end
local text = ADBriefing.compose(collect(), roleName, fruitName)
if text == nil then return end
Logging.info("ADSmartPickup: morgenbriefing:\n%s", text)
-- Ren: må pop-up'en vises nu? Ikke under søvn (dagsskiftet sker, mens spillet sover — pop-up'en åbnede oven i
-- søvndialogen, og OK låste al input, in-game 17/10), ikke oven i en anden dialog/menu, og først SHOW_GRACE_MS efter
-- opvågningen. s = {sleeping, guiVisible, awakeMs}
ADBriefing.SHOW_GRACE_MS = 3000
function ADBriefing.mayShow(s)
if s.sleeping or s.guiVisible then return false end
return (s.awakeMs or 0) >= ADBriefing.SHOW_GRACE_MS
end
ADBriefing.pending = nil -- {text, mode, awakeMs}: briefing der venter på et roligt øjeblik
local function isSleeping()
local ok, sleeping = pcall(function() return g_sleepManager ~= nil and g_sleepManager.getIsSleeping ~= nil and g_sleepManager:getIsSleeping() end)
return ok and sleeping == true
end
local function isGuiVisible()
local ok, visible = pcall(function() return g_gui ~= nil and g_gui.getIsGuiVisible ~= nil and g_gui:getIsGuiVisible() end)
return ok and visible == true
end
local function show(text, mode)
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
-- Kaldes fra markarbejdets tick (efter opstarten): samler briefingen ved dagsskifte og viser den, når der er ro.
function ADBriefing.tick(dt)
local day = currentDay()
local isNew = ADBriefing.isNewDay(ADBriefing.lastDay, day)
ADBriefing.lastDay = day
if isNew then
local mode = ADSettings ~= nil and ADSettings.get("morningBriefing") or 2
if mode ~= 0 then
local fruitName = function(name)
local fruit = g_fruitTypeManager ~= nil and g_fruitTypeManager.getFruitTypeByName ~= nil and g_fruitTypeManager:getFruitTypeByName(name) or nil
return fruit ~= nil and fruit.fillType ~= nil and fruit.fillType.title ~= nil and tostring(fruit.fillType.title) or tostring(name)
end
local text = ADBriefing.compose(collect(), roleName, fruitName)
if text ~= nil then
Logging.info("ADSmartPickup: morgenbriefing:\n%s", text)
ADBriefing.pending = {text = text, mode = mode, awakeMs = 0}
end
end
end
local pending = ADBriefing.pending
if pending == nil then return end
local sleeping = isSleeping()
pending.awakeMs = sleeping and 0 or pending.awakeMs + (dt or 0)
if ADBriefing.mayShow({sleeping = sleeping, guiVisible = isGuiVisible(), awakeMs = pending.awakeMs}) then
ADBriefing.pending = nil
show(pending.text, pending.mode)
end
end