New music: work activity

Reviewed-on: http://git.teletype.hu/games/impostor/pulls/34

.luacheckrc

@@ -5,7 +5,9 @@ globals = {
   "Focus",
   "Day",
   "Timer",
+  "Glitch",
   "Trigger",
+  "Discussion",
   "Util",
   "Decision",
   "Situation",
@@ -31,6 +33,8 @@ globals = {
   "MinigameRhythmWindow",
   "MinigameDDRWindow",
   "MysteriousManWindow",
+  "DiscussionWindow",
+  "EndWindow",
   "mset",
   "mget",
   "btnp",

impostor.inc

@@ -11,6 +11,8 @@ 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
@@ -28,6 +30,8 @@ decision/decision.go_to_end.lua
 decision/decision.go_to_walking_to_home.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
@@ -52,6 +56,7 @@ 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

@@ -24,6 +24,9 @@ function Audio.music_play_room_() end
 --- Plays room work music.
 --- @within Audio
 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
@@ -40,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.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

@@ -5,8 +5,8 @@ Decision.register({
     Meter.hide()
     Day.increase()
     MinigameRhythmWindow.start("game", {
-      focus_center_x = Config.screen.width / 2,
+      focus_center_x = (Config.screen.width / 2) - 22,
-      focus_center_y = Config.screen.height / 2,
+      focus_center_y = (Config.screen.height / 2) - 18,
       focus_initial_radius = 0,
       on_win = function()
         MysteriousManWindow.start()

inc/decision/decision.manager.lua

@@ -5,7 +5,7 @@ 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)
@@ -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.
@@ -109,12 +121,10 @@ function Decision.draw(decisions, selected_decision_index)
   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 decision_label = Decision.get_label(selected_decision)
-    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_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

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_x = (Config.screen.width / 2) - 22,
-      focus_center_y = Config.screen.height / 2,
+      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_x = (Config.screen.width / 2) - 22,
-      focus_center_y = Config.screen.height / 2,
+      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.context.lua

@@ -37,15 +37,31 @@ function Context.initial_data()
     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
 
@@ -71,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.module.lua

@@ -15,3 +15,4 @@ Focus = {}
 Day = {}
 Timer = {}
 Trigger = {}
+Discussion = {}

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/meta/meta.assets.lua

@@ -306,10 +306,10 @@
 -- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006004600000f0f00
 -- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000004600000f0f00
 -- 048:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900400000000000
--- 056:4100510061406140717081709100b100c100d100e100e100e100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100580000000600
+-- 056:4100510061406140717081709100b100c100d100e100e100e100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f10058a000000600
--- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000004
+-- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
--- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100400000080800
+-- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100500000080800
--- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000
+-- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000
 -- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200100000000000
 -- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00400000000000
 -- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100484000000000
@@ -331,7 +331,10 @@
 -- 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

@@ -7,5 +7,10 @@ Screen.register({
     "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.toilet.lua

@@ -26,10 +26,14 @@ 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
 
+    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."

inc/screen/screen.walking_to_office.lua

@@ -4,6 +4,7 @@ Screen.register({
   decisions = {
     "go_to_home",
     "go_to_office",
+    "start_discussion",
   },
   background = "street"
 })

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.
@@ -59,6 +85,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 +122,8 @@ function Sprite.draw()
       trace("Error: Sprite id " .. id .. " in _active_sprites is not registered.")
       _active_sprites[id] = nil
     end
-
+    if sprite_data then
-    local colorkey = params.colorkey or sprite_data.colorkey or 0
+      draw_sprite_instance(sprite_data, params)
-    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
 end

inc/sprite/sprite.norman.lua

@@ -1,17 +1,23 @@
 Sprite.register({
   id = "norman",
   sprites = {
-    -- Body (sprite index 0)
+    { s = 272, x_offset = -4, y_offset = -4 },
-    { s = 0, x_offset = 0, y_offset = 0 },
+    { s = 273, x_offset = 4, y_offset = -4 },
-    -- Head (sprite index 1)
+    { s = 288, x_offset = -4, y_offset = 4 },
-    { s = 1, x_offset = 0, y_offset = -8 },
+    { s = 289, x_offset = 4, y_offset = 4 },
-    -- Left Arm (sprite index 2)
+    { s = 304, x_offset = -4, y_offset = 12 },
-    { s = 2, x_offset = -4, y_offset = 4 },
+    { s = 305, x_offset = 4, y_offset = 12 }
-    -- 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 },
+Sprite.register({
-    -- Right Leg (sprite index 5, flipped)
+  id = "sleeping_norman",
-    { s = 5, x_offset = 2, y_offset = 8, flip_x = 1 } -- Flipped leg
+  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/system/system.main.lua

@@ -27,5 +27,6 @@ function TIC()
   if Context.game_in_progress then
     Meter.draw()
     Timer.draw()
+    Glitch.draw()
   end
 end

inc/system/system.ui.lua

@@ -46,36 +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
+  if text == nil then return {""} end
-    local lines = {}
+
-    for input_line in (text .. "\n"):gmatch("(.-)\n") do
+  local lines = {}
-        local current_line = ""
+
-        local words_in_line = 0
+  local function trim(s)
-        for word in input_line:gmatch("%S+") do
+    return (s:gsub("^%s+", ""):gsub("%s+$", ""))
-            words_in_line = words_in_line + 1
+  end
-            if #current_line == 0 then
+
-                current_line = word
+  local function previous_whitespace_index(s, target)
-            elseif #current_line + #word + 1 <= max_chars_per_line then
+    if s:sub(target, target):match("%s") then
-                current_line = current_line .. " " .. word
+      return target
-            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 {""}
+    for i = target - 1, 1, -1 do
+      if s:sub(i, i):match("%s") then
+        return i
+      end
     end
-    return lines
+
+    return nil
+  end
+
+  for input_line in (text .. "\n"):gmatch("(.-)\n") do
+    local remaining = trim(input_line)
+
+    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))
+
+        if not split_at or line == "" then
+          line = remaining:sub(1, max_chars_per_line)
+          split_at = max_chars_per_line
+        end
+
+        table.insert(lines, line)
+        remaining = trim(remaining:sub(split_at + 1))
+      end
+
+      table.insert(lines, remaining)
+    end
+  end
+
+  if #lines == 0 then
+    return {""}
+  end
+
+  return lines
 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

@@ -1,3 +1,5 @@
+--- @section EndWindow
+
 --- Draws the end screen window.
 --- @within EndWindow
 function EndWindow.draw()

inc/window/window.game.lua

@@ -2,9 +2,7 @@
 local _available_decisions = {}
 local _selected_decision_index = 1
 
---- Draws the game window.
+local function draw_game_scene(underlay_draw)
---- @within GameWindow
-function GameWindow.draw()
   local screen = Screen.get_by_id(Context.game.current_screen)
   if not screen then return end
   if screen.background then
@@ -12,6 +10,9 @@ function GameWindow.draw()
   elseif screen.background_color then
     rect(0, 0, Config.screen.width, Config.screen.height, screen.background_color)
   end
+  if underlay_draw then
+    underlay_draw()
+  end
   if not Context.stat_screen_active and #_available_decisions > 0 then
     Decision.draw(_available_decisions, _selected_decision_index)
   end
@@ -20,6 +21,19 @@ function GameWindow.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

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.mash.lua

@@ -4,12 +4,14 @@
 function MinigameButtonMashWindow.init_context()
   return {
     bar_fill = 0,
-    max_fill = 100,
+    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,
@@ -35,6 +37,9 @@ function MinigameButtonMashWindow.init(params)
     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
@@ -78,11 +83,11 @@ function MinigameButtonMashWindow.update()
   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
+    if mg.bar_fill > mg.target_points then
-      mg.bar_fill = mg.max_fill
+      mg.bar_fill = mg.target_points
     end
   end
-  if mg.bar_fill >= mg.max_fill then
+  if mg.bar_fill >= mg.target_points then
     mg.win_timer = Config.timing.minigame_win_duration
     return
   end
@@ -95,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
 
@@ -104,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
@@ -129,10 +136,12 @@ 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("Z", mg.button_x, mg.button_y - 3, button_color)
-  Print.text_center("MASH Z!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
+  Print.text_center(mg.instruction_text, 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)
+  if mg.show_progress_text then
-  Print.text_center(percentage .. "%", mg.bar_x + mg.bar_width / 2, mg.bar_y + 2, Config.colors.black)
+    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()

inc/window/window.minigame.rhythm.lua

@@ -130,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)
@@ -144,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
@@ -160,7 +160,7 @@ 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()

inc/window/window.mysterious_man.lua

@@ -4,12 +4,25 @@ 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 = {
   {
@@ -20,16 +33,6 @@ local choices = {
   },
 }
 
-local text = [[
-Misterious man appears
-during your sleep.
-
-He says nothing.
-He doesn't need to.
-
-He says nothing.
-]]
-
 --- Sets the scrolling text content.
 --- @within MysteriousManWindow
 --- @param new_text string The text to display.
@@ -39,22 +42,49 @@ end
 
 --- Starts the mysterious man window.
 --- @within MysteriousManWindow
-function MysteriousManWindow.start()
+--- @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,
+    focus_center_x = (Config.screen.width / 2) - 22,
-    focus_center_y = Config.screen.height / 2,
+    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,
@@ -79,13 +109,11 @@ function MysteriousManWindow.update()
     end
 
     if text_y < -lines * 8 then
-      state = STATE_DAY
+      go_to_day_state()
-      day_timer = day_display_frames
     end
 
     if Input.select() then
-      state = STATE_DAY
+      go_to_day_state()
-      day_timer = day_display_frames
     end
   elseif state == STATE_DAY then
     day_timer = day_timer - 1
@@ -117,7 +145,7 @@ function MysteriousManWindow.draw()
     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 " .. Context.day_count
+    local day_text = day_text_override or ("Day " .. Context.day_count)
     Print.text_center(
       day_text,
       Config.screen.width / 2,

inc/window/window.register.lua

@@ -33,3 +33,6 @@ Window.register("mysterious_man", MysteriousManWindow)
 
 EndWindow = {}
 Window.register("end", EndWindow)
+
+DiscussionWindow = {}
+Window.register("discussion", DiscussionWindow)