feature/end-window #31

Merged
mr.zero merged 3 commits from feature/end-window into master 2026-03-11 23:45:51 +00:00
3 changed files with 5 additions and 3 deletions
Showing only changes of commit 71a21f3f86 - Show all commits

View File

@@ -131,7 +131,9 @@ function Meter.draw()
local bar_x = 182 local bar_x = 182
local label_x = 228 local label_x = 228
local line_h = 5 local line_h = 5
local start_y = 11 local start_y = 1
local bar_offset = math.floor((line_h - bar_h) / 2) local bar_offset = math.floor((line_h - bar_h) / 2)
local meter_list = { local meter_list = {

View File

@@ -43,7 +43,7 @@ function Timer.draw()
if Context.meters.hidden and not Context.stat_screen_active then return end if Context.meters.hidden and not Context.stat_screen_active then return end
local cx = 10 local cx = 10
local cy = 20 local cy = 8
local r_outer = 5 local r_outer = 5
local r_inner = 3 local r_inner = 3
local progress = Context.timer.progress local progress = Context.timer.progress

View File

@@ -6,12 +6,12 @@ local _selected_decision_index = 1
--- @within GameWindow --- @within GameWindow
function GameWindow.draw() function GameWindow.draw()
local screen = Screen.get_by_id(Context.game.current_screen) local screen = Screen.get_by_id(Context.game.current_screen)
if not screen then return end
if screen.background then if screen.background then
Map.draw(screen.background) Map.draw(screen.background)
elseif screen.background_color then elseif screen.background_color then
rect(0, 0, Config.screen.width, Config.screen.height, screen.background_color) rect(0, 0, Config.screen.width, Config.screen.height, screen.background_color)
end end
UI.draw_top_bar(screen.name)
if not Context.stat_screen_active and #_available_decisions > 0 then if not Context.stat_screen_active and #_available_decisions > 0 then
Decision.draw(_available_decisions, _selected_decision_index) Decision.draw(_available_decisions, _selected_decision_index)
end end