color fix

Reviewed-on: #25

.luacheckrc

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

assets_src/palette-pico8.txt

@@ -0,0 +1 @@
+0404005f574fc2c3c71d2b53fff1e8ab52367e2553ffa30000875129adff83769c00e436fa77a8ff004dc3c3c7ffccaa

impostor.inc

@@ -2,12 +2,14 @@ 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
 system/system.ui.lua
 audio/audio.manager.lua
 audio/audio.songs.lua
@@ -27,6 +29,8 @@ decision/decision.play_rhythm.lua
 decision/decision.play_ddr.lua
 map/map.manager.lua
 map/map.bedroom.lua
+map/map.street.lua
+map/map.office.lua
 screen/screen.manager.lua
 screen/screen.home.lua
 screen/screen.toilet.lua

inc/audio/audio.manager.lua

@@ -19,7 +19,6 @@ 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,3 +98,39 @@ 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,15 +9,15 @@ function Config.initial_data()
       height = 136
     },
     colors = {
-      black = 2,
+      black = 0,
-      light_grey = 13,
+      light_grey = 2,
-      dark_grey = 14,
+      dark_grey = 1,
-      red = 0,
+      red = 13,
-      light_blue = 7,
+      light_blue = 9,
-      blue = 9,
+      blue = 3,
-      white = 12,
+      white = 4,
-      item = 12,
+      item = 7,
-      meter_bg = 12
+      meter_bg = 1
     },
     timing = {
       splash_duration = 120

inc/init/init.context.lua

@@ -34,10 +34,12 @@ 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.module.lua

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

inc/logic/logic.day.lua

@@ -0,0 +1,18 @@
+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.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/>
+--- * hidden (boolean) Whether meters are hidden.
---- * timer_progress (number) Clock timer revolution progress (0 to 1).
 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,37 @@ 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/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 = 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/map/map.office.lua

@@ -0,0 +1,9 @@
+Map.register({
+  id = "office",
+  from_x =  60,
+  from_y =  0,
+  width  = 30,
+  height = 17,
+  to_x   =  0,
+  to_y   =  0,
+})

inc/map/map.street.lua

@@ -0,0 +1,9 @@
+Map.register({
+  id = "street",
+  from_x =  30,
+  from_y =  0,
+  width  = 30,
+  height = 17,
+  to_x   =  0,
+  to_y   =  0,
+})

inc/meta/meta.assets.lua

@@ -1,7 +1,298 @@
---luacheck: ignore max_line_length
 -- <PALETTE>
--- 000:ab53375f574f0101017f2553c3c3c71d2b53fff1e929adff83779d3b5dc941a6f673eff7f4f4f494b0c2566c86333c57
+-- 000:0404005f574fc2c3c71d2b53fff1e8ab52367e2553ffa30000875129adff83769c00e436fa77a8ff004dc3c3c7ffccaa
 -- </PALETTE>
+-- <TILES>
+-- 000:00000000c666666006606060c636366006606060c606366006666660c0000000
+-- 001:0000000006666666060600600666666606000600066666660633633300000000
+-- 002:0000000066666666006000066666666660060006666666666333363300000000
+-- 004:1111111111111111111111111111111111111111111111111111111111111111
+-- 005:1111111111111111111111111111111111111111111111111111111100000000
+-- 006:0222222200010010033055010130150603305501013015060330550100000000
+-- 007:2222222001022220601022206001022060201020602201006022201000000000
+-- 008:0000000003330333033303330333000003330111033301110333011103330111
+-- 009:0000000033333333333333330000000011100111111001111110011111100111
+-- 010:0000000033303330333033300000333011103330111033301110333011103330
+-- 011:111111111111111111111100111110a511110a51111015a51101515111000000
+-- 012:111111111111111101111111101111115a01111115a011115151011100000111
+-- 013:1000000004444444044444440444444404444444044444440444444404444444
+-- 014:0000000144444240444424204444424044442420444442404444242044444240
+-- 015:0000000004244444024444440424400002444444042424240242424200000000
+-- 016:000000004444442044444240c004442044444240e424242042424240c0000000
+-- 017:0000000002424240042424200244444004244440024404400424044002440440
+-- 018:0000000002424240042424200444424004444420044042400440442004404240
+-- 019:0222222200010012055016020150660205501602015066020550160200000000
+-- 020:2222222022221000222203302222013022220330222201302222033000000000
+-- 021:0333011103330111033301110333011103330111033300000333011103330111
+-- 022:1110011111100111111001111110011111100111000000001110011111100111
+-- 023:1110333011103330111033301110333011103330000033301110333011103330
+-- 024:1111111011111110111111101111111011111110111111101111111011111110
+-- 025:0444444404444444044444440444444404444444044044440440444404404444
+-- 026:4444242044444240444424204444424044442420444442404444242044444240
+-- 027:3333111133331111333311113333111111113333111133331111333311113333
+-- 028:0424044002440440042404400244444004244440024242400424242000000000
+-- 029:0440442004404240044044200444424004444420024242400424242000000000
+-- 030:0000000006666660036060600360666006606060036660600360666003606060
+-- 031:0222222200010010033033030130130103303303013013010330330300000000
+-- 032:22222220c10012203033022030130220303302203013022030330220c0000000
+-- 033:0333011103330111033301110333011103330111033301110333011100000000
+-- 034:1110011111100111111001111110011111100111111001111110011100000000
+-- 035:1110333011103330111033301110333011103330111033301110333000000000
+-- 036:0440444404404444044044440444444404444444044444440444444404444444
+-- 037:0000000002222222022000220201110202011102020111020220002202222222
+-- 038:0000000022222220220002202011102020111020201110202200022022222220
+-- 039:0000000002222222022222220222222202222222022222220222222202222222
+-- 040:0000000022222220222222202222222022222220222222202222222022222220
+-- 041:0000000002222222022200000220111102201121020112000201120402012200
+-- 042:0000000022222220000002201111102021211020000210203430102000430020
+-- 043:0666606003606060036066600366606003606060066060600360606003666660
+-- 044:0222222202222222022222220222222202222222000000000001111100011111
+-- 045:2222222022222220222222202222222022222220000000001111100011111000
+-- 046:1111111111111111111111111000000002222222022222220222222202222222
+-- 047:1111111111111111111111110000000022222222222222222222222222222222
+-- 048:111111111111111111111111c000100022220444e222044422220444e2220444
+-- 049:1111111111111111111111111100001100222201022222200222222002222220
+-- 050:1111111011111110111111101111111011111110111111101111111011110000
+-- 051:1111111111111111111111111111111111111111111111111111111100011111
+-- 052:0444444404444444044444440444444404444444044444440444444410000000
+-- 053:4444242044444240444424204444424044442420444442404444242000000001
+-- 054:0222222202222222022000220201110202011102020111020220002202222222
+-- 055:2222222022222220220002202011102020111020201110202200022022222220
+-- 056:0222222202222222022222220222222202222222022222220222222200000000
+-- 057:2222222022222220222222202222222022222220222222202222222000000000
+-- 058:0201122202012222020112220201222202201222022022220222000002222222
+-- 059:2204302022204020202200202000002020222020222220200000022022222220
+-- 060:5555555555555555555555556666111155555555555555555555555566616666
+-- 061:5555555555555555555555556666666655551555555515555555655566666611
+-- 062:0222222202222222022222220222222202222222022222220222222202222222
+-- 063:2222222222222222222222222222222222222222222222222222222222222222
+-- 064:22220444e222044422220444e222044422220444e222044422220444e2220444
+-- 065:0222222002222220020000206022220002222220022222200200002000111100
+-- 066:5000000004444444044044440440444404404444044044440444444460000000
+-- 067:0000000544444240444424204444424044442420444442404444242000000001
+-- 068:0000000001111111011111110111111101111111011111110111111100000000
+-- 069:0000000011111110111111101111111011111110111111101111111000000000
+-- 070:5555555555555555555555551111666655555555555555555555555511666111
+-- 071:000000000222220002222090022209900220999002099d900099199009919790
+-- 072:0000000022222220222222202222222022220000222011002212000021222220
+-- 073:5555555555555555555555556611166655555551555555515555555166666111
+-- 074:0000000001111111000000001111666655555555555555555555555511666111
+-- 075:0000000011111111000000006611166655555551555555515555555166666111
+-- 076:0000000011111111000000001111666655555555555555555555555511666111
+-- 077:0000000011111110000000006611166655555551555555515555555166666111
+-- 078:1111111111111111111100001110919111101010110191011019191000919190
+-- 079:1111111111111111000000009191919000000010111110901111101000000090
+-- 080:09191990c991990209199020c999020209902020c902020200202020c0000000
+-- 081:0000000002020200202020200200022020002220000222202022222002222220
+-- 082:5555555555555055555501056666010155550105555501055555010566610106
+-- 083:5555555555555555000000000222222202222222022222220222222202222222
+-- 084:5555555555555555000000002222222022222220222222202222222022222220
+-- 085:5555000055500220550202206022022002220220022202200222022002220220
+-- 086:1000000110333301103333011033330110333301103333011033330110333301
+-- 087:3010101033331111333311113333111111113333111133331111333311113333
+-- 088:3333101033331090333310103333109011113010111010901110201011101090
+-- 089:2222222022222220222222202222222022222220222222202222222022222220
+-- 090:5555550055555022555502226611022255550222555502225555501266666100
+-- 091:0005010522200105222201052222010622220105222201052210505500066111
+-- 092:5000000002222222022222220222222202222222022222220222222202222222
+-- 093:0222022002220220022202200222022002220220022202200222022002220220
+-- 094:1033330110333301103333011033330110333301103333011033330110000001
+-- 095:3333101033331090333310103333109011113010111130901111301011113000
+-- 096:00000000c111111100000000c106666601051555c105155501056555c0066611
+-- 097:0000000011111110000000006666101055555010555550105555501066616000
+-- 098:5555555555555550555555056666116655550055555500555555655566666611
+-- 099:0555555500555555050555550661111105500555115005550055555500616666
+-- 100:0222222202222222022222220000000000000000501055555010555560006666
+-- 101:2222222022222220222222200000000000000000555501055555010566660001
+-- 102:0222022002220220022202200222022002220220022202200222022012220220
+-- 103:1000000103333330033333300333333003333330033333300333333010000001
+-- 104:5500000050222222022222220222222202222222022222220222222202222222
+-- 105:0222222222222222222222222222222222222222222222222222222222222222
+-- 106:1222000012201110120111101011111001111110011111100111111001111110
+-- 107:0000000001111111011111110111111101111111011111115000000066000066
+-- 108:0000000011111111111111111111111111111111111111110000000066666611
+-- 109:1111111011111110111111101111111011111110111111100000000566000066
+-- 110:1111111111111111111111111111010011101044111010441110104400000010
+-- 111:1111111111111111111111110011111144011111440111114401111110000000
+-- 112:11111111111111111111111111111111111111111111111111110111c0004000
+-- 113:3333104433331044333310003333111111113333111133331111333311113333
+-- 114:4403111144031111000311113333111111110000111044441104444411014444
+-- 115:3304440133044401330444013304440100104033440103334440333344103333
+-- 116:3330111133020000330124243330111111110111111130111111301111113300
+-- 117:1103111100401111242011111240111111203333124033331120333300013333
+-- 118:1111111100000000033333330333333303333333033333330000000011111111
+-- 119:1111111100000000333333303333333033333330333333300000000011111111
+-- 120:1a12222222a222222212222222a222222212222222a222222212222222222222
+-- 121:1a8b888822888b8b228b888822b8bb8b22888b88228b88882288b88b228b8b88
+-- 122:8b8b8888b8b88b8bb88b888888b8bb8b8b888b8888bb88888b88b88bb88b8b88
+-- 123:8b8b888800000000055555550555555500000000055555550555555500000000
+-- 124:8b8b888800000000555555555555555500000000555555555555555500000000
+-- 125:8b8b888800000000555555505555555000000000555555505555555000000000
+-- 126:0000000007777777070000000703333307033333070333330703333307033333
+-- 127:0000000077777777000000003333333033333330333333303333333033333330
+-- 128:000000007777777700000000e222222222222222e222222222222222e2222222
+-- 129:0000000077777770000000702222207022222070222220702222207022222070
+-- 130:3000000300ffff000ddddff00dddddf00dddddf00dddddf000dddd0000000000
+-- 131:0555555505555555055555550555555500000000050b88880508b88b000b8b88
+-- 132:555555555555555555555555555555550000000088bb88888b88b88bb88b8b88
+-- 133:555555505555555055555550555555500000000088bb80508b88b050b88b8000
+-- 134:0703333307033333070333330703333307033333070333330703333307033333
+-- 135:3333333033333330333333303333333033333330333333303333333033333330
+-- 136:2222207022222070222220702222207022222070222220702222207022222070
+-- 137:4444444444444444444444444444444444444444444444444444444444444444
+-- 138:4442222244422222444222224442222244422222444222224442222244422222
+-- 139:0000000000bbbb0008888bb0088888b0088888b0088888b00088880030000003
+-- 140:0000000007777777076666770767776707677776076777760767777607766667
+-- 141:0000000077777770777777707777777077777770777777777677777777777777
+-- 142:0000000066666666666666666666666600000000777777777777777777777777
+-- 143:0000000066666070666660706666607000000070777777707777777077777770
+-- 144:1a80088be2800b8822800888e280088b22800b88e220022221a001a2ea100a12
+-- 145:88888888b88b8b888b8888b8888b888888888b8b12222222a1a1a1a21a1a1a12
+-- 146:0776777707767777077677770776777707677777076777770777777700000000
+-- 147:7677666676777776767777677677767767776777677666667777777700000000
+-- 148:7766667777777677777767767776777677677776766666767777777700000000
+-- 149:7667777067767770777767706666677077776770777767707777777000000000
+-- 150:2220022222200222222002222220022222200222222002222220022222200222
+-- 151:1a12222222a222222212222222a222222212222222222222a1a1a1a21a1a1a12
+-- 152:2222222222222222222222222222222222222222444444444444444444444444
+-- 153:222002222220022222200222222002222220022212200222a000000200000000
+-- 154:222222222222222222222222222222222222222212222222a1a1a1a21a1a1a12
+-- 155:11111000111100331110a033110a903310a9a0330a9a903309a9a0330a9a9033
+-- 156:0000000033333333333333333333333333333333333333333333333333333333
+-- 157:000000000a9a9a9a09a9a9a90a9a9a9a09a9a9a90a9a9a9a09a9a9a90a9a9a9a
+-- 158:001111119a001111a9a904449a9a9004a9a9a9a09a9a9a9aa9a9a9a99a9a9a9a
+-- 159:111111111111111111111111111111111111111100111111090111110a900111
+-- 160:1111111111111111444444444444444444444444444444441111111111111111
+-- 161:09a9a0330a9a903309a9a0330000000003333333033333330333333303333333
+-- 162:3333333333333333333333330000000033333333333333333000000301111110
+-- 163:3333333333333333333333330000000033333333333333333333333333333333
+-- 164:09a9a9a90a9a9a9a09a9a9a90000000003333333033333330333333303333333
+-- 165:a9a9a9a99a9a9a9aa9a9a9a90000000033333333333333333333333333333333
+-- 166:09a9a0110a9a9a0109a9a9a00000000033333333333333333000000301111110
+-- 167:1111111111111111111111110011111133001111333301113333300133333330
+-- 168:0333333003333301033333010333330103333301000000011111111111111111
+-- 169:1100001110555501055005500506605005066050055005501055550111000011
+-- 170:0333333310333333103333331033333310333333100000001111111111111111
+-- 171:0333333303333333033333330333333303333333000000001111111111111111
+-- 172:3333333033333301333333013333330133333301000000011111111111111111
+-- 173:0333333010333330103333301033333010333330100000001111111111111111
+-- 174:111111111111111111111111111111111111111112222222a1a1a1a21a1a1a12
+-- 175:1111111111111111111111111111111111111111444444444444444444444444
+-- 176:00000000c111111001101010c131311001101010c101311001111110c0000000
+-- 177:0000000001111111010100100111111101000100011111110133133300000000
+-- 178:0000000011111111001000011111111110010001111111111333313300000000
+-- 179:11111111111111111111111111111111111100001110b161110b100010810101
+-- 180:1111111111111111111111111111111101111111b01111110001111101011111
+-- 181:111111111000111000880110080880100b08801008b080100b80801010b80010
+-- 182:081b01010081b00011001b1b11110000111111111111110111111080111108b0
+-- 183:01011111000111111b0111110011111111111111111111111111111111111111
+-- 184:1111111111111100111110081111108011111010111110811111101811111101
+-- 185:110b80100110801080110000b80111108b80111008b801100b1b011080b18010
+-- 186:11108b801108b801008b80111100011111111111111111101111100111110818
+-- 187:1111111111111111111111111111111111111111000111118001111108011111
+-- 188:0000000004444444040010040440404404404004044040440440400404444444
+-- 189:0000000044444444044001000440440404400404044044040040040444444444
+-- 190:0000000044444444404040044040404044004004444040444000404444444444
+-- 191:0000000044444444400410444044044440040004404444044004001444444444
+-- 192:0000000044444440444444404444444044444440444444404444444044444440
+-- 193:0000000002222222020000000200000002000000020000000200000002000000
+-- 194:0000000022222222000000000000000000000000000000000000000000000000
+-- 195:0000000022222220000000100000001000000010000000100000001000000010
+-- 196:3333999933339999333399993000000002222222000000000444444404111111
+-- 197:3333999933339999333399990000000922222203000000004440d6d011201110
+-- 198:3333999933339999333399993333999999993333999933339999333399993333
+-- 199:0000000001111110031010100310111001101010031110100310111003101010
+-- 200:1111110811111101111111101111111011111111111111111111111111111111
+-- 201:180b8010810180101810b0108180101008180010108100101108101011108010
+-- 202:111081801110180811018081110810b8101801801080b8011008101100100111
+-- 203:8b011111b8011111801111110111111111111111111111111111111111111111
+-- 204:0440000404404444044040040440440404440014044444440444444404444444
+-- 205:4001404404404004000040400440404404404044444444444444444444400000
+-- 206:4040041000404404404004004040444440400400444444444404444400044444
+-- 207:4444000044440222044402220444022214440222444402224444000044444444
+-- 208:00000040e222204022222040e222204022222040e22220400000004044444440
+-- 209:0200000002000000020000000200000002000000020000000200000002000000
+-- 210:0000001000000010000000100000001000000010000000100000001000000010
+-- 211:0444444404111111044444440411111104444444000000000111111100000000
+-- 212:4440222011201110444024201120444044402420000000001111111000000000
+-- 213:0111101003101010031011100311101003101010011010100310101003111110
+-- 214:1000000000606000060606060000000010565656106565651106565611100000
+-- 215:0000000100606060060606000000000055555501555555015555501100000111
+-- 216:0444444404444044044404040440440004404404044044440444444400000000
+-- 217:4404444440444444044444404444440444444440444444444444444400000000
+-- 218:4404444440444004044404404444044400004440444444444444444400000000
+-- 219:4444440044444402404444000044441044044444444444104444444400000000
+-- 220:0000444022204440000044401101444000444440440144404444444000000000
+-- 221:0200000002000000020000000200000002000000020000000211111100000000
+-- 222:0000000000000000000000000000000000000000000000001111111100000000
+-- 223:000000000000000000000000000000000000000000000000111dd11100000000
+-- 224:00000010c000001000000010c000001000000010c000001011111110c0000000
+-- 225:3333333333333333333333333333333313131313313131311313131331313131
+-- 226:0203333302033333020333330203333302031313020131310203131300013131
+-- 227:3333302033333020333330203333302013131020313130201313102031313000
+-- 228:0000000011111111111111111111111111111111111111111111111100000000
+-- 229:3000000004444444044044440440444404404444044044440444444430000000
+-- 230:0000000344444240444424204444424044442420444442404444242000000001
+-- 231:333333303333330033333090333309901310999031099d901099199009919790
+-- 232:3333333333333333333333333333333313130000313011001313000331313131
+-- 233:0000000002222222022222220222200202220440022204440220444402204414
+-- 234:0000000022222220100001202100002002222220400222204440022044444020
+-- 235:3333333333333033333301033333010313130103313101011313010331310101
+-- 236:0204414402200441022220040222222002222222022222220222200002220111
+-- 237:1444402044140220444402204144022000402220220222200222222010222220
+-- 238:3333330033333022333302223333022213130222313102221313101231313100
+-- 239:0003010322200103222201032222010322220103222201012210101300013131
+-- 240:02220111c222001102220000c222033302220333c222200002222222c2222222
+-- 241:1002222001202220002022203002222031222220022222202222222022222220
+-- 242:3333333333333330333333033333113313130013313100311313131331313131
+-- 243:0333333300333333030333330331133303100313113001310013131300313131
+-- 244:022222200222220002222090022209900220999002099d900099199009919790
+-- 245:2222222022222220222222202222222022220000222011002212000021222220
+-- 246:0000000001111111000000000103333301031313010131310103131300013131
+-- 247:0000000011111110000000003333301013131010313130101313101031313000
+-- </TILES>
+-- <SPRITES>
+-- 002:00000000000000000000444400044444000444440044ffff004fffff004f3333
+-- 003:0000000000000000441600004242600044241000ff426000fff4100033f26000
+-- 004:00000333000035550003655500365555003555ff00356fff00365f3f00355fff
+-- 005:33000000553000005563000055563000ff553000fff53000f3f63000fff53000
+-- 016:0000000000000000000000000000003000000353000035350003535100353535
+-- 017:0000000000000000000000003000000053300000151300005151300015151300
+-- 018:004f99ff000fffff0000ff3300000fff00003666000355550035652503163555
+-- 019:99f41000fff26000ff600000f600000063300000555330005555530055535530
+-- 020:00356f6f003655f60365511f3653122f3531222f363221220532232203322322
+-- 021:f6f530006f563000f1156300f2215300f2226300221233002232130022121300
+-- 032:0033535100353533003351ff00351f3f0003ff3f0003ffff00003ff3000323ff
+-- 033:5555530033555300ff155300f3f15300f3ff3000ffff30003ff30000ff323000
+-- 034:036135250316355503613525031633110333331103f333330333333300033333
+-- 035:55565530555355305556553013335530133333303333ff303333333033330000
+-- 036:00322322003223330033331a003ff31a003ff3a1003333a100003a1a00003a1a
+-- 037:223213003332130011133300111f300011133000111300001113000011130000
+-- 048:00323123003231430032314300313339000f3333000033300000333000033330
+-- 049:324303003443030034430300933313003333f000033300000333000003333000
+-- 050:0003333000033330000333300003333000053530003311300031113000333330
+-- 051:3333000033330000333300003333000035350000311330003111300033333000
+-- 052:000031a1000031a100003a1a00003a1a00003333000003f3000003f300000330
+-- 053:111300001113000011130000111300003333000003f3000003f3000003300000
+-- </SPRITES>
+-- <MAP>
+-- 000:ffffffffff0010201020102010201020102010201020102000ffffffffff40404040404087f3f3f3f397a7b7c7d7a7e7f70818a7b7c7d7a7b7c7d7a70b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b0b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 001:ffffffffff0040404040404040404040404040404040404000ffffffffff40404040404087f3f3f3f328a7384858a76878f388a7384858a7384858a70b40403b4b4040404040404040404040404040404040404040404040400b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 002:ffffffffff00406070408090a040b0c0d0e0f001f001112100ffffffffff984098409840a8f3f3f3f3b8a7a7a7a7a7c8d8e8f8a7a7a7a7a7a7a7a7a70b405b6b7b4040404040404040404040404040d0e0f001f001f00111210b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 003:ffffffffff004031414051617140814091a1b1b1b1b1c1d100ffffffffff984098409840a8f3f3f3f3091919191919293949591919191919191919190b8b9babbb4040cbdbebfb0c401c2c2c2c3c4091a14c5c6c6c6c6cc1d10b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 004:ffffffffffe140f1024012223240814042a15262728292a2e1ffffffffff984098409840a8f3f3f3f369f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f37c8c9cacbc7282ccdcecfc0d401d3030302d4042a13d4d7282728292a27c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 005:ffffffffffb240c2d240e2f203132333435363738393a3b3b2ffffffffff984098409840a8f3f3f3f369f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f35d406d7d40e3958d9dadbdcd40ddedfded0e404353839383938393a3b35d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 006:ffffffffffe1c3d3c3d3e3f30414c3d32434445410201020e1ffffffffff404040404040798989898999a9a9a9a9a9a9a9a9a9a9a9a9a9a9a9a9a9a97c1e1e1e1e44542e1e1e1e3e1e444e4e4e541e243444544454445444547c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 007:ffffffffffb264748494a4b4c4d46494649464940040e4f4b2ffffffffff4040404040404040404040404040404040404040404040404040404040405d1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e5d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 008:ffffffffffe1c30515d325d33545c3d355d3c3d365b17585e1ffffffffff4040404040404098989898404040404040404040404040404040404040407c1e7e8e1e1e1e9eae1ebe1e1e1e1e1e1e1e1e72821ebe1e72821ebe1e7c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 009:ffffffffffb264e395a5b594e39564c5d5946494e5b1b1f5b2ffffffffff4040404040404040404040404040404040404040404040404040404040405d1e05151ebe1ecedeeefe1e1e1e1e1e1e1e1ee395eefe1ee395eefe1e5d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 010:ffffffffffe1c306162636d34656c395d5d3c3d376b1b1b1e1ffffffffff404040404040409898989840b9c9c9d9e9f90a0a0a0a4040400a0a0a0a407c1ee395eefe1e0f1f2f3f1e1e1e1e1e1e1e1ee3952f3f1ee3952f3f1e7c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 011:ffffffffffb264946494649464948696a694649410201020b2ffffffffff4040404040404040404040401a2a3a4a5a6a7a40404040404040404040405d1ee3952f3f1e4f5f1ebe1e1e1e1e1e1e1e1ee3951ebe1ee3951ebe1e5d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 012:ffffffffffe1c37282d3c3d3c3d3b6c6d6d3c3d300e6f607e1ffffffffff4040404040404098989898408a9aaabaca9ada40404040404040404040407c1e4f5f1ebe1e0515eefe1e1e1e1e1e1e1e1ee395eefe1ee395eefe1e7c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 013:ffffffffffb264e395946494649464946494649465172737b2ffffffffffeaeaeaeaeaeaeafafafafaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaea5d1e0515eefe1e6f7f2f3f1e1e1e1e1e1e1e1e6f7f2f3f1e6f7f2f3f1e5d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 014:ffffffffffe1c34454d3c3d3c3d3c3d3c3d3c3d3e5b14757e1fffffffffff3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f37c1e6f7f2f3f1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e7c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 015:ffffffffffb2649464946494649464946494649476b1b1b1b2fffffffffff3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f35d1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e5d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 016:ffffffffff0010201020766777001020102010201020102000fffffffffff3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f3f30b1b2b1b2b7667776777761b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b0b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- </MAP>
 -- <SFX>
 -- 000:060006400600064006000640060006400600060006000600060006000600060006000600060006000600060006000600060006000600060006000600300000000900
 -- 016:05000500050005400540054005700570057005400540054005700570057005c005c005c005c005c005c005c005c005c005c005c005c005c005c005c0470000000000
@@ -34,280 +325,3 @@
 -- 008:0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
 -- 009:fff000fff000fff000fff000fff000ff
 -- </WAVES>
--- <TILES>
--- 000:2222222223333332233232322353533223323232232353322333333222222222
--- 001:2222222223333333232322322333333323222322233333332355355522222222
--- 002:2222222233333333223222233333333332232223333333333555535522222222
--- 003:2222222223333333232322322333333323222322233333332355355522222222
--- 004:2222222233333333223222233333333332232223333333333555535522222222
--- 005:2222222223333333232322322333333323222322233333332355355522222222
--- 006:2222222233333333223222233333333332232223333333333555535522222222
--- 007:2222222223333333232322322333333323222322233333332355355522222222
--- 008:2222222233333333223222233333333332232223333333333555535522222222
--- 009:2222222223333333232322322333333323222322233333332355355522222222
--- 010:2222222233333333223222233333333332232223333333333555535522222222
--- 011:2222222223333333232322322333333323222322233333332355355522222222
--- 012:2222222233333333223222233333333332232223333333333555535522222222
--- 013:2222222223333333232322322333333323222322233333332355355522222222
--- 014:2222222233333333223222233333333332232223333333333555535522222222
--- 015:2222222223333333232322322333333323222322233333332355355522222222
--- 016:2222222223333332233232322353533223323232232353322333333222222222
--- 017:1111111111111111111111111111111111111111111111111111111111111111
--- 018:1111111111111111111111111111111111111111111111111111111122222222
--- 019:1111111111111111111111111111111111111111111111111111111122222222
--- 020:1111111111111111111111111111111111111111111111111111111111111111
--- 021:1111111111111111111111111111111111111111111111111111111111111111
--- 022:1111111111111111111111111111111111111111111111111111111111111111
--- 023:1111111111111111111111111111111111111111111111111111111111111111
--- 024:1111111111111111111111111111111111111111111111111111111111111111
--- 025:1111111111111111111111111111111111111111111111111111111111111111
--- 026:1111111111111111111111111111111111111111111111111111111111111111
--- 027:1111111111111111111111111111111111111111111111111111111111111111
--- 028:1111111111111111111111111111111111111111111111111111111111111111
--- 029:1111111111111111111111111111111111111111111111111111111111111111
--- 030:1111111111111111111111111111111111111111111111111111111111111111
--- 031:1111111111111111111111111111111111111111111111111111111111111111
--- 032:2222222223333332233232322353533223323232232353322333333222222222
--- 033:1111111111111111111111111111111111111111111111111111111111111111
--- 034:2444444422212212255200212152102325520021215210232552002122222222
--- 035:4444444221244442321244423221244232421242324421223244421222222222
--- 036:1111111111111111111111111111111111111111111111111111111111111111
--- 037:2222222225552555255525552555222225552111255521112555211125552111
--- 038:2222222255555555555555552222222211122111111221111112211111122111
--- 039:2222222255525552555255522222555211125552111255521112555211125552
--- 040:1111111111111111111111111111111111111111111111111111111111111111
--- 041:1111111111111111111111221111128011112801111210801121010111222222
--- 042:1111111111111111211111111211111108211111108211110101211122222111
--- 043:1222222226666666266666662666666626666666266666662666666626666666
--- 044:2222222166666462666646426666646266664642666664626666464266666462
--- 045:2222222226466666246666662646622224666666264646462464646422222222
--- 046:2222222266666642666664622226664266666462464646426464646222222222
--- 047:2222222226466666246666662646622224666666264646462464646422222222
--- 048:2222222223333332233232322353533223323232232353322333333222222222
--- 049:1111111111111111111111111111111111111111111111111111111111111111
--- 050:2444444422212214200213242102332420021324210233242002132422222222
--- 051:4444444244441222444425524444215244442552444421524444255222222222
--- 052:1111111111111111111111111111111111111111111111111111111111111111
--- 053:2555211125552111255521112555211125552111255522222555211125552111
--- 054:1112211111122111111221111112211111122111222222221112211111122111
--- 055:1112555211125552111255521112555211125552222255521112555211125552
--- 056:1111111111111111111111111111111111111111111111111111111111111111
--- 057:1111111211111112111111121111111211111112111111121111111211111112
--- 058:1111111111111111111111111111111111111111111111111111111111111111
--- 059:2666666626666666266666662666666626666666266266662662666626626666
--- 060:6666464266666462666646426666646266664642666664626666464266666462
--- 061:5555111155551111555511115555111111115555111155551111555511115555
--- 062:5555111155551111555511115555111111115555111155551111555511115555
--- 063:5555111155551111555511115555111111115555111155551111555511115555
--- 064:2222222223333332253232322532333223323232253332322532333225323232
--- 065:1111111111111111111111111111111111111111111111111111111111111111
--- 066:2444444422212212255255252152152125525525215215212552552522222222
--- 067:4444444221221442525524425215244252552442521524425255244222222222
--- 068:1111111111111111111111111111111111111111111111111111111111111111
--- 069:2555211125552111255521112555211125552111255521112555211122222222
--- 070:1112211111122111111221111112211111122111111221111112211122222222
--- 071:1112555211125552111255521112555211125552111255521112555222222222
--- 072:1111111111111111111111111111111111111111111111111111111111111111
--- 073:1111111211111112111111121111111211111112111111121111111211111112
--- 074:1111111111111111111111111111111111111111111111111111111111111111
--- 075:2662666626626666266266662666666626666666266666662666666626666666
--- 076:6666464266666462666646426666646266664642666664626666464266666462
--- 077:2222222224444444244222442421112424211124242111242442224424444444
--- 078:2222222244444442442224424211124242111242421112424422244244444442
--- 079:2222222224444444244444442444444424444444244444442444444424444444
--- 080:2333323225323232253233322533323225323232233232322532323225333332
--- 081:1111111111111111111111111111111111111111111111111111111111111111
--- 082:2444444424444444244444442444444424444444222222222221111122211111
--- 083:4444444244444442444444424444444244444442222222221111122211111222
--- 084:1111111111111111111111111111111111111111111111111111111111111111
--- 085:1111111111111111111111111222222224444444244444442444444424444444
--- 086:1111111111111111111111112222222244444444444444444444444444444444
--- 087:1111111111111111111111112222122244442666444426664444266644442666
--- 088:1111111111111111111111111122221122444421244444422444444224444442
--- 089:1111111211111112111111121111111211111112111111121111111211112222
--- 090:1111111111111111111111111111111111111111111111111111111122211111
--- 091:2666666626666666266666662666666626666666266666662666666612222222
--- 092:6666464266666462666646426666646266664642666664626666464222222221
--- 093:2444444424444444244222442421112424211124242111242442224424444444
--- 094:4444444244444442442224424211124242111242421112424422244244444442
--- 095:2444444424444444244444442444444424444444244444442444444422222222
--- 096:2222222223333332253232322532333223323232253332322532333225323232
--- 097:0000000000000000000000003333111100000000000000000000000033313333
--- 098:0000000000000000000000003333333300001000000010000000300033333311
--- 099:0000000000000000000000003333111100000000000000000000000033313333
--- 100:0000000000000000000000003333333300001000000010000000300033333311
--- 101:2444444424444444244444442444444424444444244444442444444424444444
--- 102:4444444444444444444444444444444444444444444444444444444444444444
--- 103:4444266644442666444426664444266644442666444426664444266644442666
--- 104:2444444224444442242222423244442224444442244444422422224222111122
--- 105:0000000000000000000000003333111100000000000000000000000033313333
--- 106:0000000000000000000000003333333300001000000010000000300033333311
--- 107:0222222226666666266266662662666626626666266266662666666632222222
--- 108:2222222066666462666646426666646266664642666664626666464222222221
--- 109:2222222221111111211111112111111121111111211111112111111122222222
--- 110:2222222211111112111111121111111211111112111111121111111222222222
--- 111:2222222223333333232322322333333323222322233333332355355522222222
--- 112:2333323225323232253233322533323225323232233232322532323225333332
--- 113:0000000000000000000000001111333300000000000000000000000011333111
--- 114:2222222224444422244442722444277224427772242770722277177227717072
--- 115:2222222244444442444444424444444244442222444211224414222241444442
--- 116:0000000000000000000000003311133300000001000000010000000133333111
--- 117:2222222221111111222222221111333300000000000000000000000011333111
--- 118:2222222211111111222222223311133300000001000000010000000133333111
--- 119:2222222211111111222222221111333300000000000000000000000011333111
--- 120:2222222211111112222222223311133300000001000000010000000133333111
--- 121:0000000000000000000000001111333300000000000000000000000011333111
--- 122:0000000000000000000000003311133300000001000000010000000133333111
--- 123:0000000000000000000000001111333300000000000000000000000011333111
--- 124:0000000000000000000000003311133300000001000000010000000133333111
--- 125:0000000000000000000000001111333300000000000000000000000011333111
--- 126:0000000000000000000000003311133300000001000000010000000133333111
--- 127:2222222223333332233232322353533223323232232353322333333222222222
--- 128:2222222223333332253232322532333223323232253332322532333225323232
--- 129:0000000000000000000000003333111100000000000000000000000033313333
--- 130:2717177227717724271772422777242427724242272424242242424222222222
--- 131:2222222224242422424242422422244242224442222444424244444224444442
--- 132:0000000000000000000000003333333300001000000010000000300033333311
--- 133:0000000000000200000021203333212100002120000021200000212033312123
--- 134:0000000000000000000000003333333300001000000010000000300033333311
--- 135:0000000000000000222222222444444424444444244444442444444424444444
--- 136:0000000000000000222222224444444244444442444444424444444244444442
--- 137:0000000000000000000000003333111100000000000000000000000033313333
--- 138:0000000000000000000000003333333300001000000010000000300033333311
--- 139:0000222200022442002424423244244224442442244424422444244224442442
--- 140:0000000000000000000000003333333300001000000010000000300033333311
--- 141:0000000000000000000000003333111100000000000000000000000033313333
--- 142:0000000000000000000000003333333300001000000010000000300033333311
--- 143:1222222112555521125555211255552112555521125555211255552112555521
--- 144:2333323225323232253233322533323225323232233232322532323225333332
--- 145:0000000000000000000000001111333300000000000000000000000011333111
--- 146:2444444424444444244444442444444424444444244444442444444424444444
--- 147:4444444244444442444444424444444244444442444444424444444244444442
--- 148:0000002200000244000024443311244400002444000024440000021433333122
--- 149:2220212044422120444421204444212344442120444421204412020022233111
--- 150:0000000000000000000000003311133300000001000000010000000133333111
--- 151:2444444424444444244444442444444424444444244444442444444424444444
--- 152:4444444244444442444444424444444244444442444444424444444244444442
--- 153:0000000000000000000000001111333300000000000000000000000011333111
--- 154:0222222224444444244444442444444424444444244444442444444424444444
--- 155:2444244224442442244424422444244224442442244424422444244224442442
--- 156:0000000000000000000000003311133300000001000000010000000133333111
--- 157:0000000000000000000000001111333300000000000000000000000011333111
--- 158:0000000000000000000000003311133300000001000000010000000133333111
--- 159:1255552112555521125555211255552112555521125555211255552112222221
--- 160:2222222223333332253232322532333223323232253332322532333225323232
--- 161:0000000000000000000000003333111100000000000000000000000033313333
--- 162:2222222221111111222222222123333321201000212010002120300022233311
--- 163:2222222211111112222222223333121200000212000002120000021233313222
--- 164:0000000000000002000000203333113300002200000022000000300033333311
--- 165:2000000022000000202000002331111120022000110220002200000022313333
--- 166:0000000000000000000000003333333300001000000010000000300033333311
--- 167:2444444424444444244444442222222222222222021200000212000032223333
--- 168:4444444244444442444444422222222222222222000021200000212033332221
--- 169:0000000000000000000000003333111100000000000000000000000033313333
--- 170:2444444424444444244444442444444424444444244444442444444424444444
--- 171:2444244224442442244424422444244224442442244424422444244214442442
--- 172:0000000000000000000000003333333300001000000010000000300033333311
--- 173:0000000000000000000000003333111100000000000000000000000033313333
--- 174:0000000000000000000000003333333300001000000010000000300033333311
--- 175:1222222125555552255555522555555225555552255555522555555212222221
--- 176:2333323225323232253233322533323225323232233232322532323225333332
--- 177:0000000000000000000000001111333300000000000000000000000011333111
--- 178:0000000000000000000000003311133300000001000000010000000133333111
--- 179:0000000000000000000000001111333300000000000000000000000011333111
--- 180:0000000000000000000000003311133300000001000000010000000133333111
--- 181:0000000000000000000000001111333300000000000000000000000011333111
--- 182:0000000000000000000000003311133300000001000000010000000133333111
--- 183:0000000000000000000000001111333300000000000000000000000011333111
--- 184:0000000000000000000000003311133300000001000000010000000133333111
--- 185:0022222202444444244444442444444424444444244444442444444424444444
--- 186:2444444444444444444444444444444444444444444444444444444444444444
--- 187:1444222214421112142111121211111221111112211111122111111221111112
--- 188:0000000000000000000000003311133300000001000000010000000133333111
--- 189:0000000000000000000000001111333300000000000000000000000011333111
--- 190:0000000000000000000000003311133300000001000000010000000133333111
--- 191:2222222223333333232322322333333323222322233333332355355522222222
--- 192:2222222223333332253232322532333223323232253332322532333225323232
--- 193:0000000000000000000000003333111100000000000000000000000033313333
--- 194:2222222224444444244444442444444424444444244444442444444424444444
--- 195:2222222244444442444444424444444244444442444444424444444244444442
--- 196:0000000000000000000000003333333300001000000010000000300033333311
--- 197:0000000000000000000000003333111100000000000000000000000033313333
--- 198:0000000000000000000000003333333300001000000010000000300033333311
--- 199:0000000000000000000000003333111100000000000000000000000033313333
--- 200:0000000000000000000000003333333300001000000010000000300033333311
--- 201:2222222221111111211111112111111121111111211111110222222233222233
--- 202:2222222211111111111111111111111111111111111111112222222233333311
--- 203:1111111211111112111111121111111211111112111111122222222033222233
--- 204:0000000000000000000000003333333300001000000010000000300033333311
--- 205:0000000000000000000000003333111100000000000000000000000033313333
--- 206:0000000000000000000000003333333300001000000010000000300033333311
--- 207:2222222223333332233232322353533223323232232353322333333222222222
--- 208:2333323225323232253233322533323225323232233232322532323225333332
--- 209:0000000000000000000000001111333300000000000000000000000011333111
--- 210:2444444424444444244444442444444424444444244444442444444424444444
--- 211:4444444244444442444444424444444244444442444444424444444244444442
--- 212:0000000000000000000000003311133300000001000000010000000133333111
--- 213:0000000000000000000000001111333300000000000000000000000011333111
--- 214:0000000000000000000000003311133300000001000000010000000133333111
--- 215:0000000000000000000000001111333300000000000000000000000011333111
--- 216:0000000000000000000000003311133300000001000000010000000133333111
--- 217:0000000000000000000000001111333300000000000000000000000011333111
--- 218:0000000000000000000000003311133300000001000000010000000133333111
--- 219:0000000000000000000000001111333300000000000000000000000011333111
--- 220:0000000000000000000000003311133300000001000000010000000133333111
--- 221:0000000000000000000000001111333300000000000000000000000011333111
--- 222:0000000000000000000000003311133300000001000000010000000133333111
--- 223:1222222112555521125555211255552112555521125555211255552112555521
--- 224:2222222223333332253232322532333223323232253332322532333225323232
--- 225:0000000000000000000000003333111100000000000000000000000033313333
--- 226:2222222221111111211111112111111121111111211111112111111122222222
--- 227:2222222211111112111111121111111211111112111111121111111222222222
--- 228:0000000000000000000000003333333300001000000010000000300033333311
--- 229:0000000000000000000000003333111100000000000000000000000033313333
--- 230:0000000000000000000000003333333300001000000010000000300033333311
--- 231:0000000000000000000000003333111100000000000000000000000033313333
--- 232:0000000000000000000000003333333300001000000010000000300033333311
--- 233:0000000000000000000000003333111100000000000000000000000033313333
--- 234:0000000000000000000000003333333300001000000010000000300033333311
--- 235:0000000000000000000000003333111100000000000000000000000033313333
--- 236:0000000000000000000000003333333300001000000010000000300033333311
--- 237:0000000000000000000000003333111100000000000000000000000033313333
--- 238:0000000000000000000000003333333300001000000010000000300033333311
--- 239:1255552112555521125555211255552112555521125555211255552112222221
--- 240:2333323225323232253233322533323225323232233232322532323225333332
--- 241:0000000000000000000000001111333300000000000000000000000011333111
--- 242:0000000000000000000000003311133300000001000000010000000133333111
--- 243:0000000000000000000000001111333300000000000000000000000011333111
--- 244:0000000000000000000000003311133300000001000000010000000133333111
--- 245:0000000000000000000000001111333300000000000000000000000011333111
--- 246:0000000000000000000000003311133300000001000000010000000133333111
--- 247:0000000000000000000000001111333300000000000000000000000011333111
--- 248:0000000000000000000000003311133300000001000000010000000133333111
--- 249:0000000000000000000000001111333300000000000000000000000011333111
--- 250:0000000000000000000000003311133300000001000000010000000133333111
--- 251:0000000000000000000000001111333300000000000000000000000011333111
--- 252:0000000000000000000000003311133300000001000000010000000133333111
--- 253:0000000000000000000000001111333300000000000000000000000011333111
--- 254:0000000000000000000000003311133300000001000000010000000133333111
--- 255:1222222125555552255555522555555225555552255555522555555212222221
--- </TILES>
--- <MAP>
--- 000:111111001020102010201020102010201020102010201020102000111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 001:111111001111111111111111111111111111111111111111111100111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 002:11111100112232115262721192a2b2c21111111111111111111100111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 003:1111110011233311536373119411b3c31111111111111111111100111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 004:1111110011243411546474119411b4c41111111111111111111100111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 005:11111100112535115565758595a5b5c51111111111111111111100111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 006:1111110016261626566676861626b6c61626162616261626162600111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 007:111111001727372b57677787172b172b172b172b172b172b172b00111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 008:1111110016283826582678881626b8261626162616261626162600111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 009:1111110017293949592b798917a9b92b172b172b172b172b172b00111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 010:11111100162a3a4a5a267a8a16aaba261626162616261626162600111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 011:11111100172b172b172b172b9babbb2b172b172b172b172b172b00111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 012:11111100162c3c26162616269cacbc261626162616261626162600111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 013:11111100172d3d2b172b172b172b172b172b172b172b172b172b00111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 014:11111100162e3e2616261626162616261626162616261626162600111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 015:11111100172b172b172b172b172b172b172b172b172b172b172b00111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 016:111111001020102010201020102010201020102010201020102000111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- </MAP>

inc/screen/screen.home.lua

@@ -5,5 +5,5 @@ Screen.register({
     "go_to_toilet",
     "go_to_walking_to_office",
   },
-  background = "bedroom",
+  background = "bedroom"
 })

inc/screen/screen.office.lua

@@ -1,7 +1,6 @@
 Screen.register({
   id = "office",
   name = "Office",
-  background_color = Config.colors.dark_grey,
   decisions = {
     "play_button_mash",
     "play_rhythm",
@@ -12,4 +11,5 @@ Screen.register({
   situations = {
     "drink_coffee",
   },
+  background = "office"
 })

inc/screen/screen.toilet.lua

@@ -30,8 +30,7 @@ Screen.register({
     local bar_x = math.floor((sw - bar_w) / 2)
     local bar_h = 4
 
-    -- TODO: Add day counter
+    Print.text_center("day " .. Context.day_count, cx, 10, Config.colors.white)
-    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)
@@ -43,7 +42,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

@@ -1,9 +1,9 @@
 Screen.register({
   id = "walking_to_home",
   name = "Walking to home",
-  background_color = Config.colors.dark_grey,
   decisions = {
     "go_to_home",
     "go_to_office",
-  }
+  },
+  background = "street"
 })

inc/screen/screen.walking_to_office.lua

@@ -1,9 +1,9 @@
 Screen.register({
   id = "walking_to_office",
   name = "Walking to office",
-  background_color = Config.colors.dark_grey,
   decisions = {
     "go_to_home",
     "go_to_office",
-  }
+  },
+  background = "street"
 })

inc/system/system.main.lua

@@ -22,8 +22,9 @@ function TIC()
     handler()
   end
   Meter.update()
+  Timer.update()
   if Context.game_in_progress then
-    UI.draw_meters()
+    Meter.draw()
-    UI.draw_timer()
+    Timer.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/>
@@ -85,176 +79,3 @@ 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,14 +8,16 @@ ConfigurationWindow = {
 --- @within ConfigurationWindow
 function ConfigurationWindow.init()
   ConfigurationWindow.controls = {
-    UI.create_action_item(
+    {
-      "Save",
+      label = "Save",
-      function() Config.save() end
+      action = function() Config.save() end,
-    ),
+      type = "action_item"
-    UI.create_action_item(
+    },
-      "Restore Defaults",
+    {
-      function() Config.reset() end
+      label = "Restore Defaults",
-    ),
+      action = function() Config.reset() end,
+      type = "action_item"
+    },
   }
 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
-    UI.draw_decision_selector(_available_decisions, _selected_decision_index)
+    Decision.draw(_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 = UI.update_decision_selector(
+  local new_selected_decision_index = Decision.update(
     _available_decisions,
     _selected_decision_index
   )