Displays the characters on street and in office.

Reviewed-on: #34

.luacheckrc

@@ -3,6 +3,11 @@
 
 globals = {
   "Focus",
+  "Day",
+  "Timer",
+  "Glitch",
+  "Trigger",
+  "Discussion",
   "Util",
   "Decision",
   "Situation",
@@ -27,6 +32,9 @@ globals = {
   "MinigameButtonMashWindow",
   "MinigameRhythmWindow",
   "MinigameDDRWindow",
+  "MysteriousManWindow",
+  "DiscussionWindow",
+  "EndWindow",
   "mset",
   "mget",
   "btnp",

.vscode/tasks.json

@@ -11,17 +11,19 @@
         {
             "label": "Build & Run TIC80",
             "type": "shell",
-            "command": "make build && tic80 --fs=. impostor.lua"
+            "command": "make build && tic80 --fs=. impostor.lua",
+            "problemMatcher": []
         },
         {
             "label": "Export assets",
             "type": "shell",
-            "command": "make export_assets"
+            "command": "make export_assets",
+            "problemMatcher": []
         },
         {
             "label": "Make build",
             "type": "shell",
             "command": "make build"
-        },
+        }
     ]
 }

.woodpecker.yml

@@ -53,7 +53,7 @@ steps:
   - name: update
     image: alpine
     environment:
-      UPDATE_SERVER: https://games.vps.teletype.hu
+      UPDATE_SERVER: https://games.teletype.hu
       UPDATE_SECRET:
         from_secret: update_secret_key
     commands:

Makefile

@@ -30,7 +30,7 @@ DROPAREA_HOST ?= vps.teletype.hu
 DROPAREA_PORT ?= 2223
 DROPAREA_TARGET_PATH ?= /home/drop
 DROPAREA_USER ?= drop
-UPDATE_SERVER ?= https://games.vps.teletype.hu
+UPDATE_SERVER ?= https://games.teletype.hu
 
 all: build
 
@@ -164,6 +164,8 @@ export_assets:
 	@$(call f_export_asset_awk,MAP,$(OUTPUT),$(ASSETS_LUA))
 	@$(call f_export_asset_awk,SFX,$(OUTPUT),$(ASSETS_LUA))
 	@$(call f_export_asset_awk,WAVES,$(OUTPUT),$(ASSETS_LUA))
+	@$(call f_export_asset_awk,PATTERNS,$(OUTPUT),$(ASSETS_LUA))
+	@$(call f_export_asset_awk,TRACKS,$(OUTPUT),$(ASSETS_LUA))
 
 clean:
 	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(PROJECT)-*-docs.zip $(PROJECT)-docs.zip $(OUTPUT) $(OUTPUT_ORIGINAL)

impostor.inc

@@ -1,18 +1,39 @@
 meta/meta.header.lua
 init/init.module.lua
 init/init.config.lua
-init/init.minigame.lua
-init/init.meter.lua
 init/init.context.lua
 system/system.util.lua
 system/system.print.lua
 system/system.input.lua
-system/system.focus.lua
+logic/logic.meter.lua
+logic/logic.focus.lua
+logic/logic.day.lua
+logic/logic.timer.lua
+logic/logic.trigger.lua
+logic/logic.minigame.lua
+logic/logic.glitch.lua
+logic/logic.discussion.lua
 system/system.ui.lua
 audio/audio.manager.lua
 audio/audio.songs.lua
 sprite/sprite.manager.lua
 sprite/sprite.norman.lua
+sprite/sprite.sumphore.lua
+sprite/sprite.pizza_vendor.lua
+sprite/sprite.dev_boy.lua
+sprite/sprite.dev_buddy.lua
+sprite/sprite.dev_extrovert.lua
+sprite/sprite.dev_girl.lua
+sprite/sprite.dev_guard.lua
+sprite/sprite.dev_guru.lua
+sprite/sprite.dev_hr_girl.lua
+sprite/sprite.dev_introvert.lua
+sprite/sprite.dev_operator.lua
+sprite/sprite.dev_project_manager.lua
+sprite/sprite.matrix_architect.lua
+sprite/sprite.matrix_neo.lua
+sprite/sprite.matrix_oraculum.lua
+sprite/sprite.matrix_trinity.lua
 situation/situation.manager.lua
 situation/situation.drink_coffee.lua
 decision/decision.manager.lua
@@ -21,10 +42,12 @@ decision/decision.go_to_home.lua
 decision/decision.go_to_toilet.lua
 decision/decision.go_to_walking_to_office.lua
 decision/decision.go_to_office.lua
+decision/decision.go_to_end.lua
 decision/decision.go_to_walking_to_home.lua
-decision/decision.play_button_mash.lua
-decision/decision.play_rhythm.lua
-decision/decision.play_ddr.lua
+decision/decision.go_to_sleep.lua
+decision/decision.do_work.lua
+decision/decision.start_discussion.lua
+discussion/discussion.sumphore.lua
 map/map.manager.lua
 map/map.bedroom.lua
 map/map.street.lua
@@ -35,8 +58,10 @@ screen/screen.toilet.lua
 screen/screen.walking_to_office.lua
 screen/screen.office.lua
 screen/screen.walking_to_home.lua
+screen/screen.work.lua
 window/window.manager.lua
 window/window.register.lua
+window/window.end.lua
 window/window.splash.lua
 window/window.intro.lua
 window/window.menu.lua
@@ -46,6 +71,8 @@ window/window.popup.lua
 window/window.minigame.mash.lua
 window/window.minigame.rhythm.lua
 window/window.minigame.ddr.lua
+window/window.mysterious_man.lua
+window/window.discussion.lua
 window/window.game.lua
 system/system.main.lua
 meta/meta.assets.lua

inc/audio/audio.manager.lua

@@ -19,12 +19,14 @@ function Audio.music_play_room_street_1() end
 --- @within Audio
 function Audio.music_play_room_street_2() end
 --- Plays room music.
--- TODO: function name is incomplete, determine the correct room identifier
 --- @within Audio
 function Audio.music_play_room_() end
 --- Plays room work music.
 --- @within Audio
-function Audio.music_play_room_work() end
+function Audio.music_play_room_work() music(0) end
+--- Plays activity work music.
+--- @within Audio
+function Audio.music_play_activity_work() music(1) end
 
 --- Plays select sound effect.
 ---  @within Audio
@@ -41,3 +43,6 @@ function Audio.sfx_success() sfx(16, 'C-7', 60) end
 --- Plays bloop sound effect.
 ---  @within Audio
 function Audio.sfx_bloop() sfx(21, 'C-3', 60) end
+--- Plays alarm sound effect.
+---  @within Audio
+function Audio.sfx_alarm() sfx(61) end

inc/decision/decision.do_work.lua

@@ -0,0 +1,15 @@
+Decision.register({
+  id = "do_work",
+  label = "Do Work",
+  handle = function()
+    Meter.hide()
+    Util.go_to_screen_by_id("work")
+    MinigameDDRWindow.start("game", nil, {
+      on_win = function()
+        Meter.show()
+        Util.go_to_screen_by_id("office")
+        Window.set_current("game")
+      end,
+    })
+  end,
+})

inc/decision/decision.go_to_end.lua

@@ -0,0 +1,7 @@
+Decision.register({
+  id = "go_to_end",
+  label = "Break the cycle",
+  handle = function()
+    Window.set_current("end")
+  end,
+})

inc/decision/decision.go_to_office.lua

@@ -2,6 +2,7 @@ Decision.register({
   id = "go_to_office",
   label = "Go to Office",
   handle = function()
+    Glitch.show()
     Util.go_to_screen_by_id("office")
   end,
 })

inc/decision/decision.go_to_sleep.lua

@@ -0,0 +1,16 @@
+Decision.register({
+  id = "go_to_sleep",
+  label = "Go to Sleep",
+  handle = function()
+    Meter.hide()
+    Day.increase()
+    MinigameRhythmWindow.start("game", {
+      focus_center_x = (Config.screen.width / 2) - 22,
+      focus_center_y = (Config.screen.height / 2) - 18,
+      focus_initial_radius = 0,
+      on_win = function()
+        MysteriousManWindow.start()
+      end,
+    })
+  end,
+})

inc/decision/decision.manager.lua

@@ -5,16 +5,16 @@ local _decisions = {}
 --- @within Decision
 --- @param decision table The decision data table.
 --- @param decision.id string Unique decision identifier.
---- @param decision.label string Display text for the decision.
+--- @param decision.label string|function Display text for the decision, or a function returning it.
 --- @param[opt] decision.condition function Returns true if decision is available. Defaults to always true.
 --- @param[opt] decision.handle function Called when the decision is selected. Defaults to noop.
 function Decision.register(decision)
   if not decision or not decision.id then
-    PopupWindow.show({"Error: Invalid decision object registered (missing id)!"})
+    trace("Error: Invalid decision object registered (missing id)!")
     return
   end
   if not decision.label then
-    PopupWindow.show({"Error: Invalid decision object registered (missing label)!"})
+    trace("Error: Invalid decision object registered (missing label)!")
     return
   end
 
@@ -30,6 +30,18 @@ function Decision.register(decision)
   _decisions[decision.id] = decision
 end
 
+--- Gets the display label for a decision.
+--- @within Decision
+--- @param decision table The decision data table.
+--- @return string result The resolved decision label.
+function Decision.get_label(decision)
+  if not decision then return "" end
+  if type(decision.label) == "function" then
+    return decision.label() or ""
+  end
+  return decision.label or ""
+end
+
 --- Gets a decision by ID.
 --- @within Decision
 --- @param id string The ID of the decision.
@@ -92,9 +104,43 @@ end
 function Decision.filter_available(decisions_list)
   local available = {}
   for _, decision in ipairs(decisions_list) do
-    if decision and decision.condition() then
+    if decision and (not decision.condition or decision.condition()) then
       table.insert(available, decision)
     end
   end
   return available
 end
+
+--- Draws decision selector.
+--- @within Decision
+--- @param decisions table A table of decision items.<br/>
+--- @param selected_decision_index number The index of the selected decision.<br/>
+function Decision.draw(decisions, selected_decision_index)
+  local bar_height = 16
+  local bar_y = Config.screen.height - bar_height
+  rect(0, bar_y, Config.screen.width, bar_height, Config.colors.dark_grey)
+  if #decisions > 0 then
+    local selected_decision = decisions[selected_decision_index]
+    local decision_label = Decision.get_label(selected_decision)
+    local text_y = bar_y + 4
+    Print.text("<", 2, text_y, Config.colors.light_blue)
+    Print.text_center(decision_label, Config.screen.width / 2, text_y, Config.colors.item)
+    Print.text(">", Config.screen.width - 6, text_y, Config.colors.light_blue)
+  end
+end
+
+--- Updates decision selector.
+--- @within Decision
+--- @param decisions table A table of decision items.<br/>
+--- @param selected_decision_index number The current index of the selected decision.<br/>
+--- @return number selected_decision_index The updated index of the selected decision.
+function Decision.update(decisions, selected_decision_index)
+  if Input.left() then
+    Audio.sfx_beep()
+    selected_decision_index = Util.safeindex(decisions, selected_decision_index - 1)
+  elseif Input.right() then
+    Audio.sfx_beep()
+    selected_decision_index = Util.safeindex(decisions, selected_decision_index + 1)
+  end
+  return selected_decision_index
+end

inc/decision/decision.play_button_mash.lua

@@ -4,8 +4,8 @@ Decision.register({
   handle = function()
     Meter.hide()
     MinigameButtonMashWindow.start("game", {
-      focus_center_x = Config.screen.width / 2,
-      focus_center_y = Config.screen.height / 2,
+      focus_center_x = (Config.screen.width / 2) - 22,
+      focus_center_y = (Config.screen.height / 2) - 18,
       focus_initial_radius = 0,
     })
   end,

inc/decision/decision.play_rhythm.lua

@@ -4,8 +4,8 @@ Decision.register({
   handle = function()
     Meter.hide()
     MinigameRhythmWindow.start("game", {
-      focus_center_x = Config.screen.width / 2,
-      focus_center_y = Config.screen.height / 2,
+      focus_center_x = (Config.screen.width / 2) - 22,
+      focus_center_y = (Config.screen.height / 2) - 18,
       focus_initial_radius = 0,
     })
   end,

inc/decision/decision.start_discussion.lua

@@ -0,0 +1,18 @@
+Decision.register({
+  id = "start_discussion",
+  label = function()
+    if Context.day_count >= 3 then
+      return "Talk to Sumphore"
+    end
+    return "Talk to the homeless guy"
+  end,
+  handle = function()
+    if Context.day_count < 3 then
+      Discussion.start("homeless_guy", "game")
+    end
+    if Context.day_count >= 3 then
+      Discussion.start("sumphore_day_3", "game")
+      return
+    end
+  end,
+})

inc/discussion/discussion.sumphore.lua

@@ -0,0 +1,59 @@
+Discussion.register({
+  id = "sumphore_day_3",
+  steps = {
+    {
+      question = "Are you still seeking the ox?",
+      answers = {
+        { label = "Huh? What ox?", next_step = 2 },
+        { label = "Are you drunk, old man?", next_step = nil },
+      },
+    },
+    {
+      question = "Did you never think there would be more to this?",
+      answers = {
+        { label = "I'm not sure what you mean.", next_step = nil },
+      },
+    },
+  },
+})
+
+
+Discussion.register({
+  id = "homeless_guy",
+  steps = {
+    {
+      question = "Sup bro, how are you?",
+      answers = {
+        { label = "I'm doing great, thanks!", next_step = 2 },
+        { label = "Not as good as you", next_step = nil },
+      },
+    },
+    {
+      question = "What's your name?",
+      answers = {
+        { label = "Norman Reds, nice to meet you.", next_step = 3 },
+        { label = "Mom told me not to talk to strangers.", next_step = nil },
+      },
+    },
+    {
+      question = "That name ... could it be? I know a guy with that name...",
+      answers = {
+        { label = "Never met you before.", next_step = 4 },
+        { label = "I'm not sure what you mean.", next_step = nil },
+
+      },
+    },
+    {
+      question = "My name is Sumphore, nice to meet you.",
+      answers = {
+        { label = "Nice to meet you, Sumphore.", next_step = 5 },
+      },
+    },
+    {
+      question = "You're a good guy, I can tell. You abide by the rules. Life would be so much easier if more people were like you ...",
+      answers = {
+        { label = "Thanks, I try my best.", next_step = nil },
+      },
+    },
+  },
+})

inc/init/init.config.lua

@@ -9,18 +9,19 @@ function Config.initial_data()
       height = 136
     },
     colors = {
-      black = 2,
-      light_grey = 13,
-      dark_grey = 14,
-      red = 0,
-      light_blue = 7,
-      blue = 9,
-      white = 12,
-      item = 12,
-      meter_bg = 12
+      black = 0,
+      light_grey = 2,
+      dark_grey = 1,
+      red = 13,
+      light_blue = 9,
+      blue = 3,
+      white = 4,
+      item = 7,
+      meter_bg = 1
     },
     timing = {
-      splash_duration = 120
+      splash_duration = 120,
+      minigame_win_duration = 180
     }
   }
 end

inc/init/init.context.lua

@@ -18,6 +18,7 @@ Context = {}
 --- * minigame_button_mash (table) Button mash minigame state (see Minigame.get_default_button_mash).<br/>
 --- * minigame_rhythm (table) Rhythm minigame state (see Minigame.get_default_rhythm).<br/>
 --- * meters (table) Meter values (see Meter.get_initial).<br/>
+--- * triggers (table) Active trigger runtime state, keyed by trigger ID.<br/>
 --- * stat_screen_active (boolean) Whether the stat screen overlay is currently shown.<br/>
 --- * game (table) Current game progress state. Contains: `current_screen` (string) active screen ID, `current_situation` (string|nil) active situation ID.<br/>
 function Context.initial_data()
@@ -30,14 +31,37 @@ function Context.initial_data()
     },
     game_in_progress = false,
     stat_screen_active = false,
-    minigame_ddr = Minigame.get_default_ddr(),
-    minigame_button_mash = Minigame.get_default_button_mash(),
-    minigame_rhythm = Minigame.get_default_rhythm(),
+    minigame_ddr = {},
+    minigame_button_mash = {},
+    minigame_rhythm = {},
     meters = Meter.get_initial(),
+    timer = Timer.get_initial(),
+    triggers = {},
+    home_norman_visible = false,
     game = {
       current_screen = "home",
       current_situation = nil,
-    }
+    },
+    day_count = 1,
+    glitch = {
+      enabled = false,
+      state = "active",
+      timer = 0,
+    },
+    _end = {
+      state = "choice",
+      selection = 1,
+    },
+    discussion = {
+      active = false,
+      id = nil,
+      step = 1,
+      selected_answer = 1,
+      scroll_y = 0,
+      scroll_timer = 0,
+      auto_scroll = true,
+      return_window = nil,
+    },
   }
 end
 
@@ -63,6 +87,34 @@ function Context.new_game()
   Context.game_in_progress = true
   MenuWindow.refresh_menu_items()
   Screen.get_by_id(Context.game.current_screen).init()
+  MysteriousManWindow.start({
+    text = [[
+      Norman was never a bad
+      simulation engineer, but
+      we need to be careful in
+      letting him improve. We
+      need to distract him.
+    ]],
+    on_text_complete = function()
+      Audio.sfx_alarm()
+      Context.home_norman_visible = false
+      Util.go_to_screen_by_id("home")
+      MinigameButtonMashWindow.start("game", {
+        focus_center_x = (Config.screen.width / 2) - 22,
+        focus_center_y = (Config.screen.height / 2) - 18,
+        focus_initial_radius = 0,
+        target_points = 100,
+        instruction_text = "Wake up Norman!",
+        show_progress_text = false,
+        on_win = function()
+          Audio.music_play_wakingup()
+          Context.home_norman_visible = true
+          Meter.show()
+          Window.set_current("game")
+        end,
+      })
+    end,
+  })
 end
 
 --- Saves the current game state.

inc/init/init.minigame.lua

@@ -1,267 +0,0 @@
--- Manages minigame configurations and initial states.
---- @section Minigame
-
---- Applies parameters to defaults
---- @within Minigame
---- @param defaults table The default configuration table.
---- @param params table The parameters to apply.
---- @return table The updated configuration table.
-local function apply_params(defaults, params)
-  if not params then return defaults end
-  for k, v in pairs(params) do
-    defaults[k] = v
-  end
-  return defaults
-end
-
---- Gets default DDR minigame configuration.
---- @within Minigame
---- @return result table The default DDR minigame configuration. </br>
---- Fields: </br>
---- * bar_fill (number) Current fill level of the progress bar.<br/>
---- * max_fill (number) Maximum fill value to win.<br/>
---- * fill_per_hit (number) Fill gained per successful hit.<br/>
---- * miss_penalty (number) Fill lost per miss.<br/>
---- * bar_x (number) Progress bar X position.<br/>
---- * bar_y (number) Progress bar Y position.<br/>
---- * bar_width (number) Progress bar width.<br/>
---- * bar_height (number) Progress bar height.<br/>
---- * arrow_size (number) Size of arrow sprites.<br/>
---- * arrow_spawn_timer (number) Timer for arrow spawning.<br/>
---- * arrow_spawn_interval (number) Frames between arrow spawns.<br/>
---- * arrow_fall_speed (number) Speed of falling arrows.<br/>
---- * arrows (table) Array of active arrow objects.<br/>
---- * target_y (number) Y position of the target line.<br/>
---- * target_arrows (table) Array of target arrow positions. Each entry has: `dir` (string) arrow direction, `x` (number) X position.<br/>
---- * hit_threshold (number) Pixel distance for a valid hit.<br/>
---- * button_pressed_timers (table) Per-button press animation timers.<br/>
---- * button_press_duration (number) Duration of button press animation.<br/>
---- * input_cooldowns (table) Per-direction cooldown timers (left, down, up, right).<br/>
---- * input_cooldown_duration (number) Frames of input cooldown.<br/>
---- * frame_counter (number) Global frame counter.<br/>
---- * current_song (table) Currently playing song data.<br/>
---- * pattern_index (number) Current index in song pattern.<br/>
---- * use_pattern (boolean) Whether to use song pattern for spawning.<br/>
---- * return_window (string) Window ID to return to after minigame.
-function Minigame.get_default_ddr()
-  local arrow_size = 12
-  local arrow_spacing = 30
-  local total_width = (4 * arrow_size) + (3 * arrow_spacing)
-  local start_x = (Config.screen.width - total_width) / 2
-  return {
-    bar_fill = 0,
-    max_fill = 100,
-    fill_per_hit = 10,
-    miss_penalty = 5,
-    bar_x = 20,
-    bar_y = 10,
-    bar_width = 200,
-    bar_height = 12,
-    arrow_size = arrow_size,
-    arrow_spawn_timer = 0,
-    arrow_spawn_interval = 45,
-    arrow_fall_speed = 1.5,
-    arrows = {},
-    target_y = 115,
-    target_arrows = {
-      { dir = "left", x = start_x },
-      { dir = "down", x = start_x + arrow_size + arrow_spacing },
-      { dir = "up", x = start_x + (arrow_size + arrow_spacing) * 2 },
-      { dir = "right", x = start_x + (arrow_size + arrow_spacing) * 3 }
-    },
-    hit_threshold = 8,
-    button_pressed_timers = {},
-    button_press_duration = 8,
-    input_cooldowns = { left = 0, down = 0, up = 0, right = 0 },
-    input_cooldown_duration = 10,
-    frame_counter = 0,
-    current_song = nil,
-    pattern_index = 1,
-    use_pattern = false,
-    return_window = nil
-  }
-end
-
---- Gets default button mash minigame configuration.
---- @within Minigame
---- @return result table The default button mash minigame configuration. </br>
---- Fields: </br>
---- * bar_fill (number) Current fill level of the progress bar.<br/>
---- * max_fill (number) Maximum fill value to win.<br/>
---- * fill_per_press (number) Fill gained per button press.<br/>
---- * base_degradation (number) Base rate of bar degradation per frame.<br/>
---- * degradation_multiplier (number) Multiplier for degradation scaling.<br/>
---- * button_pressed_timer (number) Button press animation timer.<br/>
---- * button_press_duration (number) Duration of button press animation.<br/>
---- * return_window (string) Window ID to return to after minigame.<br/>
---- * bar_x (number) Progress bar X position.<br/>
---- * bar_y (number) Progress bar Y position.<br/>
---- * bar_width (number) Progress bar width.<br/>
---- * bar_height (number) Progress bar height.<br/>
---- * button_x (number) Button indicator X position.<br/>
---- * button_y (number) Button indicator Y position.<br/>
---- * button_size (number) Button indicator size.<br/>
-function Minigame.get_default_button_mash()
-  return {
-    bar_fill = 0,
-    max_fill = 100,
-    fill_per_press = 8,
-    base_degradation = 0.15,
-    degradation_multiplier = 0.006,
-    button_pressed_timer = 0,
-    button_press_duration = 8,
-    return_window = nil,
-    bar_x = 20,
-    bar_y = 10,
-    bar_width = 200,
-    bar_height = 12,
-    button_x = 20,
-    button_y = 110,
-    button_size = 12,
-    focus_center_x = nil,
-    focus_center_y = nil,
-    focus_initial_radius = 0
-  }
-end
-
---- Gets default rhythm minigame configuration.
---- @within Minigame
---- @return result table The default rhythm minigame configuration. </br>
---- Fields: </br>
---- * line_position (number) Current position of the moving line (0-1).<br/>
---- * line_speed (number) Speed of the moving line per frame.<br/>
---- * line_direction (number) Direction of line movement (1 or -1).<br/>
---- * target_center (number) Center of the target zone (0-1).<br/>
---- * target_width (number) Current width of the target zone.<br/>
---- * initial_target_width (number) Starting width of the target zone.<br/>
---- * min_target_width (number) Minimum width the target zone can shrink to.<br/>
---- * target_shrink_rate (number) Multiplier applied to target width after each hit.<br/>
---- * score (number) Current score.<br/>
---- * max_score (number) Score needed to win.<br/>
---- * button_pressed_timer (number) Button press animation timer.<br/>
---- * button_press_duration (number) Duration of button press animation.<br/>
---- * return_window (string) Window ID to return to after minigame.<br/>
---- * bar_x (number) Progress bar X position.<br/>
---- * bar_y (number) Progress bar Y position.<br/>
---- * bar_width (number) Progress bar width.<br/>
---- * bar_height (number) Progress bar height.<br/>
---- * button_x (number) Button indicator X position.<br/>
---- * button_y (number) Button indicator Y position.<br/>
---- * button_size (number) Button indicator size.<br/>
---- * press_cooldown (number) Current cooldown timer.<br/>
---- * press_cooldown_duration (number) Frames of press cooldown.<br/>
-function Minigame.get_default_rhythm()
-  return {
-    line_position = 0,
-    line_speed = 0.015,
-    line_direction = 1,
-    target_center = 0.5,
-    target_width = 0.3,
-    initial_target_width = 0.3,
-    min_target_width = 0.08,
-    target_shrink_rate = 0.9,
-    score = 0,
-    max_score = 10,
-    button_pressed_timer = 0,
-    button_press_duration = 10,
-    return_window = nil,
-    bar_x = 20,
-    bar_y = 10,
-    bar_width = 200,
-    bar_height = 12,
-    button_x = 210,
-    button_y = 110,
-    button_size = 10,
-    press_cooldown = 0,
-    press_cooldown_duration = 15,
-    focus_center_x = nil,
-    focus_center_y = nil,
-    focus_initial_radius = 0
-  }
-end
-
---- Configures DDR minigame.
---- @within Minigame
---- @param params table Optional parameters to override defaults (see Minigame.get_default_ddr).
---- @param[opt] params.bar_fill number Current fill level of the progress bar.
---- @param[opt] params.max_fill number Maximum fill value to win.
---- @param[opt] params.fill_per_hit number Fill gained per successful hit.
---- @param[opt] params.miss_penalty number Fill lost per miss.
---- @param[opt] params.bar_x number Progress bar X position.
---- @param[opt] params.bar_y number Progress bar Y position.
---- @param[opt] params.bar_width number Progress bar width.
---- @param[opt] params.bar_height number Progress bar height.
---- @param[opt] params.arrow_size number Size of arrow sprites.
---- @param[opt] params.arrow_spawn_timer number Timer for arrow spawning.
---- @param[opt] params.arrow_spawn_interval number Frames between arrow spawns.
---- @param[opt] params.arrow_fall_speed number Speed of falling arrows.
---- @param[opt] params.arrows table Array of active arrow objects.
---- @param[opt] params.target_y number Y position of the target line.
---- @param[opt] params.target_arrows table Array of target arrow positions with dir and x fields.
---- @param[opt] params.hit_threshold number Pixel distance for a valid hit.
---- @param[opt] params.button_pressed_timers table Per-button press animation timers.
---- @param[opt] params.button_press_duration number Duration of button press animation.
---- @param[opt] params.input_cooldowns table Per-direction cooldown timers (left, down, up, right).
---- @param[opt] params.input_cooldown_duration number Frames of input cooldown.
---- @param[opt] params.frame_counter number Global frame counter.
---- @param[opt] params.current_song table Currently playing song data.
---- @param[opt] params.pattern_index number Current index in song pattern.
---- @param[opt] params.use_pattern boolean Whether to use song pattern for spawning.
---- @param[opt] params.return_window string Window ID to return to after minigame.
---- @return result table The configured DDR minigame state (see Minigame.get_default_ddr for fields).
-function Minigame.configure_ddr(params)
-  return apply_params(Minigame.get_default_ddr(), params)
-end
-
---- Configures button mash minigame.
---- @within Minigame
---- @param params table Optional parameters to override defaults (see Minigame.get_default_button_mash).
---- @param[opt] params.bar_fill number Current fill level of the progress bar.
---- @param[opt] params.max_fill number Maximum fill value to win.
---- @param[opt] params.fill_per_press number Fill gained per button press.
---- @param[opt] params.base_degradation number Base rate of bar degradation per frame.
---- @param[opt] params.degradation_multiplier number Multiplier for degradation scaling.
---- @param[opt] params.button_pressed_timer number Button press animation timer.
---- @param[opt] params.button_press_duration number Duration of button press animation.
---- @param[opt] params.return_window string Window ID to return to after minigame.
---- @param[opt] params.bar_x number Progress bar X position.
---- @param[opt] params.bar_y number Progress bar Y position.
---- @param[opt] params.bar_width number Progress bar width.
---- @param[opt] params.bar_height number Progress bar height.
---- @param[opt] params.button_x number Button indicator X position.
---- @param[opt] params.button_y number Button indicator Y position.
---- @param[opt] params.button_size number Button indicator size.
---- @return result table The configured button mash minigame state (see Minigame.get_default_button_mash for fields).
-function Minigame.configure_button_mash(params)
-  return apply_params(Minigame.get_default_button_mash(), params)
-end
-
---- Configures rhythm minigame.
---- @within Minigame
---- @param params table Optional parameters to override defaults (see Minigame.get_default_rhythm).
---- @param[opt] params.line_position number Current position of the moving line (0-1).
---- @param[opt] params.line_speed number Speed of the moving line per frame.
---- @param[opt] params.line_direction number Direction of line movement (1 or -1).
---- @param[opt] params.target_center number Center of the target zone (0-1).
---- @param[opt] params.target_width number Current width of the target zone.
---- @param[opt] params.initial_target_width number Starting width of the target zone.
---- @param[opt] params.min_target_width number Minimum width the target zone can shrink to.
---- @param[opt] params.target_shrink_rate number Multiplier applied to target width after each hit.
---- @param[opt] params.score number Current score.
---- @param[opt] params.max_score number Score needed to win.
---- @param[opt] params.button_pressed_timer number Button press animation timer.
---- @param[opt] params.button_press_duration number Duration of button press animation.
---- @param[opt] params.return_window string Window ID to return to after minigame.
---- @param[opt] params.bar_x number Progress bar X position.
---- @param[opt] params.bar_y number Progress bar Y position.
---- @param[opt] params.bar_width number Progress bar width.
---- @param[opt] params.bar_height number Progress bar height.
---- @param[opt] params.button_x number Button indicator X position.
---- @param[opt] params.button_y number Button indicator Y position.
---- @param[opt] params.button_size number Button indicator size.
---- @param[opt] params.press_cooldown number Current cooldown timer.
---- @param[opt] params.press_cooldown_duration number Frames of press cooldown.
---- @return result table The configured rhythm minigame state (see Minigame.get_default_rhythm for fields).
-function Minigame.configure_rhythm(params)
-  return apply_params(Minigame.get_default_rhythm(), params)
-end

inc/init/init.module.lua

@@ -12,3 +12,7 @@ Input = {}
 Sprite = {}
 Audio = {}
 Focus = {}
+Day = {}
+Timer = {}
+Trigger = {}
+Discussion = {}

inc/logic/logic.day.lua

@@ -0,0 +1,25 @@
+--- @section Day
+local _day_increase_handlers = {}
+
+--- Increases the day count and triggers registered handlers.
+--- @within Day
+function Day.increase()
+    Context.day_count = Context.day_count + 1
+    for _, handler in ipairs(_day_increase_handlers) do
+        handler()
+    end
+end
+
+--- Registers a handler to be called when the day increases.
+--- @within Day
+--- @param handler function The function to call when the day increases.
+function Day.register_handler(handler)
+    table.insert(_day_increase_handlers, handler)
+end
+
+Day.register_handler(function()
+    local m = Context.meters
+    m.ism = math.max(0, m.ism - METER_DECAY_PER_DAY)
+    m.wpm = math.max(0, m.wpm - METER_DECAY_PER_DAY)
+    m.bm = math.max(0, m.bm - METER_DECAY_PER_DAY)
+end)

inc/logic/logic.discussion.lua

@@ -0,0 +1,103 @@
+--- @section Discussion
+local _discussions = {}
+
+--- Registers a discussion definition.
+--- @within Discussion
+--- @param discussion table The discussion data table.
+--- @param discussion.id string Unique discussion identifier.
+--- @param discussion.steps table Array of step tables, each with `question` (string) and `answers` (array of {label, next_step} tables).
+--- @param[opt] discussion.on_end function Called when the discussion ends. Defaults to noop.
+function Discussion.register(discussion)
+  if not discussion or not discussion.id then
+    trace("Error: Invalid discussion registered (missing id)!")
+    return
+  end
+  if not discussion.steps or #discussion.steps == 0 then
+    trace("Error: Discussion '" .. discussion.id .. "' has no steps!")
+    return
+  end
+  if not discussion.on_end then
+    discussion.on_end = function() end
+  end
+  if _discussions[discussion.id] then
+    trace("Warning: Overwriting discussion with id: " .. discussion.id)
+  end
+  _discussions[discussion.id] = discussion
+end
+
+--- Gets a discussion by ID.
+--- @within Discussion
+--- @param id string The discussion ID.
+--- @return table|nil result The discussion table or nil.
+function Discussion.get_by_id(id)
+  return _discussions[id]
+end
+
+--- Starts a discussion, switching to the discussion window.
+--- @within Discussion
+--- @param id string The discussion ID to start.
+--- @param return_window string The window ID to return to after the discussion.
+function Discussion.start(id, return_window)
+  local discussion = _discussions[id]
+  if not discussion then
+    trace("Error: Discussion not found: " .. tostring(id))
+    return
+  end
+  Context.discussion.active = true
+  Context.discussion.id = id
+  Context.discussion.step = 1
+  Context.discussion.selected_answer = 1
+  Context.discussion.scroll_y = 0
+  Context.discussion.scroll_timer = 0
+  Context.discussion.auto_scroll = true
+  Context.discussion.return_window = return_window or "game"
+  Meter.hide()
+  Window.set_current("discussion")
+end
+
+--- Gets the current step data for the active discussion.
+--- @within Discussion
+--- @return table|nil result The current step table or nil.
+function Discussion.get_current_step()
+  if not Context.discussion.active or not Context.discussion.id then return nil end
+  local discussion = _discussions[Context.discussion.id]
+  if not discussion then return nil end
+  return discussion.steps[Context.discussion.step]
+end
+
+--- Advances to a specific step or ends the discussion.
+--- @within Discussion
+--- @param next_step number|nil The step index to go to, or nil to end.
+function Discussion.go_to_step(next_step)
+  if not next_step then
+    Discussion.finish()
+    return
+  end
+  local discussion = _discussions[Context.discussion.id]
+  if not discussion or not discussion.steps[next_step] then
+    Discussion.finish()
+    return
+  end
+  Context.discussion.step = next_step
+  Context.discussion.selected_answer = 1
+  Context.discussion.scroll_y = 0
+  Context.discussion.scroll_timer = 0
+  Context.discussion.auto_scroll = true
+end
+
+--- Ends the active discussion and returns to the previous window.
+--- @within Discussion
+function Discussion.finish()
+  local discussion = _discussions[Context.discussion.id]
+  local return_window = Context.discussion.return_window or "game"
+  Context.discussion.active = false
+  Context.discussion.id = nil
+  Context.discussion.scroll_y = 0
+  Context.discussion.scroll_timer = 0
+  Context.discussion.auto_scroll = true
+  Meter.show()
+  if discussion and discussion.on_end then
+    discussion.on_end()
+  end
+  Window.set_current(return_window)
+end

inc/logic/logic.glitch.lua

@@ -0,0 +1,58 @@
+--- @section Glitch
+Glitch = {}
+
+--- Shows the glitch effect.
+--- @within Glitch
+function Glitch.show()
+  if Context and Context.glitch then
+    Context.glitch.enabled = true
+  end
+end
+
+--- Hides the glitch effect.
+--- @within Glitch
+function Glitch.hide()
+  if Context and Context.glitch then
+    Context.glitch.enabled = false
+  end
+end
+
+--- Draws the glitch effect if active.
+--- @within Glitch
+function Glitch.draw()
+  if not Context or not Context.glitch or not Context.glitch.enabled then return end
+
+  -- Update state timer
+  Context.glitch.timer = Context.glitch.timer - 1
+  if Context.glitch.timer <= 0 then
+    if Context.glitch.state == "active" then
+      Context.glitch.state = "waiting"
+      Context.glitch.timer = math.random(20, 60) -- Time to stay fixed
+    else
+      Context.glitch.state = "active"
+      Context.glitch.timer = math.random(40, 100) -- Time to stay glitchy
+    end
+  end
+
+  -- Draw stripes only when active
+  if Context.glitch.state == "active" then
+    for _ = 1, 15 do
+      local rx = math.random(0, Config.screen.width - 1)
+      local ry = math.random(0, Config.screen.height - 1)
+
+      -- Sample color at the random point
+      local color = pix(rx, ry)
+
+      -- Determine random length for the stripe (2-40)
+      local length = math.random(2, 40)
+
+      -- Draw the vertical stripe
+      for sy = 0, length - 1 do
+        local dy = ry + sy
+        if dy < Config.screen.height then
+          pix(rx, dy, color)
+        end
+      end
+    end
+  end
+end

inc/logic/logic.meter.lua

@@ -2,34 +2,17 @@
 local METER_MAX = 1000
 local METER_DEFAULT = 500
 local METER_GAIN_PER_CHORE = 100
+local METER_DECAY_PER_DAY = 20
 local COMBO_BASE_BONUS = 0.02
 local COMBO_MAX_BONUS = 0.16
 local COMBO_TIMEOUT_FRAMES = 600
 
--- 1800 frames = 30 seconds (1800 ÷ 60 = 30)
-local meter_timer_duration = 1800
-local meter_timer_decay_per_revolution = 20
-
 -- Internal meters for tracking game progress and player stats.
 Meter.COLOR_ISM = Config.colors.red
 Meter.COLOR_WPM = Config.colors.blue
 Meter.COLOR_BM = Config.colors.black
 Meter.COLOR_BG = Config.colors.meter_bg
 
---- Sets the number of frames for one full timer revolution.
---- @within Meter
---- @param frames number Frames per revolution (controls degradation speed).
-function Meter.set_timer_duration(frames)
-  meter_timer_duration = frames
-end
-
---- Sets the degradation amount applied to all meters per revolution.
---- @within Meter
---- @param amount number Amount to subtract from each meter per revolution.
-function Meter.set_timer_decay(amount)
-  meter_timer_decay_per_revolution = amount
-end
-
 --- Gets initial meter values.
 --- @within Meter
 --- @return result table Initial meter values. </br>
@@ -39,8 +22,7 @@ end
 --- * bm (number) Initial BM meter value.<br/>
 --- * combo (number) Current combo count.<br/>
 --- * combo_timer (number) Frames since last combo action.<br/>
---- * hidden (boolean) Whether meters are hidden.<br/>
---- * timer_progress (number) Clock timer revolution progress (0 to 1).
+--- * hidden (boolean) Whether meters are hidden.
 function Meter.get_initial()
   return {
     ism = METER_DEFAULT,
@@ -49,7 +31,6 @@ function Meter.get_initial()
     combo = 0,
     combo_timer = 0,
     hidden = false,
-    timer_progress = 0,
   }
 end
 
@@ -72,6 +53,20 @@ function Meter.get_max()
   return METER_MAX
 end
 
+--- Sets the decay amount applied to all meters per day.
+--- @within Meter
+--- @param amount number Amount to subtract from each meter.
+function Meter.set_decay(amount)
+  METER_DECAY_PER_DAY = amount
+end
+
+--- Gets the meter decay as a percentage of the max meter value.
+--- @within Meter
+--- @return number The decay percentage per day.
+function Meter.get_decay_percentage()
+  return math.floor(METER_DECAY_PER_DAY / METER_MAX * 100)
+end
+
 --- Gets combo multiplier.
 --- @within Meter
 --- @return number The current combo multiplier.
@@ -96,13 +91,6 @@ function Meter.update()
         m.combo_timer = 0
       end
     end
-    m.timer_progress = m.timer_progress + (1 / meter_timer_duration)
-    if m.timer_progress >= 1 then
-      m.timer_progress = m.timer_progress - 1
-      m.ism = math.max(0, m.ism - meter_timer_decay_per_revolution)
-      m.wpm = math.max(0, m.wpm - meter_timer_decay_per_revolution)
-      m.bm = math.max(0, m.bm - meter_timer_decay_per_revolution)
-    end
   end
 end
 
@@ -118,13 +106,6 @@ function Meter.add(key, amount)
   end
 end
 
---- Gets the timer decay as a percentage of the max meter value.
---- @within Meter
---- @return number The decay percentage per revolution (e.g. 2 means -2%).
-function Meter.get_timer_decay_percentage()
-  return math.floor(meter_timer_decay_per_revolution / METER_MAX * 100)
-end
-
 --- Called on minigame completion.
 --- @within Meter
 function Meter.on_minigame_complete()
@@ -136,3 +117,39 @@ function Meter.on_minigame_complete()
   m.combo = m.combo + 1
   m.combo_timer = 0
 end
+
+--- Draws meters.
+--- @within Meter
+function Meter.draw()
+  if not Context or not Context.game_in_progress or not Context.meters then return end
+  if Context.meters.hidden then return end
+
+  local m = Context.meters
+  local max = Meter.get_max()
+  local bar_w = 44
+  local bar_h = 2
+  local bar_x = 182
+  local label_x = 228
+  local line_h = 5
+  local start_y = 1
+
+
+  local bar_offset = math.floor((line_h - bar_h) / 2)
+
+  local meter_list = {
+    { key = "wpm", label = "WPM", color = Meter.COLOR_WPM, row = 0 },
+    { key = "ism", label = "ISM", color = Meter.COLOR_ISM, row = 1 },
+    { key = "bm", label = "BM", color = Meter.COLOR_BM, row = 2 },
+  }
+
+  for _, meter in ipairs(meter_list) do
+    local label_y = start_y + meter.row * line_h
+    local bar_y = label_y + bar_offset
+    local fill_w = math.max(0, math.floor((m[meter.key] / max) * bar_w))
+    rect(bar_x, bar_y, bar_w, bar_h, Meter.COLOR_BG)
+    if fill_w > 0 then
+      rect(bar_x, bar_y, fill_w, bar_h, meter.color)
+    end
+    print(meter.label, label_x, label_y, meter.color, false, 1, true)
+  end
+end

inc/logic/logic.minigame.lua

@@ -0,0 +1,19 @@
+-- Manages minigame configurations and initial states.
+--- @section Minigame
+
+--- Draws a unified win message overlay.
+--- @within Minigame
+function Minigame.draw_win_overlay()
+  local text = "SUCCESS"
+  local tw = #text * 4
+  local th = 6
+  local padding = 4
+  local box_w = tw + padding * 2
+  local box_h = th + padding * 2
+  local box_x = (Config.screen.width - box_w) / 2
+  local box_y = (Config.screen.height - box_h) / 2
+
+  rect(box_x, box_y, box_w, box_h, Config.colors.dark_grey)
+  rectb(box_x, box_y, box_w, box_h, Config.colors.white)
+  Print.text_center(text, Config.screen.width / 2, box_y + padding, Config.colors.white)
+end

inc/logic/logic.timer.lua

@@ -0,0 +1,88 @@
+--- @section Timer
+
+local timer_duration = 1800
+
+--- Gets initial timer values.
+--- @within Timer
+--- @return result table Initial timer values. </br>
+--- Fields: </br>
+--- * progress (number) Clock timer revolution progress (0 to 1).
+function Timer.get_initial()
+  return {
+    progress = 0,
+  }
+end
+
+--- Sets the number of frames for one full timer revolution.
+--- @within Timer
+--- @param frames number Frames per revolution.
+function Timer.set_duration(frames)
+  timer_duration = frames
+end
+
+--- Updates the timer and handles revolution events.
+--- @within Timer
+function Timer.update()
+  if not Context or not Context.game_in_progress or not Context.meters or not Context.timer then return end
+  local t = Context.timer
+  local in_minigame = string.find(Window.get_current_id(), "^minigame_") ~= nil
+
+  if not in_minigame then
+    t.progress = t.progress + (1 / timer_duration)
+    if t.progress >= 1 then
+      Day.increase()
+      t.progress = t.progress - 1
+    end
+  end
+end
+
+--- Draws the clock timer indicator as a circular progress bar.
+--- @within Timer
+function Timer.draw()
+  if not Context or not Context.game_in_progress or not Context.meters or not Context.timer then return end
+  if Context.meters.hidden and not Context.stat_screen_active then return end
+
+  local cx = 10
+  local cy = 8
+  local r_outer = 5
+  local r_inner = 3
+  local progress = Context.timer.progress
+
+  local fg_color
+  if progress <= 0.25 then
+    fg_color = Config.colors.dark_grey
+  elseif progress <= 0.5 then
+    fg_color = Config.colors.light_blue
+  elseif progress <= 0.75 then
+    fg_color = Config.colors.blue
+  elseif progress <= 1 then
+    fg_color = Config.colors.red
+  end
+
+  local bg_color = Config.colors.white
+  local start_angle = -math.pi * 0.5
+  local progress_angle = progress * 2 * math.pi
+  local r_outer_sq = r_outer * r_outer
+  local r_inner_sq = r_inner * r_inner
+
+  for dy = -r_outer, r_outer do
+    for dx = -r_outer, r_outer do
+      local dist_sq = dx * dx + dy * dy
+      if dist_sq <= r_outer_sq and dist_sq > r_inner_sq then
+        local angle = math.atan(dy, dx)
+        local relative = angle - start_angle
+        if relative < 0 then relative = relative + 2 * math.pi end
+        if relative <= progress_angle then
+          pix(cx + dx, cy + dy, fg_color)
+        else
+          pix(cx + dx, cy + dy, bg_color)
+        end
+      end
+    end
+  end
+
+  local hand_angle = start_angle + progress_angle
+  local hand_x = math.floor(cx + math.cos(hand_angle) * (r_inner - 1) + 0.5)
+  local hand_y = math.floor(cy + math.sin(hand_angle) * (r_inner - 1) + 0.5)
+  line(cx, cy, hand_x, hand_y, Config.colors.white)
+end

inc/logic/logic.trigger.lua

@@ -0,0 +1,135 @@
+--- @section Trigger
+local triggers = {}
+
+--- @within Trigger
+--- @param trigger table The trigger data table.
+--- @param trigger.id string Unique trigger identifier.
+--- @param trigger.duration number Duration in frames before the trigger fires.
+--- @param[opt] trigger.on_start function Called when the trigger starts. Defaults to noop.
+--- @param[opt] trigger.on_stop function Called when the trigger fires or is manually stopped. Defaults to noop.
+--- @param[opt] trigger.repeating boolean If true, trigger restarts after firing. Defaults to false.
+function Trigger.register(trigger)
+  if not trigger or not trigger.id then
+    trace("Error: Invalid trigger registered (missing id)!")
+    return
+  end
+  if not trigger.duration or trigger.duration <= 0 then
+    trace("Error: Invalid trigger registered (missing or invalid duration)!")
+    return
+  end
+
+  if not trigger.on_start then
+    trigger.on_start = function() end
+  end
+  if not trigger.on_stop then
+    trigger.on_stop = function() end
+  end
+  if trigger.repeating == nil then
+    trigger.repeating = false
+  end
+  if triggers[trigger.id] then
+    trace("Warning: Overwriting trigger with id: " .. trigger.id)
+  end
+  triggers[trigger.id] = trigger
+end
+
+--- @within Trigger
+--- @param id string The trigger ID.
+--- @return table|nil result The trigger definition or nil.
+function Trigger.get_by_id(id)
+  return triggers[id]
+end
+
+--- @within Trigger
+--- @return table result All trigger definitions keyed by ID.
+function Trigger.get_all()
+  return triggers
+end
+
+--- @within Trigger
+--- @param id string The trigger ID.
+--- @return boolean active True if the trigger is running.
+function Trigger.is_active(id)
+  if not Context or not Context.triggers then return false end
+  return Context.triggers[id] ~= nil
+end
+
+--- If already active, restarts from 0.
+--- @within Trigger
+--- @param id string The trigger ID.
+function Trigger.start(id)
+  if not Context or not Context.triggers then return end
+  local trigger = triggers[id]
+  if not trigger then
+    trace("Error: Cannot start unknown trigger: " .. tostring(id))
+    return
+  end
+
+  Context.triggers[id] = { elapsed = 0 }
+  trigger.on_start()
+end
+
+--- @within Trigger
+--- @param id string The trigger ID.
+function Trigger.stop(id)
+  if not Context or not Context.triggers then return end
+  local trigger = triggers[id]
+  if not trigger then
+    trace("Error: Cannot stop unknown trigger: " .. tostring(id))
+    return
+  end
+  if not Context.triggers[id] then return end
+
+  Context.triggers[id] = nil
+  trigger.on_stop()
+end
+
+--- Resets elapsed time to 0 without calling handlers. No-op if inactive.
+--- @within Trigger
+--- @param id string The trigger ID.
+function Trigger.reset(id)
+  if not Context or not Context.triggers then return end
+  if not triggers[id] then
+    trace("Error: Cannot reset unknown trigger: " .. tostring(id))
+    return
+  end
+  if not Context.triggers[id] then return end
+
+  Context.triggers[id].elapsed = 0
+end
+
+--- Pauses during minigames.
+--- @within Trigger
+function Trigger.update()
+  if not Context or not Context.game_in_progress or not Context.triggers then return end
+
+  local in_minigame = string.find(Window.get_current_id(), "^minigame_") ~= nil
+  if in_minigame then return end
+
+  local fired = {}
+  for id, state in pairs(Context.triggers) do
+    local trigger = triggers[id]
+    if trigger then
+      state.elapsed = state.elapsed + 1
+      if state.elapsed >= trigger.duration then
+        table.insert(fired, id)
+      end
+    else
+      table.insert(fired, id)
+    end
+  end
+
+  for _, id in ipairs(fired) do
+    local trigger = triggers[id]
+    if trigger then
+      trigger.on_stop()
+      if trigger.repeating then
+        Context.triggers[id] = { elapsed = 0 }
+      else
+        Context.triggers[id] = nil
+      end
+    else
+      Context.triggers[id] = nil
+    end
+  end
+end

inc/meta/meta.assets.lua

@@ -255,24 +255,126 @@
 -- 003:0000000000000000441600004242600044241000ff426000fff4100033f26000
 -- 004:00000333000035550003655500365555003555ff00356fff00365f3f00355fff
 -- 005:33000000553000005563000055563000ff553000fff53000f3f63000fff53000
+-- 008:0000005a00005a55000055a50000a55a00005a5700005533000575f30000757f
+-- 009:55a50000a55a50005a55a00057555500fff7a5003f335a00fff3f500fffffa00
 -- 016:0000000000000000000000000000003000000353000035350003535100353535
 -- 017:0000000000000000000000003000000053300000151300005151300015151300
 -- 018:004f99ff000fffff0000ff3300000fff00003666000355550035652503163555
 -- 019:99f41000fff26000ff600000f600000063300000555330005555530055535530
 -- 020:00356f6f003655f60365511f3653122f3531222f363221220532232203322322
 -- 021:f6f530006f563000f1156300f2215300f2226300221233002232130022121300
+-- 022:000000000000005100000155000055150000157f0000551300057f3f00017fff
+-- 023:00000000555000005155000015515000ff7f5100ff31f200fff3ff0033fff200
+-- 024:0000057f00000005000000050000559900055911005599110055119900551199
+-- 025:f3ff5000fff500005f5000004415100077995100449915007711955044119550
+-- 026:00000000000001330001331300031333001333330031f7f7001133390031999f
+-- 027:0000000013310000131330003333130033333100f7f113003337310099975300
+-- 028:000000000000000000000a77000057770005777700577777005775a50077a7ff
+-- 029:0000000000000000777a0000777750007777750077777750a5a57750fff7a770
+-- 030:000000000000051500001151000555550001517f000557ff0001ff3f0007ff1f
+-- 031:00000000150000005110000055500000f7110000ff750000f3f10000f1f50000
 -- 032:0033535100353533003351ff00351f3f0003ff3f0003ffff00003ff3000323ff
 -- 033:5555530033555300ff155300f3f15300f3ff3000ffff30003ff30000ff323000
 -- 034:036135250316355503613525031633110333331103f333330333333300033333
 -- 035:55565530555355305556553013335530133333303333ff303333333033330000
 -- 036:00322322003223330033331a003ff31a003ff3a1003333a100003a1a00003a1a
 -- 037:223213003332130011133300111f300011133000111300001113000011130000
+-- 038:000007ff0001117f0016171f0155175501561755155117555f7157555ff15755
+-- 039:fffff700333f2000ffff7100555571105555716155557111555575ff555575ff
+-- 040:005599110055991100ff533300fff511007fff110007f5110000311300003113
+-- 041:479915504499155047333f7014113ff011113f70111130003311300003113000
+-- 042:0035777f0001776600005777000000550088885508bbb84508bbb8448bb8b844
+-- 043:77775300677500007750000055880000558b8000548bb800228bbb80428b8b80
+-- 044:005a7f3f0057ff3f07f7ffff07757fdf077a57fd0575357f005a66a70006aa6f
+-- 045:ff3f7a50ff3ff750fffff777ffdf7577ddf75a77ff75157577a66a50ff6aa600
+-- 046:0005ffff00005ff3000005ff0017775500242777002121710024277100212171
+-- 047:fff500003f500000f50000005771000077720000171200001772000017120000
 -- 048:00323123003231430032314300313339000f3333000033300000333000033330
 -- 049:324303003443030034430300933313003333f000033300000333000003333000
 -- 050:0003333000033330000333300003333000053530003311300031113000333330
 -- 051:3333000033330000333300003333000035350000311330003111300033333000
 -- 052:000031a1000031a100003a1a00003a1a00003333000003f3000003f300000330
 -- 053:111300001113000011130000111300003333000003f3000003f3000003300000
+-- 054:5ff7646607f59999000991330003993000099130000133300001221000011100
+-- 055:666646ff999993f7339913000039930000991300001333000012210000111000
+-- 056:0000311300003113000031130000311300003113000033330000165100001111
+-- 057:0311300003113000031130000311300003113000033330000165100001111000
+-- 058:8888b8445f78b8445f58884405031330000331300003133000053550000577f0
+-- 059:218b8880428b87f5218885f5031330500331300003133000053550000577f000
+-- 060:0056aa66001f6aaa001fa666007f6aaa00006aaa0000a666000007d7000001d1
+-- 061:666aa650aaaa6f106666af10aaaa6f70aaaa60006666a000007d7000001d1000
+-- 062:0024277700ff611100fff333005f533300003333000033300000333000001110
+-- 063:77720000116f0000335ff000333f000033300000333000003330000001110000
+-- 064:00000000000000000000011100003311000111170003317f000117ff00553333
+-- 065:0000000000000000110000001110000077110000ff710000ff77000013330000
+-- 066:00000000000000330000033300003333000033f7000035ff000535ff0007f333
+-- 067:0000000030000000333300003333000037f30000ffff0000ffff0000f333f000
+-- 068:000000000000000000000000000000000000000000000122000012440001447f
+-- 069:00000000000000000000000000000000000000002210000044210000f7441000
+-- 070:000000000000000000000333000038880003888800388881038388310338835f
+-- 071:00000000000000003330000088880000883380003355380016665300f7ff7300
+-- 072:0000000000000000000000550000055500005577000057ff00007f55000fff33
+-- 073:0000000000000000555550005555550077777550ffffff507f755f703f333fff
+-- 074:0000000000000011000001130000113100011313000131310013137c003131ff
+-- 075:000000001110000013110000313110001313100031313100ffff7100fffff100
+-- 076:0000000000000055000005550000055500005577000057ff0007ff55000fff99
+-- 077:0000000055550000555550005555500075775500fffff5005f555f703f993ff0
+-- 078:0000000000000000000000000000000000001111000014440000144400001555
+-- 079:0000000000000000000000000000000011100000441000004410000055100000
+-- 080:0077533f000ff77f0005fff500005ff70000015f0005f315005ff3ff00ff3333
+-- 081:f33f0000f77f00005ff000007f500000f500000053f00000f3f50000333f0000
+-- 082:000fff330005ffff000057f50000007f000333350031313f0031313303113133
+-- 083:ff33f000ffff100055f10000ff70000055330000ff3130003331300033311300
+-- 084:000447ff000fffff0007f33f000ff11f000f7fff0000ff750000042400001142
+-- 085:ff744000ffff1000f33f7000f11f5000fff7f00057ff00004240000044110000
+-- 086:038383390338833b038383130338337f0383835f003838350003838300003333
+-- 087:99539900bb33bb0099513900fffff530ff66f1007fff53001555310033333000
+-- 088:000f7ff300005fff000007ff0000007f0000021f000024410002444400124244
+-- 089:fff3ff7ff1ffff50fffff700111f7000ffff1000111142004244442042442410
+-- 090:005f5733005f1f2300015fff0000077f00011117001244210144414201421444
+-- 091:ff33f500ff23f500fffff00011ff500077710000112410004442410042441410
+-- 092:00005fff000005ff0000001f0000000100000114000018140000181400018114
+-- 093:fffff500111f5000fff500001110000042411000424180004241810042411100
+-- 094:00001fff00001f3f0000cf3f0000cfff00000cf3000023cc000131ff001f1f11
+-- 095:ff1000003f1000003ff00000fff00000fc000000c3200000f13100001f1f1000
+-- 096:00ff33330033133305f333330ff31333033333330f5313330ff1311107f13333
+-- 097:333f0000333f5000333f5000333ff000333330003335f500111ff5003337f000
+-- 098:03113133031131330333313303113131033331320555313107ff313307ff3131
+-- 099:333113003331130033333300213113004233330021317f0033317f5001317500
+-- 100:0002441400244441024444240242442414424424144144241441442414414424
+-- 101:4144210014444200424444204244422042444241424441414244414142444141
+-- 102:000333330033a3530032a353003a332303a23333032a333303a23333032a3333
+-- 103:3333300055353300553533002232323033333130333332303333313333333233
+-- 104:001441440014424400144144001441240017f311001ff133001fff330007f333
+-- 105:4244142042442410424414204244122012113f7031333ff033333ff030333f00
+-- 106:01421444014414440142144431421444011111110fff1a5a0ff755a505755a51
+-- 107:44441410424414104444141042441410111111105a5a55f5a5a5a5f5111a5170
+-- 108:0001181400018114000118140001811300011333005fff33000f773300055333
+-- 109:424181104241181042418110222318101113310033335ff03333f77033335500
+-- 112:0553333300033330000333000033330000333300003333000011110000121200
+-- 113:3330000033300000333000003330000033300000333000001111000012120000
+-- 114:05f5313103003131033311310311113103111131003111300003333000012120
+-- 115:0131130001311300013113000131130001311300003113000033330000121200
+-- 116:0fff242407f72211005544200002442000024420000244200002222000024440
+-- 117:424441f1112227f1024425500244200002442000024420000222200002444000
+-- 118:0333333307ff333307f733330070333000003330000033300000111000001110
+-- 119:33333575333331f1333335750033300000333000003330000011100000111100
+-- 120:0000033300000333000003330000033300000333000003330000033300000111
+-- 121:0033300000333000003330000033300000333000003330000033300010111100
+-- 122:005015a100001a51000015a100001a51000015a1000022510000924900009999
+-- 123:0315a150001a51000015a100001a51000015a100002251000092490000999900
+-- 124:0000033300000333000003330000033300000333000003330000033300000111
+-- 125:0333000003330000033300000333000003330000033300000333000000111000
+-- 129:0000000000000000000000000000000000000000011515101151515151515151
+-- 144:0000000500000015000000150000057f000005ff0000017f0000331700073331
+-- 145:1ffffff7ff0fff0fff1fff1fffffffffff7555fffffffffffff111ff57fffff7
+-- 146:1000000071000000f5000000ff000000ff500000ff5000007513100051333700
+-- 160:0077333303331333333313333331333333313333355133335ff513335ff71111
+-- 161:1111111133333333333337333333373333333733333337333333373311117711
+-- 162:133337003733133077731330333331333333313333333155333337ff1111175f
+-- 176:0775333300031333000333130000333300001333000033330000033300000111
+-- 177:3335773333333533333333331313131333333333300000033000000310000001
+-- 178:3333357533331000331300001333000033310000333300003331000011110000
 -- </SPRITES>
 -- <MAP>
 -- 000:ffffffffff0010201020102010201020102010201020102000ffffffffff40404040404087f3f3f3f397a7b7c7d7a7e7f70818a7b7c7d7a7b7c7d7a70b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b0b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -305,13 +407,15 @@
 -- 033:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
 -- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006004600000f0f00
 -- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000004600000f0f00
+-- 048:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900400000000000
+-- 056:4100510061406140717081709100b100c100d100e100e100e100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f10058a000000600
 -- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
--- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100100000080800
--- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000
+-- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100500000080800
+-- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000
 -- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200100000000000
 -- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00400000000000
 -- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100484000000000
--- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000405000000000
+-- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000200000000000
 -- </SFX>
 -- <WAVES>
 -- 000:bcceefceedddddc84333121268abaa99
@@ -325,3 +429,14 @@
 -- 008:0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
 -- 009:fff000fff000fff000fff000fff000ff
 -- </WAVES>
+-- <PATTERNS>
+-- 000:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000008c10000000008c10000000000000000000000000000000000000000000000000000000000000000004008b50000000000000000001008c10000004008b50000001008c10000000008c1000000e008b30000004008b50000001008c10000000008c10000000008c10000000008c10000000008c10000000008c1000000000000000000000000000000
+-- 001:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007008b50000007008b50000001008c10000007008b50000001008c10000000008c10000007008b50000009008b50000001008c10000009008b50000001008c10000009008b50000009008b50000001008c10000009008b50000001008c1000000
+-- 003:4008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d9000000000000000000000000000000000000000000
+-- 004:40088d000000e0088b000000b0088b000881e0088b00000040088d000000e0088b000881b0088b000000e0088b00000040088d000000e0088b000000b0088b000000e0088b00000040088d000000e0088b000000b0088b000000e0088b00000040088b000000e00889000000b00889000000e0088900000040088b000000e00889000000b00889000000e0088900000040088b000000e00889000000b00889000000e0088900000040088b000000e00889000000b00889000000e00889000000
+-- 005:400881000000000881000000000881000000000000000000400883000000000000000000000000000000000000000000400881000000000000000000000000000000000000000000400883000000000000000000000000000000000000000000400881000000000000000000000000000000000000000000400883000000000000000000000000000000000000000000400881000000000000000000000000000000000000000000400883000000000000000000000000000000000000000000
+-- </PATTERNS>
+-- <TRACKS>
+-- 000:100001200001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 001:581000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- </TRACKS>

inc/meta/meta.header.lua

@@ -1,8 +1,8 @@
 -- title:   Definitely not an Impostor
 -- name: impostor
 -- author:  Teletype Games
--- desc:    Life of a programmer in the Vector
+-- desc:    Life of a programmer
 -- site:    https://git.teletype.hu/games/impostor
 -- license: MIT License
--- version: 0.1
+-- version: 0.8
 -- script:  lua

inc/screen/screen.home.lua

@@ -4,6 +4,13 @@ Screen.register({
   decisions = {
     "go_to_toilet",
     "go_to_walking_to_office",
+    "go_to_sleep",
+    "go_to_end",
   },
-  background = "bedroom"
+  background = "bedroom",
+  draw = function()
+    if Context.home_norman_visible and Window.get_current_id() == "game" then
+      Sprite.draw_at("norman", 100, 80)
+    end
+  end
 })

inc/screen/screen.office.lua

@@ -2,14 +2,26 @@ Screen.register({
   id = "office",
   name = "Office",
   decisions = {
-    "play_button_mash",
-    "play_rhythm",
-    "play_ddr",
+    "do_work",
     "go_to_walking_to_home",
     "have_a_coffee",
   },
   situations = {
     "drink_coffee",
   },
-  background = "office"
+  background = "office",
+  draw = function()
+    if Window.get_current_id() == "game" then
+      Sprite.draw_at("norman",              13 * 8,  9 * 8)
+      Sprite.draw_at("dev_buddy",           15 * 8,  9 * 8)
+      Sprite.draw_at("dev_project_manager",  6 * 8,  4 * 8)
+      Sprite.draw_at("dev_hr_girl",         12 * 8,  4 * 8)
+      Sprite.draw_at("dev_introvert",   -4 + 5 * 8,  9 * 8)
+      Sprite.draw_at("dev_extrovert",       20 * 8,  4 * 8)
+      Sprite.draw_at("dev_girl",            23 * 8,  5 * 8)
+      Sprite.draw_at("dev_boy",             10 * 8, 11 * 8 + 4)
+      Sprite.draw_at("dev_guru",            22 * 8, 10 * 8 + 4)
+      Sprite.draw_at("dev_operator",        27 * 8, 10 * 8 + 4)
+    end
+  end
 })

inc/screen/screen.toilet.lua

@@ -26,12 +26,15 @@ Screen.register({
 
     local sw = Config.screen.width
     local cx = sw / 2
+    local norman_x = math.floor(sw * 0.75)
+    local norman_y = math.floor(Config.screen.height * 0.75)
     local bar_w = math.floor(sw * 0.75)
     local bar_x = math.floor((sw - bar_w) / 2)
     local bar_h = 4
 
-    -- TODO: Add day counter
-    Print.text_center("day 1", cx, 10, Config.colors.white)
+    Sprite.draw_at("norman", norman_x, norman_y)
+
+    Print.text_center("day " .. Context.day_count, cx, 10, Config.colors.white)
 
     local narrative = "reflecting on my past and present\n...\nboth eventually flushed."
     local wrapped = UI.word_wrap(narrative, 38)
@@ -43,7 +46,7 @@ Screen.register({
 
     local m = Context.meters
     local max_val = Meter.get_max()
-    local decay_pct = Meter.get_timer_decay_percentage()
+    local decay_pct = Meter.get_decay_percentage()
     local decay_text = string.format("-%d%%", decay_pct)
     local combo_mult = Meter.get_combo_multiplier()
     local combo_pct = math.floor((combo_mult - 1) * 100)

inc/screen/screen.walking_to_home.lua

@@ -5,5 +5,12 @@ Screen.register({
     "go_to_home",
     "go_to_office",
   },
-  background = "street"
+  background = "street",
+  draw = function()
+    if Window.get_current_id() == "game" then
+      Sprite.draw_at("norman",               7 * 8,  3 * 8)
+      Sprite.draw_at("pizza_vendor",        19 * 8,  1 * 8)
+      Sprite.draw_at("dev_guard",           22 * 8,  2 * 8)
+    end
+  end
 })

inc/screen/screen.walking_to_office.lua

@@ -4,6 +4,19 @@ Screen.register({
   decisions = {
     "go_to_home",
     "go_to_office",
+    "start_discussion",
   },
-  background = "street"
+  background = "street",
+  draw = function()
+    if Window.get_current_id() == "game" then
+      Sprite.draw_at("norman",               7 * 8,  3 * 8)
+      Sprite.draw_at("sumphore",             9 * 8,  2 * 8)
+      Sprite.draw_at("pizza_vendor",        19 * 8,  1 * 8)
+      Sprite.draw_at("dev_guard",           22 * 8,  2 * 8)
+      Sprite.draw_at("matrix_trinity",       5 * 8, 11 * 8)
+      Sprite.draw_at("matrix_neo",           7 * 8, 11 * 8)
+      Sprite.draw_at("matrix_oraculum",      9 * 8, 12 * 8)
+      Sprite.draw_at("matrix_architect",    11 * 8, 11 * 8)
+    end
+  end
 })

inc/screen/screen.work.lua

@@ -0,0 +1,6 @@
+Screen.register({
+  id = "work",
+  name = "Work",
+  decisions = {},
+  background_color = Config.colors.blue,
+})

inc/sprite/sprite.dev_boy.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_boy",
+  sprites = Sprite.generate_table(2, 3, 278, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_buddy.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_buddy",
+  sprites = Sprite.generate_table(2, 3, 286, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_extrovert.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_extrovert",
+  sprites = Sprite.generate_table(2, 4, 330, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_girl.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_girl",
+  sprites = Sprite.generate_table(2, 3, 284, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_guard.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_guard",
+  sprites = Sprite.generate_table(3, 4, 384, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_guru.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_guru",
+  sprites = Sprite.generate_table(2, 4, 264, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_hr_girl.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_hr_girl",
+  sprites = Sprite.generate_table(2, 4, 260, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_introvert.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_introvert",
+  sprites = Sprite.generate_table(2, 4, 332, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_operator.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_operator",
+  sprites = Sprite.generate_table(2, 4, 326, -4, -4, 8, 8)
+})

inc/sprite/sprite.dev_project_manager.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "dev_project_manager",
+  sprites = Sprite.generate_table(2, 4, 328, -4, -4, 8, 8)
+})

inc/sprite/sprite.manager.lua

@@ -2,6 +2,32 @@
 local _sprites = {}
 local _active_sprites = {}
 
+local function draw_sprite_instance(sprite_data, params)
+  local colorkey = params.colorkey or sprite_data.colorkey or 0
+  local scale = params.scale or sprite_data.scale or 1
+  local flip_x = params.flip_x or sprite_data.flip_x or 0
+  local flip_y = params.flip_y or sprite_data.flip_y or 0
+  local rot = params.rot or sprite_data.rot or 0
+
+  if sprite_data.sprites then
+    for i = 1, #sprite_data.sprites do
+      local sub_sprite = sprite_data.sprites[i]
+      spr(
+        sub_sprite.s,
+        params.x + (sub_sprite.x_offset or 0),
+        params.y + (sub_sprite.y_offset or 0),
+        sub_sprite.colorkey or colorkey,
+        sub_sprite.scale or scale,
+        sub_sprite.flip_x or flip_x,
+        sub_sprite.flip_y or flip_y,
+        sub_sprite.rot or rot
+      )
+    end
+  else
+    spr(sprite_data.s, params.x, params.y, colorkey, scale, flip_x, flip_y, rot)
+  end
+end
+
 --- Registers a sprite definition.
 --- @within Sprite
 --- @param sprite_data table A table containing the sprite definition.
@@ -24,6 +50,29 @@ function Sprite.register(sprite_data)
   _sprites[sprite_data.id] = sprite_data
 end
 
+--- Generates a sprites table for a rectangular composite sprite.
+--- @within Sprite
+--- @param width number The number of sprites wide.<br/>
+--- @param height number The number of sprites tall.<br/>
+--- @param starting_s number The sprite index of the top-left tile.<br/>
+--- @param x_base number The base x-offset for the leftmost column.<br/>
+--- @param y_base number The base y-offset for the topmost row.<br/>
+--- @param x_step number The x-offset increment per column.<br/>
+--- @param y_step number The y-offset increment per row.<br/>
+--- @return table The sprites table array.
+function Sprite.generate_table(width, height, starting_s, x_base, y_base, x_step, y_step)
+  local sprites = {}
+  for row = 0, height - 1 do
+    for col = 0, width - 1 do
+      local s = starting_s + row * 16 + col
+      local x_offset = x_base + col * x_step
+      local y_offset = y_base + row * y_step
+      table.insert(sprites, { s = s, x_offset = x_offset, y_offset = y_offset })
+    end
+  end
+  return sprites
+end
+
 --- Schedules a sprite for drawing.
 --- @within Sprite
 --- @param id string The unique identifier of the sprite.<br/>
@@ -59,6 +108,34 @@ function Sprite.hide(id)
   _active_sprites[id] = nil
 end
 
+--- Draws a sprite immediately without scheduling it.
+--- @within Sprite
+--- @param id string The unique identifier of the sprite.<br/>
+--- @param x number The x-coordinate.<br/>
+--- @param y number The y-coordinate.<br/>
+--- @param[opt] colorkey number The color index for transparency.<br/>
+--- @param[opt] scale number The scaling factor.<br/>
+--- @param[opt] flip_x number Set to 1 to flip horizontally.<br/>
+--- @param[opt] flip_y number Set to 1 to flip vertically.<br/>
+--- @param[opt] rot number The rotation in degrees.<br/>
+function Sprite.draw_at(id, x, y, colorkey, scale, flip_x, flip_y, rot)
+  local sprite_data = _sprites[id]
+  if not sprite_data then
+    trace("Error: Attempted to draw non-registered sprite with id: " .. id)
+    return
+  end
+
+  draw_sprite_instance(sprite_data, {
+    x = x,
+    y = y,
+    colorkey = colorkey,
+    scale = scale,
+    flip_x = flip_x,
+    flip_y = flip_y,
+    rot = rot,
+  })
+end
+
 --- Draws all scheduled sprites.
 --- @within Sprite
 function Sprite.draw()
@@ -68,29 +145,8 @@ function Sprite.draw()
       trace("Error: Sprite id " .. id .. " in _active_sprites is not registered.")
       _active_sprites[id] = nil
     end
-
-    local colorkey = params.colorkey or sprite_data.colorkey or 0
-    local scale = params.scale or sprite_data.scale or 1
-    local flip_x = params.flip_x or sprite_data.flip_x or 0
-    local flip_y = params.flip_y or sprite_data.flip_y or 0
-    local rot = params.rot or sprite_data.rot or 0
-
-    if sprite_data.sprites then
-      for i = 1, #sprite_data.sprites do
-        local sub_sprite = sprite_data.sprites[i]
-        spr(
-          sub_sprite.s,
-          params.x + (sub_sprite.x_offset or 0),
-          params.y + (sub_sprite.y_offset or 0),
-          sub_sprite.colorkey or colorkey,
-          sub_sprite.scale or scale,
-          sub_sprite.flip_x or flip_x,
-          sub_sprite.flip_y or flip_y,
-          sub_sprite.rot or rot
-        )
-      end
-    else
-      spr(sprite_data.s, params.x, params.y, colorkey, scale, flip_x, flip_y, rot)
+    if sprite_data then
+      draw_sprite_instance(sprite_data, params)
     end
   end
 end

inc/sprite/sprite.matrix_architect.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "matrix_architect",
+  sprites = Sprite.generate_table(2, 4, 324, -4, -4, 8, 8)
+})

inc/sprite/sprite.matrix_neo.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "matrix_neo",
+  sprites = Sprite.generate_table(2, 4, 322, -4, -4, 8, 8)
+})

inc/sprite/sprite.matrix_oraculum.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "matrix_oraculum",
+  sprites = Sprite.generate_table(2, 3, 282, -4, -4, 8, 8)
+})

inc/sprite/sprite.matrix_trinity.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "matrix_trinity",
+  sprites = Sprite.generate_table(2, 4, 320, -4, -4, 8, 8)
+})

inc/sprite/sprite.norman.lua

@@ -1,17 +1,23 @@
 Sprite.register({
   id = "norman",
   sprites = {
-    -- Body (sprite index 0)
-    { s = 0, x_offset = 0, y_offset = 0 },
-    -- Head (sprite index 1)
-    { s = 1, x_offset = 0, y_offset = -8 },
-    -- Left Arm (sprite index 2)
-    { s = 2, x_offset = -4, y_offset = 4 },
-    -- Right Arm (sprite index 3, flipped)
-    { s = 3, x_offset = 4, y_offset = 4, flip_x = 1 }, -- Flipped arm
-    -- Left Leg (sprite index 4)
-    { s = 4, x_offset = -2, y_offset = 8 },
-    -- Right Leg (sprite index 5, flipped)
-    { s = 5, x_offset = 2, y_offset = 8, flip_x = 1 } -- Flipped leg
+    { s = 272, x_offset = -4, y_offset = -4 },
+    { s = 273, x_offset = 4, y_offset = -4 },
+    { s = 288, x_offset = -4, y_offset = 4 },
+    { s = 289, x_offset = 4, y_offset = 4 },
+    { s = 304, x_offset = -4, y_offset = 12 },
+    { s = 305, x_offset = 4, y_offset = 12 }
+  }
+})
+
+Sprite.register({
+  id = "sleeping_norman",
+  sprites = {
+    { s = 272, x_offset = 12, y_offset = -4, flip_y = 1 },
+    { s = 273, x_offset = 12, y_offset = 4, flip_y = 1 },
+    { s = 288, x_offset = 4, y_offset = -4, flip_y = 1 },
+    { s = 289, x_offset = 4, y_offset = 4, flip_y = 1 },
+    { s = 304, x_offset = -4, y_offset = -4, flip_y = 1 },
+    { s = 305, x_offset = -4, y_offset = 4, flip_y = 1 }
   }
 })

inc/sprite/sprite.pizza_vendor.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "pizza_vendor",
+  sprites = Sprite.generate_table(2, 2, 334, -1, -8, 8, 8)
+})

inc/sprite/sprite.sumphore.lua

@@ -0,0 +1,4 @@
+Sprite.register({
+  id = "sumphore",
+  sprites = Sprite.generate_table(2, 4, 258, -4, -4, 8, 8)
+})

inc/system/system.main.lua

@@ -22,8 +22,11 @@ function TIC()
     handler()
   end
   Meter.update()
+  Timer.update()
+  Trigger.update()
   if Context.game_in_progress then
-    UI.draw_meters()
-    UI.draw_timer()
+    Meter.draw()
+    Timer.draw()
+    Glitch.draw()
   end
 end

inc/system/system.ui.lua

@@ -8,12 +8,6 @@ function UI.draw_top_bar(title)
   Print.text(title, 3, 2, Config.colors.light_blue)
 end
 
---- Draws dialog window.
---- @within UI
-function UI.draw_dialog()
-  PopupWindow.draw()
-end
-
 --- Draws a menu.
 --- @within UI
 --- @param items table A table of menu items.<br/>
@@ -52,209 +46,108 @@ function UI.update_menu(items, selected_item)
   return selected_item
 end
 
+--- Draws a bordered textbox with scrolling text.
+--- @within UI
+--- @param text string The text to display (multi-line supported).<br/>
+--- @param box_x number The x-coordinate of the box.<br/>
+--- @param box_y number The y-coordinate of the box.<br/>
+--- @param box_w number The width of the box.<br/>
+--- @param box_h number The height of the box.<br/>
+--- @param scroll_y number The vertical scroll offset for the text (0 = top, increases to scroll up).<br/>
+--- @param[opt] color number The text color (default: Config.colors.white).<br/>
+--- @param[opt] bg_color number The background fill color (default: Config.colors.dark_grey).<br/>
+--- @param[opt] border_color number The border color (default: Config.colors.white).<br/>
+--- @param[opt] center_text boolean Whether to center each line inside the box. Defaults to false.<br/>
+function UI.draw_textbox(text, box_x, box_y, box_w, box_h, scroll_y, color, bg_color, border_color, center_text)
+  color = color or Config.colors.white
+  bg_color = bg_color or Config.colors.dark_grey
+  border_color = border_color or Config.colors.white
+  center_text = center_text or false
+
+  local padding = 4
+  local line_height = 8
+  local inner_x = box_x + padding
+  local inner_y = box_y + padding
+  local inner_center_x = box_x + (box_w / 2)
+  local visible_height = box_h - padding * 2
+  local lines = UI.word_wrap(text, 30)
+  local text_height = #lines * line_height
+  local base_y = inner_y
+
+  if center_text and text_height < visible_height then
+    base_y = inner_y + math.floor((visible_height - text_height) / 2)
+  end
+
+  rect(box_x, box_y, box_w, box_h, bg_color)
+
+  for i, line in ipairs(lines) do
+    local ly = base_y + (i - 1) * line_height - scroll_y
+    if ly >= inner_y and ly + line_height <= inner_y + visible_height then
+      if center_text then
+        Print.text_center(line, inner_center_x, ly, color)
+      else
+        Print.text(line, inner_x, ly, color)
+      end
+    end
+  end
+
+  rectb(box_x, box_y, box_w, box_h, border_color)
+end
+
 --- Wraps text.
 --- @within UI
 --- @param text string The text to wrap.<br/>
 --- @param max_chars_per_line number The maximum characters per line.<br/>
 --- @return result table A table of wrapped lines.
 function UI.word_wrap(text, max_chars_per_line)
-    if text == nil then return {""} end
-    local lines = {}
-    for input_line in (text .. "\n"):gmatch("(.-)\n") do
-        local current_line = ""
-        local words_in_line = 0
-        for word in input_line:gmatch("%S+") do
-            words_in_line = words_in_line + 1
-            if #current_line == 0 then
-                current_line = word
-            elseif #current_line + #word + 1 <= max_chars_per_line then
-                current_line = current_line .. " " .. word
-            else
-                table.insert(lines, current_line)
-                current_line = word
-            end
-        end
-        if words_in_line > 0 then
-            table.insert(lines, current_line)
-        else
-            table.insert(lines, "")
-        end
-    end
-    if #lines == 0 then
-        return {""}
-    end
-    return lines
-end
+  if text == nil then return {""} end
 
---- Creates a numeric stepper.
---- @within UI
---- @param label string The label for the stepper.<br/>
---- @param value_getter function Function to get the current value.<br/>
---- @param value_setter function Function to set the current value.<br/>
---- @param min number The minimum value.<br/>
---- @param max number The maximum value.<br/>
---- @param step number The step increment.<br/>
---- @param[opt] format string The format string for displaying the value.<br/>
---- @return result table A numeric stepper control definition or nil. </br>
---- Fields: </br>
---- * label (string) The label for the stepper.<br/>
---- * get (function) Function to get the current value.<br/>
---- * set (function) Function to set the current value.<br/>
---- * min (number) The minimum value.<br/>
---- * max (number) The maximum value.<br/>
---- * step (number) The step increment.<br/>
---- * format (string) The format string for displaying the value.<br/>
---- * type (string) Control type identifier ("numeric_stepper").<br/>
-function UI.create_numeric_stepper(label, value_getter, value_setter, min, max, step, format)
-  return {
-    label = label,
-    get = value_getter,
-    set = value_setter,
-    min = min,
-    max = max,
-    step = step,
-    format = format or "%.1f",
-    type = "numeric_stepper"
-  }
-end
+  local lines = {}
 
---- Creates an action item.
---- @within UI
---- @param label string The label for the action item.<br/>
---- @param action function The function to execute when the item is selected.<br/>
---- @return result table An action item control definition or nil. </br>
---- Fields: </br>
---- * label (string) The label for the action item.<br/>
---- * action (function) The function to execute when the item is selected.<br/>
---- * type (string) Control type identifier ("action_item").<br/>
-function UI.create_action_item(label, action)
-  return {
-    label = label,
-    action = action,
-    type = "action_item"
-  }
-end
-
---- Draws decision selector.
---- @within UI
---- @param decisions table A table of decision items.<br/>
---- @param selected_decision_index number The index of the selected decision.<br/>
-function UI.draw_decision_selector(decisions, selected_decision_index)
-  local bar_height = 16
-  local bar_y = Config.screen.height - bar_height
-  rect(0, bar_y, Config.screen.width, bar_height, Config.colors.dark_grey)
-  if #decisions > 0 then
-    local selected_decision = decisions[selected_decision_index]
-    local decision_label = selected_decision.label
-    local text_width = #decision_label * 4
-    local text_y = bar_y + 4
-    local text_x = (Config.screen.width - text_width) / 2
-    Print.text("<", 2, text_y, Config.colors.light_blue)
-    Print.text(decision_label, text_x, text_y, Config.colors.item)
-    Print.text(">", Config.screen.width - 6, text_y, Config.colors.light_blue)
-  end
-end
-
---- Draws the clock timer indicator as a circular progress bar in the top-left area.
---- Color transitions: white (0-50%), yellow (50-75%), red (75-100%).
---- @within UI
-function UI.draw_timer()
-  if not Context or not Context.game_in_progress or not Context.meters then return end
-  if Context.meters.hidden and not Context.stat_screen_active then return end
-
-  local m = Context.meters
-  local cx = 10
-  local cy = 20
-  local r_outer = 5
-  local r_inner = 3
-  local progress = m.timer_progress
-
-  local fg_color
-  if progress <= 0.25 then
-    fg_color = Config.colors.white
-  elseif progress <= 0.5 then
-    fg_color = Config.colors.light_blue
-  elseif progress <= 0.75 then
-    fg_color = Config.colors.blue
-  elseif progress <= 1 then
-    fg_color = Config.colors.red
+  local function trim(s)
+    return (s:gsub("^%s+", ""):gsub("%s+$", ""))
   end
 
+  local function previous_whitespace_index(s, target)
+    if s:sub(target, target):match("%s") then
+      return target
+    end
 
-  local bg_color = Config.colors.dark_grey
-  local start_angle = -math.pi * 0.5
-  local progress_angle = progress * 2 * math.pi
-  local r_outer_sq = r_outer * r_outer
-  local r_inner_sq = r_inner * r_inner
-
-  for dy = -r_outer, r_outer do
-    for dx = -r_outer, r_outer do
-      local dist_sq = dx * dx + dy * dy
-      if dist_sq <= r_outer_sq and dist_sq > r_inner_sq then
-        local angle = math.atan(dy, dx)
-        local relative = angle - start_angle
-        if relative < 0 then relative = relative + 2 * math.pi end
-        if relative <= progress_angle then
-          pix(cx + dx, cy + dy, fg_color)
-        else
-          pix(cx + dx, cy + dy, bg_color)
-        end
+    for i = target - 1, 1, -1 do
+      if s:sub(i, i):match("%s") then
+        return i
       end
     end
+
+    return nil
   end
 
-  local hand_angle = start_angle + progress_angle
-  local hand_x = math.floor(cx + math.cos(hand_angle) * (r_inner - 1) + 0.5)
-  local hand_y = math.floor(cy + math.sin(hand_angle) * (r_inner - 1) + 0.5)
-  line(cx, cy, hand_x, hand_y, Config.colors.white)
-end
+  for input_line in (text .. "\n"):gmatch("(.-)\n") do
+    local remaining = trim(input_line)
 
---- Draws meters.
---- @within UI
-function UI.draw_meters()
-  if not Context or not Context.game_in_progress or not Context.meters then return end
-  if Context.meters.hidden then return end
+    if remaining == "" then
+      table.insert(lines, "")
+    else
+      while #remaining > max_chars_per_line do
+        local split_at = previous_whitespace_index(remaining, max_chars_per_line)
+        local line = trim(remaining:sub(1, split_at))
 
-  local m = Context.meters
-  local max = Meter.get_max()
-  local bar_w = 44
-  local bar_h = 2
-  local bar_x = 182
-  local label_x = 228
-  local line_h = 5
-  local start_y = 11
-  local bar_offset = math.floor((line_h - bar_h) / 2)
+        if not split_at or line == "" then
+          line = remaining:sub(1, max_chars_per_line)
+          split_at = max_chars_per_line
+        end
 
-  local meter_list = {
-    { key = "wpm", label = "WPM", color = Meter.COLOR_WPM, row = 0 },
-    { key = "ism", label = "ISM", color = Meter.COLOR_ISM, row = 1 },
-    { key = "bm", label = "BM", color = Meter.COLOR_BM, row = 2 },
-  }
+        table.insert(lines, line)
+        remaining = trim(remaining:sub(split_at + 1))
+      end
 
-  for _, meter in ipairs(meter_list) do
-    local label_y = start_y + meter.row * line_h
-    local bar_y = label_y + bar_offset
-    local fill_w = math.max(0, math.floor((m[meter.key] / max) * bar_w))
-    rect(bar_x, bar_y, bar_w, bar_h, Meter.COLOR_BG)
-    if fill_w > 0 then
-      rect(bar_x, bar_y, fill_w, bar_h, meter.color)
+      table.insert(lines, remaining)
     end
-    print(meter.label, label_x, label_y, meter.color, false, 1, true)
   end
-end
 
---- Updates decision selector.
---- @within UI
---- @param decisions table A table of decision items.<br/>
---- @param selected_decision_index number The current index of the selected decision.<br/>
---- @return number selected_decision_index The updated index of the selected decision.
-function UI.update_decision_selector(decisions, selected_decision_index)
-  if Input.left() then
-    Audio.sfx_beep()
-    selected_decision_index = Util.safeindex(decisions, selected_decision_index - 1)
-  elseif Input.right() then
-    Audio.sfx_beep()
-    selected_decision_index = Util.safeindex(decisions, selected_decision_index + 1)
+  if #lines == 0 then
+    return {""}
   end
-  return selected_decision_index
-end
+
+  return lines
+end

inc/window/window.audiotest.lua

@@ -1,11 +1,9 @@
 --- @section AudioTestWindow
-AudioTestWindow = {
-    index_menu = 1,
-    index_func = 1,
-    list_func = {},
-    menuitems = {},
-    last_pressed = false
-}
+AudioTestWindow.index_menu = 1
+AudioTestWindow.index_func = 1
+AudioTestWindow.list_func = {}
+AudioTestWindow.menuitems = {}
+AudioTestWindow.last_pressed = false
 
 --- Generates menu items for audio test.
 --- @within AudioTestWindow

inc/window/window.configuration.lua

@@ -1,21 +1,21 @@
 --- @section ConfigurationWindow
-ConfigurationWindow = {
-  controls = {},
-  selected_control = 1,
-}
+ConfigurationWindow.controls = {}
+ConfigurationWindow.selected_control = 1
 
 --- Initializes configuration window.
 --- @within ConfigurationWindow
 function ConfigurationWindow.init()
   ConfigurationWindow.controls = {
-    UI.create_action_item(
-      "Save",
-      function() Config.save() end
-    ),
-    UI.create_action_item(
-      "Restore Defaults",
-      function() Config.reset() end
-    ),
+    {
+      label = "Save",
+      action = function() Config.save() end,
+      type = "action_item"
+    },
+    {
+      label = "Restore Defaults",
+      action = function() Config.reset() end,
+      type = "action_item"
+    },
   }
 end
 

inc/window/window.discussion.lua

@@ -0,0 +1,107 @@
+--- @section DiscussionWindow
+
+local TEXTBOX_W = math.floor(Config.screen.width * 0.7)
+local TEXTBOX_H = math.floor(Config.screen.height * 0.3)
+local TEXTBOX_X = math.floor((Config.screen.width - TEXTBOX_W) / 2)
+local TEXTBOX_Y = math.floor((Config.screen.height - TEXTBOX_H) / 2 - 8)
+local TEXTBOX_MAX_CHARS = 30
+local DISCUSSION_LINE_HEIGHT = 8
+local PADDING = 4
+local AUTO_SCROLL_DELAY = 12
+local AUTO_SCROLL_STEP = 1
+
+--- Draws the discussion window.
+--- @within DiscussionWindow
+function DiscussionWindow.draw()
+  GameWindow.draw()
+
+  local step = Discussion.get_current_step()
+  if not step then return end
+
+  UI.draw_textbox(
+    step.question,
+    TEXTBOX_X, TEXTBOX_Y,
+    TEXTBOX_W, TEXTBOX_H,
+    Context.discussion.scroll_y,
+    Config.colors.white,
+    Config.colors.dark_grey,
+    Config.colors.light_blue,
+    true
+  )
+
+  local answers = step.answers
+  if #answers > 0 then
+    local bar_height = 16
+    local bar_y = Config.screen.height - bar_height
+    rect(0, bar_y, Config.screen.width, bar_height, Config.colors.dark_grey)
+    local selected = answers[Context.discussion.selected_answer]
+    local label = selected.label
+    local answer_text_y = bar_y + 4
+    Print.text("<", 2, answer_text_y, Config.colors.light_blue)
+    Print.text_center(label, Config.screen.width / 2, answer_text_y, Config.colors.item)
+    Print.text(">", Config.screen.width - 6, answer_text_y, Config.colors.light_blue)
+  end
+end
+
+--- Updates the discussion window logic.
+--- @within DiscussionWindow
+function DiscussionWindow.update()
+  local step = Discussion.get_current_step()
+  if not step then return end
+
+  local lines = UI.word_wrap(step.question, TEXTBOX_MAX_CHARS)
+  local text_height = #lines * DISCUSSION_LINE_HEIGHT
+  local visible_height = TEXTBOX_H - PADDING * 2
+  local max_scroll = text_height - visible_height
+  if max_scroll < 0 then max_scroll = 0 end
+
+  if max_scroll > 0 then
+    if Context.discussion.auto_scroll then
+      Context.discussion.scroll_timer = Context.discussion.scroll_timer + 1
+      if Context.discussion.scroll_timer >= AUTO_SCROLL_DELAY then
+        Context.discussion.scroll_timer = 0
+        Context.discussion.scroll_y = Context.discussion.scroll_y + AUTO_SCROLL_STEP
+        if Context.discussion.scroll_y > max_scroll then
+          Context.discussion.scroll_y = max_scroll
+        end
+      end
+    end
+  else
+    Context.discussion.scroll_y = 0
+    Context.discussion.scroll_timer = 0
+  end
+
+  if Input.up() then
+    Context.discussion.auto_scroll = false
+    Context.discussion.scroll_y = Context.discussion.scroll_y - DISCUSSION_LINE_HEIGHT
+    if Context.discussion.scroll_y < 0 then
+      Context.discussion.scroll_y = 0
+    end
+  elseif Input.down() then
+    Context.discussion.auto_scroll = false
+    Context.discussion.scroll_y = Context.discussion.scroll_y + DISCUSSION_LINE_HEIGHT
+    if Context.discussion.scroll_y > max_scroll then
+      Context.discussion.scroll_y = max_scroll
+    end
+  end
+
+  local answers = step.answers
+  if #answers > 0 then
+    if Input.left() then
+      Audio.sfx_beep()
+      Context.discussion.selected_answer = Util.safeindex(answers, Context.discussion.selected_answer - 1)
+    elseif Input.right() then
+      Audio.sfx_beep()
+      Context.discussion.selected_answer = Util.safeindex(answers, Context.discussion.selected_answer + 1)
+    end
+
+    if Input.select() then
+      Audio.sfx_select()
+      local selected = answers[Context.discussion.selected_answer]
+      if selected.on_select then
+        selected.on_select()
+      end
+      Discussion.go_to_step(selected.next_step)
+    end
+  end
+end

inc/window/window.end.lua

@@ -0,0 +1,77 @@
+--- @section EndWindow
+
+--- Draws the end screen window.
+--- @within EndWindow
+function EndWindow.draw()
+  cls(Config.colors.black)
+
+  if Context._end.state == "choice" then
+    local lines = {
+      "This is not a workplace.",
+      "This is a cycle.",
+      "And if it is a cycle...",
+      "it can be broken."
+    }
+
+    local y = 40
+    for _, line in ipairs(lines) do
+      Print.text_center(line, Config.screen.width / 2, y, Config.colors.white)
+      y = y + 10
+    end
+
+    y = y + 20
+    local yes_color = Context._end.selection == 1 and Config.colors.light_blue or Config.colors.white
+    local no_color = Context._end.selection == 2 and Config.colors.light_blue or Config.colors.white
+
+    local yes_text = (Context._end.selection == 1 and "> YES" or "  YES")
+    local no_text = (Context._end.selection == 2 and "> NO" or "  NO")
+
+    local centerX = Config.screen.width / 2
+    Print.text(yes_text, centerX - 40, y, yes_color)
+    Print.text(no_text, centerX + 10, y, no_color)
+  elseif Context._end.state == "ending" then
+    Print.text_center("Game over -- good ending.", Config.screen.width / 2, 50, Config.colors.light_blue)
+    Print.text_center("Congratulations!", Config.screen.width / 2, 70, Config.colors.white)
+    Print.text_center("Press Z to return to menu", Config.screen.width / 2, 110, Config.colors.light_grey)
+  end
+end
+
+--- Updates the end screen logic.
+--- @within EndWindow
+function EndWindow.update()
+  if Context._end.state == "choice" then
+    if Input.left() or Input.up() then
+      if Context._end.selection == 2 then
+        Audio.sfx_beep()
+        Context._end.selection = 1
+      end
+    elseif Input.right() or Input.down() then
+      if Context._end.selection == 1 then
+        Audio.sfx_beep()
+        Context._end.selection = 2
+      end
+    end
+
+    if Input.menu_confirm() then
+      Audio.sfx_select()
+      if Context._end.selection == 1 then
+        Context._end.state = "ending"
+      else
+        -- NO: increment day and go home
+        Day.increase()
+        Context.game.current_screen = "home"
+        Window.set_current("game")
+        -- Initialize home screen
+        local home_screen = Screen.get_by_id("home")
+        if home_screen and home_screen.init then
+          home_screen.init()
+        end
+      end
+    end
+  elseif Context._end.state == "ending" then
+    if Input.menu_confirm() then
+      Window.set_current("menu")
+      MenuWindow.refresh_menu_items()
+    end
+  end
+end

inc/window/window.game.lua

@@ -2,24 +2,38 @@
 local _available_decisions = {}
 local _selected_decision_index = 1
 
---- Draws the game window.
---- @within GameWindow
-function GameWindow.draw()
+local function draw_game_scene(underlay_draw)
   local screen = Screen.get_by_id(Context.game.current_screen)
+  if not screen then return end
   if screen.background then
     Map.draw(screen.background)
   elseif screen.background_color then
     rect(0, 0, Config.screen.width, Config.screen.height, screen.background_color)
   end
-  UI.draw_top_bar(screen.name)
+  if underlay_draw then
+    underlay_draw()
+  end
   if not Context.stat_screen_active and #_available_decisions > 0 then
-    UI.draw_decision_selector(_available_decisions, _selected_decision_index)
+    Decision.draw(_available_decisions, _selected_decision_index)
   end
   Sprite.draw()
   Focus.draw()
   screen.draw()
 end
 
+--- Draws the game window.
+--- @within GameWindow
+function GameWindow.draw()
+  draw_game_scene()
+end
+
+--- Draws the game window with a custom underlay.
+--- @within GameWindow
+--- @param underlay_draw function A draw callback rendered after the background but before overlays.<br/>
+function GameWindow.draw_with_underlay(underlay_draw)
+  draw_game_scene(underlay_draw)
+end
+
 --- Updates the game window logic.
 --- @within GameWindow
 function GameWindow.update()
@@ -31,12 +45,13 @@ function GameWindow.update()
   end
 
   local screen = Screen.get_by_id(Context.game.current_screen)
+  if not screen or not screen.update then return end
   screen.update()
 
   -- Handle current situation updates
   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
+    if current_situation_obj and type(current_situation_obj.update) == "function" then
       current_situation_obj.update()
     end
   end
@@ -53,7 +68,7 @@ function GameWindow.update()
     _selected_decision_index = 1
   end
 
-  local new_selected_decision_index = UI.update_decision_selector(
+  local new_selected_decision_index = Decision.update(
     _available_decisions,
     _selected_decision_index
   )

inc/window/window.menu.lua

@@ -26,7 +26,6 @@ end
 --- @within MenuWindow
 function MenuWindow.new_game()
   Context.new_game()
-  GameWindow.set_state("game")
 end
 
 --- Loads a game from the menu.

inc/window/window.minigame.ddr.lua

@@ -1,10 +1,60 @@
 --- @section MinigameDDRWindow
 
+--- Gets initial DDR minigame configuration.
+--- @within MinigameDDRWindow
+--- @return result table The default DDR minigame configuration.
+function MinigameDDRWindow.init_context()
+  local arrow_size = 12
+  local arrow_spacing = 30
+  local total_width = (4 * arrow_size) + (3 * arrow_spacing)
+  local start_x = (Config.screen.width - total_width) / 2
+  return {
+    bar_fill = 0,
+    max_fill = 100,
+    fill_per_hit = 10,
+    miss_penalty = 5,
+    bar_x = 20,
+    bar_y = 10,
+    bar_width = 200,
+    bar_height = 12,
+    arrow_size = arrow_size,
+    arrow_spawn_timer = 0,
+    arrow_spawn_interval = 45,
+    arrow_fall_speed = 1.5,
+    arrows = {},
+    target_y = 115,
+    target_arrows = {
+      { dir = "left", x = start_x },
+      { dir = "down", x = start_x + arrow_size + arrow_spacing },
+      { dir = "up", x = start_x + (arrow_size + arrow_spacing) * 2 },
+      { dir = "right", x = start_x + (arrow_size + arrow_spacing) * 3 }
+    },
+    hit_threshold = 8,
+    button_pressed_timers = {},
+    button_press_duration = 8,
+    input_cooldowns = { left = 0, down = 0, up = 0, right = 0 },
+    input_cooldown_duration = 10,
+    frame_counter = 0,
+    current_song = nil,
+    pattern_index = 1,
+    use_pattern = false,
+    return_window = nil,
+    win_timer = 0,
+    on_win = nil
+  }
+end
+
 --- Initializes DDR minigame state.
 --- @within MinigameDDRWindow
 --- @param params table Optional parameters for configuration.<br/>
 function MinigameDDRWindow.init(params)
-  Context.minigame_ddr = Minigame.configure_ddr(params)
+  local defaults = MinigameDDRWindow.init_context()
+  if params then
+    for k, v in pairs(params) do
+      defaults[k] = v
+    end
+  end
+  Context.minigame_ddr = defaults
 end
 
 --- Starts the DDR minigame.
@@ -108,18 +158,29 @@ end
 --- @within MinigameDDRWindow
 function MinigameDDRWindow.update()
   local mg = Context.minigame_ddr
+
+  if mg.win_timer > 0 then
+    mg.win_timer = mg.win_timer - 1
+    if mg.win_timer == 0 then
+      Meter.on_minigame_complete()
+      if mg.on_win then
+        mg.on_win()
+      else
+        Meter.show()
+        Window.set_current(mg.return_window)
+      end
+    end
+    return
+  end
+
   if mg.bar_fill >= mg.max_fill then
-    Meter.on_minigame_complete()
-    Meter.show()
-    Window.set_current(mg.return_window)
+    mg.win_timer = Config.timing.minigame_win_duration
     return
   end
   mg.frame_counter = mg.frame_counter + 1
   if mg.use_pattern and mg.current_song and mg.current_song.end_frame then
     if mg.frame_counter > mg.current_song.end_frame and #mg.arrows == 0 then
-      Meter.on_minigame_complete()
-      Meter.show()
-      Window.set_current(mg.return_window)
+      mg.win_timer = Config.timing.minigame_win_duration
       return
     end
   end
@@ -265,4 +326,7 @@ function MinigameDDRWindow.draw()
   else
     Print.text_center("RANDOM MODE", Config.screen.width / 2, debug_y, Config.colors.blue)
   end
+if mg.win_timer > 0 then
+  Minigame.draw_win_overlay()
+end
 end

inc/window/window.minigame.mash.lua

@@ -1,8 +1,47 @@
+--- Gets initial button mash minigame configuration.
+--- @within MinigameButtonMashWindow
+--- @return result table The default button mash minigame configuration.
+function MinigameButtonMashWindow.init_context()
+  return {
+    bar_fill = 0,
+    target_points = 100,
+    fill_per_press = 8,
+    base_degradation = 0.15,
+    degradation_multiplier = 0.006,
+    button_pressed_timer = 0,
+    button_press_duration = 8,
+    instruction_text = "MASH Z!",
+    show_progress_text = true,
+    return_window = nil,
+    bar_x = 20,
+    bar_y = 10,
+    bar_width = 200,
+    bar_height = 12,
+    button_x = 20,
+    button_y = 110,
+    button_size = 12,
+    focus_center_x = nil,
+    focus_center_y = nil,
+    focus_initial_radius = 0,
+    win_timer = 0,
+    on_win = nil
+  }
+end
+
 --- Initializes button mash minigame state.
 --- @within MinigameButtonMashWindow
 --- @param params table Optional parameters for configuration.<br/>
 function MinigameButtonMashWindow.init(params)
-  Context.minigame_button_mash = Minigame.configure_button_mash(params)
+  local defaults = MinigameButtonMashWindow.init_context()
+  if params then
+    for k, v in pairs(params) do
+      defaults[k] = v
+    end
+    if params.max_fill and not params.target_points then
+      defaults.target_points = params.max_fill
+    end
+  end
+  Context.minigame_button_mash = defaults
 end
 
 --- Starts the button mash minigame.
@@ -25,18 +64,31 @@ end
 --- @within MinigameButtonMashWindow
 function MinigameButtonMashWindow.update()
   local mg = Context.minigame_button_mash
+
+  if mg.win_timer > 0 then
+    mg.win_timer = mg.win_timer - 1
+    if mg.win_timer == 0 then
+      Meter.on_minigame_complete()
+      if mg.focus_center_x then Focus.stop() end
+      if mg.on_win then
+        mg.on_win()
+      else
+        Meter.show()
+        Window.set_current(mg.return_window)
+      end
+    end
+    return
+  end
+
   if Input.select() then
     mg.bar_fill = mg.bar_fill + mg.fill_per_press
     mg.button_pressed_timer = mg.button_press_duration
-    if mg.bar_fill > mg.max_fill then
-      mg.bar_fill = mg.max_fill
+    if mg.bar_fill > mg.target_points then
+      mg.bar_fill = mg.target_points
     end
   end
-  if mg.bar_fill >= mg.max_fill then
-    Meter.on_minigame_complete()
-    Meter.show()
-    if mg.focus_center_x then Focus.stop() end
-    Window.set_current(mg.return_window)
+  if mg.bar_fill >= mg.target_points then
+    mg.win_timer = Config.timing.minigame_win_duration
     return
   end
   local degradation = mg.base_degradation + (mg.bar_fill * mg.degradation_multiplier)
@@ -48,7 +100,7 @@ function MinigameButtonMashWindow.update()
     mg.button_pressed_timer = mg.button_pressed_timer - 1
   end
   if mg.focus_center_x then
-    Focus.set_percentage(mg.bar_fill / mg.max_fill)
+    Focus.set_percentage(mg.bar_fill / mg.target_points)
   end
 end
 
@@ -57,14 +109,16 @@ end
 function MinigameButtonMashWindow.draw()
   local mg = Context.minigame_button_mash
   if mg.return_window == "game" then
-    GameWindow.draw()
+    GameWindow.draw_with_underlay(function()
+      Sprite.draw_at("sleeping_norman", (Config.screen.width / 2) - 30, (Config.screen.height / 2) - 22)
+    end)
   end
   if not mg.focus_center_x then
     rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
   end
   rect(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.light_grey)
   rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
-  local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
+  local fill_width = (mg.bar_fill / mg.target_points) * mg.bar_width
   if fill_width > 0 then
     local bar_color = Config.colors.light_blue
     if mg.bar_fill > 66 then
@@ -82,8 +136,14 @@ function MinigameButtonMashWindow.draw()
   if mg.button_pressed_timer > 0 then
     circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
   end
-  Print.text_center(" Z", mg.button_x - 2, mg.button_y - 3, Config.colors.light_grey)
-  Print.text_center("MASH Z!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
-  local percentage = math.floor((mg.bar_fill / mg.max_fill) * 100)
-  Print.text_center(percentage .. "%", mg.bar_x + mg.bar_width / 2, mg.bar_y + 2, Config.colors.black)
+  Print.text_center("Z", mg.button_x, mg.button_y - 3, button_color)
+  Print.text_center(mg.instruction_text, Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
+  if mg.show_progress_text then
+    local points_text = math.floor(mg.bar_fill) .. "/" .. mg.target_points
+    Print.text_center(points_text, mg.bar_x + mg.bar_width / 2, mg.bar_y + 2, Config.colors.black)
+  end
+
+  if mg.win_timer > 0 then
+    Minigame.draw_win_overlay()
+  end
 end

inc/window/window.minigame.rhythm.lua

@@ -1,10 +1,51 @@
 --- @section MinigameRhythmWindow
 
+--- Gets initial rhythm minigame configuration.
+--- @within MinigameRhythmWindow
+--- @return result table The default rhythm minigame configuration.
+function MinigameRhythmWindow.init_context()
+  return {
+    line_position = 0,
+    line_speed = 0.015,
+    line_direction = 1,
+    target_center = 0.5,
+    target_width = 0.3,
+    initial_target_width = 0.3,
+    min_target_width = 0.08,
+    target_shrink_rate = 0.9,
+    score = 0,
+    max_score = 10,
+    button_pressed_timer = 0,
+    button_press_duration = 10,
+    return_window = nil,
+    bar_x = 20,
+    bar_y = 10,
+    bar_width = 200,
+    bar_height = 12,
+    button_x = 210,
+    button_y = 110,
+    button_size = 10,
+    press_cooldown = 0,
+    press_cooldown_duration = 15,
+    focus_center_x = nil,
+    focus_center_y = nil,
+    focus_initial_radius = 0,
+    win_timer = 0,
+    on_win = nil
+  }
+end
+
 --- Initializes rhythm minigame state.
 --- @within MinigameRhythmWindow
 --- @param params table Optional parameters for configuration.<br/>
 function MinigameRhythmWindow.init(params)
-  Context.minigame_rhythm = Minigame.configure_rhythm(params)
+  local defaults = MinigameRhythmWindow.init_context()
+  if params then
+    for k, v in pairs(params) do
+      defaults[k] = v
+    end
+  end
+  Context.minigame_rhythm = defaults
 end
 
 --- Starts the rhythm minigame.
@@ -27,6 +68,22 @@ end
 --- @within MinigameRhythmWindow
 function MinigameRhythmWindow.update()
   local mg = Context.minigame_rhythm
+
+  if mg.win_timer > 0 then
+    mg.win_timer = mg.win_timer - 1
+    if mg.win_timer == 0 then
+      Meter.on_minigame_complete()
+      if mg.focus_center_x then Focus.stop() end
+      if mg.on_win then
+        mg.on_win()
+      else
+        Meter.show()
+        Window.set_current(mg.return_window)
+      end
+    end
+    return
+  end
+
   mg.line_position = mg.line_position + (mg.line_speed * mg.line_direction)
   if mg.line_position > 1 then
     mg.line_position = 1
@@ -57,10 +114,7 @@ function MinigameRhythmWindow.update()
     end
   end
   if mg.score >= mg.max_score then
-    Meter.on_minigame_complete()
-    Meter.show()
-    if mg.focus_center_x then Focus.stop() end
-    Window.set_current(mg.return_window)
+    mg.win_timer = Config.timing.minigame_win_duration
     return
   end
   if mg.button_pressed_timer > 0 then
@@ -76,7 +130,9 @@ end
 function MinigameRhythmWindow.draw()
   local mg = Context.minigame_rhythm
   if mg.return_window == "game" then
-    GameWindow.draw()
+    GameWindow.draw_with_underlay(function()
+      Sprite.draw_at("sleeping_norman", (Config.screen.width / 2) - 30, (Config.screen.height / 2) - 22)
+    end)
   end
   if not mg.focus_center_x then
     rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
@@ -90,12 +146,10 @@ function MinigameRhythmWindow.draw()
   rect(target_x, mg.bar_y, target_width_pixels, mg.bar_height, Config.colors.light_blue)
   local line_x = mg.bar_x + (mg.line_position * mg.bar_width)
   rect(line_x - 1, mg.bar_y, 2, mg.bar_height, Config.colors.item)
-  local score_text = "SCORE: " .. mg.score .. " / " .. mg.max_score
-  Print.text_center(score_text, Config.screen.width / 2, mg.bar_y + mg.bar_height + 8, Config.colors.light_grey)
   Print.text_center(
-    "Press Z when line is in green!",
+    "Sleep Norman ... Sleep!",
     Config.screen.width / 2,
-    mg.bar_y + mg.bar_height + 20,
+    mg.bar_y + mg.bar_height + 14,
     Config.colors.light_grey
   )
   local button_color = Config.colors.light_grey
@@ -106,5 +160,9 @@ function MinigameRhythmWindow.draw()
   if mg.button_pressed_timer > 0 then
     circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
   end
-  Print.text_center("Z", mg.button_x - 2, mg.button_y - 3, button_color)
+  Print.text_center("Z", mg.button_x, mg.button_y - 3, button_color)
+
+  if mg.win_timer > 0 then
+    Minigame.draw_win_overlay()
+  end
 end

inc/window/window.mysterious_man.lua

@@ -0,0 +1,160 @@
+--- @section MysteriousManWindow
+
+local STATE_TEXT = "text"
+local STATE_DAY = "day"
+local STATE_CHOICE = "choice"
+
+local DEFAULT_TEXT = [[
+Misterious man appears
+during your sleep.
+
+He says nothing.
+He doesn't need to.
+
+He says nothing.
+]]
+
+local state = STATE_TEXT
+local text_y = Config.screen.height
+local text_speed = 0.4
+local day_timer = 0
+local day_display_frames = 120
+local selected_choice = 1
+local text = DEFAULT_TEXT
+local day_text_override = nil
+local on_text_complete = nil
+
+local choices = {
+  {
+    label = "Wake Up",
+  },
+  {
+    label = "Stay in Bed",
+  },
+}
+
+--- Sets the scrolling text content.
+--- @within MysteriousManWindow
+--- @param new_text string The text to display.
+function MysteriousManWindow.set_text(new_text)
+  text = new_text
+end
+
+--- Starts the mysterious man window.
+--- @within MysteriousManWindow
+--- @param[opt] options table Optional window configuration.</br>
+--- Fields: </br>
+--- * text (string) Override for the scrolling text.<br/>
+--- * day_text (string) Override for the centered day label.<br/>
+--- * on_text_complete (function) Callback fired once when the text phase ends.<br/>
+function MysteriousManWindow.start(options)
+  options = options or {}
+  state = STATE_TEXT
+  text_y = Config.screen.height
+  day_timer = 0
+  selected_choice = 1
+  text = options.text or DEFAULT_TEXT
+  day_text_override = options.day_text
+  on_text_complete = options.on_text_complete
+  Meter.hide()
+  Window.set_current("mysterious_man")
+end
+
+local function go_to_day_state()
+  if on_text_complete then
+    on_text_complete()
+    on_text_complete = nil
+  end
+  if Window.get_current_id() ~= "mysterious_man" then
+    return
+  end
+  state = STATE_DAY
+  day_timer = day_display_frames
+end
+
+local function wake_up()
+  Context.home_norman_visible = false
+  Util.go_to_screen_by_id("home")
+  MinigameButtonMashWindow.start("game", {
+    focus_center_x = (Config.screen.width / 2) - 22,
+    focus_center_y = (Config.screen.height / 2) - 18,
+    focus_initial_radius = 0,
+    target_points = 100,
+    instruction_text = "Wake up Norman!",
+    show_progress_text = false,
+    on_win = function()
+      Audio.music_play_wakingup()
+      Context.home_norman_visible = true
+      Meter.show()
+      Window.set_current("game")
+    end,
+  })
+end
+
+local function stay_in_bed()
+  Day.increase()
+  state = STATE_DAY
+  day_timer = day_display_frames
+end
+
+--- Updates the mysterious man window logic.
+--- @within MysteriousManWindow
+function MysteriousManWindow.update()
+  if state == STATE_TEXT then
+    text_y = text_y - text_speed
+
+    local lines = 1
+    for _ in string.gmatch(text, "\n") do
+      lines = lines + 1
+    end
+
+    if text_y < -lines * 8 then
+      go_to_day_state()
+    end
+
+    if Input.select() then
+      go_to_day_state()
+    end
+  elseif state == STATE_DAY then
+    day_timer = day_timer - 1
+
+    if day_timer <= 0 or Input.select() then
+      state = STATE_CHOICE
+      selected_choice = 1
+    end
+  elseif state == STATE_CHOICE then
+    selected_choice = UI.update_menu(choices, selected_choice)
+
+    if Input.select() then
+      Audio.sfx_select()
+      if selected_choice == 1 then
+        wake_up()
+      else
+        stay_in_bed()
+      end
+    end
+  end
+end
+
+--- Draws the mysterious man window.
+--- @within MysteriousManWindow
+function MysteriousManWindow.draw()
+  rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
+
+  if state == STATE_TEXT then
+    local x = (Config.screen.width - 132) / 2
+    Print.text(text, x, text_y, Config.colors.light_grey)
+  elseif state == STATE_DAY then
+    local day_text = day_text_override or ("Day " .. Context.day_count)
+    Print.text_center(
+      day_text,
+      Config.screen.width / 2,
+      Config.screen.height / 2 - 3,
+      Config.colors.white
+    )
+  elseif state == STATE_CHOICE then
+    local menu_x = (Config.screen.width - 60) / 2
+    local menu_y = (Config.screen.height - 20) / 2
+    UI.draw_menu(choices, selected_choice, menu_x, menu_y)
+  end
+end

inc/window/window.register.lua

@@ -27,3 +27,12 @@ Window.register("minigame_rhythm", MinigameRhythmWindow)
 
 MinigameDDRWindow = {}
 Window.register("minigame_ddr", MinigameDDRWindow)
+
+MysteriousManWindow = {}
+Window.register("mysterious_man", MysteriousManWindow)
+
+EndWindow = {}
+Window.register("end", EndWindow)
+
+DiscussionWindow = {}
+Window.register("discussion", DiscussionWindow)

infra.md

@@ -1,289 +0,0 @@
-# Server
-```mermaid
-graph TD
-  Internet --> Nginx
-
-  Nginx --> Traefik
-  Traefik --> Gitea
-  Gitea --> GiteaDB[(Gitea data / SQLite)]
-
-  Traefik --> WoodpeckerServer
-  WoodpeckerServer --> WoodpeckerDB[(Woodpecker data / SQLite)]
-  WoodpeckerServer --> WoodpeckerAgent
-  WoodpeckerAgent --> DockerSocket[(Docker)]
-
-  Traefik --> WebApp
-  WebApp --> MySQL[(MySQL)]
-  WebApp --> Softwares[(Volume)]
-
-  Droparea --> Softwares
-
-  Nginx --> Discourse
-  Discourse --> ForumDB[(Postgres)]
-  Discourse --> Redis[(Redis)]
-
-  Nginx --> Wiki
-  Wiki --> WikiDB[(Postgres)]
-```
-
-# TIC-80 Pipeline
-
-This document describes the Woodpecker CI pipeline used to build, export, upload, and publish a TIC-80 game project.
-
----
-
-## Overview
-
-The pipeline performs the following steps:
-
-1. **Build** the TIC-80 project using a custom Docker image
-2. **Export** the game to `.tic` and HTML formats
-3. **Upload artifacts** to a remote server via SCP
-4. **Notify an update server** to publish the new version
-
-The pipeline is driven by environment variables so it can be reused across projects.
-
----
-
-## Global Environment
-
-```yaml
-environment: &environment
-  GAME_NAME: mranderson
-  GAME_LANG: lua
-```
-
-- **GAME_NAME**: Project name (used for all outputs)
-- **GAME_LANG**: Source language used by TIC-80 (Lua)
-
-The anchor (`&environment`) allows reuse across steps.
-
----
-
-## Step 1: Build & Export
-
-```yaml
-- name: build
-  image: git.teletype.hu/internal/tic80pro:latest
-  environment:
-    <<: *environment
-    XDG_RUNTIME_DIR: /tmp
-  commands:
-    - make build
-    - make export
-```
-
-**What it does:**
-
-- Uses a custom TIC-80 Pro Docker image hosted in Gitea
-- Runs the Makefile `build` target to assemble source files
-- Runs the `export` target to generate:
-  - `.tic` cartridge
-  - `.html.zip` web build
-
----
-
-## Step 2: Artifact Upload
-
-```yaml
-- name: artifact
-  image: alpine
-  environment:
-    <<: *environment
-    DROPAREA_HOST: vps.teletype.hu
-    DROPAREA_PORT: 2223
-    DROPAREA_TARGET_PATH: /home/drop
-    DROPAREA_USER: drop
-    DROPAREA_SSH_PASSWORD:
-      from_secret: droparea_ssh_password
-  commands:
-    - apk add --no-cache openssh-client sshpass
-    - mkdir -p /root/.ssh
-    - sshpass -p $DROPAREA_SSH_PASSWORD scp -o StrictHostKeyChecking=no -P $DROPAREA_PORT \
-        $GAME_NAME.$GAME_LANG \
-        $GAME_NAME.tic \
-        $GAME_NAME.html.zip \
-        $DROPAREA_USER@$DROPAREA_HOST:$DROPAREA_TARGET_PATH
-```
-
-**What it does:**
-
-- Installs SCP tooling in a minimal Alpine container
-- Uploads:
-  - Source file
-  - TIC-80 cartridge
-  - HTML export ZIP
-- Uses secrets for SSH authentication
-
----
-
-## Step 3: Update Notification
-
-```yaml
-- name: update
-  image: alpine
-  environment:
-    <<: *environment
-    UPDATE_SERVER: https://games.vps.teletype.hu
-    UPDATE_SECRET:
-      from_secret: update_secret_key
-  commands:
-    - apk add --no-cache curl
-    - curl "$UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80"
-```
-
-**What it does:**
-
-- Sends an HTTP request to the update server
-- Notifies that a new TIC-80 build is available
-- Uses a secret key to authorize the update
-
----
-
-## Result
-
-After a successful run:
-
-- The game is built and exported
-- Artifacts are uploaded to the server
-- The public game index is updated automatically
-
-This pipeline enables **fully automated TIC-80 releases** using open tools and infrastructure.
-
-
-# TIC-80 Makefile Project Builder
-
-This Makefile provides a simple, reproducible workflow for building **TIC-80 Lua projects** from multiple source files. It is designed for small indie or experimental projects where the source code is split into logical parts and then merged into a single `.lua` cartridge.
-
----
-
-## Overview
-
-The workflow is based on four core ideas:
-
-- Source code is split into multiple Lua files inside an `inc/` directory
-- A project-specific `.inc` file defines the **build order**
-- All source files are concatenated into one final `.lua` file
-- TIC-80 is used in CLI mode to export runnable artifacts
-
-This approach keeps the codebase modular while remaining compatible with TIC-80’s single-file cartridge model.
-
----
-
-## Project Structure
-
-```text
-project-root/
-├── inc/
-│   ├── core.lua
-│   ├── player.lua
-│   └── world.lua
-├── mranderson.inc
-├── Makefile
-└── README.md
-```
-
-- `inc/` contains all Lua source fragments
-- `<project>.inc` defines the order in which files are merged
-- `<project>.lua` is generated automatically
-
----
-
-## The `.inc` File
-
-The `.inc` file is a **plain text file** listing Lua source files in build order:
-
-```text
-core.lua
-player.lua
-world.lua
-```
-
-The order matters. Files listed earlier are concatenated first and must define any globals used later.
-
----
-
-## Usage
-
-### Build (default)
-
-```sh
-make build
-```
-
-- Reads `mranderson.inc`
-- Concatenates files from `inc/`
-- Produces `mranderson.lua`
-
-### Export (TIC-80)
-
-```sh
-make export
-```
-
-- Loads the generated Lua file into TIC-80 (CLI mode)
-- Saves a `.tic` cartridge
-- Exports an HTML build
-
-### Export Assets
-
-```sh
-make export_assets
-```
-
-- **Purpose**: Extracts asset sections (PALETTE, TILES, SPRITES, MAP, SFX, MUSIC) from the compiled `<project>.lua` file.
-- **Mechanism**: Uses `sed` to directly parse the generated `<project>.lua` and saves the extracted data into `inc/meta/meta.assets.lua`. This file can then be used to embed the asset data directly into other parts of the project or for version control of visual assets.
-
-### Import Assets
-
-The `import_assets` target was considered during development but is currently not part of the build workflow. Asset handling for TIC-80 projects within this Makefile relies solely on direct extraction (`export_assets`) from the built Lua cartridge, rather than importing external asset definitions. This target may be implemented in the future if a need for pre-build asset injection arises.
-
-### Watch Mode
-
-```sh
-make watch
-```
-
-- Performs an initial build
-- Watches the `inc/` directory and `.inc` file
-- Rebuilds automatically on any change
-
-Requires `fswatch` to be installed.
-
----
-
-## Generated Artifacts
-
-| File | Description |
-|-----|-------------|
-| `<project>.lua` | Merged Lua source (input for TIC-80) |
-| `<project>.tic` | TIC-80 cartridge |
-| `<project>.html` | Web export |
-| `<project>.html.zip` | Packaged HTML build |
-
----
-
-## Design Goals
-
-- Keep TIC-80 projects modular
-- Avoid manual copy-paste between files
-- Enable fast iteration and experimentation
-- Remain fully compatible with open-source tooling
-
-This Makefile is intentionally minimal and transparent, favoring simplicity over abstraction.
-
----
-
-## Requirements
-
-- `make`
-- `tic80` available in PATH
-- `fswatch` (only for watch mode)
-
----
-
-## License
-
-MIT License — free to use, modify, and redistribute.
-
-