success label border fix

Reviewed-on: #40

.luacheckrc

@@ -18,6 +18,7 @@ globals = {
   "Input",
   "Audio",
   "AsciiArt",
+  "Ascension",
   "Config",
   "Context",
   "Meter",

.vscode/tasks.json

@@ -6,12 +6,17 @@
         {
             "label": "Run TIC80",
             "type": "shell",
-            "command": "tic80 --fs=. impostor.lua"
+            "command": "tic80 --fs=. impostor.lua",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
         },
         {
             "label": "Build & Run TIC80",
             "type": "shell",
-            "command": "make build && tic80 --fs=. impostor.lua",
+            "command": "make clean && make build && tic80 --fs=. impostor.lua",
             "problemMatcher": []
         },
         {

impostor.inc

@@ -1,6 +1,7 @@
 meta/meta.header.lua
 init/init.module.lua
 init/init.config.lua
+init/init.ascension.lua
 init/init.context.lua
 system/system.util.lua
 system/system.print.lua
@@ -19,6 +20,22 @@ audio/audio.manager.lua
 audio/audio.songs.lua
 sprite/sprite.manager.lua
 sprite/sprite.norman.lua
+sprite/sprite.sumphore.lua
+sprite/sprite.pizza_vendor.lua
+sprite/sprite.dev_boy.lua
+sprite/sprite.dev_buddy.lua
+sprite/sprite.dev_extrovert.lua
+sprite/sprite.dev_girl.lua
+sprite/sprite.dev_guard.lua
+sprite/sprite.dev_guru.lua
+sprite/sprite.dev_hr_girl.lua
+sprite/sprite.dev_introvert.lua
+sprite/sprite.dev_operator.lua
+sprite/sprite.dev_project_manager.lua
+sprite/sprite.matrix_architect.lua
+sprite/sprite.matrix_neo.lua
+sprite/sprite.matrix_oraculum.lua
+sprite/sprite.matrix_trinity.lua
 situation/situation.manager.lua
 situation/situation.drink_coffee.lua
 decision/decision.manager.lua
@@ -44,6 +61,7 @@ screen/screen.walking_to_office.lua
 screen/screen.office.lua
 screen/screen.walking_to_home.lua
 screen/screen.work.lua
+screen/screen.mysterious_man.lua
 window/window.manager.lua
 window/window.register.lua
 window/window.end.lua

inc/decision/decision.go_to_end.lua

@@ -1,6 +1,9 @@
 Decision.register({
   id = "go_to_end",
   label = "Break the cycle",
+  condition = function()
+    return Ascension.is_complete()
+  end,
   handle = function()
     Window.set_current("end")
   end,

inc/decision/decision.go_to_sleep.lua

@@ -9,7 +9,8 @@ Decision.register({
       focus_center_y = (Config.screen.height / 2) - 18,
       focus_initial_radius = 0,
       on_win = function()
-        MysteriousManWindow.start()
+        local ascended = Ascension.consume_increase()
+        MysteriousManWindow.start({ skip_text = not ascended })
       end,
     })
   end,

inc/decision/decision.start_discussion.lua

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

inc/discussion/discussion.sumphore.lua

@@ -46,7 +46,9 @@ Discussion.register({
     {
       question = "My name is Sumphore, nice to meet you.",
       answers = {
-        { label = "Nice to meet you, Sumphore.", next_step = 5 },
+        { label = "Nice to meet you, Sumphore.", next_step = 5, on_select = function()
+          Context.have_met_sumphore = true
+        end },
       },
     },
     {

inc/init/init.ascension.lua

@@ -0,0 +1,169 @@
+--- @section Ascension
+local ASCENSION_MAX_LEVEL = 9
+local ASCENSION_WORD = "ASCENSION"
+local _increased_this_cycle = false
+
+local _flash_active = false
+local _flash_timer = 0
+local _flash_total = 0
+local FLASH_DURATION = 120
+
+local _fade_active = false
+local _fade_timer = 0
+local FADE_DURATION = 120
+local FADE_COLORS = nil
+
+--- Gets initial ascension state.
+--- @within Ascension
+--- @return result table Initial ascension state. </br>
+--- Fields: </br>
+--- * level (number) Current ascension level (0-9).
+function Ascension.get_initial()
+  _increased_this_cycle = false
+  return {
+    level = 0,
+  }
+end
+
+--- Gets the current ascension level.
+--- @within Ascension
+--- @return number The current ascension level (0-9).
+function Ascension.get_level()
+  if not Context or not Context.ascension then return 0 end
+  return Context.ascension.level
+end
+
+--- Gets the maximum ascension level.
+--- @within Ascension
+--- @return number The maximum ascension level.
+function Ascension.get_max_level()
+  return ASCENSION_MAX_LEVEL
+end
+
+--- Increases the ascension level by 1, clamped to the max.
+--- @within Ascension
+function Ascension.increase()
+  if not Context or not Context.ascension then return end
+  Context.ascension.level = math.min(ASCENSION_MAX_LEVEL, Context.ascension.level + 1)
+  _increased_this_cycle = true
+end
+
+--- Returns true if ascension was incremented since the last consume call.
+--- @within Ascension
+--- @return boolean Whether ascension increased this cycle.
+function Ascension.did_increase()
+  return _increased_this_cycle
+end
+
+--- Consumes the increase flag, returning its value and resetting it.
+--- @within Ascension
+--- @return boolean Whether ascension had increased this cycle.
+function Ascension.consume_increase()
+  local result = _increased_this_cycle
+  _increased_this_cycle = false
+  return result
+end
+
+--- Returns true when the ascension meter is fully complete (level 10).
+--- @within Ascension
+--- @return boolean Whether the cycle can be broken.
+function Ascension.is_complete()
+  return Ascension.get_level() >= ASCENSION_MAX_LEVEL
+end
+
+--- Draws the ascension meter as individual letters of "ASCENSION".
+--- Each letter lights up per level. Drawn beneath existing meter bars.
+--- @within Ascension
+--- @param x number Left x position.
+--- @param y number Top y position.
+--- @param options table Optional overrides: lit_color, dim_color, spacing.
+function Ascension.draw(x, y, options)
+  if not Context or not Context.ascension then return end
+  options = options or {}
+  local level = Context.ascension.level
+  if level < 1 then return end
+  local lit_color = options.lit_color or Config.colors.white
+  local spacing = options.spacing or 5
+
+  for i = 1, level do
+    local ch = ASCENSION_WORD:sub(i, i)
+    local color
+    if i == level and _fade_active then
+      color = Ascension.get_fade_color()
+    else
+      color = lit_color
+    end
+    print(ch, x + (i - 1) * spacing, y, color, false, 1, true)
+  end
+end
+
+--- Returns the current fade-in color based on progress through the palette.
+--- @within Ascension
+--- @return number The palette color index for the current fade step.
+function Ascension.get_fade_color()
+  if not FADE_COLORS then
+    FADE_COLORS = {
+      Config.colors.black,
+      Config.colors.dark_grey,
+      Config.colors.light_grey,
+      Config.colors.white,
+    }
+  end
+  if not _fade_active then return Config.colors.white end
+  local progress = math.min(_fade_timer / FADE_DURATION, 1)
+  local idx = math.floor(progress * (#FADE_COLORS - 1)) + 1
+  return FADE_COLORS[idx]
+end
+
+--- Starts the fade-in effect for the most recently gained letter.
+--- @within Ascension
+function Ascension.start_fade()
+  _fade_active = true
+  _fade_timer = 0
+end
+
+--- Starts the ascension flash effect.
+--- @within Ascension
+function Ascension.start_flash()
+  _flash_active = true
+  _flash_timer = 0
+  _flash_total = FLASH_DURATION
+end
+
+--- Updates and draws the ascension flash overlay.
+--- Call once per frame from the main loop.
+--- @within Ascension
+function Ascension.draw_flash()
+  if not _flash_active then return end
+  _flash_timer = _flash_timer + 1
+
+  local sw = Config.screen.width
+  local sh = Config.screen.height
+
+  local progress = _flash_timer / FLASH_DURATION
+  local pulse = math.abs(math.sin(progress * math.pi * 6))
+  local flash_color = (pulse > 0.5) and Config.colors.white or Config.colors.light_grey
+  rect(0, 0, sw, sh, flash_color)
+
+  if _flash_timer >= _flash_total then
+    _flash_active = false
+    Ascension.start_fade()
+  end
+end
+
+--- Updates the fade-in timer. Call once per frame from the main loop.
+--- @within Ascension
+function Ascension.update_fade()
+  if not _fade_active then return end
+  _fade_timer = _fade_timer + 1
+  if _fade_timer >= FADE_DURATION then
+    _fade_active = false
+  end
+end
+
+--- Returns whether a flash effect is currently active.
+--- @within Ascension
+--- @return boolean Whether the flash is playing.
+function Ascension.is_flashing()
+  return _flash_active
+end

inc/init/init.context.lua

@@ -17,8 +17,10 @@ Context = {}
 --- * minigame_button_mash (table) Button mash minigame state (see Minigame.get_default_button_mash).<br/>
 --- * minigame_rhythm (table) Rhythm minigame state (see Minigame.get_default_rhythm).<br/>
 --- * meters (table) Meter values (see Meter.get_initial).<br/>
+--- * ascension (table) Ascension meter state (see Ascension.get_initial).<br/>
 --- * triggers (table) Active trigger runtime state, keyed by trigger ID.<br/>
 --- * stat_screen_active (boolean) Whether the stat screen overlay is currently shown.<br/>
+--- * have_met_sumphore (boolean) Whether the player has talked to the homeless guy.<br/>
 --- * game (table) Current game progress state. Contains: `current_screen` (string) active screen ID, `current_situation` (string|nil) active situation ID.<br/>
 function Context.initial_data()
   return {
@@ -33,9 +35,11 @@ function Context.initial_data()
     minigame_button_mash = {},
     minigame_rhythm = {},
     meters = Meter.get_initial(),
+    ascension = Ascension.get_initial(),
     timer = Timer.get_initial(),
     triggers = {},
     home_norman_visible = false,
+    have_met_sumphore = false,
     game = {
       current_screen = "home",
       current_situation = nil,

inc/init/init.module.lua

@@ -17,3 +17,4 @@ Timer = {}
 Trigger = {}
 Discussion = {}
 AsciiArt = {}
+Ascension = {}

inc/logic/logic.day.lua

@@ -23,3 +23,9 @@ Day.register_handler(function()
     m.wpm = math.max(0, m.wpm - METER_DECAY_PER_DAY)
     m.bm = math.max(0, m.bm - METER_DECAY_PER_DAY)
 end)
+
+Day.register_handler(function()
+    if Context.day_count == 3 then
+        Ascension.increase()
+    end
+end)

inc/logic/logic.discussion.lua

@@ -37,15 +37,18 @@ end
 --- @within Discussion
 --- @param id string The discussion ID to start.
 --- @param return_window string The window ID to return to after the discussion.
-function Discussion.start(id, return_window)
+--- @param[opt] start_step number The step index to start from (defaults to 1).
+function Discussion.start(id, return_window, start_step)
   local discussion = _discussions[id]
   if not discussion then
     trace("Error: Discussion not found: " .. tostring(id))
     return
   end
+  local step = start_step or 1
+  if not discussion.steps[step] then step = 1 end
   Context.discussion.active = true
   Context.discussion.id = id
-  Context.discussion.step = 1
+  Context.discussion.step = step
   Context.discussion.selected_answer = 1
   Context.discussion.scroll_y = 0
   Context.discussion.scroll_timer = 0

inc/logic/logic.meter.lua

@@ -152,4 +152,7 @@ function Meter.draw()
     end
     print(meter.label, label_x, label_y, meter.color, false, 1, true)
   end
+
+  local ascension_y = start_y + 3 * line_h + 1
+  Ascension.draw(bar_x, ascension_y, { spacing = 5 })
 end

inc/logic/logic.minigame.lua

@@ -5,7 +5,7 @@
 --- @within Minigame
 function Minigame.draw_win_overlay()
   local text = "SUCCESS"
-  local tw = #text * 4
+  local tw = #text * 6
   local th = 6
   local padding = 4
   local box_w = tw + padding * 2

inc/logic/logic.timer.lua

@@ -30,7 +30,6 @@ function Timer.update()
   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

inc/meta/meta.assets.lua

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

inc/screen/screen.home.lua

@@ -5,6 +5,7 @@ Screen.register({
     "go_to_toilet",
     "go_to_walking_to_office",
     "go_to_sleep",
+    "go_to_end",
   },
   background = "bedroom",
   draw = function()

inc/screen/screen.mysterious_man.lua

@@ -0,0 +1,20 @@
+--- Draws the mysterious screen with the mysterious man and the glowing TV.
+function Screen.draw_the_mysterious_screen()
+    local img_values = {0,1,0,1,0,1,0,1,0,1,0,1,2,1,4,1,0,2,4,1,0,2,4,1,0,2,4,1,0,2,4,1,0,2,4,2,1,4,2,1,4,1,0,2,4,1,0,1,4,2,1,2,1,0,1,2,4,1,0,2,4,2,1,0,1,2,1,2,1,0,1,4,1,0,2,4,2,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,4,1,0,2,4,2,0,1,2,4,1,0,2,4,1,0,1,0,4,1,0,2,4,0,1,0,1,0,1,0,4,1,0,2,4,0,1,4,1,0,2,4,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,4,1,0,2,4,1,0,1,0,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,1,2,1,0,1,4,1,0,2,4,2,1,0,1,2,4,1,0,2,4,2,1,0,1,2,4,1,0,2,4,1,2,0,1,0,1,0,1,2,1,2,1,0,2,4,1,0,2,4,0,1,0,1,2,1,0,1,0,2,4,1,0,2,4,2,1,0,1,0,1,4,1,0,2,4,2,1,0,1,0,2,4,2,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,2,1,0,1,0,2,0,1,4,1,0,2,4,1,0,1,0,1,2,0,1,4,1,0,2,4,2,1,0,1,0,1,4,1,0,2,4,2,1,0,2,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,0,1,0,1,0,1,0,1,4,1,0,2,4,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,2,4,1,0,2,4,2,1,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,0,1,4,1,0,2,4,2,4,1,0,1,0,1,0,1,0,1,0,1,2,1,4,2,4,1,0,2,4,2,1,0,1,0,1,0,1,0,1,0,1,2,1,4,2,4,1,0,2,4,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,4,1,0,2,4,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,2,1,4,1,0,2,4,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,2,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,2,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,2,0,1,0,1,0,4,1,0,2,4,0,1,0,1,0,2,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,2,0,1,4,1,0,2,4,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,2,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,2,4,1,0,2,4,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,2,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,2,4,1,0,2,4,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,2,4,1,0,2,4,2,0,1,0,1,4,1,0,2,4,2,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,0,1,0,1,4,2,1,0,1,2,1,2,1,0,1,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,0,1,2,0,1,0,2,1,0,1,2,0,1,0,2,0,1,0,1,0,1,2,0,1,0,1,0,1,0,2,0,1,0,1,0,1,0,2,0,1,0,1,0,2,1,0,1,0,1,2,0,1,0,2,0,2,1,0,1,2,0,2,1,0,1,0,1,2,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,0,2,1,0,1,0,1,0,1,0,1,0,2,1,0,1,2,0,1,0,1,2,1,0,1,0,1,0,1,0,2,1,0,2,0,1,0,1,0,2,0,1,0,1,0,2,0,1,0,2,0,1,0,1,0,2,1,0,1,2,0,1,0,1,0,1,0,1,0,2,0,1,0,2,0,1,0,2,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0}
+
+    local img_runs = {1480,1,151,1,87,1,1,150,1,1,86,1,2,148,1,2,87,2,148,2,88,2,148,2,88,2,148,2,88,2,148,2,88,2,70,1,2,9,1,2,63,2,88,2,69,1,2,3,5,1,1,1,1,1,1,1,61,2,88,2,68,1,1,3,1,2,1,3,2,3,2,61,2,88,2,68,1,6,1,4,1,5,1,1,60,2,88,2,67,1,1,17,2,60,2,88,2,67,1,19,1,1,59,2,88,2,67,1,19,1,1,59,2,88,2,67,4,1,11,1,1,1,3,59,2,88,2,67,21,1,59,2,88,2,67,21,1,59,2,88,2,66,1,21,2,58,2,88,2,66,1,21,1,1,58,2,88,2,66,4,17,2,1,58,2,88,2,65,2,5,1,15,2,58,2,88,2,63,1,1,2,22,4,55,2,88,2,57,2,2,34,2,2,49,2,88,2,55,1,2,39,3,1,47,2,88,2,55,5,1,3,2,2,1,25,1,1,1,1,1,1,1,47,2,88,2,57,1,2,1,29,1,4,1,1,1,1,49,2,88,2,59,1,2,8,15,9,2,52,2,88,2,62,2,1,1,1,24,1,1,1,54,2,88,2,66,1,22,1,58,2,88,2,66,1,21,1,59,2,88,2,66,2,20,1,59,2,88,2,65,3,20,2,58,2,88,2,63,2,2,1,20,1,1,2,56,2,88,2,61,2,4,1,20,1,2,2,55,2,88,2,59,1,1,6,1,19,1,4,2,54,2,88,2,58,2,7,2,17,1,1,6,2,52,3,87,2,56,1,2,9,1,26,2,51,3,87,2,55,1,1,40,1,50,2,88,2,54,2,41,1,50,2,88,2,53,2,42,2,49,2,88,2,52,2,44,2,48,2,88,2,51,2,46,2,47,2,88,2,50,2,16,1,31,1,47,2,88,2,50,3,1,14,1,29,1,1,2,46,2,88,2,50,18,1,29,1,2,1,46,2,88,2,50,4,14,1,33,1,45,2,88,2,53,1,3,11,2,15,1,13,1,2,46,2,88,2,56,1,1,11,1,15,1,10,2,1,49,2,88,2,55,2,3,10,2,12,2,8,8,46,2,88,2,50,1,1,4,4,1,9,2,11,2,8,2,4,2,1,2,1,1,42,2,88,2,48,2,3,8,1,9,2,9,3,7,2,8,1,1,2,1,1,40,2,88,2,45,3,2,1,1,1,1,8,1,7,1,1,3,6,4,6,1,8,1,1,1,1,4,2,38,2,88,2,45,1,2,2,22,4,4,4,6,1,10,1,1,2,1,2,1,2,37,2,88,2,42,1,1,1,4,1,2,19,1,1,4,1,5,21,1,2,6,35,2,88,2,42,2,1,1,1,1,15,2,8,3,4,3,6,1,17,1,1,2,1,1,1,34,2,88,2,41,3,1,1,15,2,9,3,5,2,8,1,21,1,1,34,2,88,2,41,1,1,1,16,2,11,2,5,2,9,2,18,2,1,34,2,88,2,41,1,2,1,14,2,13,1,5,1,12,1,17,1,2,34,2,88,2,41,1,16,1,17,1,2,1,14,2,17,1,1,33,2,88,2,41,1,2,1,12,1,17,1,3,2,15,1,14,1,1,1,1,33,2,88,2,41,15,1,22,1,17,1,1,11,1,3,1,33,2,88,2,41,1,14,2,40,1,15,1,33,2,88,2,41,1,15,2,35,1,3,1,10,1,4,1,33,2,88,2,41,1,3,1,12,2,36,2,11,1,4,1,33,2,88,2,40,1,1,18,1,35,1,12,1,4,1,1,32,2,88,2,40,2,4,1,14,1,33,1,12,1,6,1,32,2,88,2,40,1,6,1,14,1,31,1,13,1,6,1,32,2,88,2,39,2,22,2,28,1,21,1,1,31,2,88,2,39,2,24,1,26,1,22,1,1,31,2,88,2,39,2,25,1,24,1,23,1,1,31,2,88,2,39,1,27,1,22,2,23,1,1,31,2,88,2,39,1,49,2,24,3,30,2,88,2,39,1,48,1,27,1,1,30,2,88,2,39,1,47,2,27,1,1,30,2,88,2,37,1,1,47,2,28,1,1,30,2,88,2,37,1,1,46,1,30,2,1,29,2,88,2,37,1,47,1,30,2,30,2,88,2,37,1,1,2,43,1,33,30,3,87,2,37,1,45,1,31,1,1,2,29,3,87,2,37,45,1,35,1,29,1,1,88,2,1,35,1,1,80,2,1,26,1,3,86,1,1,2,1,21,1,4,4,2,1,3,80,30,1,2,125,2,80,2,156,2,79,2,1,156,2,1,77,4,156,1,3,76,3,1,140,1,15,1,2,2,74,2,1,1,1,5,3,129,1,18,1,82,1,7,1,129,1,18,1,82,1,9,1,123,3,20,1,1,80,2,11,1,1,119,1,22,1,1,1,2,76,4,1,154,2,2,63,1,14,3,1,126,1,27,2,65,1,17,1,17,2,132,4,66,1,17,4,113,39,66,2,16,31,191,1,1,1,15,1,153,2,15,3,48,2,16,2,152,1,16,1,1,1,48,2,16,2,152,1,1,2,2,1,10,1,1,1,48,1,13,6,153,1,3,13,1,1,48,1,15,2,1,1,153,3,64,1,16,2,154,1,1,83,1,154,1,17,1,66,1,154,1,17,1,66,1,155,1,82,1,156,1,82,1,156,1,1,80,1,1,157,2,78,2,158,2,78,2,158,1,80,1,158,1,79,2,158,1,79,1,159,1,79,1,160,1,77,2,160,1,77,1,162,1,74,1,1,1,162,1,75,1,239,1,165,1,72,1,166,1,240,1,69,1,412,1,63,1,175,1,63,2,238,1,175,1,63,1,239,1,807}
+
+    local val_i=0
+    local run=0
+    for y=0,136-1 do
+        for x=0,240-1 do
+            if run==0 then
+                val_i=val_i+1
+                run=img_runs[val_i]
+            end
+            run=run-1
+            pix(x,y,img_values[val_i])
+        end
+    end
+end
+

inc/screen/screen.office.lua

@@ -9,5 +9,19 @@ Screen.register({
   situations = {
     "drink_coffee",
   },
-  background = "office"
+  background = "office",
+  draw = function()
+    if Window.get_current_id() == "game" then
+      Sprite.draw_at("norman",              13 * 8,  9 * 8)
+      Sprite.draw_at("dev_buddy",           15 * 8,  9 * 8)
+      Sprite.draw_at("dev_project_manager",  6 * 8,  4 * 8)
+      Sprite.draw_at("dev_hr_girl",         12 * 8,  4 * 8)
+      Sprite.draw_at("dev_introvert",   -4 + 5 * 8,  9 * 8)
+      Sprite.draw_at("dev_extrovert",       20 * 8,  4 * 8)
+      Sprite.draw_at("dev_girl",            23 * 8,  5 * 8)
+      Sprite.draw_at("dev_boy",             10 * 8, 11 * 8 + 4)
+      Sprite.draw_at("dev_guru",            22 * 8, 10 * 8 + 4)
+      Sprite.draw_at("dev_operator",        27 * 8, 10 * 8 + 4)
+    end
+  end
 })

inc/screen/screen.toilet.lua

@@ -75,5 +75,14 @@ Screen.register({
       Print.text(decay_text, bar_x - decay_w - 4, bar_y, Config.colors.light_blue)
       Print.text(mult_text, bar_x + bar_w + 4, bar_y, Config.colors.light_blue)
     end
+
+    if Ascension.get_level() > 0 then
+      local asc_y = meter_start_y + #meter_list * 20
+      local asc_letter_y = asc_y + 10
+      local asc_spacing = 8
+      local asc_total_w = Ascension.get_level() * asc_spacing
+      local asc_x = math.floor((sw - asc_total_w) / 2)
+      Ascension.draw(asc_x, asc_letter_y, { spacing = asc_spacing })
+    end
   end,
 })

inc/screen/screen.walking_to_home.lua

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

inc/screen/screen.walking_to_office.lua

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

inc/sprite/sprite.dev_boy.lua

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

inc/sprite/sprite.dev_buddy.lua

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

inc/sprite/sprite.dev_extrovert.lua

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

inc/sprite/sprite.dev_girl.lua

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

inc/sprite/sprite.dev_guard.lua

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

inc/sprite/sprite.dev_guru.lua

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

inc/sprite/sprite.dev_hr_girl.lua

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

inc/sprite/sprite.dev_introvert.lua

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

inc/sprite/sprite.dev_operator.lua

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

inc/sprite/sprite.dev_project_manager.lua

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

inc/sprite/sprite.manager.lua

@@ -50,6 +50,29 @@ function Sprite.register(sprite_data)
   _sprites[sprite_data.id] = sprite_data
 end
 
+--- Generates a sprites table for a rectangular composite sprite.
+--- @within Sprite
+--- @param width number The number of sprites wide.<br/>
+--- @param height number The number of sprites tall.<br/>
+--- @param starting_s number The sprite index of the top-left tile.<br/>
+--- @param x_base number The base x-offset for the leftmost column.<br/>
+--- @param y_base number The base y-offset for the topmost row.<br/>
+--- @param x_step number The x-offset increment per column.<br/>
+--- @param y_step number The y-offset increment per row.<br/>
+--- @return table The sprites table array.
+function Sprite.generate_table(width, height, starting_s, x_base, y_base, x_step, y_step)
+  local sprites = {}
+  for row = 0, height - 1 do
+    for col = 0, width - 1 do
+      local s = starting_s + row * 16 + col
+      local x_offset = x_base + col * x_step
+      local y_offset = y_base + row * y_step
+      table.insert(sprites, { s = s, x_offset = x_offset, y_offset = y_offset })
+    end
+  end
+  return sprites
+end
+
 --- Schedules a sprite for drawing.
 --- @within Sprite
 --- @param id string The unique identifier of the sprite.<br/>

inc/sprite/sprite.matrix_architect.lua

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

inc/sprite/sprite.matrix_neo.lua

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

inc/sprite/sprite.matrix_oraculum.lua

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

inc/sprite/sprite.matrix_trinity.lua

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

inc/sprite/sprite.pizza_vendor.lua

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

inc/sprite/sprite.sumphore.lua

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

inc/system/system.main.lua

@@ -26,8 +26,10 @@ function TIC()
   Timer.update()
   Trigger.update()
   Glitch.draw()
+  Ascension.update_fade()
   if Context.game_in_progress then
     Meter.draw()
     Timer.draw()
   end
+  Ascension.draw_flash()
 end

inc/window/window.menu.lua

@@ -81,6 +81,14 @@ function MenuWindow.continued()
   GameWindow.set_state("continued")
 end
 
+--- Opens the minigame ddr test menu.
+--- @within MenuWindow
+function MenuWindow.ddr_test()
+  AudioTestWindow.init()
+  GameWindow.set_state("minigame_ddr")
+  MinigameDDRWindow.start("menu", nil)
+end
+
 --- Refreshes menu items.
 --- @within MenuWindow
 function MenuWindow.refresh_menu_items()
@@ -95,6 +103,7 @@ function MenuWindow.refresh_menu_items()
   table.insert(_menu_items, {label = "Configuration", decision = MenuWindow.configuration})
   table.insert(_menu_items, {label = "Audio Test", decision = MenuWindow.audio_test})
   table.insert(_menu_items, {label = "To Be Continued...", decision = MenuWindow.continued})
+  table.insert(_menu_items, {label = "DDR Test", decision = MenuWindow.ddr_test})
   table.insert(_menu_items, {label = "Exit", decision = MenuWindow.exit})
 
   Context.current_menu_item = 1

inc/window/window.minigame.ddr.lua

@@ -141,16 +141,16 @@ local function draw_arrow(x, y, direction, color)
   local half = size / 2
   if direction == "left" then
     tri(x + half, y, x, y + half, x + half, y + size, color)
-    rect(x + half, y + half - 2, half, 4, color)
+    rectb(x + half, y + half - 2, half, 4, color)
   elseif direction == "right" then
     tri(x + half, y, x + size, y + half, x + half, y + size, color)
-    rect(x, y + half - 2, half, 4, color)
+    rectb(x, y + half - 2, half, 4, color)
   elseif direction == "up" then
     tri(x, y + half, x + half, y, x + size, y + half, color)
-    rect(x + half - 2, y + half, 4, half, color)
+    rectb(x + half - 2, y + half, 4, half, color)
   elseif direction == "down" then
     tri(x, y + half, x + half, y + size, x + size, y + half, color)
-    rect(x + half - 2, y, 4, half, color)
+    rectb(x + half - 2, y, 4, half, color)
   end
 end
 

inc/window/window.mysterious_man.lua

@@ -16,13 +16,18 @@ He says nothing.
 
 local state = STATE_TEXT
 local text_y = Config.screen.height
-local text_speed = 0.4
+local text_speed = 0.2
 local day_timer = 0
 local day_display_frames = 120
+local text_done = false
+local text_done_timer = 0
+local TEXT_DONE_HOLD_FRAMES = 120
 local selected_choice = 1
 local text = DEFAULT_TEXT
 local day_text_override = nil
 local on_text_complete = nil
+local show_mysterious_screen = true
+local trigger_flash_on_wake = false
 
 local choices = {
   {
@@ -47,16 +52,30 @@ end
 --- * text (string) Override for the scrolling text.<br/>
 --- * day_text (string) Override for the centered day label.<br/>
 --- * on_text_complete (function) Callback fired once when the text phase ends.<br/>
+--- * skip_text (boolean) If true, skip the text phase and go straight to day display.<br/>
 function MysteriousManWindow.start(options)
   options = options or {}
-  state = STATE_TEXT
-  text_y = Config.screen.height
   day_timer = 0
+  text_done = false
+  text_done_timer = 0
   selected_choice = 1
   text = options.text or DEFAULT_TEXT
+  local line_count = 1
+  for _ in string.gmatch(text, "\n") do line_count = line_count + 1 end
+  local text_block_h = line_count * 8
+  text_y = math.floor((Config.screen.height - text_block_h) / 2)
   day_text_override = options.day_text
   on_text_complete = options.on_text_complete
   Meter.hide()
+  trigger_flash_on_wake = not options.skip_text
+  if options.skip_text then
+    show_mysterious_screen = false
+    state = STATE_DAY
+    day_timer = day_display_frames
+  else
+    show_mysterious_screen = true
+    state = STATE_TEXT
+  end
   Window.set_current("mysterious_man")
 end
 
@@ -86,6 +105,10 @@ local function wake_up()
       Audio.music_play_wakingup()
       Context.home_norman_visible = true
       Meter.show()
+      if trigger_flash_on_wake then
+        trigger_flash_on_wake = false
+        Ascension.start_flash()
+      end
       Window.set_current("game")
     end,
   })
@@ -101,6 +124,7 @@ end
 --- @within MysteriousManWindow
 function MysteriousManWindow.update()
   if state == STATE_TEXT then
+    if not text_done then
       text_y = text_y - text_speed
 
       local lines = 1
@@ -109,19 +133,26 @@ function MysteriousManWindow.update()
       end
 
       if text_y < -lines * 8 then
+        text_done = true
+        text_done_timer = TEXT_DONE_HOLD_FRAMES
+      end
+    else
+      text_done_timer = text_done_timer - 1
+      if text_done_timer <= 0 then
         go_to_day_state()
       end
-
-    if Input.select() then
-      go_to_day_state()
     end
   elseif state == STATE_DAY then
     day_timer = day_timer - 1
 
     if day_timer <= 0 or Input.select() then
+      if trigger_flash_on_wake or Ascension.get_level() < 1 then
+        wake_up()
+      else
         state = STATE_CHOICE
         selected_choice = 1
       end
+    end
   elseif state == STATE_CHOICE then
     selected_choice = UI.update_menu(choices, selected_choice)
 
@@ -140,10 +171,17 @@ end
 --- @within MysteriousManWindow
 function MysteriousManWindow.draw()
   rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
+  if show_mysterious_screen then
+    Screen.draw_the_mysterious_screen()
+  end
 
   if state == STATE_TEXT then
-    local x = (Config.screen.width - 132) / 2
+    local cx = Config.screen.width / 2
-    Print.text(text, x, text_y, Config.colors.light_grey)
+    local line_y = text_y
+    for line in (text .. "\n"):gmatch("(.-)\n") do
+      Print.text_center(line, cx, line_y, Config.colors.light_grey)
+      line_y = line_y + 8
+    end
   elseif state == STATE_DAY then
     local day_text = day_text_override or ("Day " .. Context.day_count)
     Print.text_center(

tools/musicator/musicator.lua

@@ -0,0 +1,130 @@
+unpack = unpack or table.unpack
+
+function build_markov_model(sequence, order)
+  local function make_key(tbl)
+    return table.concat(tbl, "|")
+  end
+
+  local function unmake_key(k)
+    local result = {}
+    for t in string.gmatch(k, "[^|]+") do
+      result[#result + 1] = t
+    end
+
+    return result
+  end
+
+  local function add_key(str, value)
+    return str .. "|" .. value
+  end
+
+  local function split_last(full)
+    local i = full:match(".*()|")
+    return full:sub(1, i-1), full:sub(i+1)
+  end
+
+  local counts = {}
+  local totals = {}
+
+  -- count
+  for i = 1, #sequence - order do
+    local notes = make_key({unpack(sequence, i, i + order - 1)})
+    totals[notes] = (totals[notes] or 0) + 1
+
+    local notes_full = add_key(notes, sequence[i + order])
+    counts[notes_full] = (counts[notes_full] or 0) + 1
+  end
+
+  -- build model
+  local model = {}
+
+  for notes_full,count in pairs(counts) do
+    local notes, _ = split_last(notes_full)
+
+    model[notes_full] = count[notes_full] / total[notes]
+  end
+
+  return {
+    order = order,
+    model = model,
+    counts = counts -- keep raw counts (useful!)
+  }
+end
+
+function generate_sequence(model_data, length)
+  local model = model_data.model
+  local order = model_data.order
+
+  -- helper: split key into parts
+  local function split(k)
+    local t = {}
+    for part in string.gmatch(k, "[^|]+") do
+      t[#t+1] = part
+    end
+    return t
+  end
+
+  -- pick random starting state
+  local start_key
+  for k,_ in pairs(model) do
+    start_key = k
+    break
+  end
+
+  -- (optional: better random start)
+  for k,_ in pairs(model) do
+    if math.random() < 0.1 then
+      start_key = k
+    end
+  end
+
+  local parts = split(start_key)
+
+  -- initial sequence = first `order` items
+  local seq = {}
+  for i = 1, order do
+    seq[i] = parts[i]
+  end
+
+  -- generation loop
+  while #seq < length do
+    -- build current state key
+    local state = table.concat({unpack(seq, #seq - order + 1, #seq)}, "|")
+
+    -- collect matching transitions
+    local matches = {}
+    for full,prob in pairs(model) do
+      if full:sub(1, #state) == state and full:sub(#state+1, #state+1) == "|" then
+        matches[#matches+1] = {key=full, prob=prob}
+      end
+    end
+
+    if #matches == 0 then break end
+
+    -- weighted pick
+    local r = math.random()
+    local sum = 0
+
+    local chosen
+    for _,m in ipairs(matches) do
+      sum = sum + m.prob
+      if r <= sum then
+        chosen = m.key
+        break
+      end
+    end
+
+    if not chosen then
+      chosen = matches[#matches].key
+    end
+
+    -- extract next symbol (after last '|')
+    local next_symbol = chosen:match("|([^|]+)$")
+
+    seq[#seq+1] = next_symbol
+  end
+
+  return seq
+end
+
+-- todo: feed samples

tools/musicator/sample_1.lua

@@ -0,0 +1 @@
+-- todo