feat: klik på kæde-/marklinjer i statusvinduet åbner fanen Kæder/Marker (v1.62.100)
This commit is contained in:
@@ -186,6 +186,8 @@ function ADStatusHud.flowEntries(adEnv, proxy)
|
||||
return entries
|
||||
end
|
||||
|
||||
local FIELDS_TAB = {tab = "fields"}
|
||||
|
||||
-- Én linje pr. mark med aktivt markarbejde (samme statustekst og farve som Marker-fanen).
|
||||
function ADStatusHud.fieldEntries(proxy)
|
||||
local entries = {}
|
||||
@@ -207,7 +209,7 @@ function ADStatusHud.fieldEntries(proxy)
|
||||
level = proxy:fieldLevel(info.id),
|
||||
reason = type(reasonKey) == "string" and reasonKey:match("^spu_field_reason_(%w+)$") or nil,
|
||||
awaiting = ADFieldJobs.awaitingPlayer(info.id) ~= nil,
|
||||
target = target,
|
||||
target = target or FIELDS_TAB, -- ingen maskine endnu: klik åbner fanen Marker
|
||||
})
|
||||
end
|
||||
end
|
||||
@@ -234,13 +236,15 @@ function ADStatusHud.missingEntries(proxy)
|
||||
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"})
|
||||
table.insert(entries, {text = ok and text or textOf("spu_status_missing_" .. group.kind), level = "error", target = FIELDS_TAB})
|
||||
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).
|
||||
local CHAINS_TAB = {tab = "chains"}
|
||||
|
||||
function ADStatusHud.chainEntries(proxy)
|
||||
local chains, suggestions = {}, {}
|
||||
local result = {chains = chains, suggestions = suggestions, dependencies = {}}
|
||||
@@ -248,17 +252,18 @@ function ADStatusHud.chainEntries(proxy)
|
||||
return result
|
||||
end
|
||||
for _, entry in ipairs(ADStorageStats.chainEntries(ADChain.last)) do
|
||||
-- klik på en kædelinje åbner fanen Kæder (8/10)
|
||||
if entry.kind == "chainProblem" then
|
||||
table.insert(chains, {text = proxy:alertText(entry), level = "error"})
|
||||
table.insert(chains, {text = proxy:alertText(entry), level = "error", target = CHAINS_TAB})
|
||||
elseif entry.kind == "chainSuggest" then
|
||||
table.insert(suggestions, {text = proxy:alertText(entry), level = "waiting"})
|
||||
table.insert(suggestions, {text = proxy:alertText(entry), level = "waiting", target = CHAINS_TAB})
|
||||
elseif entry.kind == "dependencyOff" then
|
||||
table.insert(result.dependencies, {text = proxy:alertText(entry), level = "error"})
|
||||
table.insert(result.dependencies, {text = proxy:alertText(entry), level = "error", target = CHAINS_TAB})
|
||||
end
|
||||
end
|
||||
-- ikke marker nok til kædens/dyrenes behov (8/10)
|
||||
for _, entry in ipairs(ADChain.last.uncovered or {}) do
|
||||
table.insert(suggestions, {text = ADChain.uncoveredText(entry, ADChain.last.titles, textOf), level = "waiting"})
|
||||
table.insert(suggestions, {text = ADChain.uncoveredText(entry, ADChain.last.titles, textOf), level = "waiting", target = CHAINS_TAB})
|
||||
end
|
||||
return result
|
||||
end
|
||||
@@ -577,10 +582,32 @@ function ADStatusHud.mouseEvent(posX, posY, isDown, isUp, button)
|
||||
-- klik på en linje med et køretøj: ind i køretøjet (brugerønske 8/10); ellers flyttes vinduet
|
||||
local index = ADStatusView.lineAt(layout.top, layout.marginY, layout.textSize, #ADStatusHud.lines, posY)
|
||||
local line = index ~= nil and ADStatusHud.lines[index] or nil
|
||||
if line ~= nil and line.target ~= nil and ADStatusHud.enterVehicle(line.target) then return end
|
||||
if line ~= nil and line.target ~= nil then
|
||||
if line.target.tab ~= nil then
|
||||
if ADStatusHud.openTab(line.target.tab) then return end
|
||||
elseif ADStatusHud.enterVehicle(line.target) then
|
||||
return
|
||||
end
|
||||
end
|
||||
ADStatusHud.drag = {grabX = posX - layout.x, grabY = posY - layout.top}
|
||||
end
|
||||
|
||||
-- Åbn ESC-menuen på Smart Pickup-fanen med en bestemt underfane ("chains"). -> true hvis forsøgt
|
||||
function ADStatusHud.openTab(tab)
|
||||
local frame = ADSmartPickup ~= nil and ADSmartPickup.guiFrame or nil
|
||||
local tabs = SmartPickupFrame ~= nil and {chains = SmartPickupFrame.TAB_CHAINS, fields = SmartPickupFrame.TAB_FIELDS} or {}
|
||||
local tabIndex = tabs[tab]
|
||||
if frame == nil or tabIndex == nil or g_gui == nil then return false end
|
||||
local ok, err = pcall(function()
|
||||
frame.pendingTab = tabIndex
|
||||
g_gui:showGui("InGameMenu")
|
||||
local menu = g_gui.screenControllers ~= nil and InGameMenu ~= nil and g_gui.screenControllers[InGameMenu] or nil
|
||||
if menu ~= nil and menu.goToPage ~= nil then menu:goToPage(frame) end
|
||||
end)
|
||||
if not ok then logOnce("openTab", err) end
|
||||
return ok
|
||||
end
|
||||
|
||||
-- Sæt spilleren ind i køretøjet (et redskab: traktoren det sidder på). -> true hvis forsøgt
|
||||
function ADStatusHud.enterVehicle(vehicle)
|
||||
if isGone(vehicle) then return false end
|
||||
|
||||
Reference in New Issue
Block a user