Add the street background.

Reviewed-on: #23

.gitignore

@@ -1,4 +1,6 @@
 .local
 impostor.lua
+impostor.original.lua
 prompts
 docs
+minify.lua

.luacheckrc

@@ -2,6 +2,7 @@
 -- Configuration for luacheck
 
 globals = {
+  "Focus",
   "Util",
   "Decision",
   "Situation",
@@ -39,6 +40,8 @@ globals = {
   "circb",
   "cls",
   "tri",
+  "pix",
+  "line",
   "Songs",
   "frame_from_beat",
   "beats_to_pattern",

.vscode/settings.json

@@ -14,7 +14,10 @@
     "inc/?.lua"
   ],
   "Lua.diagnostics.disable": [
-    "undefined-global"
+    "undefined-global",
+    "undefined-doc-param",
+    "undefined-doc-name",
+    "luadoc-miss-param-name"
   ],
   "python.autoComplete.extraPaths": [
     "${workspaceFolder}/sources/poky/bitbake/lib",

.woodpecker.yml

@@ -5,7 +5,32 @@ steps:
       - 'apk add --no-cache make'
       - 'make ci-version'
 
-  - name: build
+  - name: lint
+    image: alpine
+    commands:
+      - 'apk add --no-cache make lua5.4 lua5.4-dev luarocks gcc musl-dev'
+      - 'ln -sf /usr/bin/lua5.4 /usr/bin/lua'
+      - 'ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks'
+      - 'luarocks install luacheck'
+      - 'make ci-lint'
+
+  - name: minify
+    image: alpine
+    commands:
+      - 'apk add --no-cache make lua5.4 curl'
+      - 'ln -sf /usr/bin/lua5.4 /usr/bin/lua'
+      - 'make ci-minify'
+
+  - name: docs
+    image: alpine
+    commands:
+      - 'apk add --no-cache make lua5.4 lua5.4-dev luarocks gcc musl-dev zip'
+      - 'ln -sf /usr/bin/lua5.4 /usr/bin/lua'
+      - 'ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks'
+      - 'luarocks install ldoc'
+      - 'make ci-docs'
+
+  - name: export
     image: git.teletype.hu/internal/tic80pro:latest
     environment:
       XDG_RUNTIME_DIR: /tmp
@@ -23,7 +48,7 @@ steps:
         from_secret: droparea_ssh_password
     commands:
       - 'apk add --no-cache make openssh-client sshpass'
-      - 'make ci-upload'
+      - 'make ci-artifact'
 
   - name: update
     image: alpine

Makefile

@@ -6,9 +6,13 @@ PROJECT = impostor
 
 ORDER      = $(PROJECT).inc
 OUTPUT     = $(PROJECT).lua
+OUTPUT_ORIGINAL   = $(PROJECT).original.lua
 OUTPUT_ZIP = $(PROJECT).html.zip
 OUTPUT_TIC = $(PROJECT).tic
 
+MINIFY     = minify.lua
+MINIFY_URL = https://raw.githubusercontent.com/ztimar31/lua-minify-tic80/refs/heads/master/minify.lua
+
 SRC_DIR    = inc
 SRC        = $(shell sed 's|^|$(SRC_DIR)/|' $(ORDER))
 
@@ -30,16 +34,22 @@ UPDATE_SERVER ?= https://games.vps.teletype.hu
 
 all: build
 
-build: $(OUTPUT)
+build:
-
-$(OUTPUT): $(SRC) $(ORDER)
 	@rm -f $(OUTPUT)
 	@sed 's/\r$$//' $(ORDER) | while read f; do \
 		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
 		echo "" >> $(OUTPUT); \
 	done
 
-export: build
+download-minify:
+	@test -f $(MINIFY) || { echo "==> Downloading $(MINIFY)"; curl -fsSL $(MINIFY_URL) -o $(MINIFY); }
+
+minify: build download-minify
+	@echo "==> Minifying $(OUTPUT)"
+	@cp $(OUTPUT) $(OUTPUT_ORIGINAL)
+	@lua $(MINIFY) minify $(OUTPUT_ORIGINAL) > $(OUTPUT)
+
+export: minify
 	@if [ -z "$(VERSION)" ]; then \
 		echo "ERROR: VERSION not set!"; \
 		exit 1; \
@@ -61,7 +71,7 @@ watch:
 	$(MAKE) build
 	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do $(MAKE) build; done
 
-import_assets: $(OUTPUT)
+import_assets: build
 	@TIC_CMD="load $(OUTPUT) &"; \
 	for t in $(ASSET_TYPES); do \
 		for f in $(ASSETS_DIR)/$$t/*.png; do \
@@ -156,41 +166,9 @@ export_assets:
 	@$(call f_export_asset_awk,WAVES,$(OUTPUT),$(ASSETS_LUA))
 
 clean:
-	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(OUTPUT)
+	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(PROJECT)-*-docs.zip $(PROJECT)-docs.zip $(OUTPUT) $(OUTPUT_ORIGINAL)
 	@echo "==> Cleaned build artifacts"
 
-# CI/CD Targets
-ci-version:
-	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
-	BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
-	BRANCH=$$(echo "$$BRANCH" | tr '/' '-'); \
-	if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
-		VERSION=dev-$$VERSION-$$BRANCH; \
-	fi; \
-	echo "VERSION is: $$VERSION"; \
-	echo $$VERSION > $(VERSION_FILE)
-
-ci-export:
-	@VERSION=$$(cat $(VERSION_FILE)); \
-	echo "==> Building and exporting version $$VERSION"; \
-	$(MAKE) export VERSION=$$VERSION
-
-ci-upload:
-	@VERSION=$$(cat $(VERSION_FILE)); \
-	echo "==> Uploading artifacts for version $$VERSION"; \
-	ls -lh $(PROJECT)-$$VERSION.* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true; \
-	cp $(PROJECT).lua $(PROJECT)-$$VERSION.lua; \
-	FILE_LUA=$(PROJECT)-$$VERSION.lua; \
-	FILE_TIC=$(PROJECT)-$$VERSION.tic; \
-	FILE_HTML_ZIP=$(PROJECT)-$$VERSION.html.zip; \
-	SCP_TARGET="$(DROPAREA_USER)@$(DROPAREA_HOST):$(DROPAREA_TARGET_PATH)/"; \
-	sshpass -p "$(DROPAREA_SSH_PASSWORD)" scp -o StrictHostKeyChecking=no -P $(DROPAREA_PORT) $$FILE_LUA $$FILE_TIC $$FILE_HTML_ZIP $$SCP_TARGET
-
-ci-update:
-	@VERSION=$$(cat $(VERSION_FILE)); \
-	echo "==> Triggering update for version $$VERSION"; \
-	curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=tic80&version=$$VERSION"
-
 install_precommit_hook:
 	@echo "Installing Git pre-commit hook (lint check)..."
 	@mkdir -p .git/hooks
@@ -219,5 +197,62 @@ docs: build
 	@ldoc ${OUTPUT} -d docs
 	@echo "==> Documentation generated."
 
-.PHONY: all build export watch import_assets export_assets clean lint ci-version ci-export ci-upload ci-update install_precommit_hook docs
+# -----------------------------------------
+# CI/CD Pipeline targets
+# -----------------------------------------
 
+ci-version:
+	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
+	BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
+	BRANCH=$$(echo "$$BRANCH" | tr '/' '-'); \
+	if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
+		VERSION=dev-$$VERSION-$$BRANCH; \
+	fi; \
+	echo "VERSION is: $$VERSION"; \
+	echo $$VERSION > $(VERSION_FILE)
+
+ci-lint: lint
+
+ci-minify: minify
+
+ci-docs:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Generating docs from $(OUTPUT_ORIGINAL)"; \
+	ldoc $(OUTPUT_ORIGINAL) -d docs; \
+	echo "==> Zipping docs for version $$VERSION"; \
+	(cd docs && zip -r ../$(PROJECT)-$$VERSION-docs.zip .); \
+	cp $(PROJECT)-$$VERSION-docs.zip $(PROJECT)-docs.zip; \
+	echo "==> Docs zip created"
+
+ci-export:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Exporting HTML for version $$VERSION"; \
+	tic80 --cli --skip --fs=. \
+		--cmd="load $(OUTPUT) & save $(PROJECT)-$$VERSION & export html $(PROJECT)-$$VERSION.html & exit"; \
+	if [ -f "$(PROJECT)-$$VERSION.tic" ]; then \
+		cp $(PROJECT)-$$VERSION.tic $(PROJECT).tic; \
+	fi; \
+	if [ -f "$(PROJECT)-$$VERSION.html.zip" ]; then \
+		cp $(PROJECT)-$$VERSION.html.zip $(PROJECT).html.zip; \
+	fi; \
+	echo "==> Generated files:"; \
+	ls -lh $(PROJECT)-$$VERSION.* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true
+
+ci-artifact:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Uploading artifacts for version $$VERSION"; \
+	cp $(PROJECT).lua $(PROJECT)-$$VERSION.lua; \
+	SCP_TARGET="$(DROPAREA_USER)@$(DROPAREA_HOST):$(DROPAREA_TARGET_PATH)/"; \
+	sshpass -p "$(DROPAREA_SSH_PASSWORD)" scp -o StrictHostKeyChecking=no -P $(DROPAREA_PORT) \
+		$(PROJECT)-$$VERSION.lua \
+		$(PROJECT)-$$VERSION.tic \
+		$(PROJECT)-$$VERSION.html.zip \
+		$(PROJECT)-$$VERSION-docs.zip \
+		$$SCP_TARGET
+
+ci-update:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Triggering update for version $$VERSION"; \
+	curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=tic80&version=$$VERSION"
+
+.PHONY: all build download-minify minify export watch import_assets export_assets clean lint install_precommit_hook docs ci-version ci-lint ci-minify ci-docs ci-export ci-artifact ci-update

assets_src/palette-pico8.txt

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

impostor.inc

@@ -7,6 +7,7 @@ init/init.context.lua
 system/system.util.lua
 system/system.print.lua
 system/system.input.lua
+system/system.focus.lua
 system/system.ui.lua
 audio/audio.manager.lua
 audio/audio.songs.lua
@@ -26,6 +27,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.songs.lua

@@ -110,10 +110,10 @@ Songs = {
 
 --- Converts beats to frames.
 --- @within Songs
--- @param beat number The beat number.
+--- @param beat number The beat number.
--- @param bpm number Beats per minute.
+--- @param bpm number Beats per minute.
--- @param[opt] fps number Frames per second (default: 60).
+--- @param[opt] fps number Frames per second (default: 60).
--- @return number The corresponding frame number.
+--- @return number The corresponding frame number.
 function frame_from_beat(beat, bpm, fps)
   fps = fps or 60
   local seconds_per_beat = 60 / bpm
@@ -123,10 +123,15 @@ end
 
 --- Converts beat notation to frame pattern.
 --- @within Songs
--- @param beats table A table of beat data, e.g., {{1, "left"}, {2, "down"}}.
+--- @param beats table A table of beat data, e.g., {{1, "left"}, {2, "down"}}.
--- @param bpm number Beats per minute.
+--- @param beats.1 number The beat number.
--- @param[opt] fps number Frames per second (default: 60).
+--- @param beats.2 string Arrow direction ("left", "down", "up", or "right").
--- @return table The generated pattern.
+--- @param bpm number Beats per minute.
+--- @param[opt] fps number Frames per second (default: 60).
+--- @return result table The generated pattern or nil. </br>
+--- Fields: </br>
+--- * frame (number) The frame number when the arrow should spawn.<br/>
+--- * dir (string) Arrow direction ("left", "down", "up", or "right").<br/>
 function beats_to_pattern(beats, bpm, fps)
   fps = fps or 60
   local pattern = {}

inc/decision/decision.manager.lua

@@ -3,7 +3,11 @@ local _decisions = {}
 
 --- Registers a decision definition.
 --- @within Decision
--- @param decision table The decision data table.
+--- @param decision table The decision data table.
+--- @param decision.id string Unique decision identifier.
+--- @param decision.label string Display text for the decision.
+--- @param[opt] decision.condition function Returns true if decision is available. Defaults to always true.
+--- @param[opt] decision.handle function Called when the decision is selected. Defaults to noop.
 function Decision.register(decision)
   if not decision or not decision.id then
     PopupWindow.show({"Error: Invalid decision object registered (missing id)!"})
@@ -28,23 +32,39 @@ end
 
 --- Gets a decision by ID.
 --- @within Decision
--- @param id string The ID of the decision.
+--- @param id string The ID of the decision.
--- @return table The decision table or nil.
+--- @return table|nil result The decision table or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique decision identifier.<br/>
+--- * label (string) Display text for the decision.<br/>
+--- * condition (function) Returns true if decision is available.<br/>
+--- * handle (function) Called when the decision is selected.
 function Decision.get_by_id(id)
   return _decisions[id]
 end
 
 --- Gets all registered decisions.
 --- @within Decision
--- @return table A table of all registered decisions.
+--- @return result table A table of all registered decisions, indexed by their IDs. </br>
+--- Fields: </br>
+--- * id (string) Unique decision identifier.<br/>
+--- * label (string) Display text for the decision.<br/>
+--- * condition (function) Returns true if decision is available.<br/>
+--- * handle (function) Called when the decision is selected.
 function Decision.get_all()
   return _decisions
 end
 
 --- Gets decision objects based on a screen's data.
 --- @within Decision
--- @param screen_data table The data for the screen, containing a 'decisions' field (list of decision IDs).
+--- @param screen_data table The data for the screen.
--- @return table A table containing decision objects relevant to the screen.
+--- @param screen_data.decisions table Array of decision ID strings.
+--- @return result table An array of decision objects relevant to the screen or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique decision identifier.<br/>
+--- * label (string) Display text for the decision.<br/>
+--- * condition (function) Returns true if decision is available.<br/>
+--- * handle (function) Called when the decision is selected.<br/>
 function Decision.get_for_screen(screen_data)
   if not screen_data or not screen_data.decisions then
     return {}
@@ -62,8 +82,13 @@ end
 
 --- Filters a list of decision objects based on their condition function.
 --- @within Decision
--- @param decisions_list table A table of decision objects.
+--- @param decisions_list table A table of decision objects.
--- @return table A new table containing only the decisions for which condition() is true.
+--- @return result table An array of decisions for which condition() is true or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique decision identifier.<br/>
+--- * label (string) Display text for the decision.<br/>
+--- * condition (function) Returns true if decision is available.<br/>
+--- * handle (function) Called when the decision is selected.<br/>
 function Decision.filter_available(decisions_list)
   local available = {}
   for _, decision in ipairs(decisions_list) do

inc/decision/decision.play_button_mash.lua

@@ -1,5 +1,12 @@
 Decision.register({
   id = "play_button_mash",
   label = "Play Button Mash",
-  handle = function() Meter.hide() MinigameButtonMashWindow.start("game") end,
+  handle = function()
+    Meter.hide()
+    MinigameButtonMashWindow.start("game", {
+      focus_center_x = Config.screen.width / 2,
+      focus_center_y = Config.screen.height / 2,
+      focus_initial_radius = 0,
+    })
+  end,
 })

inc/decision/decision.play_rhythm.lua

@@ -1,5 +1,12 @@
 Decision.register({
   id = "play_rhythm",
   label = "Play Rhythm Game",
-  handle = function() Meter.hide() MinigameRhythmWindow.start("game") end,
+  handle = function()
+    Meter.hide()
+    MinigameRhythmWindow.start("game", {
+      focus_center_x = Config.screen.width / 2,
+      focus_center_y = Config.screen.height / 2,
+      focus_initial_radius = 0,
+    })
+  end,
 })

inc/init/init.config.lua

@@ -13,7 +13,7 @@ function Config.initial_data()
       light_grey = 13,
       dark_grey = 14,
       red = 0,
-      green = 7,
+      light_blue = 7,
       blue = 9,
       white = 12,
       item = 12,

inc/init/init.context.lua

@@ -8,7 +8,18 @@ Context = {}
 
 --- Gets initial data for Context.
 --- @within Context
--- @return table Initial context data.
+--- @return result table Initial context data or nil. </br>
+--- Fields: </br>
+--- * current_menu_item (number) Index of the currently selected menu item.<br/>
+--- * splash_timer (number) Remaining frames for the splash screen timer.<br/>
+--- * popup (table) Popup window state. Contains: `show` (boolean) whether popup is visible, `content` (table) array of strings to display.<br/>
+--- * game_in_progress (boolean) Whether a game is currently active.<br/>
+--- * minigame_ddr (table) DDR minigame state (see Minigame.get_default_ddr).<br/>
+--- * 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/>
+--- * stat_screen_active (boolean) Whether the stat screen overlay is currently shown.<br/>
+--- * game (table) Current game progress state. Contains: `current_screen` (string) active screen ID, `current_situation` (string|nil) active situation ID.<br/>
 function Context.initial_data()
   return {
     current_menu_item = 1,
@@ -18,6 +29,7 @@ function Context.initial_data()
       content = {}
     },
     game_in_progress = false,
+    stat_screen_active = false,
     minigame_ddr = Minigame.get_default_ddr(),
     minigame_button_mash = Minigame.get_default_button_mash(),
     minigame_rhythm = Minigame.get_default_rhythm(),

inc/init/init.meter.lua

@@ -1,21 +1,46 @@
 --- @section Meter
 local METER_MAX = 1000
 local METER_DEFAULT = 500
-local METER_DECAY_PER_FRAME = 0.02
 local METER_GAIN_PER_CHORE = 100
 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 table A table of initial meter values.
+--- @return result table Initial meter values. </br>
+--- Fields: </br>
+--- * ism (number) Initial ISM meter value.<br/>
+--- * wpm (number) Initial WPM meter value.<br/>
+--- * bm (number) Initial BM meter value.<br/>
+--- * combo (number) Current combo count.<br/>
+--- * combo_timer (number) Frames since last combo action.<br/>
+--- * hidden (boolean) Whether meters are hidden.<br/>
+--- * timer_progress (number) Clock timer revolution progress (0 to 1).
 function Meter.get_initial()
   return {
     ism = METER_DEFAULT,
@@ -24,6 +49,7 @@ function Meter.get_initial()
     combo = 0,
     combo_timer = 0,
     hidden = false,
+    timer_progress = 0,
   }
 end
 
@@ -41,14 +67,14 @@ end
 
 --- Gets max meter value.
 --- @within Meter
--- @return number The maximum meter value.
+--- @return number The maximum meter value.
 function Meter.get_max()
   return METER_MAX
 end
 
 --- Gets combo multiplier.
 --- @within Meter
--- @return number The current combo multiplier.
+--- @return number The current combo multiplier.
 function Meter.get_combo_multiplier()
   if not Context or not Context.meters then return 1 end
   local combo = Context.meters.combo
@@ -61,22 +87,29 @@ end
 function Meter.update()
   if not Context or not Context.game_in_progress or not Context.meters then return end
   local m = Context.meters
-  m.ism = math.max(0, m.ism - METER_DECAY_PER_FRAME)
+  local in_minigame = string.find(Window.get_current_id(), "^minigame_") ~= nil
-  m.wpm = math.max(0, m.wpm - METER_DECAY_PER_FRAME)
+  if not in_minigame then
-  m.bm = math.max(0, m.bm - METER_DECAY_PER_FRAME)
+    if m.combo > 0 then
-  if m.combo > 0 then
+      m.combo_timer = m.combo_timer + 1
-    m.combo_timer = m.combo_timer + 1
+      if m.combo_timer >= COMBO_TIMEOUT_FRAMES then
-    if m.combo_timer >= COMBO_TIMEOUT_FRAMES then
+        m.combo = 0
-      m.combo = 0
+        m.combo_timer = 0
-      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
 
 --- Adds amount to a meter.
 --- @within Meter
--- @param key string The meter key (e.g., "wpm", "ism", "bm").
+--- @param key string The meter key (e.g., "wpm", "ism", "bm").
--- @param amount number The amount to add.
+--- @param amount number The amount to add.
 function Meter.add(key, amount)
   if not Context or not Context.meters then return end
   local m = Context.meters
@@ -85,6 +118,13 @@ function Meter.add(key, amount)
   end
 end
 
+--- Gets the timer decay as a percentage of the max meter value.
+--- @within Meter
+--- @return number The decay percentage per revolution (e.g. 2 means -2%).
+function Meter.get_timer_decay_percentage()
+  return math.floor(meter_timer_decay_per_revolution / METER_MAX * 100)
+end
+
 --- Called on minigame completion.
 --- @within Meter
 function Meter.on_minigame_complete()

inc/init/init.minigame.lua

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

inc/init/init.module.lua

@@ -11,3 +11,4 @@ Print = {}
 Input = {}
 Sprite = {}
 Audio = {}
+Focus = {}

inc/map/map.manager.lua

@@ -6,7 +6,15 @@ local _maps = {}
 
 --- Gets all registered maps as an array.
 --- @within Map
--- @return table An array of registered map data.
+--- @return result table An array of registered map data. </br>
+--- Fields: </br>
+--- * id (string) Unique map identifier.<br/>
+--- * from_x (number) Source tile X coordinate in the map sheet.<br/>
+--- * from_y (number) Source tile Y coordinate in the map sheet.<br/>
+--- * width (number) Width in tiles.<br/>
+--- * height (number) Height in tiles.<br/>
+--- * to_x (number) Destination X coordinate on screen.<br/>
+--- * to_y (number) Destination Y coordinate on screen.<br/>
 function Map.get_maps_array()
   local maps_array = {}
   for _, map_data in pairs(_maps) do
@@ -17,7 +25,14 @@ end
 
 --- Registers a map definition.
 --- @within Map
--- @param map_data table The map data table.
+--- @param map_data table The map data table.
+--- @param map_data.id string Unique map identifier.<br/>
+--- @param map_data.from_x number Source tile X coordinate in the map sheet.<br/>
+--- @param map_data.from_y number Source tile Y coordinate in the map sheet.<br/>
+--- @param map_data.width number Width in tiles.<br/>
+--- @param map_data.height number Height in tiles.<br/>
+--- @param map_data.to_x number Destination X coordinate on screen.<br/>
+--- @param map_data.to_y number Destination Y coordinate on screen.<br/>
 function Map.register(map_data)
   if _maps[map_data.id] then
     trace("Warning: Overwriting map with id: " .. map_data.id)
@@ -27,15 +42,23 @@ end
 
 --- Gets a map by ID.
 --- @within Map
--- @param map_id string The ID of the map.
+--- @param map_id string The ID of the map.
--- @return table The map data table or nil.
+--- @return result table The map data table or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique map identifier.<br/>
+--- * from_x (number) Source tile X coordinate in the map sheet.<br/>
+--- * from_y (number) Source tile Y coordinate in the map sheet.<br/>
+--- * width (number) Width in tiles.<br/>
+--- * height (number) Height in tiles.<br/>
+--- * to_x (number) Destination X coordinate on screen.<br/>
+--- * to_y (number) Destination Y coordinate on screen.<br/>
 function Map.get_by_id(map_id)
   return _maps[map_id]
 end
 
 --- Draws a map.
 --- @within Map
--- @param map_id string The ID of the map to draw.
+--- @param map_id string The ID of the map to draw.
 function Map.draw(map_id)
   local map_data = Map.get_by_id(map_id)
   if not map_data then

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

@@ -3,7 +3,15 @@ local _screens = {}
 
 --- Registers a screen definition.
 --- @within Screen
--- @param screen_data table The screen data table.
+--- @param screen_data table The screen data table.
+--- @param screen_data.id string Unique screen identifier.
+--- @param screen_data.name string Display name of the screen.
+--- @param screen_data.decisions table Array of decision ID strings available on this screen.
+--- @param screen_data.background string Map ID used as background.
+--- @param[opt] screen_data.situations table Array of situation ID strings. Defaults to {}.
+--- @param[opt] screen_data.init function Called when the screen is entered. Defaults to noop.
+--- @param[opt] screen_data.update function Called each frame while screen is active. Defaults to noop.
+--- @param[opt] screen_data.draw function Called after the focus overlay to draw screen-specific overlays. Defaults to noop.
 function Screen.register(screen_data)
   if _screens[screen_data.id] then
     trace("Warning: Overwriting screen with id: " .. screen_data.id)
@@ -17,20 +25,39 @@ function Screen.register(screen_data)
   if not screen_data.update then
     screen_data.update = function() end
   end
+  if not screen_data.draw then
+    screen_data.draw = function() end
+  end
   _screens[screen_data.id] = screen_data
 end
 
 --- Gets a screen by ID.
 --- @within Screen
--- @param screen_id string The ID of the screen.
+--- @param screen_id string The ID of the screen.
--- @return table The screen table or nil.
+--- @return table|nil screen The screen table or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique screen identifier.<br/>
+--- * name (string) Display name.<br/>
+--- * decisions (table) Array of decision ID strings.<br/>
+--- * background (string) Map ID used as background.<br/>
+--- * situations (table) Array of situation ID strings.<br/>
+--- * init (function) Called when the screen is entered.<br/>
+--- * update (function) Called each frame while screen is active.
 function Screen.get_by_id(screen_id)
   return _screens[screen_id]
 end
 
 --- Gets all registered screens.
 --- @within Screen
--- @return table A table containing all registered screen data, indexed by their IDs.
+--- @return result table A table containing all registered screen data, indexed by their IDs or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique screen identifier.<br/>
+--- * name (string) Display name of the screen.<br/>
+--- * decisions (table) Array of decision ID strings available on this screen.<br/>
+--- * background (string) Map ID used as background.<br/>
+--- * situations (table) Array of situation ID strings.<br/>
+--- * init (function) Called when the screen is entered.<br/>
+--- * update (function) Called each frame while screen is active.<br/>
 function Screen.get_all()
   return _screens
 end

inc/screen/screen.office.lua

@@ -11,4 +11,5 @@ Screen.register({
   situations = {
     "drink_coffee",
   },
+  background = "office"
 })

inc/screen/screen.toilet.lua

@@ -3,5 +3,74 @@ Screen.register({
   name = "Toilet",
   decisions = {
     "go_to_home",
-  }
+  },
+  background = "bedroom",
+  init = function()
+    Context.stat_screen_active = true
+    Meter.hide()
+    local cx = Config.screen.width * 0.75
+    local cy = Config.screen.height * 0.75
+    Focus.start_driven(cx, cy)
+    Focus.set_percentage(0.15)
+  end,
+  update = function()
+    if not Context.stat_screen_active then return end
+    if Input.select() or Input.player_interact() then
+      Focus.stop()
+      Context.stat_screen_active = false
+      Meter.show()
+    end
+  end,
+  draw = function()
+    if not Context.stat_screen_active then return end
+
+    local sw = Config.screen.width
+    local cx = sw / 2
+    local bar_w = math.floor(sw * 0.75)
+    local bar_x = math.floor((sw - bar_w) / 2)
+    local bar_h = 4
+
+    -- TODO: Add day counter
+    Print.text_center("day 1", cx, 10, Config.colors.white)
+
+    local narrative = "reflecting on my past and present\n...\nboth eventually flushed."
+    local wrapped = UI.word_wrap(narrative, 38)
+    local text_y = 24
+    for _, line in ipairs(wrapped) do
+      Print.text_center(line, cx, text_y, Config.colors.light_grey)
+      text_y = text_y + 8
+    end
+
+    local m = Context.meters
+    local max_val = Meter.get_max()
+    local decay_pct = Meter.get_timer_decay_percentage()
+    local decay_text = string.format("-%d%%", decay_pct)
+    local combo_mult = Meter.get_combo_multiplier()
+    local combo_pct = math.floor((combo_mult - 1) * 100)
+    local mult_text = string.format("+%d%%", combo_pct)
+    local meter_start_y = text_y + 10
+
+    local meter_list = {
+      { key = "wpm", label = "Work Productivity Meter" },
+      { key = "ism", label = "Impostor Syndrome Meter" },
+      { key = "bm",  label = "Burnout Meter" },
+    }
+
+    for i, meter in ipairs(meter_list) do
+      local y = meter_start_y + (i - 1) * 20
+
+      Print.text_center(meter.label, cx, y, Config.colors.white)
+
+      local bar_y = y + 8
+      local fill_w = math.max(0, math.floor((m[meter.key] / max_val) * 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, Config.colors.blue)
+      end
+
+      local decay_w = print(decay_text, 0, -6, 0, false, 1)
+      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
+  end,
 })

inc/screen/screen.walking_to_home.lua

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

inc/screen/screen.walking_to_office.lua

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

inc/situation/situation.manager.lua

@@ -3,7 +3,11 @@ local _situations = {}
 
 --- Registers a situation definition.
 --- @within Situation
--- @param situation table The situation data table.
+--- @param situation table The situation data table.
+--- @param situation.id string Unique situation identifier.<br/>
+--- @param[opt] situation.screen_id string ID of the screen this situation belongs to.<br/>
+--- @param[opt] situation.handle function Called when the situation is applied. Defaults to noop.<br/>
+--- @param[opt] situation.update function Called each frame while situation is active. Defaults to noop.<br/>
 function Situation.register(situation)
   if not situation or not situation.id then
     PopupWindow.show({"Error: Invalid situation object registered (missing id)!"})
@@ -23,16 +27,26 @@ end
 
 --- Gets a situation by ID.
 --- @within Situation
--- @param id string The situation ID.
+--- @param id string The situation ID.
--- @return table The situation table or nil.
+--- @return result table The situation table or nil. </br>
+--- Fields: </br>
+--- * id (string) Unique situation identifier.<br/>
+--- * screen_id (string) ID of the screen this situation belongs to.<br/>
+--- * handle (function) Called when the situation is applied.<br/>
+--- * update (function) Called each frame while situation is active.<br/>
 function Situation.get_by_id(id)
   return _situations[id]
 end
 
 --- Gets all registered situations, optionally filtered by screen ID.
 --- @within Situation
--- @param screen_id string Optional. If provided, returns situations associated with this screen ID.
+--- @param screen_id string Optional. If provided, returns situations associated with this screen ID.
--- @return table A table containing all registered situation data, indexed by their IDs, or filtered by screen_id.
+--- @return result table A table containing all registered situation data, indexed by their IDs, or an array filtered by screen_id. </br>
+--- Fields: </br>
+--- * id (string) Unique situation identifier.<br/>
+--- * screen_id (string) ID of the screen this situation belongs to.<br/>
+--- * handle (function) Called when the situation is applied.<br/>
+--- * update (function) Called each frame while situation is active.<br/>
 function Situation.get_all(screen_id)
   if screen_id then
     local filtered_situations = {}
@@ -48,9 +62,9 @@ end
 
 --- Applies a situation, checking screen compatibility and returning the new situation ID if successful.
 --- @within Situation
--- @param id string The situation ID to apply.
+--- @param id string The situation ID to apply.
--- @param current_screen_id string The ID of the currently active screen.
+--- @param current_screen_id string The ID of the currently active screen.
--- @return string|nil The ID of the applied situation if successful, otherwise nil.
+--- @return string|nil The ID of the applied situation if successful, otherwise nil.
 function Situation.apply(id, current_screen_id)
   local situation = Situation.get_by_id(id)
   local screen = Screen.get_by_id(current_screen_id)

inc/sprite/sprite.manager.lua

@@ -4,7 +4,15 @@ local _active_sprites = {}
 
 --- Registers a sprite definition.
 --- @within Sprite
--- @param sprite_data table A table containing the sprite definition.
+--- @param sprite_data table A table containing the sprite definition.
+--- @param sprite_data.id string Unique sprite identifier.<br/>
+--- @param[opt] sprite_data.s number Sprite index for single-sprite mode.<br/>
+--- @param[opt] sprite_data.colorkey number Default color index for transparency.<br/>
+--- @param[opt] sprite_data.scale number Default scaling factor.<br/>
+--- @param[opt] sprite_data.flip_x number Set to 1 to flip horizontally by default.<br/>
+--- @param[opt] sprite_data.flip_y number Set to 1 to flip vertically by default.<br/>
+--- @param[opt] sprite_data.rot number Default rotation in degrees.<br/>
+--- @param[opt] sprite_data.sprites table Array of sub-sprite tables for composite sprites. Each entry has: `s` (number) sprite index, `x_offset` (number) horizontal offset, `y_offset` (number) vertical offset, and optional `colorkey`, `scale`, `flip_x`, `flip_y`, `rot` overrides.<br/>
 function Sprite.register(sprite_data)
   if not sprite_data or not sprite_data.id then
     trace("Error: Invalid sprite object registered (missing id)!")
@@ -18,14 +26,14 @@ end
 
 --- Schedules a sprite for drawing.
 --- @within Sprite
--- @param id string The unique identifier of the sprite.
+--- @param id string The unique identifier of the sprite.<br/>
--- @param x number The x-coordinate.
+--- @param x number The x-coordinate.<br/>
--- @param y number The y-coordinate.
+--- @param y number The y-coordinate.<br/>
--- @param[opt] colorkey number The color index for transparency.
+--- @param[opt] colorkey number The color index for transparency.<br/>
--- @param[opt] scale number The scaling factor.
+--- @param[opt] scale number The scaling factor.<br/>
--- @param[opt] flip_x number Set to 1 to flip horizontally.
+--- @param[opt] flip_x number Set to 1 to flip horizontally.<br/>
--- @param[opt] flip_y number Set to 1 to flip vertically.
+--- @param[opt] flip_y number Set to 1 to flip vertically.<br/>
--- @param[opt] rot number The rotation in degrees.
+--- @param[opt] rot number The rotation in degrees.<br/>
 function Sprite.show(id, x, y, colorkey, scale, flip_x, flip_y, rot)
   if not _sprites[id] then
     trace("Error: Attempted to show non-registered sprite with id: " .. id)
@@ -46,7 +54,7 @@ end
 
 --- Hides a displayed sprite.
 --- @within Sprite
--- @param id string The unique identifier of the sprite.
+--- @param id string The unique identifier of the sprite.<br/>
 function Sprite.hide(id)
   _active_sprites[id] = nil
 end

inc/system/system.focus.lua

@@ -0,0 +1,166 @@
+--- @section Focus
+
+local FOCUS_DEFAULT_SPEED = 5
+
+local active = false
+local closing = false
+local driven = false
+local center_x = 0
+local center_y = 0
+local radius = 0
+local speed = FOCUS_DEFAULT_SPEED
+local on_complete = nil
+local driven_initial_r = 0
+local driven_max_r = 0
+
+local function max_radius(cx, cy)
+  local dx = math.max(cx, Config.screen.width - cx)
+  local dy = math.max(cy, Config.screen.height - cy)
+  return math.sqrt(dx * dx + dy * dy)
+end
+
+--- Starts a focus overlay that reveals content through an expanding circle.
+--- @within Focus
+--- @param cx number The x-coordinate of the circle center.
+--- @param cy number The y-coordinate of the circle center.
+--- @param[opt] params table Optional parameters: `speed` (number) expansion rate in pixels/frame, `initial_radius` (number) starting radius in pixels (default 0), `on_complete` (function) callback when overlay disperses.
+function Focus.start(cx, cy, params)
+  params = params or {}
+  active = true
+  closing = false
+  driven = false
+  center_x = cx
+  center_y = cy
+  radius = params.initial_radius or 0
+  speed = params.speed or FOCUS_DEFAULT_SPEED
+  on_complete = params.on_complete
+end
+
+--- Starts a closing focus overlay that hides content by shrinking the visible circle.
+--- @within Focus
+--- @param cx number The x-coordinate of the circle center.
+--- @param cy number The y-coordinate of the circle center.
+--- @param[opt] params table Optional parameters: `speed` (number) shrink rate in pixels/frame, `on_complete` (function) callback when screen is fully covered.
+function Focus.close(cx, cy, params)
+  params = params or {}
+  active = true
+  closing = true
+  driven = false
+  center_x = cx
+  center_y = cy
+  radius = max_radius(cx, cy)
+  speed = params.speed or FOCUS_DEFAULT_SPEED
+  on_complete = params.on_complete
+end
+
+--- Starts a driven focus overlay whose radius is controlled externally via Focus.set_percentage().
+--- The radius maps linearly from initial_radius (at 0%) to the screen corner distance (at 100%).
+--- @within Focus
+--- @param cx number The x-coordinate of the circle center.
+--- @param cy number The y-coordinate of the circle center.
+--- @param[opt] params table Optional parameters: `initial_radius` (number) radius at 0% (default 0).
+function Focus.start_driven(cx, cy, params)
+  params = params or {}
+  active = true
+  closing = false
+  driven = true
+  center_x = cx
+  center_y = cy
+  driven_initial_r = params.initial_radius or 0
+  driven_max_r = max_radius(cx, cy)
+  radius = driven_initial_r
+  on_complete = nil
+end
+
+--- Sets the visible radius as a percentage of the full screen extent.
+--- Only has effect when the overlay is in driven mode (started via Focus.start_driven).
+--- @within Focus
+--- @param pct number A value from 0 to 1 (0 = initial_radius, 1 = full screen).
+function Focus.set_percentage(pct)
+  if not driven then return end
+  radius = driven_initial_r + pct * (driven_max_r - driven_initial_r)
+end
+
+--- Checks whether the focus overlay is currently active.
+--- @within Focus
+--- @return boolean Whether the focus overlay is active.
+function Focus.is_active()
+  return active
+end
+
+--- Stops the focus overlay immediately.
+--- @within Focus
+function Focus.stop()
+  active = false
+  closing = false
+  driven = false
+  radius = 0
+  on_complete = nil
+end
+
+--- Updates the focus overlay animation. No-op in driven mode.
+--- @within Focus
+function Focus.update()
+  if not active then return end
+  if driven then return end
+
+  if closing then
+    radius = radius - speed
+    if radius <= 0 then
+      local cb = on_complete
+      Focus.stop()
+      if cb then cb() end
+    end
+  else
+    radius = radius + speed
+    if radius >= max_radius(center_x, center_y) then
+      local cb = on_complete
+      Focus.stop()
+      if cb then cb() end
+    end
+  end
+end
+
+--- Draws the focus overlay (black screen with circular cutout).
+--- Must be called after all other drawing to appear on top of every visual layer.
+--- @within Focus
+function Focus.draw()
+  if not active then return end
+
+  local cx = center_x
+  local cy = center_y
+  local r = radius
+  local w = Config.screen.width
+  local h = Config.screen.height
+  local color = Config.colors.black
+
+  if closing and r <= 0 then
+    rect(0, 0, w, h, color)
+    return
+  end
+
+  local top = math.max(0, math.floor(cy - r))
+  local bottom = math.min(h - 1, math.ceil(cy + r))
+
+  if top > 0 then
+    rect(0, 0, w, top, color)
+  end
+
+  if bottom < h - 1 then
+    rect(0, bottom + 1, w, h - bottom - 1, color)
+  end
+
+  for y = top, bottom do
+    local dy = y - cy
+    local half_w = math.sqrt(math.max(0, r * r - dy * dy))
+    local left = math.floor(cx - half_w)
+    local right = math.ceil(cx + half_w)
+
+    if left > 0 then
+      rect(0, y, left, 1, color)
+    end
+    if right < w then
+      rect(right, y, w - right, 1, color)
+    end
+  end
+end

inc/system/system.main.lua

@@ -3,6 +3,7 @@ local initialized_game = false
 
 --- Initializes game state.
 --- @within Main
+--- @return boolean initialized_game True if game has been initialized, false otherwise.
 local function init_game()
   if initialized_game then return end
   Context.reset()
@@ -23,5 +24,6 @@ function TIC()
   Meter.update()
   if Context.game_in_progress then
     UI.draw_meters()
+    UI.draw_timer()
   end
 end

inc/system/system.print.lua

@@ -1,13 +1,11 @@
---- @section Print
-
 --- Prints text with shadow.
 --- @within Print
--- @param text string The text to print.
+--- @param text string The text to print.<br/>
--- @param x number The x-coordinate.
+--- @param x number The x-coordinate.<br/>
--- @param y number The y-coordinate.
+--- @param y number The y-coordinate.<br/>
--- @param color number The color of the text.
+--- @param color number The color of the text.<br/>
--- @param[opt] fixed boolean If true, uses fixed-width font.
+--- @param[opt] fixed boolean If true, uses fixed-width font.<br/>
--- @param[opt] scale number The scaling factor.
+--- @param[opt] scale number The scaling factor.<br/>
 function Print.text(text, x, y, color, fixed, scale)
   local shadow_color = Config.colors.black
   if color == shadow_color then shadow_color = Config.colors.light_grey end
@@ -18,12 +16,12 @@ end
 
 --- Prints centered text with shadow.
 --- @within Print
--- @param text string The text to print.
+--- @param text string The text to print.<br/>
--- @param x number The x-coordinate for centering.
+--- @param x number The x-coordinate for centering.<br/>
--- @param y number The y-coordinate.
+--- @param y number The y-coordinate.<br/>
--- @param color number The color of the text.
+--- @param color number The color of the text.<br/>
--- @param[opt] fixed boolean If true, uses fixed-width font.
+--- @param[opt] fixed boolean If true, uses fixed-width font.<br/>
--- @param[opt] scale number The scaling factor.
+--- @param[opt] scale number The scaling factor.<br/>
 function Print.text_center(text, x, y, color, fixed, scale)
   scale = scale or 1
   local text_width = print(text, 0, -6, 0, fixed, scale)

inc/system/system.ui.lua

@@ -2,10 +2,10 @@
 
 --- Draws the top bar.
 --- @within UI
--- @param title string The title text to display.
+--- @param title string The title text to display.<br/>
 function UI.draw_top_bar(title)
   rect(0, 0, Config.screen.width, 10, Config.colors.dark_grey)
-  Print.text(title, 3, 2, Config.colors.green)
+  Print.text(title, 3, 2, Config.colors.light_blue)
 end
 
 --- Draws dialog window.
@@ -16,25 +16,25 @@ end
 
 --- Draws a menu.
 --- @within UI
--- @param items table A table of menu items.
+--- @param items table A table of menu items.<br/>
--- @param selected_item number The index of the currently selected item.
+--- @param selected_item number The index of the currently selected item.<br/>
--- @param x number The x-coordinate for the menu.
+--- @param x number The x-coordinate for the menu.<br/>
--- @param y number The y-coordinate for the menu.
+--- @param y number The y-coordinate for the menu.<br/>
 function UI.draw_menu(items, selected_item, x, y)
   for i, item in ipairs(items) do
     local current_y = y + (i-1)*10
     if i == selected_item then
-      Print.text(">", x - 8, current_y, Config.colors.green)
+      Print.text(">", x - 8, current_y, Config.colors.light_blue)
     end
-    Print.text(item.label, x, current_y, Config.colors.green)
+    Print.text(item.label, x, current_y, Config.colors.light_blue)
   end
 end
 
 --- Updates menu selection.
 --- @within UI
--- @param items table A table of menu items.
+--- @param items table A table of menu items.<br/>
--- @param selected_item number The current index of the selected item.
+--- @param selected_item number The current index of the selected item.<br/>
--- @return number The updated index of the selected item.
+--- @return number selected_item The updated index of the selected item.
 function UI.update_menu(items, selected_item)
   if Input.up() then
     Audio.sfx_beep()
@@ -54,9 +54,9 @@ end
 
 --- Wraps text.
 --- @within UI
--- @param text string The text to wrap.
+--- @param text string The text to wrap.<br/>
--- @param max_chars_per_line number The maximum characters per line.
+--- @param max_chars_per_line number The maximum characters per line.<br/>
--- @return table A table of wrapped lines.
+--- @return result table A table of wrapped lines.
 function UI.word_wrap(text, max_chars_per_line)
     if text == nil then return {""} end
     local lines = {}
@@ -88,14 +88,23 @@ end
 
 --- Creates a numeric stepper.
 --- @within UI
--- @param label string The label for the stepper.
+--- @param label string The label for the stepper.<br/>
--- @param value_getter function Function to get the current value.
+--- @param value_getter function Function to get the current value.<br/>
--- @param value_setter function Function to set the current value.
+--- @param value_setter function Function to set the current value.<br/>
--- @param min number The minimum value.
+--- @param min number The minimum value.<br/>
--- @param max number The maximum value.
+--- @param max number The maximum value.<br/>
--- @param step number The step increment.
+--- @param step number The step increment.<br/>
--- @param[opt] format string The format string for displaying the value.
+--- @param[opt] format string The format string for displaying the value.<br/>
--- @return table A numeric stepper control definition.
+--- @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,
@@ -111,9 +120,13 @@ end
 
 --- Creates an action item.
 --- @within UI
--- @param label string The label for the action item.
+--- @param label string The label for the action item.<br/>
--- @param action function The function to execute when the item is selected.
+--- @param action function The function to execute when the item is selected.<br/>
--- @return table An action item control definition.
+--- @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,
@@ -124,8 +137,8 @@ end
 
 --- Draws decision selector.
 --- @within UI
--- @param decisions table A table of decision items.
+--- @param decisions table A table of decision items.<br/>
--- @param selected_decision_index number The index of the selected decision.
+--- @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
@@ -136,12 +149,66 @@ function UI.draw_decision_selector(decisions, selected_decision_index)
     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.green)
+    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.green)
+    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()
@@ -178,9 +245,9 @@ end
 
 --- Updates decision selector.
 --- @within UI
--- @param decisions table A table of decision items.
+--- @param decisions table A table of decision items.<br/>
--- @param selected_decision_index number The current index of the selected decision.
+--- @param selected_decision_index number The current index of the selected decision.<br/>
--- @return number The updated index of the selected decision.
+--- @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()

inc/system/system.util.lua

@@ -3,16 +3,16 @@
 
 --- Safely wraps an index for an array.
 --- @within Util
--- @param array table The array to index.
+--- @param array table The array to index.
--- @param index number The desired index (can be out of bounds).
+--- @param index number The desired index (can be out of bounds).
--- @return number The wrapped index within the array's bounds.
+--- @return number index The wrapped index within the array's bounds.
 function Util.safeindex(array, index)
     return ((index - 1 + #array) % #array) + 1
 end
 
 --- Navigates to a screen by its ID.
 --- @within Util
--- @param screen_id string The ID of the screen to go to.
+--- @param screen_id string The ID of the screen to go to.<br/>
 function Util.go_to_screen_by_id(screen_id)
   local screen = Screen.get_by_id(screen_id)
   if screen then
@@ -25,8 +25,9 @@ end
 
 --- Checks if a table contains a specific value.
 --- @within Util
--- @param t table The table to check.
+--- @param t table The table to check.
--- @param value any The value to look for.
+--- @param value any The value to look for.<br/>
+--- @return boolean true if the value is found, false otherwise.
 function Util.contains(t, value)
   for i = 1, #t do
     if t[i] == value then

inc/window/window.audiotest.lua

@@ -9,9 +9,12 @@ AudioTestWindow = {
 
 --- Generates menu items for audio test.
 --- @within AudioTestWindow
--- @param list_func table List of audio functions.
+--- @param list_func table List of audio functions.<br/>
--- @param index_func number Current index of selected function.
+--- @param index_func number Current index of selected function.<br/>
--- @return table Generated menu items.
+--- @return result table Generated menu items, an array of menu item tables or nil. </br>
+--- Fields: </br>
+--- * label (string) Display text for the menu item.<br/>
+--- * decision (function) Called when the menu item is selected.<br/>
 function AudioTestWindow.generate_menuitems(list_func, index_func)
     return {
         {
@@ -42,7 +45,7 @@ end
 
 --- Generates list of audio functions.
 --- @within AudioTestWindow
--- @return table A sorted list of audio function names.
+--- @return result table A sorted list of audio function names.
 function AudioTestWindow.generate_listfunc()
     local result = {}
 

inc/window/window.configuration.lua

@@ -30,7 +30,7 @@ function ConfigurationWindow.draw()
   local char_width = 4
   for i, control in ipairs(ConfigurationWindow.controls) do
     local current_y = y_start + (i - 1) * 12
-    local color = Config.colors.green
+    local color = Config.colors.light_blue
     if control.type == "numeric_stepper" then
       local value = control.get()
       local label_text = control.label

inc/window/window.game.lua

@@ -6,17 +6,24 @@ local _selected_decision_index = 1
 --- @within GameWindow
 function GameWindow.draw()
   local screen = Screen.get_by_id(Context.game.current_screen)
-  if screen.background then Map.draw(screen.background) end
+  if screen.background then
+    Map.draw(screen.background)
+  elseif screen.background_color then
+    rect(0, 0, Config.screen.width, Config.screen.height, screen.background_color)
+  end
   UI.draw_top_bar(screen.name)
-  if #_available_decisions > 0 then
+  if not Context.stat_screen_active and #_available_decisions > 0 then
     UI.draw_decision_selector(_available_decisions, _selected_decision_index)
   end
   Sprite.draw()
+  Focus.draw()
+  screen.draw()
 end
 
 --- Updates the game window logic.
 --- @within GameWindow
 function GameWindow.update()
+  Focus.update()
   if Input.menu_back() then
     Window.set_current("menu")
     MenuWindow.refresh_menu_items()
@@ -34,6 +41,8 @@ function GameWindow.update()
     end
   end
 
+  if Context.stat_screen_active then return end
+
   -- Fetch and filter decisions locally
   local all_decisions_for_screen = Decision.get_for_screen(screen)
   _available_decisions = Decision.filter_available(all_decisions_for_screen)
@@ -60,11 +69,13 @@ function GameWindow.update()
       selected_decision.handle()
     end
   end
+
+
 end
 
 --- Sets the active window.
 --- @within GameWindow
--- @param new_state string The ID of the new active window.
+--- @param new_state string The ID of the new active window.</br>
 function GameWindow.set_state(new_state)
   Window.set_current(new_state)
 end

inc/window/window.intro.lua

@@ -18,7 +18,7 @@ on than meets the eye.
 --- @within IntroWindow
 function IntroWindow.draw()
   local x = (Config.screen.width - 132) / 2
-  Print.text(IntroWindow.text, x, IntroWindow.y, Config.colors.green)
+  Print.text(IntroWindow.text, x, IntroWindow.y, Config.colors.light_blue)
 end
 
 --- Updates the intro window logic.

inc/window/window.manager.lua

@@ -3,30 +3,34 @@ local _windows = {}
 
 --- Registers a window table.
 --- @within Window
--- @param id string The ID of the window (e.g., "splash", "menu").
+--- @param id string The ID of the window (e.g., "splash", "menu").</br>
--- @param window_table table The actual window module table (e.g., SplashWindow).
+--- @param window_table table The actual window module table (e.g., SplashWindow).</br>
 function Window.register(id, window_table)
   _windows[id] = window_table
 end
 
 --- Retrieves a registered window table by its ID.
 --- @within Window
--- @param id string The ID of the window.
+--- @param id string The ID of the window.
--- @return table The window module table.
+--- @return result table The window module table or nil. </br>
+--- Fields: </br>
+--- * update (function) Called each frame to update window logic.<br/>
+--- * draw (function) Called each frame to draw the window.<br/>
 function Window.get(id)
   return _windows[id]
 end
 
 --- Sets the currently active window.
 --- @within Window
--- @param id string The ID of the window to activate.
+--- @param id string The ID of the window to activate.</br>
 function Window.set_current(id)
   Context.current_window = id
 end
 
 --- Gets the ID of the currently active window.
+--- This function is used by the main game loop to update and draw the active window.
 --- @within Window
--- @return string The ID of the active window.
+--- @return string The ID of the active window.
 function Window.get_current_id()
   return Context.current_window
 end
@@ -34,7 +38,7 @@ end
 --- Gets the handler function for the currently active window.
 -- This function is used by the main game loop to update and draw the active window.
 --- @within Window
--- @return function A function that updates and draws the current window.
+--- @return function A function that updates and draws the current window.
 function Window.get_current_handler()
   local window_table = Window.get(Context.current_window)
   if window_table and window_table.update and window_table.draw then

inc/window/window.minigame.ddr.lua

@@ -2,16 +2,16 @@
 
 --- Initializes DDR minigame state.
 --- @within MinigameDDRWindow
--- @param params table Optional parameters for configuration.
+--- @param params table Optional parameters for configuration.<br/>
 function MinigameDDRWindow.init(params)
   Context.minigame_ddr = Minigame.configure_ddr(params)
 end
 
 --- Starts the DDR minigame.
 --- @within MinigameDDRWindow
--- @param return_window string The window ID to return to after the minigame.
+--- @param return_window string The window ID to return to after the minigame.</br>
--- @param[opt] song_key string The key of the song to play.
+--- @param[opt] song_key string The key of the song to play.</br>
--- @param[opt] params table Optional parameters for minigame configuration.
+--- @param[opt] params table Optional parameters for minigame configuration.</br>
 function MinigameDDRWindow.start(return_window, song_key, params)
   MinigameDDRWindow.init(params)
   Context.minigame_ddr.return_window = return_window or "game"
@@ -46,7 +46,7 @@ end
 
 --- Spawns an arrow in a specific direction.
 --- @within MinigameDDRWindow
--- @param direction string The direction of the arrow ("left", "down", "up", "right").
+--- @param direction string The direction of the arrow ("left", "down", "up", "right").
 local function spawn_arrow_dir(direction)
   local mg = Context.minigame_ddr
   for _, target in ipairs(mg.target_arrows) do
@@ -63,8 +63,8 @@ end
 
 --- Checks if an arrow is hit.
 --- @within MinigameDDRWindow
--- @param arrow table The arrow data.
+--- @param arrow table The arrow data.
--- @return boolean True if the arrow is hit, false otherwise.
+--- @return boolean True if the arrow is hit, false otherwise.
 local function check_hit(arrow)
   local mg = Context.minigame_ddr
   local distance = math.abs(arrow.y - mg.target_y)
@@ -73,8 +73,8 @@ end
 
 --- Checks if an arrow is missed.
 --- @within MinigameDDRWindow
--- @param arrow table The arrow data.
+--- @param arrow table The arrow data.
--- @return boolean True if the arrow is missed, false otherwise.
+--- @return boolean True if the arrow is missed, false otherwise.
 local function check_miss(arrow)
   local mg = Context.minigame_ddr
   return arrow.y > mg.target_y + mg.hit_threshold
@@ -82,10 +82,10 @@ end
 
 --- Draws an arrow.
 --- @within MinigameDDRWindow
--- @param x number The x-coordinate.
+--- @param x number The x-coordinate.
--- @param y number The y-coordinate.
+--- @param y number The y-coordinate.
--- @param direction string The direction of the arrow.
+--- @param direction string The direction of the arrow.
--- @param color number The color of the arrow.
+--- @param color number The color of the arrow.
 local function draw_arrow(x, y, direction, color)
   local size = 12
   local half = size / 2
@@ -219,7 +219,7 @@ function MinigameDDRWindow.draw()
   rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
   local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
   if fill_width > 0 then
-    local bar_color = Config.colors.green
+    local bar_color = Config.colors.light_blue
     if mg.bar_fill > 66 then
       bar_color = Config.colors.item
     elseif mg.bar_fill > 33 then
@@ -232,7 +232,7 @@ function MinigameDDRWindow.draw()
   if mg.target_arrows then
     for _, target in ipairs(mg.target_arrows) do
       local is_pressed = mg.button_pressed_timers[target.dir] and mg.button_pressed_timers[target.dir] > 0
-      local color = is_pressed and Config.colors.green or Config.colors.light_grey
+      local color = is_pressed and Config.colors.light_blue or Config.colors.light_grey
       draw_arrow(target.x, mg.target_y, target.dir, color)
     end
   end
@@ -252,14 +252,14 @@ function MinigameDDRWindow.draw()
       "PATTERN MODE - Frame:" .. mg.frame_counter,
       Config.screen.width / 2,
       debug_y,
-      Config.colors.green
+      Config.colors.light_blue
     )
     if mg.current_song and mg.current_song.pattern then
       Print.text_center(
         "Pattern Len:" .. #mg.current_song.pattern .. " Index:" .. mg.pattern_index,
         Config.screen.width / 2,
         debug_y + 10,
-        Config.colors.green
+        Config.colors.light_blue
       )
     end
   else

inc/window/window.minigame.mash.lua

@@ -1,19 +1,23 @@
---- @section MinigameButtonMashWindow
-
 --- Initializes button mash minigame state.
 --- @within MinigameButtonMashWindow
--- @param params table Optional parameters for configuration.
+--- @param params table Optional parameters for configuration.<br/>
 function MinigameButtonMashWindow.init(params)
   Context.minigame_button_mash = Minigame.configure_button_mash(params)
 end
 
 --- Starts the button mash minigame.
 --- @within MinigameButtonMashWindow
--- @param return_window string The window ID to return to after the minigame.
+--- @param return_window string The window ID to return to after the minigame.<br/>
--- @param[opt] params table Optional parameters for minigame configuration.
+--- @param[opt] params table Optional parameters for minigame configuration.<br/>
 function MinigameButtonMashWindow.start(return_window, params)
   MinigameButtonMashWindow.init(params)
-  Context.minigame_button_mash.return_window = return_window or "game"
+  local mg = Context.minigame_button_mash
+  mg.return_window = return_window or "game"
+  if mg.focus_center_x then
+    Focus.start_driven(mg.focus_center_x, mg.focus_center_y, {
+      initial_radius = mg.focus_initial_radius
+    })
+  end
   Window.set_current("minigame_button_mash")
 end
 
@@ -31,6 +35,7 @@ function MinigameButtonMashWindow.update()
   if mg.bar_fill >= mg.max_fill then
     Meter.on_minigame_complete()
     Meter.show()
+    if mg.focus_center_x then Focus.stop() end
     Window.set_current(mg.return_window)
     return
   end
@@ -42,6 +47,9 @@ function MinigameButtonMashWindow.update()
   if mg.button_pressed_timer > 0 then
     mg.button_pressed_timer = mg.button_pressed_timer - 1
   end
+  if mg.focus_center_x then
+    Focus.set_percentage(mg.bar_fill / mg.max_fill)
+  end
 end
 
 --- Draws button mash minigame.
@@ -51,12 +59,14 @@ function MinigameButtonMashWindow.draw()
   if mg.return_window == "game" then
     GameWindow.draw()
   end
-  rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
+  if not mg.focus_center_x then
+    rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
+  end
   rect(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.light_grey)
   rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
   local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
   if fill_width > 0 then
-    local bar_color = Config.colors.green
+    local bar_color = Config.colors.light_blue
     if mg.bar_fill > 66 then
       bar_color = Config.colors.item
     elseif mg.bar_fill > 33 then
@@ -66,7 +76,7 @@ function MinigameButtonMashWindow.draw()
   end
   local button_color = Config.colors.light_grey
   if mg.button_pressed_timer > 0 then
-    button_color = Config.colors.green
+    button_color = Config.colors.light_blue
   end
   circb(mg.button_x, mg.button_y, mg.button_size, button_color)
   if mg.button_pressed_timer > 0 then

inc/window/window.minigame.rhythm.lua

@@ -2,18 +2,24 @@
 
 --- Initializes rhythm minigame state.
 --- @within MinigameRhythmWindow
--- @param params table Optional parameters for configuration.
+--- @param params table Optional parameters for configuration.<br/>
 function MinigameRhythmWindow.init(params)
   Context.minigame_rhythm = Minigame.configure_rhythm(params)
 end
 
 --- Starts the rhythm minigame.
 --- @within MinigameRhythmWindow
--- @param return_window string The window ID to return to after the minigame.
+--- @param return_window string The window ID to return to after the minigame.<br/>
--- @param[opt] params table Optional parameters for minigame configuration.
+--- @param[opt] params table Optional parameters for minigame configuration.<br/>
 function MinigameRhythmWindow.start(return_window, params)
   MinigameRhythmWindow.init(params)
-  Context.minigame_rhythm.return_window = return_window or "game"
+  local mg = Context.minigame_rhythm
+  mg.return_window = return_window or "game"
+  if mg.focus_center_x then
+    Focus.start_driven(mg.focus_center_x, mg.focus_center_y, {
+      initial_radius = mg.focus_initial_radius
+    })
+  end
   Window.set_current("minigame_rhythm")
 end
 
@@ -53,12 +59,16 @@ function MinigameRhythmWindow.update()
   if mg.score >= mg.max_score then
     Meter.on_minigame_complete()
     Meter.show()
+    if mg.focus_center_x then Focus.stop() end
     Window.set_current(mg.return_window)
     return
   end
   if mg.button_pressed_timer > 0 then
     mg.button_pressed_timer = mg.button_pressed_timer - 1
   end
+  if mg.focus_center_x then
+    Focus.set_percentage(1 - mg.score / mg.max_score)
+  end
 end
 
 --- Draws rhythm minigame.
@@ -68,14 +78,16 @@ function MinigameRhythmWindow.draw()
   if mg.return_window == "game" then
     GameWindow.draw()
   end
-  rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
+  if not mg.focus_center_x then
+    rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
+  end
   rect(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.light_grey)
   rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
   rect(mg.bar_x, mg.bar_y, mg.bar_width, mg.bar_height, Config.colors.dark_grey)
   local target_left = mg.target_center - (mg.target_width / 2)
   local target_x = mg.bar_x + (target_left * mg.bar_width)
   local target_width_pixels = mg.target_width * mg.bar_width
-  rect(target_x, mg.bar_y, target_width_pixels, mg.bar_height, Config.colors.green)
+  rect(target_x, mg.bar_y, target_width_pixels, mg.bar_height, Config.colors.light_blue)
   local line_x = mg.bar_x + (mg.line_position * mg.bar_width)
   rect(line_x - 1, mg.bar_y, 2, mg.bar_height, Config.colors.item)
   local score_text = "SCORE: " .. mg.score .. " / " .. mg.max_score
@@ -88,7 +100,7 @@ function MinigameRhythmWindow.draw()
   )
   local button_color = Config.colors.light_grey
   if mg.button_pressed_timer > 0 then
-    button_color = Config.colors.green
+    button_color = Config.colors.light_blue
   end
   circb(mg.button_x, mg.button_y, mg.button_size, button_color)
   if mg.button_pressed_timer > 0 then

inc/window/window.popup.lua

@@ -9,7 +9,7 @@ local LINE_HEIGHT = 8
 
 --- Displays a popup window.
 --- @within PopupWindow
--- @param content_strings table A table of strings to display in the popup.
+--- @param content_strings table A table of strings to display in the popup.</br>
 function PopupWindow.show(content_strings)
   Context.popup.show = true
   Context.popup.content = content_strings or {}
@@ -39,7 +39,7 @@ end
 function PopupWindow.draw()
   if Context.popup.show then
     rect(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.black)
-    rectb(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.green)
+    rectb(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.light_blue)
 
     local current_y = TEXT_MARGIN_Y
     for _, line in ipairs(Context.popup.content) do
@@ -47,6 +47,6 @@ function PopupWindow.draw()
       current_y = current_y + LINE_HEIGHT
     end
 
-    Print.text("[A] Close", TEXT_MARGIN_X, POPUP_Y + POPUP_HEIGHT - LINE_HEIGHT - 2, Config.colors.green)
+    Print.text("[A] Close", TEXT_MARGIN_X, POPUP_Y + POPUP_HEIGHT - LINE_HEIGHT - 2, Config.colors.light_blue)
   end
 end

inc/window/window.splash.lua

@@ -1,5 +1,3 @@
---- @section SplashWindow
-
 --- Draws the splash window.
 --- @within SplashWindow
 function SplashWindow.draw()