Add the street background.

.luacheckrc

@@ -3,8 +3,6 @@
 
 globals = {
   "Focus",
-  "Day",
-  "Timer",
   "Util",
   "Decision",
   "Situation",

impostor.inc

@@ -2,14 +2,12 @@ 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
-logic/logic.meter.lua
-logic/logic.focus.lua
-logic/logic.day.lua
-logic/logic.timer.lua
+system/system.focus.lua
 system/system.ui.lua
 audio/audio.manager.lua
 audio/audio.songs.lua

inc/audio/audio.manager.lua

@@ -19,6 +19,7 @@ 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.

inc/decision/decision.manager.lua

@@ -98,39 +98,3 @@ function Decision.filter_available(decisions_list)
   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 = 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
-
---- 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/init/init.config.lua

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

inc/init/init.context.lua

@@ -34,12 +34,10 @@ function Context.initial_data()
     minigame_button_mash = Minigame.get_default_button_mash(),
     minigame_rhythm = Minigame.get_default_rhythm(),
     meters = Meter.get_initial(),
-    timer = Timer.get_initial(),
     game = {
       current_screen = "home",
       current_situation = nil,
-    },
-    day_count = 1,
+    }
   }
 end
 

inc/init/init.meter.lua

@@ -2,17 +2,34 @@
 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>
@@ -22,7 +39,8 @@ Meter.COLOR_BG = Config.colors.meter_bg
 --- * 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.
+--- * hidden (boolean) Whether meters are hidden.<br/>
+--- * timer_progress (number) Clock timer revolution progress (0 to 1).
 function Meter.get_initial()
   return {
     ism = METER_DEFAULT,
@@ -31,6 +49,7 @@ function Meter.get_initial()
     combo = 0,
     combo_timer = 0,
     hidden = false,
+    timer_progress = 0,
   }
 end
 
@@ -53,20 +72,6 @@ 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.
@@ -91,6 +96,13 @@ 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
 
@@ -106,6 +118,13 @@ 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()
@@ -117,37 +136,3 @@ 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 = 11
-  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/init/init.minigame.lua

@@ -78,8 +78,7 @@ function Minigame.get_default_ddr()
     current_song = nil,
     pattern_index = 1,
     use_pattern = false,
-    return_window = nil,
-    win_timer = 0
+    return_window = nil
   }
 end
 
@@ -102,7 +101,6 @@ end
 --- * button_x (number) Button indicator X position.<br/>
 --- * button_y (number) Button indicator Y position.<br/>
 --- * button_size (number) Button indicator size.<br/>
---- * win_timer (number) Timer for the win message overlay.<br/>
 function Minigame.get_default_button_mash()
   return {
     bar_fill = 0,
@@ -122,8 +120,7 @@ function Minigame.get_default_button_mash()
     button_size = 12,
     focus_center_x = nil,
     focus_center_y = nil,
-    focus_initial_radius = 0,
-    win_timer = 0
+    focus_initial_radius = 0
   }
 end
 
@@ -153,7 +150,6 @@ end
 --- * button_size (number) Button indicator size.<br/>
 --- * press_cooldown (number) Current cooldown timer.<br/>
 --- * press_cooldown_duration (number) Frames of press cooldown.<br/>
---- * win_timer (number) Timer for the win message overlay.<br/>
 function Minigame.get_default_rhythm()
   return {
     line_position = 0,
@@ -180,28 +176,10 @@ function Minigame.get_default_rhythm()
     press_cooldown_duration = 15,
     focus_center_x = nil,
     focus_center_y = nil,
-    focus_initial_radius = 0,
-    win_timer = 0
+    focus_initial_radius = 0
   }
 end
 
---- Draws a unified win message overlay.
---- @within Minigame
-function Minigame.draw_win_overlay()
-  local text = "WELL DONE!"
-  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
-
 --- Configures DDR minigame.
 --- @within Minigame
 --- @param params table Optional parameters to override defaults (see Minigame.get_default_ddr).

inc/init/init.module.lua

@@ -12,5 +12,3 @@ Input = {}
 Sprite = {}
 Audio = {}
 Focus = {}
-Day = {}
-Timer = {}

inc/logic/logic.day.lua

@@ -1,18 +0,0 @@
-local _day_increase_handlers = {}
-
-function Day.increase()
-    Context.day_count = Context.day_count + 1
-    for _, handler in ipairs(_day_increase_handlers) do
-        handler()
-    end
-end
-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.timer.lua

@@ -1,88 +0,0 @@
---- @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 = 20
-  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.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
-  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
-      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/screen/screen.toilet.lua

@@ -30,7 +30,8 @@ Screen.register({
     local bar_x = math.floor((sw - bar_w) / 2)
     local bar_h = 4
 
-    Print.text_center("day " .. Context.day_count, cx, 10, Config.colors.white)
+    -- TODO: Add day counter
+    Print.text_center("day 1", cx, 10, Config.colors.white)
 
     local narrative = "reflecting on my past and present\n...\nboth eventually flushed."
     local wrapped = UI.word_wrap(narrative, 38)
@@ -42,7 +43,7 @@ Screen.register({
 
     local m = Context.meters
     local max_val = Meter.get_max()
-    local decay_pct = Meter.get_decay_percentage()
+    local decay_pct = Meter.get_timer_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/system/system.main.lua

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

inc/system/system.ui.lua

@@ -8,6 +8,12 @@ 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/>
@@ -79,3 +85,176 @@ function UI.word_wrap(text, max_chars_per_line)
     end
     return lines
 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
+
+--- 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
+  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
+      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
+
+--- 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
+
+  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)
+
+  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
+
+--- 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)
+  end
+  return selected_decision_index
+end

inc/window/window.configuration.lua

@@ -8,16 +8,14 @@ ConfigurationWindow = {
 --- @within ConfigurationWindow
 function ConfigurationWindow.init()
   ConfigurationWindow.controls = {
-    {
-      label = "Save",
-      action = function() Config.save() end,
-      type = "action_item"
-    },
-    {
-      label = "Restore Defaults",
-      action = function() Config.reset() end,
-      type = "action_item"
-    },
+    UI.create_action_item(
+      "Save",
+      function() Config.save() end
+    ),
+    UI.create_action_item(
+      "Restore Defaults",
+      function() Config.reset() end
+    ),
   }
 end
 

inc/window/window.game.lua

@@ -13,7 +13,7 @@ function GameWindow.draw()
   end
   UI.draw_top_bar(screen.name)
   if not Context.stat_screen_active and #_available_decisions > 0 then
-    Decision.draw(_available_decisions, _selected_decision_index)
+    UI.draw_decision_selector(_available_decisions, _selected_decision_index)
   end
   Sprite.draw()
   Focus.draw()
@@ -53,7 +53,7 @@ function GameWindow.update()
     _selected_decision_index = 1
   end
 
-  local new_selected_decision_index = Decision.update(
+  local new_selected_decision_index = UI.update_decision_selector(
     _available_decisions,
     _selected_decision_index
   )

inc/window/window.minigame.ddr.lua

@@ -108,25 +108,18 @@ 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()
-      Meter.show()
-      Window.set_current(mg.return_window)
-    end
-    return
-  end
-
   if mg.bar_fill >= mg.max_fill then
-    mg.win_timer = Config.timing.minigame_win_duration
+    Meter.on_minigame_complete()
+    Meter.show()
+    Window.set_current(mg.return_window)
     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
-      mg.win_timer = Config.timing.minigame_win_duration
+      Meter.on_minigame_complete()
+      Meter.show()
+      Window.set_current(mg.return_window)
       return
     end
   end
@@ -272,7 +265,4 @@ 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

@@ -25,18 +25,6 @@ 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()
-      Meter.show()
-      if mg.focus_center_x then Focus.stop() end
-      Window.set_current(mg.return_window)
-    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
@@ -45,7 +33,10 @@ function MinigameButtonMashWindow.update()
     end
   end
   if mg.bar_fill >= mg.max_fill then
-    mg.win_timer = Config.timing.minigame_win_duration
+    Meter.on_minigame_complete()
+    Meter.show()
+    if mg.focus_center_x then Focus.stop() end
+    Window.set_current(mg.return_window)
     return
   end
   local degradation = mg.base_degradation + (mg.bar_fill * mg.degradation_multiplier)
@@ -95,8 +86,4 @@ function MinigameButtonMashWindow.draw()
   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)
-
-  if mg.win_timer > 0 then
-    Minigame.draw_win_overlay()
-  end
 end

inc/window/window.minigame.rhythm.lua

@@ -27,18 +27,6 @@ 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()
-      Meter.show()
-      if mg.focus_center_x then Focus.stop() end
-      Window.set_current(mg.return_window)
-    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
@@ -69,7 +57,10 @@ function MinigameRhythmWindow.update()
     end
   end
   if mg.score >= mg.max_score then
-    mg.win_timer = Config.timing.minigame_win_duration
+    Meter.on_minigame_complete()
+    Meter.show()
+    if mg.focus_center_x then Focus.stop() end
+    Window.set_current(mg.return_window)
     return
   end
   if mg.button_pressed_timer > 0 then
@@ -116,8 +107,4 @@ function MinigameRhythmWindow.draw()
     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)
-
-  if mg.win_timer > 0 then
-    Minigame.draw_win_overlay()
-  end
 end