refact
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful

This commit is contained in:
2026-02-22 18:15:24 +01:00
parent d9febf16e0
commit 62d4863a1a
33 changed files with 328 additions and 313 deletions

View File

@@ -1,82 +1,56 @@
local _available_decisions = {}
local _selected_decision_index = 1
--- Draws the game window.
function GameWindow.draw()
local screen = Context.screens[Context.current_screen]
local screen = Screen.get_by_id(Context.game.current_screen)
Map.draw(screen.background)
UI.draw_top_bar(screen.name)
if screen and screen.decisions and #screen.decisions > 0 then
local available_decisions = {}
for _, decision_id in ipairs(screen.decisions) do
local decision = Decision.get(decision_id)
if decision and decision.condition() then
table.insert(available_decisions, decision)
end
end
if #available_decisions > 0 then
UI.draw_decision_selector(available_decisions, Context.selected_decision_index)
end
if #_available_decisions > 0 then
UI.draw_decision_selector(_available_decisions, _selected_decision_index)
end
Sprite.draw()
end
--- Updates the game window logic.
function GameWindow.update()
local previous_screen_index = Context.current_screen
if Input.menu_back() then
Context.active_window = WINDOW_MENU
Context.current_window = "menu"
MenuWindow.refresh_menu_items()
return
end
if Input.up() then
Context.current_screen = Context.current_screen - 1
if Context.current_screen < 1 then
Context.current_screen = #Context.screens
end
Context.selected_decision_index = 1 elseif Input.down() then
Context.current_screen = Context.current_screen + 1
if Context.current_screen > #Context.screens then
Context.current_screen = 1
end
Context.selected_decision_index = 1 end
local screen = Context.screens[Context.current_screen]
local screen = Screen.get_by_id(Context.game.current_screen)
screen.update()
if previous_screen_index ~= Context.current_screen then
screen.init()
end
if Context.current_situation then
local current_situation_obj = Situation.get(Context.current_situation)
-- Handle situations (Context.game.current_situation is still present)
if Context.game.current_situation then
local current_situation_obj = Situation.get_by_id(Context.game.current_situation)
if current_situation_obj and current_situation_obj.update then
current_situation_obj.update()
end
end
if screen and screen.decisions and #screen.decisions > 0 then
local available_decisions = {}
for _, decision_id in ipairs(screen.decisions) do
local decision = Decision.get(decision_id)
if decision and decision.condition() then table.insert(available_decisions, decision)
end
end
-- Fetch and filter decisions locally
local all_decisions_for_screen = Decision.get_for_screen(screen)
_available_decisions = Decision.filter_available(all_decisions_for_screen)
if #available_decisions == 0 then return end
if #_available_decisions == 0 then return end
local new_selected_decision_index = UI.update_decision_selector(
available_decisions,
Context.selected_decision_index
)
local new_selected_decision_index = UI.update_decision_selector(
_available_decisions,
_selected_decision_index
)
if new_selected_decision_index ~= Context.selected_decision_index then
Context.selected_decision_index = new_selected_decision_index
end
if new_selected_decision_index ~= _selected_decision_index then
_selected_decision_index = new_selected_decision_index
end
if Input.select() then
local selected_decision = available_decisions[Context.selected_decision_index]
if selected_decision and selected_decision.handle then Audio.sfx_select() selected_decision.handle()
end
if Input.select() then
local selected_decision = _available_decisions[_selected_decision_index]
if selected_decision and selected_decision.handle then
Audio.sfx_select()
selected_decision.handle()
end
end
end
@@ -84,5 +58,5 @@ end
--- Sets the active window.
-- @param new_state number The ID of the new active window.
function GameWindow.set_state(new_state)
Context.active_window = new_state
Context.current_window = new_state
end