docs

.gitignore

@@ -1,8 +1,4 @@
 .local
 impostor.lua
-impostor.original.lua
 prompts
 docs
-minify.lua
-*.tic
-*.zip

.luacheckrc

@@ -2,12 +2,6 @@
 -- Configuration for luacheck
 
 globals = {
-  "Focus",
-  "Day",
-  "Timer",
-  "Glitch",
-  "Trigger",
-  "Discussion",
   "Util",
   "Decision",
   "Situation",
@@ -17,17 +11,11 @@ globals = {
   "Print",
   "Input",
   "Audio",
-  "AsciiArt",
-  "Ascension",
-  "Config",
   "Context",
-  "Meter",
+  "Meters",
-  "Minigame",
+  "Minigames",
-  "Window",
+  "SplashWindow",
-  "ContinuedWindow",
+  "IntroWindow",
-  "TTGIntroWindow",
-  "BriefIntroWindow",
-  "TitleIntroWindow",
   "MenuWindow",
   "GameWindow",
   "PopupWindow",
@@ -36,9 +24,6 @@ globals = {
   "MinigameButtonMashWindow",
   "MinigameRhythmWindow",
   "MinigameDDRWindow",
-  "MysteriousManScreen",
-  "DiscussionWindow",
-  "EndWindow",
   "mset",
   "mget",
   "btnp",
@@ -52,8 +37,6 @@ globals = {
   "circb",
   "cls",
   "tri",
-  "pix",
-  "line",
   "Songs",
   "frame_from_beat",
   "beats_to_pattern",
@@ -64,8 +47,6 @@ globals = {
   "index_menu",
   "Map",
   "map",
-  "time",
-  "RLE",
 }
 
 

.vscode/settings.json

@@ -14,10 +14,7 @@
     "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",
@@ -30,5 +27,5 @@
   "files.associations": {
     "*.conf": "bitbake",
     "*.inc": "bitbake"
-  },
+  }
 }

.vscode/tasks.json

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

.woodpecker.yml

@@ -5,32 +5,7 @@ steps:
       - 'apk add --no-cache make'
       - 'make ci-version'
 
-  - name: lint
+  - name: build
-    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
@@ -48,12 +23,12 @@ steps:
         from_secret: droparea_ssh_password
     commands:
       - 'apk add --no-cache make openssh-client sshpass'
-      - 'make ci-artifact'
+      - 'make ci-upload'
 
   - name: update
     image: alpine
     environment:
-      UPDATE_SERVER: https://games.teletype.hu
+      UPDATE_SERVER: https://games.vps.teletype.hu
       UPDATE_SECRET:
         from_secret: update_secret_key
     commands:

GEMINI.md

@@ -55,7 +55,7 @@ Based on the analysis of `impostor.lua`, the following regularities and conventi
 
 ---
 
-# Impostor Minigame Documentation
+# Impostor Minigames Documentation
 
 This document provides comprehensive documentation for all three minigames implemented in the Impostor game: Button Mash, Rhythm, and DDR (Dance Dance Revolution).
 
@@ -74,7 +74,7 @@ This document provides comprehensive documentation for all three minigames imple
 
 The Impostor game includes three interactive minigames that can be triggered during gameplay. Each minigame presents a unique challenge that the player must complete to progress. All minigames feature:
 
-- **Overlay rendering** - Minigame render over the current game window
+- **Overlay rendering** - Minigames render over the current game window
 - **Progress tracking** - Visual indicators show completion status
 - **Return mechanism** - Automatic return to the calling window upon completion
 - **Visual feedback** - Button presses and hits are visually indicated

Makefile

@@ -6,13 +6,9 @@ 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,26 +26,20 @@ DROPAREA_HOST ?= vps.teletype.hu
 DROPAREA_PORT ?= 2223
 DROPAREA_TARGET_PATH ?= /home/drop
 DROPAREA_USER ?= drop
-UPDATE_SERVER ?= https://games.teletype.hu
+UPDATE_SERVER ?= https://games.vps.teletype.hu
 
 all: build
 
-build:
+build: $(OUTPUT)
+
+$(OUTPUT): $(SRC) $(ORDER)
 	@rm -f $(OUTPUT)
 	@sed 's/\r$$//' $(ORDER) | while read f; do \
 		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
 		echo "" >> $(OUTPUT); \
 	done
 
-download-minify:
+export: build
-	@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; \
@@ -68,10 +58,10 @@ export: minify
 	@ls -lh $(PROJECT)-$(VERSION).* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true
 
 watch:
-	$(MAKE) build
+	make build
-	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do $(MAKE) build; done
+	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do make build; done
 
-import_assets: build
+import_assets: $(OUTPUT)
 	@TIC_CMD="load $(OUTPUT) &"; \
 	for t in $(ASSET_TYPES); do \
 		for f in $(ASSETS_DIR)/$$t/*.png; do \
@@ -164,13 +154,43 @@ export_assets:
 	@$(call f_export_asset_awk,MAP,$(OUTPUT),$(ASSETS_LUA))
 	@$(call f_export_asset_awk,SFX,$(OUTPUT),$(ASSETS_LUA))
 	@$(call f_export_asset_awk,WAVES,$(OUTPUT),$(ASSETS_LUA))
-	@$(call f_export_asset_awk,PATTERNS,$(OUTPUT),$(ASSETS_LUA))
-	@$(call f_export_asset_awk,TRACKS,$(OUTPUT),$(ASSETS_LUA))
 
 clean:
-	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(PROJECT)-*-docs.zip $(PROJECT)-docs.zip $(OUTPUT) $(OUTPUT_ORIGINAL)
+	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(OUTPUT)
 	@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
@@ -199,62 +219,12 @@ 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:
+#-- <WAVES>
-	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
+#-- 000:224578acdeeeeddcba95434567653100
-	BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
+#-- </WAVES>
-	BRANCH=$$(echo "$$BRANCH" | tr '/' '-'); \
+#
-	if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
+#-- <SFX>
-		VERSION=dev-$$VERSION-$$BRANCH; \
+#-- 000:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000
-	fi; \
+#-- </SFX>
-	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

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

impostor.inc

@@ -1,44 +1,12 @@
 meta/meta.header.lua
-init/init.module.lua
+init/init.modules.lua
 init/init.config.lua
-init/init.ascension.lua
+init/init.minigames.lua
-init/init.context.lua
+init/init.meters.lua
 system/system.util.lua
-system/system.print.lua
+init/init.windows.lua
-system/system.input.lua
-system/system.asciiart.lua
-rle/rle.manager.lua
-rle/rle.register.lua
-logic/logic.meter.lua
-logic/logic.focus.lua
-logic/logic.day.lua
-logic/logic.timer.lua
-logic/logic.trigger.lua
-logic/logic.minigame.lua
-logic/logic.glitch.lua
-logic/logic.discussion.lua
-system/system.ui.lua
-audio/audio.manager.lua
-audio/audio.generator.lua
-audio/audio.songs.lua
 sprite/sprite.manager.lua
 sprite/sprite.norman.lua
-sprite/sprite.sumphore.lua
-sprite/sprite.pizza_vendor.lua
-sprite/sprite.dev_boy.lua
-sprite/sprite.dev_buddy.lua
-sprite/sprite.dev_extrovert.lua
-sprite/sprite.dev_girl.lua
-sprite/sprite.dev_guard.lua
-sprite/sprite.dev_guru.lua
-sprite/sprite.dev_hr_girl.lua
-sprite/sprite.dev_introvert.lua
-sprite/sprite.dev_operator.lua
-sprite/sprite.dev_project_manager.lua
-sprite/sprite.matrix_architect.lua
-sprite/sprite.matrix_neo.lua
-sprite/sprite.matrix_oraculum.lua
-sprite/sprite.matrix_trinity.lua
 situation/situation.manager.lua
 situation/situation.drink_coffee.lua
 decision/decision.manager.lua
@@ -47,31 +15,26 @@ decision/decision.go_to_home.lua
 decision/decision.go_to_toilet.lua
 decision/decision.go_to_walking_to_office.lua
 decision/decision.go_to_office.lua
-decision/decision.go_to_end.lua
 decision/decision.go_to_walking_to_home.lua
-decision/decision.go_to_sleep.lua
+decision/decision.play_button_mash.lua
-decision/decision.do_work.lua
+decision/decision.play_rhythm.lua
-decision/decision.sumphore_discussion.lua
+decision/decision.play_ddr.lua
-discussion/discussion.sumphore.lua
-discussion/discussion.coworker.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
 screen/screen.walking_to_office.lua
 screen/screen.office.lua
 screen/screen.walking_to_home.lua
-screen/screen.work.lua
+init/init.context.lua
-screen/screen.mysterious_man.lua
+data/data.songs.lua
-window/window.manager.lua
+system/system.print.lua
-window/window.register.lua
+system/system.input.lua
-window/window.end.lua
+system/system.audio.lua
-window/window.intro.title.lua
+system/system.ui.lua
-window/window.intro.ttg.lua
+window/window.splash.lua
-window/window.intro.brief.lua
+window/window.intro.lua
 window/window.menu.lua
 window/window.configuration.lua
 window/window.audiotest.lua
@@ -79,8 +42,6 @@ window/window.popup.lua
 window/window.minigame.mash.lua
 window/window.minigame.rhythm.lua
 window/window.minigame.ddr.lua
-window/window.discussion.lua
-window/window.continued.lua
 window/window.game.lua
 system/system.main.lua
 meta/meta.assets.lua

inc/audio/audio.generator.lua

@@ -1,744 +0,0 @@
-local musicator_markov_model = {
-  model = {
-    ["...|..."] = {
-      next = {
-        ["..."] = 0.71111111111111,
-        ["A-4"] = 0.0074074074074074,
-        ["B-4"] = 0.0037037037037037,
-        ["C-3"] = 0.011111111111111,
-        ["C-4"] = 0.037037037037037,
-        ["C-5"] = 0.11111111111111,
-        ["C-6"] = 0.0037037037037037,
-        ["D-4"] = 0.011111111111111,
-        ["D-5"] = 0.018518518518519,
-        ["E-4"] = 0.0074074074074074,
-        ["E-5"] = 0.025925925925926,
-        ["F-5"] = 0.0074074074074074,
-        ["G-3"] = 0.0037037037037037,
-        ["G-4"] = 0.022222222222222,
-        ["G-5"] = 0.018518518518519
-      },
-      total = 270
-    },
-    ["...|A-4"] = {
-      next = {
-        ["..."] = 0.9,
-        ["C-5"] = 0.1
-      },
-      total = 10
-    },
-    ["...|A-5"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 8
-    },
-    ["...|B-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["...|B-5"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 5
-    },
-    ["...|C-3"] = {
-      next = {
-        ["..."] = 0.66666666666667,
-        ["C-5"] = 0.33333333333333
-      },
-      total = 3
-    },
-    ["...|C-4"] = {
-      next = {
-        ["..."] = 0.875,
-        ["D-4"] = 0.083333333333333,
-        ["E-4"] = 0.041666666666667
-      },
-      total = 24
-    },
-    ["...|C-5"] = {
-      next = {
-        ["..."] = 0.73333333333333,
-        ["B-4"] = 0.033333333333333,
-        ["C-5"] = 0.066666666666667,
-        ["D-5"] = 0.13333333333333,
-        ["E-5"] = 0.033333333333333
-      },
-      total = 60
-    },
-    ["...|C-6"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["...|D-4"] = {
-      next = {
-        ["..."] = 0.92857142857143,
-        ["D-4"] = 0.071428571428571
-      },
-      total = 14
-    },
-    ["...|D-5"] = {
-      next = {
-        ["..."] = 0.80645161290323,
-        ["C-5"] = 0.032258064516129,
-        ["D-5"] = 0.032258064516129,
-        ["E-5"] = 0.12903225806452
-      },
-      total = 31
-    },
-    ["...|D-6"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 3
-    },
-    ["...|E-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 19
-    },
-    ["...|E-5"] = {
-      next = {
-        ["..."] = 0.77777777777778,
-        ["C-5"] = 0.022222222222222,
-        ["D-5"] = 0.13333333333333,
-        ["F-5"] = 0.066666666666667
-      },
-      total = 45
-    },
-    ["...|F-3"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 3
-    },
-    ["...|F-4"] = {
-      next = {
-        ["..."] = 0.8,
-        ["D-4"] = 0.1,
-        ["F-4"] = 0.1
-      },
-      total = 10
-    },
-    ["...|F-5"] = {
-      next = {
-        ["..."] = 0.66666666666667,
-        ["D-5"] = 0.066666666666667,
-        ["E-5"] = 0.066666666666667,
-        ["G-5"] = 0.2
-      },
-      total = 15
-    },
-    ["...|G-3"] = {
-      next = {
-        ["..."] = 0.8,
-        ["G-5"] = 0.2
-      },
-      total = 5
-    },
-    ["...|G-4"] = {
-      next = {
-        ["..."] = 0.95652173913043,
-        ["E-4"] = 0.043478260869565
-      },
-      total = 23
-    },
-    ["...|G-5"] = {
-      next = {
-        ["..."] = 0.875,
-        ["A-5"] = 0.0625,
-        ["E-5"] = 0.0625
-      },
-      total = 16
-    },
-    ["...|G-6"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["A-4|..."] = {
-      next = {
-        ["..."] = 0.55555555555556,
-        ["C-5"] = 0.33333333333333,
-        ["D-5"] = 0.11111111111111
-      },
-      total = 9
-    },
-    ["A-4|B-4"] = {
-      next = {
-        ["C-5"] = 1
-      },
-      total = 2
-    },
-    ["A-4|C-5"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["A-4|G-4"] = {
-      next = {
-        ["F-4"] = 1
-      },
-      total = 2
-    },
-    ["A-5|..."] = {
-      next = {
-        ["..."] = 0.2,
-        ["B-5"] = 0.1,
-        ["E-4"] = 0.1,
-        ["E-5"] = 0.4,
-        ["F-5"] = 0.1,
-        ["G-5"] = 0.1
-      },
-      total = 10
-    },
-    ["A-5|G-5"] = {
-      next = {
-        ["..."] = 0.33333333333333,
-        ["A-5"] = 0.66666666666667
-      },
-      total = 3
-    },
-    ["B-4|..."] = {
-      next = {
-        ["A-4"] = 1
-      },
-      total = 1
-    },
-    ["B-4|A-4"] = {
-      next = {
-        ["G-4"] = 1
-      },
-      total = 2
-    },
-    ["B-4|C-5"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 2
-    },
-    ["B-5|..."] = {
-      next = {
-        ["..."] = 0.2,
-        ["A-5"] = 0.2,
-        ["D-6"] = 0.4,
-        ["G-5"] = 0.2
-      },
-      total = 5
-    },
-    ["C-3|..."] = {
-      next = {
-        ["C-4"] = 1
-      },
-      total = 2
-    },
-    ["C-3|C-5"] = {
-      next = {
-        ["..."] = 0.33333333333333,
-        ["C-3"] = 0.66666666666667
-      },
-      total = 3
-    },
-    ["C-4|..."] = {
-      next = {
-        ["..."] = 0.5,
-        ["D-4"] = 0.125,
-        ["E-4"] = 0.041666666666667,
-        ["F-3"] = 0.041666666666667,
-        ["G-3"] = 0.16666666666667,
-        ["G-4"] = 0.083333333333333,
-        ["G-5"] = 0.041666666666667
-      },
-      total = 24
-    },
-    ["C-4|D-4"] = {
-      next = {
-        ["E-4"] = 1
-      },
-      total = 2
-    },
-    ["C-4|E-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["C-5|..."] = {
-      next = {
-        ["..."] = 0.40677966101695,
-        ["A-4"] = 0.067796610169492,
-        ["C-5"] = 0.050847457627119,
-        ["D-5"] = 0.20338983050847,
-        ["E-5"] = 0.15254237288136,
-        ["F-5"] = 0.016949152542373,
-        ["G-4"] = 0.10169491525424
-      },
-      total = 59
-    },
-    ["C-5|B-4"] = {
-      next = {
-        ["A-4"] = 1
-      },
-      total = 2
-    },
-    ["C-5|C-3"] = {
-      next = {
-        ["C-5"] = 1
-      },
-      total = 2
-    },
-    ["C-5|C-5"] = {
-      next = {
-        ["..."] = 0.8,
-        ["C-5"] = 0.2
-      },
-      total = 5
-    },
-    ["C-5|D-5"] = {
-      next = {
-        ["..."] = 0.3,
-        ["C-5"] = 0.2,
-        ["D-5"] = 0.1,
-        ["E-5"] = 0.4
-      },
-      total = 10
-    },
-    ["C-5|E-5"] = {
-      next = {
-        ["..."] = 0.33333333333333,
-        ["D-5"] = 0.33333333333333,
-        ["G-5"] = 0.33333333333333
-      },
-      total = 3
-    },
-    ["C-6|..."] = {
-      next = {
-        ["A-5"] = 1
-      },
-      total = 1
-    },
-    ["D-4|..."] = {
-      next = {
-        ["..."] = 0.26666666666667,
-        ["A-5"] = 0.066666666666667,
-        ["C-4"] = 0.2,
-        ["E-4"] = 0.4,
-        ["F-3"] = 0.066666666666667
-      },
-      total = 15
-    },
-    ["D-4|C-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 2
-    },
-    ["D-4|D-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["D-4|E-4"] = {
-      next = {
-        ["F-4"] = 1
-      },
-      total = 2
-    },
-    ["D-5|..."] = {
-      next = {
-        ["..."] = 0.2258064516129,
-        ["A-4"] = 0.032258064516129,
-        ["A-5"] = 0.032258064516129,
-        ["C-5"] = 0.2258064516129,
-        ["E-5"] = 0.29032258064516,
-        ["F-5"] = 0.096774193548387,
-        ["G-5"] = 0.096774193548387
-      },
-      total = 31
-    },
-    ["D-5|C-5"] = {
-      next = {
-        ["..."] = 0.77777777777778,
-        ["D-5"] = 0.22222222222222
-      },
-      total = 9
-    },
-    ["D-5|D-5"] = {
-      next = {
-        ["..."] = 0.5,
-        ["E-5"] = 0.5
-      },
-      total = 2
-    },
-    ["D-5|E-5"] = {
-      next = {
-        ["..."] = 0.33333333333333,
-        ["E-5"] = 0.11111111111111,
-        ["F-5"] = 0.55555555555556
-      },
-      total = 9
-    },
-    ["D-5|F-5"] = {
-      next = {
-        ["E-5"] = 1
-      },
-      total = 1
-    },
-    ["D-6|..."] = {
-      next = {
-        ["B-5"] = 0.66666666666667,
-        ["G-6"] = 0.33333333333333
-      },
-      total = 3
-    },
-    ["E-4|..."] = {
-      next = {
-        ["..."] = 0.19047619047619,
-        ["B-5"] = 0.047619047619048,
-        ["C-4"] = 0.14285714285714,
-        ["D-4"] = 0.23809523809524,
-        ["F-4"] = 0.19047619047619,
-        ["G-4"] = 0.19047619047619
-      },
-      total = 21
-    },
-    ["E-4|D-4"] = {
-      next = {
-        ["C-4"] = 1
-      },
-      total = 2
-    },
-    ["E-4|F-4"] = {
-      next = {
-        ["G-4"] = 1
-      },
-      total = 2
-    },
-    ["E-5|..."] = {
-      next = {
-        ["..."] = 0.18604651162791,
-        ["A-5"] = 0.046511627906977,
-        ["C-5"] = 0.27906976744186,
-        ["D-5"] = 0.2093023255814,
-        ["E-5"] = 0.069767441860465,
-        ["F-5"] = 0.093023255813953,
-        ["G-4"] = 0.023255813953488,
-        ["G-5"] = 0.093023255813953
-      },
-      total = 43
-    },
-    ["E-5|C-5"] = {
-      next = {
-        ["E-5"] = 1
-      },
-      total = 1
-    },
-    ["E-5|D-5"] = {
-      next = {
-        ["..."] = 0.125,
-        ["C-5"] = 0.75,
-        ["F-5"] = 0.125
-      },
-      total = 8
-    },
-    ["E-5|E-5"] = {
-      next = {
-        ["F-5"] = 1
-      },
-      total = 1
-    },
-    ["E-5|F-5"] = {
-      next = {
-        ["..."] = 0.5,
-        ["E-5"] = 0.4,
-        ["G-5"] = 0.1
-      },
-      total = 10
-    },
-    ["E-5|G-5"] = {
-      next = {
-        ["..."] = 0.5,
-        ["F-5"] = 0.5
-      },
-      total = 2
-    },
-    ["F-3|..."] = {
-      next = {
-        ["C-4"] = 1
-      },
-      total = 3
-    },
-    ["F-4|..."] = {
-      next = {
-        ["D-4"] = 0.11111111111111,
-        ["E-4"] = 0.44444444444444,
-        ["G-4"] = 0.44444444444444
-      },
-      total = 9
-    },
-    ["F-4|D-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["F-4|E-4"] = {
-      next = {
-        ["D-4"] = 1
-      },
-      total = 2
-    },
-    ["F-4|F-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["F-4|G-4"] = {
-      next = {
-        ["A-4"] = 1
-      },
-      total = 2
-    },
-    ["F-5|..."] = {
-      next = {
-        ["..."] = 0.2,
-        ["A-5"] = 0.066666666666667,
-        ["D-5"] = 0.2,
-        ["E-5"] = 0.46666666666667,
-        ["G-5"] = 0.066666666666667
-      },
-      total = 15
-    },
-    ["F-5|A-5"] = {
-      next = {
-        ["G-5"] = 1
-      },
-      total = 1
-    },
-    ["F-5|D-5"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["F-5|E-5"] = {
-      next = {
-        ["..."] = 0.5,
-        ["D-5"] = 0.16666666666667,
-        ["F-5"] = 0.16666666666667,
-        ["G-5"] = 0.16666666666667
-      },
-      total = 6
-    },
-    ["F-5|G-5"] = {
-      next = {
-        ["..."] = 0.75,
-        ["A-5"] = 0.25
-      },
-      total = 4
-    },
-    ["G-3|..."] = {
-      next = {
-        ["C-4"] = 0.5,
-        ["D-4"] = 0.25,
-        ["F-3"] = 0.25
-      },
-      total = 4
-    },
-    ["G-3|G-5"] = {
-      next = {
-        ["..."] = 0.5,
-        ["G-3"] = 0.5
-      },
-      total = 2
-    },
-    ["G-4|..."] = {
-      next = {
-        ["..."] = 0.090909090909091,
-        ["A-4"] = 0.090909090909091,
-        ["C-4"] = 0.045454545454545,
-        ["C-5"] = 0.18181818181818,
-        ["D-5"] = 0.045454545454545,
-        ["E-4"] = 0.22727272727273,
-        ["E-5"] = 0.045454545454545,
-        ["F-4"] = 0.27272727272727
-      },
-      total = 22
-    },
-    ["G-4|A-4"] = {
-      next = {
-        ["B-4"] = 1
-      },
-      total = 2
-    },
-    ["G-4|E-4"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["G-4|F-4"] = {
-      next = {
-        ["E-4"] = 1
-      },
-      total = 2
-    },
-    ["G-5|..."] = {
-      next = {
-        ["..."] = 0.35,
-        ["A-5"] = 0.05,
-        ["B-5"] = 0.05,
-        ["C-5"] = 0.05,
-        ["D-4"] = 0.05,
-        ["E-5"] = 0.25,
-        ["F-5"] = 0.2
-      },
-      total = 20
-    },
-    ["G-5|A-5"] = {
-      next = {
-        ["..."] = 0.5,
-        ["G-5"] = 0.5
-      },
-      total = 4
-    },
-    ["G-5|E-5"] = {
-      next = {
-        ["..."] = 1
-      },
-      total = 1
-    },
-    ["G-5|F-5"] = {
-      next = {
-        ["A-5"] = 1
-      },
-      total = 1
-    },
-    ["G-5|G-3"] = {
-      next = {
-        ["G-5"] = 1
-      },
-      total = 1
-    },
-    ["G-6|..."] = {
-      next = {
-        ["D-6"] = 1
-      },
-      total = 1
-    }
-  },
-  order = 2
-}
-
-local function musicator_unmake_key(k)
-  local result = {}
-  for t in string.gmatch(k, "[^|]+") do
-    result[#result + 1] = t
-  end
-
-  return result
-end
-
-local function musicator_count_notes(sequence)
-  local result = 0
-
-  for _,v in ipairs(sequence) do
-    if v ~= "..." then
-      result = result + 1
-    end
-  end
-
-  return result
-end
-
-local function musicator_generate_sequence(model_data, length)
-  local order = model_data.order
-  local model = model_data.model
-
-  -- random start key
-  local model_keys = {}
-  for k,_ in pairs(model) do
-    model_keys[#model_keys + 1] = k
-  end
-  local start_key = model_keys[math.ceil(math.random() * #model_keys)]
-
-  -- sequence starts with the start key
-  local seq = musicator_unmake_key(start_key)
-
-  -- generation loop
-  while musicator_count_notes(seq) < length do
-    local current_key = table.concat({table.unpack(seq, #seq - order + 1, #seq)}, "|") -- luacheck: ignore
-
-    local chosen = "..."
-
-    local key_data = model[current_key]
-    if key_data then
-      local r = math.random()
-      local prob_sum = 0.0
-      for new_note, new_prob in pairs(key_data.next) do
-        prob_sum = prob_sum + new_prob
-        if prob_sum < r then
-          chosen = new_note
-        end
-      end
-    end
-
---    print(current_key .. " --> " .. chosen)
-
-    seq[#seq+1] = chosen
-  end
-
-  return seq
-end
-
-local function musicator_row_to_frame(row, bpm, spd)
-  local frames_per_row = (150 * spd) / bpm
-  return math.floor(row * frames_per_row)
-end
-
-local function musicator_note_to_direction(note)
-  local subnote = note:sub(1,1)
-
-  local mapping = {
-    C="left",
-    D="up",
-    E="up",
-    F="right",
-    G="right",
-    A="down"
-  }
-
-  return mapping[subnote] or "up"
-end
-
--- converts generated sequence to pattern that the ddr minigame can consume
-local function musicator_sequence_to_pattern(sequence, bpm, spd)
-  local result = {}
-
-  for i, note in ipairs(sequence) do
-    if note ~= "..." then
-
-      local at_ms = musicator_row_to_frame(i, bpm, spd)
-      local direction = musicator_note_to_direction(note)
-
-      result[#result + 1] = { frame=at_ms, dir=direction, note=note }
-    end
-  end
-
-  return result
-end
-
-local function musicator_generate_pattern(length, bpm, spd)
-  return musicator_sequence_to_pattern(musicator_generate_sequence(musicator_markov_model, length), bpm, spd)
-end

inc/audio/audio.manager.lua

@@ -1,93 +0,0 @@
---- @section Audio
-
-Audio = {
-    music_playing = nil
-}
-
---- Stops current music.
---- @within Audio
-function Audio.music_stop()
-    music()
-    Audio.music_playing = nil
-end
-
---- Plays track, doesn't restart if already playing.
-function Audio.music_play(track)
-    if Audio.music_playing ~= track then
-        music(track)
-        Audio.music_playing = track
-    end
-end
-
---- Plays main menu music.
---- @within Audio
-function Audio.music_play_mainmenu() end
-
---- Plays mystery man music.
---- @within Audio
-function Audio.music_play_mystery() Audio.music_play(2) end
-
---- Plays waking up music.
---- @within Audio
-function Audio.music_play_wakingup() end
-
---- Plays room morning music.
---- @within Audio
-function Audio.music_play_room_morning() end
-
---- Plays room street 1 music.
----  @within Audio
-function Audio.music_play_room_street_1() end
-
---- Plays room street 2 music.
---- @within Audio
-function Audio.music_play_room_street_2() end
-
---- Plays room music.
---- @within Audio
-function Audio.music_play_room_() end
-
---- Plays room work music.
---- @within Audio
-function Audio.music_play_room_work() Audio.music_play(0) end
-
---- Plays activity work music.
---- @within Audio
-function Audio.music_play_activity_work() Audio.music_play(1) end
-
---- Plays select sound effect.
----  @within Audio
-function Audio.sfx_select() sfx(17, 'C-7', 30) end
-
---- Plays deselect sound effect.
----  @within Audio
-function Audio.sfx_deselect() sfx(18, 'C-7', 30) end
-
---- Plays beep sound effect.
----  @within Audio
-function Audio.sfx_beep() sfx(19, 'C-6', 30) end
-
---- Plays success sound effect.
----  @within Audio
-function Audio.sfx_success() sfx(16, 'C-7', 60) end
-
---- Plays bloop sound effect.
----  @within Audio
-function Audio.sfx_bloop() sfx(21, 'C-3', 60) end
-
---- Plays alarm sound effect
---- @within Audio
-function Audio.sfx_alarm() sfx(34, "C-5", 240) end
-
---- Plays drum sound effect.
----  @within Audio
-function Audio.sfx_drum_low() sfx(61, "C-2") end
-
---- Plays drum sound effect.
----  @within Audio
-function Audio.sfx_drum_high() sfx(61, "C-6") end
-
---- Plays sound effect for arrow hit
---- @within Audio
---- @param note string The note for the sound to play
-function Audio.sfx_arrowhit(note) sfx(56, note) end

inc/data/data.songs.lua

@@ -1,7 +1,6 @@
---- @section Songs
-
 -- DDR Arrow Spawn Patterns
 -- Each song defines when arrows should spawn, synced to music beats
+
 Songs = {
   -- Example song pattern
   test_song = {
@@ -105,24 +104,11 @@ Songs = {
     fps = 60,
     end_frame = nil, -- No end frame for random mode
     pattern = {} -- Empty, will spawn randomly in game
-  },
-  generated = {
-    name = "Markov Mode",
-    bpm = 150,
-    spd = 6,
-    fps = 60,
-    end_frame = nil, -- calculated
-    pattern = {}, -- generated
-    generated = true
   }
 }
 
---- Converts beats to frames.
+-- Helper function to calculate frame from beat
---- @within Songs
+-- Usage: frame_from_beat(beat_number, bpm, fps)
---- @param beat number The beat number.
---- @param bpm number Beats per minute.
---- @param[opt] fps number Frames per second (default: 60).
---- @return number The corresponding frame number.
 function frame_from_beat(beat, bpm, fps)
   fps = fps or 60
   local seconds_per_beat = 60 / bpm
@@ -130,17 +116,8 @@ function frame_from_beat(beat, bpm, fps)
   return math.floor(beat * frames_per_beat)
 end
 
---- Converts beat notation to frame pattern.
+-- Helper function to convert simple beat notation to frame pattern
---- @within Songs
+-- Usage: beats_to_pattern({{1, "left"}, {2, "down"}}, 120)
---- @param beats table A table of beat data, e.g., {{1, "left"}, {2, "down"}}.
---- @param beats.1 number The beat number.
---- @param beats.2 string Arrow direction ("left", "down", "up", or "right").
---- @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.do_work.lua

@@ -1,34 +0,0 @@
-Decision.register({
-  id = "do_work",
-  label = "Do Work",
-  handle = function()
-    Meter.hide()
-    Util.go_to_screen_by_id("work")
-
-    local modes_for_ascension_levels = {}
-    modes_for_ascension_levels[0] = "normal"
-    modes_for_ascension_levels[1] = "only_special"
-    modes_for_ascension_levels[2] = "only_left"
-    modes_for_ascension_levels[3] = "only_nothing"
-
-    MinigameDDRWindow.start("game", "generated", {
-      on_win = function(game_context)
-        if (game_context.special_mode_condition and Context.ascension.level == 1) then
-          Context.should_ascend = true
-        elseif (game_context.special_mode_condition and Context.ascension.level == 2) then
-          Context.should_ascend = true
-        elseif (game_context.special_mode_condition and Context.ascension.level == 3) then
-          Context.should_ascend = true
-        elseif (game_context.special_mode_condition and Context.ascension.level == 4) then
-          Context.should_ascend = true
-        end
-
-        Meter.show()
-        Util.go_to_screen_by_id("office")
-        Window.set_current("game")
-        Context.have_done_work_today = true
-      end,
-      special_mode = modes_for_ascension_levels[Ascension.get_level()]
-    })
-  end,
-})

inc/decision/decision.go_to_end.lua

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

inc/decision/decision.go_to_home.lua

@@ -1,10 +1,8 @@
 Decision.register({
   id = "go_to_home",
-  label = "Go Home",
+  label = "Go to Home",
-  condition = function()
-    return Context.have_been_to_office and Context.have_done_work_today
-  end,
   handle = function()
     Util.go_to_screen_by_id("home")
   end,
+  condition = function() return true end
 })

inc/decision/decision.go_to_office.lua

@@ -4,4 +4,5 @@ Decision.register({
   handle = function()
     Util.go_to_screen_by_id("office")
   end,
+  condition = function() return true end
 })

inc/decision/decision.go_to_sleep.lua

@@ -1,24 +0,0 @@
-Decision.register({
-  id = "go_to_sleep",
-  label = "Go to Sleep",
-  condition = function()
-    return Context.have_been_to_office and Context.have_done_work_today
-  end,
-  handle = function()
-    Meter.hide()
-    Day.increase()
-    MinigameRhythmWindow.start("game", {
-      focus_center_x = (Config.screen.width / 2) - 22,
-      focus_center_y = (Config.screen.height / 2) - 18,
-      focus_initial_radius = 0,
-      on_win = function()
-        local ascended = Ascension.consume_increase()
-        local level = Ascension.get_level()
-        MysteriousManScreen.start({
-          skip_text = not ascended,
-          text = ascended and MysteriousManScreen.get_text_for_level(level) or nil,
-        })
-      end,
-    })
-  end,
-})

inc/decision/decision.go_to_toilet.lua

@@ -4,4 +4,5 @@ Decision.register({
   handle = function()
     Util.go_to_screen_by_id("toilet")
   end,
+  condition = function() return true end
 })

inc/decision/decision.go_to_walking_to_home.lua

@@ -1,7 +1,8 @@
 Decision.register({
   id = "go_to_walking_to_home",
-  label = "Walk home",
+  label = "Walking to home",
   handle = function()
     Util.go_to_screen_by_id("walking_to_home")
   end,
+  condition = function() return true end
 })

inc/decision/decision.go_to_walking_to_office.lua

@@ -1,7 +1,8 @@
 Decision.register({
   id = "go_to_walking_to_office",
-  label = "Walk to office",
+  label = "Walking to office",
   handle = function()
     Util.go_to_screen_by_id("walking_to_office")
   end,
+  condition = function() return true end
 })

inc/decision/decision.have_a_coffee.lua

@@ -2,15 +2,7 @@ Decision.register({
   id = "have_a_coffee",
   label = "Have a Coffee",
   handle = function()
-    local new_situation_id = Situation.apply("drink_coffee", Context.game.current_screen)
+    Situation.apply("drink_coffee")
-    local level = Ascension.get_level()
-    local disc_id = "coworker_disc_0"
-    -- TODO: Add more discussions for levels above 3
-    if level >= 1 and level <= 3 then
-      local suffix = Context.have_done_work_today and ("_asc_" .. level) or ("_" .. level)
-      disc_id = "coworker_disc" .. suffix
-    end
-    Discussion.start(disc_id, "game")
-    Context.game.current_situation = new_situation_id
   end,
+  condition = function() return true end
 })

inc/decision/decision.manager.lua

@@ -1,20 +1,12 @@
---- @section Decision
 local _decisions = {}
 
---- Registers a decision definition.
---- @within Decision
---- @param decision table The decision data table.
---- @param decision.id string Unique decision identifier.
---- @param decision.label string|function Display text for the decision, or a function returning it.
---- @param[opt] decision.condition function Returns true if decision is available. Defaults to always true.
---- @param[opt] decision.handle function Called when the decision is selected. Defaults to noop.
 function Decision.register(decision)
   if not decision or not decision.id then
-    trace("Error: Invalid decision object registered (missing id)!")
+    PopupWindow.show({"Error: Invalid decision object registered (missing id)!"})
     return
   end
   if not decision.label then
-    trace("Error: Invalid decision object registered (missing label)!")
+    PopupWindow.show({"Error: Invalid decision object registered (missing label)!"})
     return
   end
 
@@ -30,117 +22,10 @@ function Decision.register(decision)
   _decisions[decision.id] = decision
 end
 
---- Gets the display label for a decision.
+function Decision.get(id)
---- @within Decision
---- @param decision table The decision data table.
---- @return string result The resolved decision label.
-function Decision.get_label(decision)
-  if not decision then return "" end
-  if type(decision.label) == "function" then
-    return decision.label() or ""
-  end
-  return decision.label or ""
-end
-
---- Gets a decision by ID.
---- @within Decision
---- @param id string The ID of the decision.
---- @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 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.
---- @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 {}
-  end
-
-  local screen_decisions = {}
-  for _, decision_id in ipairs(screen_data.decisions) do
-    local decision = Decision.get_by_id(decision_id)
-    if decision then
-      table.insert(screen_decisions, decision)
-    end
-  end
-  return screen_decisions
-end
-
---- Filters a list of decision objects based on their condition function.
---- @within Decision
---- @param decisions_list table A table of decision objects.
---- @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
-    if decision and (not decision.condition or decision.condition()) then
-      table.insert(available, decision)
-    end
-  end
-  return available
-end
-
---- Draws decision selector.
---- @within Decision
---- @param decisions table A table of decision items.<br/>
---- @param selected_decision_index number The index of the selected decision.<br/>
-function Decision.draw(decisions, selected_decision_index)
-  local bar_height = 16
-  local bar_y = Config.screen.height - bar_height
-  rect(0, bar_y, Config.screen.width, bar_height, Config.colors.dark_grey)
-  if #decisions > 0 then
-    local selected_decision = decisions[selected_decision_index]
-    local decision_label = Decision.get_label(selected_decision)
-    local text_y = bar_y + 4
-    Print.text("<", 2, text_y, Config.colors.light_blue)
-    Print.text_center(decision_label, Config.screen.width / 2, text_y, Config.colors.item)
-    Print.text(">", Config.screen.width - 6, text_y, Config.colors.light_blue)
-  end
-end
-
---- Updates decision selector.
---- @within Decision
---- @param decisions table A table of decision items.<br/>
---- @param selected_decision_index number The current index of the selected decision.<br/>
---- @return number selected_decision_index The updated index of the selected decision.
-function Decision.update(decisions, selected_decision_index)
-  if Input.left() then
-    Audio.sfx_beep()
-    selected_decision_index = Util.safeindex(decisions, selected_decision_index - 1)
-  elseif Input.right() then
-    Audio.sfx_beep()
-    selected_decision_index = Util.safeindex(decisions, selected_decision_index + 1)
-  end
-  return selected_decision_index
-end

inc/decision/decision.play_button_mash.lua

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

inc/decision/decision.play_ddr.lua

@@ -1,8 +1,6 @@
 Decision.register({
   id = "play_ddr",
   label = "Play DDR (Random)",
-  handle = function()
+  handle = function() Meters.hide() MinigameDDRWindow.start(WINDOW_GAME, nil) end,
-    Meter.hide()
+  condition = function() return true end
-    MinigameDDRWindow.start("game", nil)
-  end,
 })

inc/decision/decision.play_rhythm.lua

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

inc/decision/decision.sumphore_discussion.lua

@@ -1,23 +0,0 @@
-Decision.register({
-  id = "sumphore_discussion",
-  label = function()
-    if Context.have_met_sumphore then
-      return "Talk to Sumphore"
-    end
-    return "Talk to the homeless guy"
-  end,
-  handle = function()
-    if not Context.have_met_sumphore then
-      Discussion.start("homeless_guy", "game")
-      return
-    end
-    local level = Ascension.get_level()
-
-    -- TODO: Add more discussions for levels above 3
-    if level >= 1 and level <= 3 then
-      Discussion.start("sumphore_disc_asc_" .. level, "game")
-    else
-      Discussion.start("homeless_guy", "game", 4)
-    end
-  end,
-})

inc/discussion/discussion.coworker.lua

@@ -1,137 +0,0 @@
-Discussion.register({
-  id = "coworker_disc_0",
-  steps = {
-    {
-      question = "Good morning Normal, enjoying your coffee as usual, huh?",
-      answers = {
-        { label = "The name is Norman, not Normal", next_step = 2 },
-      },
-    },
-    {
-      question = "Can't work without some good coffee, no? ",
-      answers = {
-        { label = "Mhmm", next_step = nil },
-      },
-    },
-  },
-});
-
-Discussion.register({
-  id = "coworker_disc_1",
-  steps = {
-    {
-      question = "Norman, you look confused, what's up?",
-      answers = {
-        { label = "Just some bugs I noticed", next_step = 2 },
-      },
-    },
-    {
-      question = "Your coffee also seems whiter than usual!",
-      answers = {
-        { label = "I feel like latte today", next_step = nil },
-      },
-    },
-  },
-});
-
-Discussion.register({
-  id = "coworker_disc_asc_1",
-  steps = {
-    {
-      question = "Normann you look weird and unfocused. You are usually locked in and not like this, what's up?",
-      answers = {
-        { label = "Nothing it's just, I noticed some bugs in the simulation, maybe.", next_step = 2 },
-      },
-    },
-    {
-      question = "Are you fixing bugs nobody noticed before?",
-      answers = {
-        { label = "Maybe", next_step = nil },
-      },
-    },
-  },
-})
-
-Discussion.register({
-  id = "coworker_disc_2",
-  steps = {
-    {
-      question = "Hey Norman, do you have new socks on? That's a weird color!",
-      answers = {
-        { label = "Huh? True ...", next_step = 2 },
-      },
-    },
-    {
-      question = "You look strange today, Normal, you put your tie on backwards, is everything ok? ",
-      answers = {
-        { label = "Get it right, Norman ... NORMAN!", next_step = 3 },
-      },
-    },
-    {
-      question = "Yo Normann, text goes from left to right, not right to left, these parts!",
-      answers = {
-        { label = "Uhm...why?", next_step = nil },
-      },
-    },
-  },
-});
-
-
-Discussion.register({
-  id = "coworker_disc_asc_2",
-  steps = {
-    {
-      question = "Normann, are you ok? You were doing weird things while typing?",
-      answers = {
-        { label = "Naw", next_step = 2 },
-      },
-    },
-    {
-      question = "Oh, it's ok, I'm not wathcing you. Noone really is. *giggle*",
-      answers = {
-        { label = "Huh ?", next_step = nil },
-      },
-    },
-  },
-})
-
-Discussion.register({
-  id = "coworker_disc_3",
-  steps = {
-    {
-      question = "You look so happy, did you catch a bull or something?",
-      answers = {
-        { label =  "What do you mean?", next_step = 2 },
-      },
-    },
-    {
-      question = "Most people catch colds! You are so strange!",
-      answers = {
-        { label =  "An apple a day keeps the cold away", next_step = 3 },
-      },
-    },
-    {
-      question = "You look like you don't really want to work today, are you ok?",
-      answers = {
-        { label =  "Oh brother", next_step = nil },
-      },
-    },
-  },
-})
-Discussion.register({
-  id = "coworker_disc_asc_3",
-  steps = {
-    {
-      question = "Normal, you should take a break, you don't live up to your name today",
-      answers = {
-        { label =  "Norman is the name ...", next_step = 2 },
-      },
-    },
-    {
-      question = "You aren't as enthusiastic as you were before!",
-      answers = {
-        { label =  "Burnout comes for everyone", next_step = nil },
-      },
-    },
-  },
-})

inc/discussion/discussion.sumphore.lua

@@ -1,129 +0,0 @@
-Discussion.register({
-  id = "sumphore_disc_asc_1",
-  steps = {
-    {
-      question = "Are you still seeking the ox?",
-      answers = {
-        { label = "Huh? What ox?", next_step = 2 },
-        { label = "Are you drunk, old man?", next_step = nil },
-      },
-    },
-    {
-      question = "Did you never think there would be more to this?",
-      answers = {
-        { label = "I'm not sure what you mean.", next_step = nil },
-      },
-    },
-  },
-})
-
-Discussion.register({
-  id = "sumphore_disc_asc_2",
-  steps = {
-    {
-      question = "How's work? Your face looks strange",
-      answers = {
-        { label = "I just really need to take a break.", next_step = 2 },
-        { label = "Not sure what you mean.", next_step = nil },
-      },
-    },
-    {
-      question = "Are you seeing things?",
-      answers = {
-        { label = "How did you know ?", next_step = 3 },
-        { label = "I'm not sure what you mean.", next_step = nil },
-      },
-    },
-    {
-      question = "Come have a drink, I could tell you some stories.",
-      answers = {
-        { label = "No, drink makes you stupid and I need to be in top shape.", next_step = 4, on_select = function()
-          Meter.add("ism", 10)
-        end },
-        { label = "I could use a drink.", next_step = nil, on_select = function()
-          Meter.add("bm", 10)
-        end },
-      },
-    },
-    {
-      question = "Always trying to do the right thing, huh? What if you did the left thing instead?",
-        answers = {
-          { label = "I've never thought of that up till now.", next_step = nil, on_select = function()
-            Meter.add("ism", 5)
-          end },
-        { label = "Silly wordgames, I like them.", next_step = nil, on_select = function()
-          Meter.add("wpm", 10)
-        end },
-      },
-    },
-  },
-})
-
-Discussion.register({
-  id = "sumphore_disc_asc_3",
-  steps = {
-    {
-      question = "Do you think it's work you're doing?",
-      answers = {
-        { label = "... that sounds like it's from a movie.", next_step = 2 },
-        { label = "Are you drunk, old man?", next_step = nil },
-      },
-    },
-    {
-      question = "You might just be trying too hard, why dont you just flow for a while?",
-      answers = {
-        { label = "Flow where ?", next_step = 3 },
-        { label = "I'm not sure what you mean.", next_step = nil },
-      },
-    },
-    {
-      question = "Flow carelessly, without any effort",
-      answers = {
-        { label = "Consuming sth other than alcohol ?", next_step = nil },
-        { label = "Deja vu", next_step = nil },
-      },
-    },
-  },
-})
-
-Discussion.register({
-  id = "homeless_guy",
-  steps = {
-    {
-      question = "Sup bro, how are you?",
-      answers = {
-        { label = "I'm doing great, thanks!", next_step = 2 },
-        { label = "Not as good as you", next_step = nil },
-      },
-    },
-    {
-      question = "What's your name?",
-      answers = {
-        { label = "Norman Reds, nice to meet you.", next_step = 3 },
-        { label = "Mom told me not to talk to strangers.", next_step = nil },
-      },
-    },
-    {
-      question = "That name ... could it be? I know a guy with that name...",
-      answers = {
-        { label = "Never met you before.", next_step = 4 },
-        { label = "I'm not sure what you mean.", next_step = nil },
-
-      },
-    },
-    {
-      question = "My name is Sumphore, nice to meet you.",
-      answers = {
-        { label = "Nice to meet you, Sumphore.", next_step = 5, on_select = function()
-          Context.have_met_sumphore = true
-        end },
-      },
-    },
-    {
-      question = "You're a good guy, I can tell. You abide by the rules. Life would be so much easier if more people were like you ...",
-      answers = {
-        { label = "Thanks, I try my best.", next_step = nil },
-      },
-    },
-  },
-})

inc/init/init.ascension.lua

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

inc/init/init.config.lua

@@ -1,57 +1,53 @@
-Config = {}
+local DEFAULT_CONFIG = {
-
---- Return initial data for Config
---- @within Config
-function Config.initial_data()
-  return {
   screen = {
     width = 240,
     height = 136
   },
   colors = {
     black = 0,
-      light_grey = 2,
+    light_grey = 13,
-      dark_grey = 1,
+    dark_grey = 14,
-      red = 13,
+    red = 2,
-      light_blue = 9,
+    green = 6,
-      blue = 3,
+    blue = 9,
-      white = 4,
+    white = 12,
-      item = 7,
+    item = 12,
-      meter_bg = 1
+    meter_bg = 12
+  },
+  player = {
+    sprite_id = 1
   },
   timing = {
-      minigame_win_duration = 180
+    splash_duration = 120
   }
-  }
+}
-end
 
---- Restores default configuration settings.
+local Config = {
---- @within Config
+  screen = DEFAULT_CONFIG.screen,
-function Config.reset()
+  colors = DEFAULT_CONFIG.colors,
-  local initial = Config.initial_data()
+  player = DEFAULT_CONFIG.player,
-  Config.screen = initial.screen
+  timing = DEFAULT_CONFIG.timing,
-  Config.colors = initial.colors
+}
-  Config.timing = initial.timing
-end
 
 local CONFIG_SAVE_BANK = 7
 local CONFIG_MAGIC_VALUE_ADDRESS = 2
+local CONFIG_SPLASH_DURATION_ADDRESS = 3
 local CONFIG_MAGIC_VALUE = 0xDE
 
---- Saves the current configuration.
---- @within Config
 function Config.save()
   mset(CONFIG_MAGIC_VALUE, CONFIG_MAGIC_VALUE_ADDRESS, CONFIG_SAVE_BANK)
 end
 
---- Loads saved configuration.
---- @within Config
 function Config.load()
   if mget(CONFIG_MAGIC_VALUE_ADDRESS, CONFIG_SAVE_BANK) == CONFIG_MAGIC_VALUE then
-    return
+    Config.timing.splash_duration = mget(CONFIG_SPLASH_DURATION_ADDRESS, CONFIG_SAVE_BANK)
   else
-    Config.reset()
+    Config.restore_defaults()
   end
 end
 
+function Config.restore_defaults()
+  Config.timing.splash_duration = DEFAULT_CONFIG.timing.splash_duration
+end
+
 Config.load()

inc/init/init.context.lua

@@ -2,152 +2,111 @@ local SAVE_GAME_BANK = 6
 local SAVE_GAME_MAGIC_VALUE_ADDRESS = 0
 local SAVE_GAME_MAGIC_VALUE = 0xCA
 
---- Global game context.
+local SAVE_GAME_CURRENT_SCREEN_ADDRESS = 6
---- @section Context
-Context = {}
 
---- Gets initial data for Context.
+local function get_initial_data()
---- @within Context
---- @return result table Initial context data or nil. </br>
---- Fields: </br>
---- * current_menu_item (number) Index of the currently selected menu item.<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/>
---- * ascension (table) Ascension meter state (see Ascension.get_initial).<br/>
---- * triggers (table) Active trigger runtime state, keyed by trigger ID.<br/>
---- * stat_screen_active (boolean) Whether the stat screen overlay is currently shown.<br/>
---- * have_met_sumphore (boolean) Whether the player has talked to the homeless guy.<br/>
---- * have_been_to_office (boolean) Whether the player has been to the office.<br/>
---- * have_done_work_today (boolean) Whether the player has done work today.<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,
+    active_window = WINDOW_SPLASH,
-    test_mode = false,
+    intro = {
+      y = Config.screen.height,
+      speed = 0.5,
+      text = [[Norman Reds’ everyday life
+seems ordinary: work,
+meetings, coffee, and
+endless notifications.
+But beneath the surface
+— within him, or around
+him — something is
+constantly building, and
+it soon becomes clear
+that there is more going
+on than meets the eye.]]
+    },
+    current_screen = 1,
+    splash_timer = Config.timing.splash_duration,
     popup = {
       show = false,
       content = {}
     },
+    player = {
+      sprite_id = Config.player.sprite_id
+    },
+    ground = {
+      x = 0,
+      y = Config.screen.height,
+      w = Config.screen.width,
+      h = 8
+    },
+    menu_items = {},
+    selected_menu_item = 1,
+    selected_decision_index = 1,
     game_in_progress = false,
-    stat_screen_active = false,
+    screens = {},
-    minigame_ddr = {},
+    minigame_ddr = Minigames.get_default_ddr(),
-    minigame_button_mash = {},
+    minigame_button_mash = Minigames.get_default_button_mash(),
-    minigame_rhythm = {},
+    minigame_rhythm = Minigames.get_default_rhythm(),
-    meters = Meter.get_initial(),
+    meters = Meters.get_initial(),
-    ascension = Ascension.get_initial(),
+    --- Table storing currently active sprites to be drawn.
-    timer = Timer.get_initial(),
+    -- Each entry is a table with `id`, `x`, `y`, and other drawing parameters.
-    triggers = {},
+    sprites = {},
-    home_norman_visible = false,
+    --- The ID of the currently active situation.
-    have_been_to_office = false,
+    -- Set by `Situation.apply()` and `nil` if no situation is active.
-    have_done_work_today = false,
-    should_ascend = false,
-    have_met_sumphore = false,
-    game = {
-      current_screen = "home",
     current_situation = nil,
-    },
-    day_count = 1,
-    delta_time = 0,
-    last_frame_time = 0,
-    glitch = {
-      enabled = false,
-      state = "active",
-      timer = 0,
-    },
-    _end = {
-      state = "choice",
-      selection = 1,
-    },
-    discussion = {
-      active = false,
-      id = nil,
-      step = 1,
-      selected_answer = 1,
-      scroll_y = 0,
-      scroll_timer = 0,
-      auto_scroll = true,
-      return_window = nil,
-    },
   }
 end
 
---- Resets game context to initial state.
+Context = {}
---- @within Context
+
-function Context.reset()
+local function reset_context_to_initial_state()
-  local initial_data = Context.initial_data()
+  local initial_data = get_initial_data()
+
   for k in pairs(Context) do
-    if type(Context[k]) ~= "function" then
+    if type(Context[k]) ~= "function" then       Context[k] = nil
-      Context[k] = nil
     end
   end
 
   for k, v in pairs(initial_data) do
     Context[k] = v
   end
+
+  Context.screens = {}
+  Context.screen_indices_by_id = {}
+  local screen_order = {"home", "toilet", "walking_to_office", "office", "walking_to_home"}
+  for i, screen_id in ipairs(screen_order) do
+    local screen_data = Screen.get_by_id(screen_id)
+    if screen_data then
+      table.insert(Context.screens, screen_data)
+      Context.screen_indices_by_id[screen_id] = i
+    else
+      PopupWindow.show({"Error: Screen '" .. screen_id .. "' not registered!"})
+    end
+  end
 end
 
---- Starts a new game.
+reset_context_to_initial_state()
---- @within Context
+
 function Context.new_game()
-  Context.reset()
+  reset_context_to_initial_state()
   Context.game_in_progress = true
   MenuWindow.refresh_menu_items()
-  Screen.get_by_id(Context.game.current_screen).init()
-  MysteriousManScreen.start({
-    text = [[
-      Norman was never a bad
-      ...
-      simulation engineer,
-      ...
-      but
-      ...
-      we need to be careful
-      ...
-      letting him improve.
-      ...
-      We need to distract him.
-    ]],
-    on_text_complete = function()
-      Audio.sfx_alarm()
-      Context.home_norman_visible = false
-      Util.go_to_screen_by_id("home")
-      MinigameButtonMashWindow.start("game", {
-        focus_center_x = (Config.screen.width / 2) - 22,
-        focus_center_y = (Config.screen.height / 2) - 18,
-        focus_initial_radius = 0,
-        target_points = 100,
-        instruction_text = "Wake up Norman!",
-        show_progress_text = false,
-        on_win = function()
-          Audio.music_play_wakingup()
-          Meter.show()
-          Window.set_current("game")
-        end,
-      })
-    end,
-  })
 end
 
---- Saves the current game state.
---- @within Context
 function Context.save_game()
   if not Context.game_in_progress then return end
+
   mset(SAVE_GAME_MAGIC_VALUE, SAVE_GAME_MAGIC_VALUE_ADDRESS, SAVE_GAME_BANK)
+  mset(Context.current_screen, SAVE_GAME_CURRENT_SCREEN_ADDRESS, SAVE_GAME_BANK)
 end
 
---- Loads a saved game state.
---- @within Context
 function Context.load_game()
   if mget(SAVE_GAME_MAGIC_VALUE_ADDRESS, SAVE_GAME_BANK) ~= SAVE_GAME_MAGIC_VALUE then
         Context.new_game()
     return
   end
-  Context.reset()
+
+  reset_context_to_initial_state()
+  Context.current_screen = mget(SAVE_GAME_CURRENT_SCREEN_ADDRESS, SAVE_GAME_BANK)
+
   Context.game_in_progress = true
   MenuWindow.refresh_menu_items()
-  Screen.get_by_id(Context.game.current_screen).init()
 end

inc/init/init.meters.lua

@@ -0,0 +1,75 @@
+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
+
+Meters.COLOR_ISM = Config.colors.red
+Meters.COLOR_WPM = Config.colors.blue
+Meters.COLOR_BM = Config.colors.black
+Meters.COLOR_BG = Config.colors.meter_bg
+
+function Meters.get_initial()
+  return {
+    ism = METER_DEFAULT,
+    wpm = METER_DEFAULT,
+    bm = METER_DEFAULT,
+    combo = 0,
+    combo_timer = 0,
+    hidden = false,
+  }
+end
+
+function Meters.hide()
+  if Context and Context.meters then Context.meters.hidden = true end
+end
+
+function Meters.show()
+  if Context and Context.meters then Context.meters.hidden = false end
+end
+
+function Meters.get_max()
+  return METER_MAX
+end
+
+function Meters.get_combo_multiplier()
+  if not Context or not Context.meters then return 1 end
+  local combo = Context.meters.combo
+  if combo == 0 then return 1 end
+  return 1 + math.min(COMBO_MAX_BONUS, COMBO_BASE_BONUS * (2 ^ (combo - 1)))
+end
+
+function Meters.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)
+  m.wpm = math.max(0, m.wpm - METER_DECAY_PER_FRAME)
+  m.bm = math.max(0, m.bm - METER_DECAY_PER_FRAME)
+  if m.combo > 0 then
+    m.combo_timer = m.combo_timer + 1
+    if m.combo_timer >= COMBO_TIMEOUT_FRAMES then
+      m.combo = 0
+      m.combo_timer = 0
+    end
+  end
+end
+
+function Meters.add(key, amount)
+  if not Context or not Context.meters then return end
+  local m = Context.meters
+  if m[key] ~= nil then
+    m[key] = math.min(METER_MAX, m[key] + amount)
+  end
+end
+
+function Meters.on_minigame_complete()
+  local m = Context.meters
+  local gain = math.floor(METER_GAIN_PER_CHORE * Meters.get_combo_multiplier())
+  Meters.add("wpm", gain)
+  Meters.add("ism", gain)
+  Meters.add("bm", gain)
+  m.combo = m.combo + 1
+  m.combo_timer = 0
+end

inc/init/init.minigames.lua

@@ -0,0 +1,107 @@
+Minigames = {}
+
+local function apply_params(defaults, params)
+  if not params then return defaults end
+  for k, v in pairs(params) do
+    defaults[k] = v
+  end
+  return defaults
+end
+
+function Minigames.get_default_ddr()
+  local arrow_size = 12
+  local arrow_spacing = 30
+  local total_width = (4 * arrow_size) + (3 * arrow_spacing)
+  local start_x = (Config.screen.width - total_width) / 2
+  return {
+    bar_fill = 0,
+    max_fill = 100,
+    fill_per_hit = 10,
+    miss_penalty = 5,
+    bar_x = 20,
+    bar_y = 10,
+    bar_width = 200,
+    bar_height = 12,
+    arrow_size = arrow_size,
+    arrow_spawn_timer = 0,
+    arrow_spawn_interval = 45,
+    arrow_fall_speed = 1.5,
+    arrows = {},
+    target_y = 115,
+    target_arrows = {
+      { dir = "left", x = start_x },
+      { dir = "down", x = start_x + arrow_size + arrow_spacing },
+      { dir = "up", x = start_x + (arrow_size + arrow_spacing) * 2 },
+      { dir = "right", x = start_x + (arrow_size + arrow_spacing) * 3 }
+    },
+    hit_threshold = 8,
+    button_pressed_timers = {},
+    button_press_duration = 8,
+    input_cooldowns = { left = 0, down = 0, up = 0, right = 0 },
+    input_cooldown_duration = 10,
+    frame_counter = 0,
+    current_song = nil,
+    pattern_index = 1,
+    use_pattern = false,
+    return_window = nil
+  }
+end
+
+function Minigames.get_default_button_mash()
+  return {
+    bar_fill = 0,
+    max_fill = 100,
+    fill_per_press = 8,
+    base_degradation = 0.15,
+    degradation_multiplier = 0.006,
+    button_pressed_timer = 0,
+    button_press_duration = 8,
+    return_window = nil,
+    bar_x = 20,
+    bar_y = 10,
+    bar_width = 200,
+    bar_height = 12,
+    button_x = 20,
+    button_y = 110,
+    button_size = 12
+  }
+end
+
+function Minigames.get_default_rhythm()
+  return {
+    line_position = 0,
+    line_speed = 0.015,
+    line_direction = 1,
+    target_center = 0.5,
+    target_width = 0.3,
+    initial_target_width = 0.3,
+    min_target_width = 0.08,
+    target_shrink_rate = 0.9,
+    score = 0,
+    max_score = 10,
+    button_pressed_timer = 0,
+    button_press_duration = 10,
+    return_window = nil,
+    bar_x = 20,
+    bar_y = 10,
+    bar_width = 200,
+    bar_height = 12,
+    button_x = 210,
+    button_y = 110,
+    button_size = 10,
+    press_cooldown = 0,
+    press_cooldown_duration = 15
+  }
+end
+
+function Minigames.configure_ddr(params)
+  return apply_params(Minigames.get_default_ddr(), params)
+end
+
+function Minigames.configure_button_mash(params)
+  return apply_params(Minigames.get_default_button_mash(), params)
+end
+
+function Minigames.configure_rhythm(params)
+  return apply_params(Minigames.get_default_rhythm(), params)
+end

inc/init/init.module.lua

@@ -1,22 +0,0 @@
-Window = {}
-Util = {}
-Meter = {}
-Minigame = {}
-Decision = {}
-Situation = {}
-Screen = {}
-Map = {}
-UI = {}
-Print = {}
-Input = {}
-Sprite = {}
-Audio = {}
-Focus = {}
-Day = {}
-Timer = {}
-Trigger = {}
-Discussion = {}
-RLE = {}
-AsciiArt = {}
-Ascension = {}
-MysteriousManScreen = {}

inc/init/init.modules.lua

@@ -0,0 +1,22 @@
+SplashWindow = {}
+IntroWindow = {}
+MenuWindow = {}
+GameWindow = {}
+PopupWindow = {}
+ConfigurationWindow = {}
+AudioTestWindow = {}
+MinigameButtonMashWindow = {}
+MinigameRhythmWindow = {}
+MinigameDDRWindow = {}
+Util = {}
+Meters = {}
+Minigames = {}
+Decision = {}
+Situation = {}
+Screen = {}
+Map = {}
+UI = {}
+Print = {}
+Input = {}
+Sprite = {}
+Audio = {}

inc/init/init.windows.lua

@@ -0,0 +1,10 @@
+local WINDOW_SPLASH = 0
+local WINDOW_INTRO = 1
+local WINDOW_MENU = 2
+local WINDOW_GAME = 3
+local WINDOW_POPUP = 4
+local WINDOW_CONFIGURATION = 7
+local WINDOW_MINIGAME_BUTTON_MASH = 8
+local WINDOW_MINIGAME_RHYTHM = 9
+local WINDOW_MINIGAME_DDR = 10
+local WINDOW_AUDIOTEST = 9001

inc/logic/logic.day.lua

@@ -1,35 +0,0 @@
---- @section Day
-local _day_increase_handlers = {}
-
---- Increases the day count and triggers registered handlers.
---- @within Day
-function Day.increase()
-    Context.day_count = Context.day_count + 1
-    if Context.day_count == 3 then
-        Context.should_ascend = true
-    end
-    for _, handler in ipairs(_day_increase_handlers) do
-        handler()
-    end
-end
-
---- Registers a handler to be called when the day increases.
---- @within Day
---- @param handler function The function to call when the day increases.
-function Day.register_handler(handler)
-    table.insert(_day_increase_handlers, handler)
-end
-
-Day.register_handler(function()
-    local m = Context.meters
-    m.ism = math.max(0, m.ism - METER_DECAY_PER_DAY)
-    m.wpm = math.max(0, m.wpm - METER_DECAY_PER_DAY)
-    m.bm = math.max(0, m.bm - METER_DECAY_PER_DAY)
-end)
-
-Day.register_handler(function()
-    if Context.should_ascend then
-        Ascension.increase()
-    end
-    Context.should_ascend = false
-end)

inc/logic/logic.discussion.lua

@@ -1,106 +0,0 @@
---- @section Discussion
-local _discussions = {}
-
---- Registers a discussion definition.
---- @within Discussion
---- @param discussion table The discussion data table.
---- @param discussion.id string Unique discussion identifier.
---- @param discussion.steps table Array of step tables, each with `question` (string) and `answers` (array of {label, next_step} tables).
---- @param[opt] discussion.on_end function Called when the discussion ends. Defaults to noop.
-function Discussion.register(discussion)
-  if not discussion or not discussion.id then
-    trace("Error: Invalid discussion registered (missing id)!")
-    return
-  end
-  if not discussion.steps or #discussion.steps == 0 then
-    trace("Error: Discussion '" .. discussion.id .. "' has no steps!")
-    return
-  end
-  if not discussion.on_end then
-    discussion.on_end = function() end
-  end
-  if _discussions[discussion.id] then
-    trace("Warning: Overwriting discussion with id: " .. discussion.id)
-  end
-  _discussions[discussion.id] = discussion
-end
-
---- Gets a discussion by ID.
---- @within Discussion
---- @param id string The discussion ID.
---- @return table|nil result The discussion table or nil.
-function Discussion.get_by_id(id)
-  return _discussions[id]
-end
-
---- Starts a discussion, switching to the discussion window.
---- @within Discussion
---- @param id string The discussion ID to start.
---- @param return_window string The window ID to return to after the discussion.
---- @param[opt] start_step number The step index to start from (defaults to 1).
-function Discussion.start(id, return_window, start_step)
-  local discussion = _discussions[id]
-  if not discussion then
-    trace("Error: Discussion not found: " .. tostring(id))
-    return
-  end
-  local step = start_step or 1
-  if not discussion.steps[step] then step = 1 end
-  Context.discussion.active = true
-  Context.discussion.id = id
-  Context.discussion.step = step
-  Context.discussion.selected_answer = 1
-  Context.discussion.scroll_y = 0
-  Context.discussion.scroll_timer = 0
-  Context.discussion.auto_scroll = true
-  Context.discussion.return_window = return_window or "game"
-  Meter.hide()
-  Window.set_current("discussion")
-end
-
---- Gets the current step data for the active discussion.
---- @within Discussion
---- @return table|nil result The current step table or nil.
-function Discussion.get_current_step()
-  if not Context.discussion.active or not Context.discussion.id then return nil end
-  local discussion = _discussions[Context.discussion.id]
-  if not discussion then return nil end
-  return discussion.steps[Context.discussion.step]
-end
-
---- Advances to a specific step or ends the discussion.
---- @within Discussion
---- @param next_step number|nil The step index to go to, or nil to end.
-function Discussion.go_to_step(next_step)
-  if not next_step then
-    Discussion.finish()
-    return
-  end
-  local discussion = _discussions[Context.discussion.id]
-  if not discussion or not discussion.steps[next_step] then
-    Discussion.finish()
-    return
-  end
-  Context.discussion.step = next_step
-  Context.discussion.selected_answer = 1
-  Context.discussion.scroll_y = 0
-  Context.discussion.scroll_timer = 0
-  Context.discussion.auto_scroll = true
-end
-
---- Ends the active discussion and returns to the previous window.
---- @within Discussion
-function Discussion.finish()
-  local discussion = _discussions[Context.discussion.id]
-  local return_window = Context.discussion.return_window or "game"
-  Context.discussion.active = false
-  Context.discussion.id = nil
-  Context.discussion.scroll_y = 0
-  Context.discussion.scroll_timer = 0
-  Context.discussion.auto_scroll = true
-  Meter.show()
-  if discussion and discussion.on_end then
-    discussion.on_end()
-  end
-  Window.set_current(return_window)
-end

inc/logic/logic.focus.lua

@@ -1,166 +0,0 @@
---- @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/logic/logic.glitch.lua

@@ -1,58 +0,0 @@
---- @section Glitch
-Glitch = {}
-
---- Shows the glitch effect.
---- @within Glitch
-function Glitch.show()
-  if Context and Context.glitch then
-    Context.glitch.enabled = true
-  end
-end
-
---- Hides the glitch effect.
---- @within Glitch
-function Glitch.hide()
-  if Context and Context.glitch then
-    Context.glitch.enabled = false
-  end
-end
-
---- Draws the glitch effect if active.
---- @within Glitch
-function Glitch.draw()
-  if not Context or not Context.glitch or not Context.glitch.enabled then return end
-
-  -- Update state timer
-  Context.glitch.timer = Context.glitch.timer - 1
-  if Context.glitch.timer <= 0 then
-    if Context.glitch.state == "active" then
-      Context.glitch.state = "waiting"
-      Context.glitch.timer = math.random(20, 60) -- Time to stay fixed
-    else
-      Context.glitch.state = "active"
-      Context.glitch.timer = math.random(40, 100) -- Time to stay glitchy
-    end
-  end
-
-  -- Draw stripes only when active
-  if Context.glitch.state == "active" then
-    for _ = 1, 15 do
-      local rx = math.random(0, Config.screen.width - 1)
-      local ry = math.random(0, Config.screen.height - 1)
-
-      -- Sample color at the random point
-      local color = pix(rx, ry)
-
-      -- Determine random length for the stripe (2-40)
-      local length = math.random(2, 40)
-
-      -- Draw the vertical stripe
-      for sy = 0, length - 1 do
-        local dy = ry + sy
-        if dy < Config.screen.height then
-          pix(rx, dy, color)
-        end
-      end
-    end
-  end
-end

inc/logic/logic.meter.lua

@@ -1,158 +0,0 @@
---- @section Meter
-local METER_MAX = 1000
-local METER_DEFAULT = 500
-local METER_GAIN_PER_CHORE = 100
-local METER_DECAY_PER_DAY = 20
-local COMBO_BASE_BONUS = 0.02
-local COMBO_MAX_BONUS = 0.16
-local COMBO_TIMEOUT_FRAMES = 600
-
--- 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
-
---- Gets initial meter values.
---- @within Meter
---- @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.
-function Meter.get_initial()
-  return {
-    ism = METER_DEFAULT,
-    wpm = METER_DEFAULT,
-    bm = METER_DEFAULT,
-    combo = 0,
-    combo_timer = 0,
-    hidden = false,
-  }
-end
-
---- Hides meters.
---- @within Meter
-function Meter.hide()
-  if Context and Context.meters then Context.meters.hidden = true end
-end
-
---- Shows meters.
---- @within Meter
-function Meter.show()
-  if Context and Context.meters then Context.meters.hidden = false end
-end
-
---- Gets max meter value.
---- @within Meter
---- @return number The maximum meter value.
-function Meter.get_max()
-  return METER_MAX
-end
-
---- Sets the decay amount applied to all meters per day.
---- @within Meter
---- @param amount number Amount to subtract from each meter.
-function Meter.set_decay(amount)
-  METER_DECAY_PER_DAY = amount
-end
-
---- Gets the meter decay as a percentage of the max meter value.
---- @within Meter
---- @return number The decay percentage per day.
-function Meter.get_decay_percentage()
-  return math.floor(METER_DECAY_PER_DAY / METER_MAX * 100)
-end
-
---- Gets combo multiplier.
---- @within Meter
---- @return number The current combo multiplier.
-function Meter.get_combo_multiplier()
-  if not Context or not Context.meters then return 1 end
-  local combo = Context.meters.combo
-  if combo == 0 then return 1 end
-  return 1 + math.min(COMBO_MAX_BONUS, COMBO_BASE_BONUS * (2 ^ (combo - 1)))
-end
-
---- Updates all meters.
---- @within Meter
-function Meter.update()
-  if not Context or not Context.game_in_progress or not Context.meters then return end
-  local m = Context.meters
-  local in_minigame = string.find(Window.get_current_id(), "^minigame_") ~= nil
-  if not in_minigame then
-    if m.combo > 0 then
-      m.combo_timer = m.combo_timer + 1
-      if m.combo_timer >= COMBO_TIMEOUT_FRAMES then
-        m.combo = 0
-        m.combo_timer = 0
-      end
-    end
-  end
-end
-
---- Adds amount to a meter.
---- @within Meter
---- @param key string The meter key (e.g., "wpm", "ism", "bm").
---- @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
-  if m[key] ~= nil then
-    m[key] = math.min(METER_MAX, m[key] + amount)
-  end
-end
-
---- Called on minigame completion.
---- @within Meter
-function Meter.on_minigame_complete()
-  local m = Context.meters
-  local gain = math.floor(METER_GAIN_PER_CHORE * Meter.get_combo_multiplier())
-  Meter.add("wpm", gain)
-  Meter.add("ism", gain)
-  Meter.add("bm", gain)
-  m.combo = m.combo + 1
-  m.combo_timer = 0
-end
-
---- Draws meters.
---- @within Meter
-function Meter.draw()
-  if not Context or not Context.game_in_progress or not Context.meters then return end
-  if Context.meters.hidden then return end
-
-  local m = Context.meters
-  local max = Meter.get_max()
-  local bar_w = 44
-  local bar_h = 2
-  local bar_x = 182
-  local label_x = 228
-  local line_h = 5
-  local start_y = 1
-
-
-  local bar_offset = math.floor((line_h - bar_h) / 2)
-
-  local meter_list = {
-    { key = "wpm", label = "WPM", color = Meter.COLOR_WPM, row = 0 },
-    { key = "ism", label = "ISM", color = Meter.COLOR_ISM, row = 1 },
-    { key = "bm", label = "BM", color = Meter.COLOR_BM, row = 2 },
-  }
-
-  for _, meter in ipairs(meter_list) do
-    local label_y = start_y + meter.row * line_h
-    local bar_y = label_y + bar_offset
-    local fill_w = math.max(0, math.floor((m[meter.key] / max) * bar_w))
-    rect(bar_x, bar_y, bar_w, bar_h, Meter.COLOR_BG)
-    if fill_w > 0 then
-      rect(bar_x, bar_y, fill_w, bar_h, meter.color)
-    end
-    print(meter.label, label_x, label_y, meter.color, false, 1, true)
-  end
-
-  local ascension_y = start_y + 3 * line_h + 1
-  Ascension.draw(bar_x, ascension_y, { spacing = 5 })
-end

inc/logic/logic.minigame.lua

@@ -1,19 +0,0 @@
--- Manages minigame configurations and initial states.
---- @section Minigame
-
---- Draws a unified win message overlay.
---- @within Minigame
-function Minigame.draw_win_overlay(win_text)
-  local text = win_text or "SUCCESS"
-  local tw = #text * 6
-  local th = 6
-  local padding = 4
-  local box_w = tw + padding * 2
-  local box_h = th + padding * 2
-  local box_x = (Config.screen.width - box_w) / 2
-  local box_y = (Config.screen.height - box_h) / 2
-
-  rect(box_x, box_y, box_w, box_h, Config.colors.dark_grey)
-  rectb(box_x, box_y, box_w, box_h, Config.colors.white)
-  Print.text_center(text, Config.screen.width / 2, box_y + padding, Config.colors.white)
-end

inc/logic/logic.timer.lua

@@ -1,87 +0,0 @@
---- @section Timer
-
-local timer_duration = 1800
-
---- Gets initial timer values.
---- @within Timer
---- @return result table Initial timer values. </br>
---- Fields: </br>
---- * progress (number) Clock timer revolution progress (0 to 1).
-function Timer.get_initial()
-  return {
-    progress = 0,
-  }
-end
-
---- Sets the number of frames for one full timer revolution.
---- @within Timer
---- @param frames number Frames per revolution.
-function Timer.set_duration(frames)
-  timer_duration = frames
-end
-
---- Updates the timer and handles revolution events.
---- @within Timer
-function Timer.update()
-  if not Context or not Context.game_in_progress or not Context.meters or not Context.timer then return end
-  local t = Context.timer
-  local in_minigame = string.find(Window.get_current_id(), "^minigame_") ~= nil
-
-  if not in_minigame then
-    t.progress = t.progress + (1 / timer_duration)
-    if t.progress >= 1 then
-      t.progress = t.progress - 1
-    end
-  end
-end
-
---- Draws the clock timer indicator as a circular progress bar.
---- @within Timer
-function Timer.draw()
-  if not Context or not Context.game_in_progress or not Context.meters or not Context.timer then return end
-  if Context.meters.hidden and not Context.stat_screen_active then return end
-
-  local cx = 10
-  local cy = 8
-  local r_outer = 5
-  local r_inner = 3
-  local progress = Context.timer.progress
-
-  local fg_color
-  if progress <= 0.25 then
-    fg_color = Config.colors.dark_grey
-  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.white
-  local start_angle = -math.pi * 0.5
-  local progress_angle = progress * 2 * math.pi
-  local r_outer_sq = r_outer * r_outer
-  local r_inner_sq = r_inner * r_inner
-
-  for dy = -r_outer, r_outer do
-    for dx = -r_outer, r_outer do
-      local dist_sq = dx * dx + dy * dy
-      if dist_sq <= r_outer_sq and dist_sq > r_inner_sq then
-        local angle = math.atan(dy, dx)
-        local relative = angle - start_angle
-        if relative < 0 then relative = relative + 2 * math.pi end
-        if relative <= progress_angle then
-          pix(cx + dx, cy + dy, fg_color)
-        else
-          pix(cx + dx, cy + dy, bg_color)
-        end
-      end
-    end
-  end
-
-  local hand_angle = start_angle + progress_angle
-  local hand_x = math.floor(cx + math.cos(hand_angle) * (r_inner - 1) + 0.5)
-  local hand_y = math.floor(cy + math.sin(hand_angle) * (r_inner - 1) + 0.5)
-  line(cx, cy, hand_x, hand_y, Config.colors.white)
-end

inc/logic/logic.trigger.lua

@@ -1,135 +0,0 @@
---- @section Trigger
-local triggers = {}
-
---- @within Trigger
---- @param trigger table The trigger data table.
---- @param trigger.id string Unique trigger identifier.
---- @param trigger.duration number Duration in frames before the trigger fires.
---- @param[opt] trigger.on_start function Called when the trigger starts. Defaults to noop.
---- @param[opt] trigger.on_stop function Called when the trigger fires or is manually stopped. Defaults to noop.
---- @param[opt] trigger.repeating boolean If true, trigger restarts after firing. Defaults to false.
-function Trigger.register(trigger)
-  if not trigger or not trigger.id then
-    trace("Error: Invalid trigger registered (missing id)!")
-    return
-  end
-  if not trigger.duration or trigger.duration <= 0 then
-    trace("Error: Invalid trigger registered (missing or invalid duration)!")
-    return
-  end
-
-  if not trigger.on_start then
-    trigger.on_start = function() end
-  end
-  if not trigger.on_stop then
-    trigger.on_stop = function() end
-  end
-  if trigger.repeating == nil then
-    trigger.repeating = false
-  end
-  if triggers[trigger.id] then
-    trace("Warning: Overwriting trigger with id: " .. trigger.id)
-  end
-  triggers[trigger.id] = trigger
-end
-
---- @within Trigger
---- @param id string The trigger ID.
---- @return table|nil result The trigger definition or nil.
-function Trigger.get_by_id(id)
-  return triggers[id]
-end
-
---- @within Trigger
---- @return table result All trigger definitions keyed by ID.
-function Trigger.get_all()
-  return triggers
-end
-
---- @within Trigger
---- @param id string The trigger ID.
---- @return boolean active True if the trigger is running.
-function Trigger.is_active(id)
-  if not Context or not Context.triggers then return false end
-  return Context.triggers[id] ~= nil
-end
-
---- If already active, restarts from 0.
---- @within Trigger
---- @param id string The trigger ID.
-function Trigger.start(id)
-  if not Context or not Context.triggers then return end
-  local trigger = triggers[id]
-  if not trigger then
-    trace("Error: Cannot start unknown trigger: " .. tostring(id))
-    return
-  end
-
-  Context.triggers[id] = { elapsed = 0 }
-  trigger.on_start()
-end
-
---- @within Trigger
---- @param id string The trigger ID.
-function Trigger.stop(id)
-  if not Context or not Context.triggers then return end
-  local trigger = triggers[id]
-  if not trigger then
-    trace("Error: Cannot stop unknown trigger: " .. tostring(id))
-    return
-  end
-  if not Context.triggers[id] then return end
-
-  Context.triggers[id] = nil
-  trigger.on_stop()
-end
-
---- Resets elapsed time to 0 without calling handlers. No-op if inactive.
---- @within Trigger
---- @param id string The trigger ID.
-function Trigger.reset(id)
-  if not Context or not Context.triggers then return end
-  if not triggers[id] then
-    trace("Error: Cannot reset unknown trigger: " .. tostring(id))
-    return
-  end
-  if not Context.triggers[id] then return end
-
-  Context.triggers[id].elapsed = 0
-end
-
---- Pauses during minigames.
---- @within Trigger
-function Trigger.update()
-  if not Context or not Context.game_in_progress or not Context.triggers then return end
-
-  local in_minigame = string.find(Window.get_current_id(), "^minigame_") ~= nil
-  if in_minigame then return end
-
-  local fired = {}
-  for id, state in pairs(Context.triggers) do
-    local trigger = triggers[id]
-    if trigger then
-      state.elapsed = state.elapsed + 1
-      if state.elapsed >= trigger.duration then
-        table.insert(fired, id)
-      end
-    else
-      table.insert(fired, id)
-    end
-  end
-
-  for _, id in ipairs(fired) do
-    local trigger = triggers[id]
-    if trigger then
-      trigger.on_stop()
-      if trigger.repeating then
-        Context.triggers[id] = { elapsed = 0 }
-      else
-        Context.triggers[id] = nil
-      end
-    else
-      Context.triggers[id] = nil
-    end
-  end
-end

inc/map/map.manager.lua

@@ -1,20 +1,5 @@
--- Manages game maps.
---- @section Map
-
-
 local _maps = {}
 
---- Gets all registered maps as an array.
---- @within Map
---- @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
@@ -23,16 +8,6 @@ function Map.get_maps_array()
   return maps_array
 end
 
---- Registers a map definition.
---- @within Map
---- @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)
@@ -40,25 +15,10 @@ function Map.register(map_data)
   _maps[map_data.id] = map_data
 end
 
---- Gets a map by ID.
---- @within Map
---- @param map_id string The ID of the map.
---- @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.
 function Map.draw(map_id)
   local map_data = Map.get_by_id(map_id)
   if not map_data then

inc/map/map.office.lua

@@ -1,9 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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,422 +1,26 @@
+--luacheck: ignore max_line_length
 -- <PALETTE>
--- 000:0404005f574fc2c3c71d2b53fff1e8ab52367e2553ffa30000875129adff83769c00e436fa77a8ff004dc3c3c7ffccaa
+-- 000:ab53375f574f0101017f2553c3c3c71d2b53fff1e929adff83779d3b5dc941a6f673eff7f4f4f494b0c2566c86333c57
 -- </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
--- 008:0000005a00005a55000055a50000a55a00005a5700005533000575f30000757f
--- 009:55a50000a55a50005a55a00057555500fff7a5003f335a00fff3f500fffffa00
--- 016:0000000000000000000000000000003000000353000035350003535100353535
--- 017:0000000000000000000000003000000053300000151300005151300015151300
--- 018:004f99ff000fffff0000ff3300000fff00003666000355550035652503163555
--- 019:99f41000fff26000ff600000f600000063300000555330005555530055535530
--- 020:00356f6f003655f60365511f3653122f3531222f363221220532232203322322
--- 021:f6f530006f563000f1156300f2215300f2226300221233002232130022121300
--- 022:000000000000005100000155000055150000157f0000551300057f3f00017fff
--- 023:00000000555000005155000015515000ff7f5100ff31f200fff3ff0033fff200
--- 024:0000057f00000005000000050000559900055911005599110055119900551199
--- 025:f3ff5000fff500005f5000004415100077995100449915007711955044119550
--- 026:00000000000001330001331300031333001333330031f7f7001133390031999f
--- 027:0000000013310000131330003333130033333100f7f113003337310099975300
--- 028:000000000000000000000a77000057770005777700577777005775a50077a7ff
--- 029:0000000000000000777a0000777750007777750077777750a5a57750fff7a770
--- 030:000000000000051500001151000555550001517f000557ff0001ff3f0007ff1f
--- 031:00000000150000005110000055500000f7110000ff750000f3f10000f1f50000
--- 032:0033535100353533003351ff00351f3f0003ff3f0003ffff00003ff3000323ff
--- 033:5555530033555300ff155300f3f15300f3ff3000ffff30003ff30000ff323000
--- 034:036135250316355503613525031633110333331103f333330333333300033333
--- 035:55565530555355305556553013335530133333303333ff303333333033330000
--- 036:00322322003223330033331a003ff31a003ff3a1003333a100003a1a00003a1a
--- 037:223213003332130011133300111f300011133000111300001113000011130000
--- 038:000007ff0001117f0016171f0155175501561755155117555f7157555ff15755
--- 039:fffff700333f2000ffff7100555571105555716155557111555575ff555575ff
--- 040:005599110055991100ff533300fff511007fff110007f5110000311300003113
--- 041:479915504499155047333f7014113ff011113f70111130003311300003113000
--- 042:0035777f0001776600005777000000550088885508bbb84508bbb8448bb8b844
--- 043:77775300677500007750000055880000558b8000548bb800228bbb80428b8b80
--- 044:005a7f3f0057ff3f07f7ffff07757fdf077a57fd0575357f005a66a70006aa6f
--- 045:ff3f7a50ff3ff750fffff777ffdf7577ddf75a77ff75157577a66a50ff6aa600
--- 046:0005ffff00005ff3000005ff0017775500242777002121710024277100212171
--- 047:fff500003f500000f50000005771000077720000171200001772000017120000
--- 048:00323123003231430032314300313339000f3333000033300000333000033330
--- 049:324303003443030034430300933313003333f000033300000333000003333000
--- 050:0003333000033330000333300003333000053530003311300031113000333330
--- 051:3333000033330000333300003333000035350000311330003111300033333000
--- 052:000031a1000031a100003a1a00003a1a00003333000003f3000003f300000330
--- 053:111300001113000011130000111300003333000003f3000003f3000003300000
--- 054:5ff7646607f59999000991330003993000099130000133300001221000011100
--- 055:666646ff999993f7339913000039930000991300001333000012210000111000
--- 056:0000311300003113000031130000311300003113000033330000165100001111
--- 057:0311300003113000031130000311300003113000033330000165100001111000
--- 058:8888b8445f78b8445f58884405031330000331300003133000053550000577f0
--- 059:218b8880428b87f5218885f5031330500331300003133000053550000577f000
--- 060:0056aa66001f6aaa001fa666007f6aaa00006aaa0000a666000007d7000001d1
--- 061:666aa650aaaa6f106666af10aaaa6f70aaaa60006666a000007d7000001d1000
--- 062:0024277700ff611100fff333005f533300003333000033300000333000001110
--- 063:77720000116f0000335ff000333f000033300000333000003330000001110000
--- 064:00000000000000000000011100003311000111170003317f000117ff00553333
--- 065:0000000000000000110000001110000077110000ff710000ff77000013330000
--- 066:00000000000000330000033300003333000033f7000035ff000535ff0007f333
--- 067:0000000030000000333300003333000037f30000ffff0000ffff0000f333f000
--- 068:000000000000000000000000000000000000000000000122000012440001447f
--- 069:00000000000000000000000000000000000000002210000044210000f7441000
--- 070:000000000000000000000333000038880003888800388881038388310338835f
--- 071:00000000000000003330000088880000883380003355380016665300f7ff7300
--- 072:0000000000000000000000550000055500005577000057ff00007f55000fff33
--- 073:0000000000000000555550005555550077777550ffffff507f755f703f333fff
--- 074:0000000000000011000001130000113100011313000131310013137c003131ff
--- 075:000000001110000013110000313110001313100031313100ffff7100fffff100
--- 076:0000000000000055000005550000055500005577000057ff0007ff55000fff99
--- 077:0000000055550000555550005555500075775500fffff5005f555f703f993ff0
--- 078:0000000000000000000000000000000000001111000014440000144400001555
--- 079:0000000000000000000000000000000011100000441000004410000055100000
--- 080:0077533f000ff77f0005fff500005ff70000015f0005f315005ff3ff00ff3333
--- 081:f33f0000f77f00005ff000007f500000f500000053f00000f3f50000333f0000
--- 082:000fff330005ffff000057f50000007f000333350031313f0031313303113133
--- 083:ff33f000ffff100055f10000ff70000055330000ff3130003331300033311300
--- 084:000447ff000fffff0007f33f000ff11f000f7fff0000ff750000042400001142
--- 085:ff744000ffff1000f33f7000f11f5000fff7f00057ff00004240000044110000
--- 086:038383390338833b038383130338337f0383835f003838350003838300003333
--- 087:99539900bb33bb0099513900fffff530ff66f1007fff53001555310033333000
--- 088:000f7ff300005fff000007ff0000007f0000021f000024410002444400124244
--- 089:fff3ff7ff1ffff50fffff700111f7000ffff1000111142004244442042442410
--- 090:005f5733005f1f2300015fff0000077f00011117001244210144414201421444
--- 091:ff33f500ff23f500fffff00011ff500077710000112410004442410042441410
--- 092:00005fff000005ff0000001f0000000100000114000018140000181400018114
--- 093:fffff500111f5000fff500001110000042411000424180004241810042411100
--- 094:00001fff00001f3f0000cf3f0000cfff00000cf3000023cc000131ff001f1f11
--- 095:ff1000003f1000003ff00000fff00000fc000000c3200000f13100001f1f1000
--- 096:00ff33330033133305f333330ff31333033333330f5313330ff1311107f13333
--- 097:333f0000333f5000333f5000333ff000333330003335f500111ff5003337f000
--- 098:03113133031131330333313303113131033331320555313107ff313307ff3131
--- 099:333113003331130033333300213113004233330021317f0033317f5001317500
--- 100:0002441400244441024444240242442414424424144144241441442414414424
--- 101:4144210014444200424444204244422042444241424441414244414142444141
--- 102:000333330033a3530032a353003a332303a23333032a333303a23333032a3333
--- 103:3333300055353300553533002232323033333130333332303333313333333233
--- 104:001441440014424400144144001441240017f311001ff133001fff330007f333
--- 105:4244142042442410424414204244122012113f7031333ff033333ff030333f00
--- 106:01421444014414440142144431421444011111110fff1a5a0ff755a505755a51
--- 107:44441410424414104444141042441410111111105a5a55f5a5a5a5f5111a5170
--- 108:0001181400018114000118140001811300011333005fff33000f773300055333
--- 109:424181104241181042418110222318101113310033335ff03333f77033335500
--- 112:0553333300033330000333000033330000333300003333000011110000121200
--- 113:3330000033300000333000003330000033300000333000001111000012120000
--- 114:05f5313103003131033311310311113103111131003111300003333000012120
--- 115:0131130001311300013113000131130001311300003113000033330000121200
--- 116:0fff242407f72211005544200002442000024420000244200002222000024440
--- 117:424441f1112227f1024425500244200002442000024420000222200002444000
--- 118:0333333307ff333307f733330070333000003330000033300000111000001110
--- 119:33333575333331f1333335750033300000333000003330000011100000111100
--- 120:0000033300000333000003330000033300000333000003330000033300000111
--- 121:0033300000333000003330000033300000333000003330000033300010111100
--- 122:005015a100001a51000015a100001a51000015a1000022510000924900009999
--- 123:0315a150001a51000015a100001a51000015a100002251000092490000999900
--- 124:0000033300000333000003330000033300000333000003330000033300000111
--- 125:0333000003330000033300000333000003330000033300000333000000111000
--- 129:0000000000000000000000000000000000000000011515101151515151515151
--- 144:0000000500000015000000150000057f000005ff0000017f0000331700073331
--- 145:1ffffff7ff0fff0fff1fff1fffffffffff7555fffffffffffff111ff57fffff7
--- 146:1000000071000000f5000000ff000000ff500000ff5000007513100051333700
--- 160:0077333303331333333313333331333333313333355133335ff513335ff71111
--- 161:1111111133333333333337333333373333333733333337333333373311117711
--- 162:133337003733133077731330333331333333313333333155333337ff1111175f
--- 176:0775333300031333000333130000333300001333000033330000033300000111
--- 177:3335773333333533333333331313131333333333300000033000000310000001
--- 178:3333357533331000331300001333000033310000333300003331000011110000
--- </SPRITES>
--- <MAP>
--- 000:ffffffffff0010201020102010201020102010201020102000ffffffffff40404040404087f3f3f3f397a7b7c7d7a7e7f70818a7b7c7d7a7b7c7d7a70b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b1b2b0b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- 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>
--- 016:00000000000000400040004000700070007000400040004000700070007000c000c000c000c000c000c000c000c000c000c000c000c000c000c000c0470000000000
+-- 000:060006400600064006000640060006400600060006000600060006000600060006000600060006000600060006000600060006000600060006000600300000000900
--- 017:030003000300030003000300036003600360036003600360136023c033c053c063c083c0a3c0b3c0c3c0c3c0d3c0d3c0e3c0f3c0f3c0f3c0f3c0f3c0400000000000
+-- 016:05000500050005400540054005700570057005400540054005700570057005c005c005c005c005c005c005c005c005c005c005c005c005c005c005c0470000000000
--- 018:03c003c003c003c003c003c0036003600360036003600360230033005300630083009300a300b300c300d300d300e300e300e300f300f300f300f300400000000000
+-- 017:040004000400040004000400046004600460046004600460146024c034c054c064c084c0a4c0b4c0c4c0c4c0d4c0d4c0e4c0f4c0f4c0f4c0f4c0f4c0400000000000
--- 019:0300030003000300030003d013d013d023d033d053d073d093d0b3d0c3d0e3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0f3d0400000000000
+-- 018:04c004c004c004c004c004c0046004600460046004600460240034005400640084009400a400b400c400d400d400e400e400e400f400f400f400f400300000000000
+-- 019:0400040004000400040004d014d014d024d034d054d074d094d0b4d0c4d0e4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0400000000000
 -- 020:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900500000000000
--- 021:01000100010001000100f10001100110011001100110f11001200120012001200120f1201130113011302130213021302130313041308130a130d130580000000000
+-- 021:01000100010001000100f10001100110011001100110f11001200120012001200120f1201130113011302130213021302130313041308130a130d130380000000000
--- 022:03b003100300030003000300130063009300b300c300d300d300e300e300e300f300f300f300f300f300f300f300f300f300f300f300f300f300f300400000000000
+-- 032:010001100100011001000110010001100100010001000100010001000100010001000100010001000100010001000100010001000100010001000100301000000800
--- 032:010001100100011001000110010001100100010001000100010001000100010001000100010001000100010001000100010001000100010001000100400000000800
+-- 033:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
--- 033:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000004
+-- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006004600000f0f00
--- 034:02000240020002000200020002000200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f200f2004700000f0200
+-- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000004600000f0f00
--- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006001600000f0f00
+-- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
--- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000005600000f0f00
+-- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100100000080800
--- 048:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900400000000000
+-- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000
--- 056:4100510061406140717081709100b100c100d100e100e100e100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100480000000600
+-- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200100000000000
--- 057:000000010002000300020001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000840000000004
+-- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00400000000000
--- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100003000080800
+-- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100484000000000
--- 059:03000300030003000300030003000300030003000300030003000300030003000300030003000300030003000300030003000300030003000300030000b000000000
+-- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000405000000000
--- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200500000000000
--- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00100000000000
--- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100580000000000
--- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000500000000000
 -- </SFX>
 -- <WAVES>
 -- 000:bcceefceedddddc84333121268abaa99
@@ -430,17 +34,280 @@
 -- 008:0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
 -- 009:fff000fff000fff000fff000fff000ff
 -- </WAVES>
--- <PATTERNS>
+-- <TILES>
--- 000:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000008c10000000008c10000000000000000000000000000000000000000000000000000000000000000004008b50000000000000000001008c10000004008b50000001008c10000000008c1000000e008b30000004008b50000001008c10000000008c10000000008c10000000008c10000000008c10000000008c1000000000000000000000000000000
+-- 000:2222222223333332233232322353533223323232232353322333333222222222
--- 001:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007008b50000007008b50000001008c10000007008b50000001008c10000000008c10000007008b50000009008b50000001008c10000009008b50000001008c10000009008b50000009008b50000001008c10000009008b50000001008c1000000
+-- 001:2222222223333333232322322333333323222322233333332355355522222222
--- 003:4008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d9000000000000000000000000000000000000000000
+-- 002:2222222233333333223222233333333332232223333333333555535522222222
--- 004:43398d000000e0088b000000b0088b000881e0088b00000040088d000000e0088b000881b0088b000000e0088b00000040088d000000e0088b000000b0088b000000e0088b00000040088d000000e0088b000000b0088b000000e0088b00000040088b000000e00889000000b00889000000e0088900000040088b000000e00889000000b00889000000e0088900000040088b000000e00889000000b00889000000e0088900000040088b000000e00889000000b00889000000e00889000000
+-- 003:2222222223333333232322322333333323222322233333332355355522222222
--- 005:455981000000000881000000000881000000000000000000400883000000000000000000000000000000000000000000400881000000000000000000000000000000000000000000400883000000000000000000000000000000000000000000400881000000000000000000000000000000000000000000400883000000000000000000000000000000000000000000400881000000000000000000000000000000000000000000400883000000000000000000000000000000000000000000
+-- 004:2222222233333333223222233333333332232223333333333555535522222222
--- 008:4aa9b30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005008b30000000000000000000000000000000000000000000008b10000000000000000000008910000000000000000004008b30000000000000000000000000000000000000000000000000000000000000000000008b1000000000000000000f008b1000000000000000000000000000000000000000000000891000000000000000000000000000000000000000000
+-- 005:2222222223333333232322322333333323222322233333332355355522222222
--- 009:4779d30000000000000000004008d30000000000000000004008db0000000000000000004008d30000000000000000004008d30000000000000000004008d30000000000000000004008db0000000000000000004008d30000000000000000004008d30000000000000000004008d30000000000000000004008db0000000000000000004008d30000000000000000004008d30000000000000000004008d30000000000000000004008db0000000000000000004008d3000000000000000000
+-- 006:2222222233333333223222233333333332232223333333333555535522222222
--- </PATTERNS>
+-- 007:2222222223333333232322322333333323222322233333332355355522222222
--- <TRACKS>
+-- 008:2222222233333333223222233333333332232223333333333555535522222222
--- 000:1000012000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ff
+-- 009:2222222223333333232322322333333323222322233333332355355522222222
--- 001:581000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 010:2222222233333333223222233333333332232223333333333555535522222222
--- 002:900082000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+-- 011:2222222223333333232322322333333323222322233333332355355522222222
--- </TRACKS>
+-- 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/meta/meta.header.lua

@@ -1,8 +1,8 @@
 -- title:   Definitely not an Impostor
 -- name: impostor
 -- author:  Teletype Games
--- desc:    Life of a programmer
+-- desc:    Life of a programmer in the Vector
 -- site:    https://git.teletype.hu/games/impostor
 -- license: MIT License
--- version: 1.0-beta1
+-- version: 0.1
 -- script:  lua

inc/rle/rle.manager.lua

@@ -1,47 +0,0 @@
---- @section RLE
-RLE = {
-  data = {}
-}
-
---- Registers an RLE-encoded image.
---- @param rle_data table Table containing 'id', 'values' and 'runs' arrays.
-function RLE.register(rle_data)
-  table.insert(RLE.data, rle_data)
-end
-
---- Gets the RLE data for a given ID.
---- @param id string The identifier of the image.
---- @return table|nil The RLE data or nil if not found.
-function RLE.get(id)
-    for _, rle_data in ipairs(RLE.data) do
-        if rle_data.id == id then
-            return rle_data
-        end
-    end
-    return nil
-end
-
---- Draws an RLE-encoded image by its ID.
---- @param id string The identifier of the image to draw.
-function RLE.draw(id)
-    local rle_data = RLE.get(id)
-    if not rle_data then return end
-
-    local img_values = rle_data.values
-    local img_runs = rle_data.runs
-
-    local SCREEN_WIDTH=240
-    local SCREEN_HEIGHT=136
-    local val_i=0
-    local run=0
-    for y=0,SCREEN_HEIGHT-1 do
-        for x=0,SCREEN_WIDTH-1 do
-            if run==0 then
-                val_i=val_i+1
-                run=img_runs[val_i]
-            end
-            run=run-1
-            pix(x,y,img_values[val_i])
-        end
-    end
-end

inc/rle/rle.register.lua

@@ -1,19 +0,0 @@
-RLE.register({
-    id = "ddr_background",
-    values = {1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1},
-    runs = {809,40,5,26,178,42,4,7,30,10,127,103,11,1,116,124,116,124,115,18,60,47,115,10,105,10,115,9,108,9,114,9,108,9,114,9,108,9,114,9,33,31,44,9,114,9,34,28,46,9,114,9,108,9,114,9,108,9,114,9,108,9,114,9,108,9,114,9,109,8,114,9,109,8,114,9,109,9,112,10,105,1,3,9,111,11,104,2,3,9,111,11,101,5,3,9,111,11,101,5,3,9,111,9,103,5,3,9,111,9,99,1,2,6,3,9,111,9,99,1,2,8,1,9,111,9,3,1,88,1,3,1,2,11,1,9,111,9,3,1,88,1,3,14,1,9,111,9,3,1,88,1,3,1,2,11,1,9,111,9,3,1,88,1,5,12,1,9,111,9,3,1,88,1,3,14,1,9,111,9,3,1,88,3,1,1,2,11,1,9,111,9,3,1,88,3,1,14,1,9,111,9,3,1,88,3,2,13,2,8,111,9,3,1,88,3,3,12,3,8,110,9,3,1,88,3,3,12,3,9,109,9,3,1,88,3,1,14,3,9,109,9,3,1,90,1,1,7,3,4,3,9,109,9,3,1,90,1,1,5,6,3,3,9,108,10,3,1,44,1,4,1,40,1,1,5,7,2,3,9,108,10,3,1,44,1,4,1,38,3,1,5,7,3,2,9,108,10,3,1,48,1,39,3,1,5,7,2,3,9,108,10,3,1,88,3,1,5,6,3,3,9,108,10,3,1,32,5,4,4,3,2,38,3,1,15,2,9,108,10,3,1,41,5,2,2,2,4,32,3,1,15,2,9,108,10,2,2,41,9,2,5,3,1,3,1,23,3,1,9,1,5,2,9,108,10,2,2,41,12,35,3,1,7,4,4,2,9,108,10,2,2,32,26,30,3,1,5,7,3,2,9,108,10,2,2,36,21,31,9,7,3,2,9,108,10,2,2,35,23,30,10,6,3,2,9,108,10,2,2,35,23,30,11,4,4,2,9,108,10,2,2,34,24,30,19,2,9,108,10,2,2,33,25,30,19,2,9,108,10,2,2,32,28,28,19,2,9,108,10,2,2,32,30,26,19,2,9,108,10,2,2,33,31,24,19,2,9,108,10,2,4,37,17,32,19,2,10,107,10,2,5,85,19,2,10,107,10,2,109,2,10,107,12,1,107,3,10,107,133,107,133,107,133,107,133,107,133,107,133,107,133,118,111,129,6,63,3,28,10,121,13,98,6,142,7,76,6,129,10,13,5,77,15,109,4,31,4,78,4,24,7,75,173,66,176,64,177,62,178,62,178,62,56,31,2,7,2,2,3,2,1,2,1,61,8,62,56,114,8,62,56,114,8,62,56,114,8,62,56,114,8,62,9,8,39,114,9,61,8,9,39,114,9,61,8,9,39,114,9,61,8,9,39,114,9,61,8,9,39,114,9,61,8,9,39,114,9,61,8,9,39,115,8,61,8,8,40,115,8,61,56,115,8,61,13,2,1,1,1,1,16,1,1,2,17,115,8,61,13,2,1,1,1,2,1,1,10,2,1,1,1,2,1,2,7,1,6,115,8,60,14,2,1,1,1,5,9,2,1,1,1,2,1,2,6,2,6,115,8,59,15,2,1,1,1,5,9,2,1,1,1,2,1,2,6,2,6,115,8,59,15,2,1,1,1,6,8,2,1,1,1,2,1,2,14,115,8,59,6,1,11,1,1,7,10,1,1,2,1,2,14,115,8,59,6,1,11,1,1,7,10,1,1,2,1,2,1,1,12,115,9,58,6,1,1,2,10,9,8,1,1,2,1,2,1,1,12,115,9,58,6,1,1,2,8,1,1,9,8,1,1,2,1,2,1,1,11,116,9,58,6,1,1,2,1,2,7,9,8,1,1,2,1,2,1,1,11,116,9,58,6,1,1,2,1,2,7,9,10,2,1,2,1,1,11,116,9,58,57,116,9,58,58,115,9,102,13,116,9,58,48,2,10,1,3,22,84,5,7,58,158,7,5,6,6,75,3,7,2,7,1,7,2,6,1,6,2,6,2,4,4,6,2,6,1,6,2,6,3,6,1,6,5,7,8,7,9,11,1,9,2,50,1,22,1,14,5,3,5,3,4,3,6,3,5,2,16,2,5,3,14,2,6,2,6,5,5,11,4,30,1,50,1,37,6,3,5,3,5,2,6,3,5,3,6,1,7,2,6,2,15,2,6,2,5,6,5,12,1,15,1,106,93,2,8,10,5,2,6,2,5,4,4,100,7,3,13,2,65,3,8,3,5,2,5,4,4,3,5,4,4,100,94,2,5,3,5,4,4,6,5,2,5,105,86,2,13,3,5,4,4,6,5,2,1,1,3,102,4,2,24,2,62,1,1,2,7,3,5,4,5,4,5,2,8,4,2,92,5,2,24,2,61,5,5,7,2,5,6,3,4,3,7,102,88,6,7,12,8,6,1,3,7,103,87,6,7,11,9,6,1,3,7,110,1,9,9,5,1,2,1,3,47,162,1,10,6,27,34,162,1,10,6,27,34,97,3,57,14,2,7,26,66,9,33,5,2,17,223,17,223,18,222,47,193,53,1,3,163,19,1,85,109,14,29,36,151,784},
-})
-
-
-RLE.register({
-    id = "mysterious_man_background",
-    values = {0,1,0,1,0,1,0,1,0,1,0,1,2,1,4,1,0,2,4,1,0,2,4,1,0,2,4,1,0,2,4,1,0,2,4,2,1,4,2,1,4,1,0,2,4,1,0,1,4,2,1,2,1,0,1,2,4,1,0,2,4,2,1,0,1,2,1,2,1,0,1,4,1,0,2,4,2,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,4,1,0,2,4,2,0,1,2,4,1,0,2,4,1,0,1,0,4,1,0,2,4,0,1,0,1,0,1,0,4,1,0,2,4,0,1,4,1,0,2,4,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,4,1,0,2,4,1,0,1,0,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,1,2,1,0,1,4,1,0,2,4,2,1,0,1,2,4,1,0,2,4,2,1,0,1,2,4,1,0,2,4,1,2,0,1,0,1,0,1,2,1,2,1,0,2,4,1,0,2,4,0,1,0,1,2,1,0,1,0,2,4,1,0,2,4,2,1,0,1,0,1,4,1,0,2,4,2,1,0,1,0,2,4,2,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,2,1,0,1,0,2,0,1,4,1,0,2,4,1,0,1,0,1,2,0,1,4,1,0,2,4,2,1,0,1,0,1,4,1,0,2,4,2,1,0,2,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,0,1,0,1,0,1,0,1,4,1,0,2,4,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,2,4,1,0,2,4,2,1,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,0,1,4,1,0,2,4,2,4,1,0,1,0,1,0,1,0,1,0,1,2,1,4,2,4,1,0,2,4,2,1,0,1,0,1,0,1,0,1,0,1,2,1,4,2,4,1,0,2,4,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,4,1,0,2,4,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,2,1,4,1,0,2,4,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,2,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,2,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,2,0,1,0,1,0,4,1,0,2,4,0,1,0,1,0,2,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,2,0,1,4,1,0,2,4,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,2,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,2,4,1,0,2,4,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,2,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,2,4,1,0,2,4,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,2,4,1,0,2,4,2,0,1,0,1,4,1,0,2,4,2,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,0,1,0,1,4,2,1,0,1,2,1,2,1,0,1,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,0,1,2,0,1,0,2,1,0,1,2,0,1,0,2,0,1,0,1,0,1,2,0,1,0,1,0,1,0,2,0,1,0,1,0,1,0,2,0,1,0,1,0,2,1,0,1,0,1,2,0,1,0,2,0,2,1,0,1,2,0,2,1,0,1,0,1,2,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,0,2,1,0,1,0,1,0,1,0,1,0,2,1,0,1,2,0,1,0,1,2,1,0,1,0,1,0,1,0,2,1,0,2,0,1,0,1,0,2,0,1,0,1,0,2,0,1,0,2,0,1,0,1,0,2,1,0,1,2,0,1,0,1,0,1,0,1,0,2,0,1,0,2,0,1,0,2,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0},
-    runs = {1480,1,151,1,87,1,1,150,1,1,86,1,2,148,1,2,87,2,148,2,88,2,148,2,88,2,148,2,88,2,148,2,88,2,70,1,2,9,1,2,63,2,88,2,69,1,2,3,5,1,1,1,1,1,1,1,61,2,88,2,68,1,1,3,1,2,1,3,2,3,2,61,2,88,2,68,1,6,1,4,1,5,1,1,60,2,88,2,67,1,1,17,2,60,2,88,2,67,1,19,1,1,59,2,88,2,67,1,19,1,1,59,2,88,2,67,4,1,11,1,1,1,3,59,2,88,2,67,21,1,59,2,88,2,67,21,1,59,2,88,2,66,1,21,2,58,2,88,2,66,1,21,1,1,58,2,88,2,66,4,17,2,1,58,2,88,2,65,2,5,1,15,2,58,2,88,2,63,1,1,2,22,4,55,2,88,2,57,2,2,34,2,2,49,2,88,2,55,1,2,39,3,1,47,2,88,2,55,5,1,3,2,2,1,25,1,1,1,1,1,1,1,47,2,88,2,57,1,2,1,29,1,4,1,1,1,1,49,2,88,2,59,1,2,8,15,9,2,52,2,88,2,62,2,1,1,1,24,1,1,1,54,2,88,2,66,1,22,1,58,2,88,2,66,1,21,1,59,2,88,2,66,2,20,1,59,2,88,2,65,3,20,2,58,2,88,2,63,2,2,1,20,1,1,2,56,2,88,2,61,2,4,1,20,1,2,2,55,2,88,2,59,1,1,6,1,19,1,4,2,54,2,88,2,58,2,7,2,17,1,1,6,2,52,3,87,2,56,1,2,9,1,26,2,51,3,87,2,55,1,1,40,1,50,2,88,2,54,2,41,1,50,2,88,2,53,2,42,2,49,2,88,2,52,2,44,2,48,2,88,2,51,2,46,2,47,2,88,2,50,2,16,1,31,1,47,2,88,2,50,3,1,14,1,29,1,1,2,46,2,88,2,50,18,1,29,1,2,1,46,2,88,2,50,4,14,1,33,1,45,2,88,2,53,1,3,11,2,15,1,13,1,2,46,2,88,2,56,1,1,11,1,15,1,10,2,1,49,2,88,2,55,2,3,10,2,12,2,8,8,46,2,88,2,50,1,1,4,4,1,9,2,11,2,8,2,4,2,1,2,1,1,42,2,88,2,48,2,3,8,1,9,2,9,3,7,2,8,1,1,2,1,1,40,2,88,2,45,3,2,1,1,1,1,8,1,7,1,1,3,6,4,6,1,8,1,1,1,1,4,2,38,2,88,2,45,1,2,2,22,4,4,4,6,1,10,1,1,2,1,2,1,2,37,2,88,2,42,1,1,1,4,1,2,19,1,1,4,1,5,21,1,2,6,35,2,88,2,42,2,1,1,1,1,15,2,8,3,4,3,6,1,17,1,1,2,1,1,1,34,2,88,2,41,3,1,1,15,2,9,3,5,2,8,1,21,1,1,34,2,88,2,41,1,1,1,16,2,11,2,5,2,9,2,18,2,1,34,2,88,2,41,1,2,1,14,2,13,1,5,1,12,1,17,1,2,34,2,88,2,41,1,16,1,17,1,2,1,14,2,17,1,1,33,2,88,2,41,1,2,1,12,1,17,1,3,2,15,1,14,1,1,1,1,33,2,88,2,41,15,1,22,1,17,1,1,11,1,3,1,33,2,88,2,41,1,14,2,40,1,15,1,33,2,88,2,41,1,15,2,35,1,3,1,10,1,4,1,33,2,88,2,41,1,3,1,12,2,36,2,11,1,4,1,33,2,88,2,40,1,1,18,1,35,1,12,1,4,1,1,32,2,88,2,40,2,4,1,14,1,33,1,12,1,6,1,32,2,88,2,40,1,6,1,14,1,31,1,13,1,6,1,32,2,88,2,39,2,22,2,28,1,21,1,1,31,2,88,2,39,2,24,1,26,1,22,1,1,31,2,88,2,39,2,25,1,24,1,23,1,1,31,2,88,2,39,1,27,1,22,2,23,1,1,31,2,88,2,39,1,49,2,24,3,30,2,88,2,39,1,48,1,27,1,1,30,2,88,2,39,1,47,2,27,1,1,30,2,88,2,37,1,1,47,2,28,1,1,30,2,88,2,37,1,1,46,1,30,2,1,29,2,88,2,37,1,47,1,30,2,30,2,88,2,37,1,1,2,43,1,33,30,3,87,2,37,1,45,1,31,1,1,2,29,3,87,2,37,45,1,35,1,29,1,1,88,2,1,35,1,1,80,2,1,26,1,3,86,1,1,2,1,21,1,4,4,2,1,3,80,30,1,2,125,2,80,2,156,2,79,2,1,156,2,1,77,4,156,1,3,76,3,1,140,1,15,1,2,2,74,2,1,1,1,5,3,129,1,18,1,82,1,7,1,129,1,18,1,82,1,9,1,123,3,20,1,1,80,2,11,1,1,119,1,22,1,1,1,2,76,4,1,154,2,2,63,1,14,3,1,126,1,27,2,65,1,17,1,17,2,132,4,66,1,17,4,113,39,66,2,16,31,191,1,1,1,15,1,153,2,15,3,48,2,16,2,152,1,16,1,1,1,48,2,16,2,152,1,1,2,2,1,10,1,1,1,48,1,13,6,153,1,3,13,1,1,48,1,15,2,1,1,153,3,64,1,16,2,154,1,1,83,1,154,1,17,1,66,1,154,1,17,1,66,1,155,1,82,1,156,1,82,1,156,1,1,80,1,1,157,2,78,2,158,2,78,2,158,1,80,1,158,1,79,2,158,1,79,1,159,1,79,1,160,1,77,2,160,1,77,1,162,1,74,1,1,1,162,1,75,1,239,1,165,1,72,1,166,1,240,1,69,1,412,1,63,1,175,1,63,2,238,1,175,1,63,1,239,1,807},
-})
-
-
-RLE.register({
-    id = "draw_day_switch_background_1",
-    values = {1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1},
-    runs = {86,2,238,2,225,1,10,5,224,1,8,8,221,4,5,2,1,8,219,6,2,13,217,1,2,19,1,1,213,2,4,19,2,1,211,2,5,19,3,1,208,1,7,20,4,1,204,2,7,2,1,19,5,1,201,2,7,2,3,19,6,1,198,2,7,2,5,9,2,1,2,5,7,1,195,2,7,2,7,5,7,7,8,1,192,2,7,2,9,5,8,6,9,1,188,3,7,2,11,5,9,5,10,1,186,2,7,2,13,5,9,5,11,1,182,2,7,3,15,5,9,5,12,1,179,2,8,2,17,5,9,5,13,1,176,2,7,3,19,5,9,5,14,1,173,2,7,3,21,5,9,5,15,1,169,3,7,2,24,5,9,5,16,1,166,2,8,2,26,5,9,5,3,1,177,2,8,3,27,5,9,5,4,1,13,1,159,3,7,3,30,5,8,6,5,1,170,3,7,3,32,5,7,7,6,1,13,1,153,2,8,2,35,19,7,1,164,2,7,3,37,19,8,1,160,3,7,3,39,19,9,1,156,3,8,3,41,19,10,1,153,3,8,2,44,19,25,1,136,3,8,2,46,19,160,2,8,3,48,19,157,3,7,4,50,7,6,6,15,1,139,2,9,3,52,6,7,6,16,1,12,1,122,3,8,3,55,6,7,6,17,1,132,4,7,3,57,6,7,6,159,2,60,6,7,6,32,1,123,3,62,6,7,6,33,1,119,4,64,6,7,6,22,1,128,3,67,6,7,6,150,2,1,1,67,6,7,6,153,1,67,6,7,6,25,1,11,1,115,1,67,6,7,6,26,1,126,1,67,6,7,6,28,1,124,1,67,6,7,6,29,1,11,1,111,1,67,6,7,6,30,1,11,1,110,1,66,7,6,8,42,1,109,1,66,21,32,1,10,1,71,4,33,1,66,21,115,1,2,1,33,1,66,21,119,1,32,1,66,21,36,1,115,1,66,21,48,1,66,1,2,1,33,1,66,21,38,1,10,1,65,4,33,1,66,21,152,1,66,21,152,1,66,8,6,7,152,1,66,7,7,7,114,6,32,1,66,7,7,7,114,6,32,1,66,7,7,7,57,1,56,2,2,2,32,1,66,7,7,7,58,1,18,1,35,7,32,1,12,1,49,1,3,7,7,7,19,1,1,1,2,2,24,1,8,2,46,1,4,8,32,1,66,8,6,7,12,1,1,1,4,3,2,2,2,2,2,1,18,2,7,3,44,1,3,9,32,1,12,1,1,1,51,8,6,7,14,1,1,2,1,1,1,1,2,3,1,3,1,1,3,1,2,2,11,4,1,1,2,5,41,1,3,10,32,1,12,3,51,8,5,8,7,3,2,1,1,1,1,2,1,1,1,1,1,4,1,6,1,2,2,2,1,2,1,3,1,2,1,6,1,2,1,4,39,3,2,3,1,6,32,1,8,1,2,6,2,1,4,1,2,1,7,1,30,8,5,8,2,2,3,1,1,1,6,2,1,11,1,6,2,2,1,2,1,6,1,15,24,5,1,3,1,7,2,3,1,10,28,1,14,1,9,2,1,1,38,8,1,1,2,9,1,3,10,1,1,6,10,1,2,2,1,1,3,9,1,4,1,6,1,7,8,47,26,1,27,1,7,1,18,1,4,1,4,13,1,9,1,3,3,1,1,1,1,4,1,1,2,3,2,5,2,7,1,2,1,6,1,7,1,16,1,53,25,1,66,8,1,1,3,8,1,3,3,1,1,2,3,1,1,1,1,4,2,2,2,1,7,1,2,1,1,1,1,4,1,3,1,31,7,2,1,15,6,2,1,7,1,2,25,1,66,7,7,7,29,1,2,1,3,1,6,1,16,1,2,3,6,14,5,16,2,6,10,2,25,1,66,7,7,7,57,1,7,6,1,36,9,8,1,1,25,1,66,7,7,7,68,35,7,11,5,1,25,1,66,7,7,7,69,2,1,3,1,22,7,16,2,1,2,1,25,1,66,8,6,7,75,19,6,21,2,1,2,1,92,21,79,4,1,7,4,26,2,1,2,1,2,1,89,21,91,12,9,1,1,7,2,1,28,1,66,21,87,12,13,9,98,21,84,11,19,6,99,21,80,12,22,2,3,1,32,1,66,21,70,1,5,13,25,6,99,21,73,13,28,6,2,1,29,1,66,21,69,14,31,7,31,1,66,21,58,2,6,14,39,1,99,8,4,9,55,1,6,15,42,1,99,8,5,8,51,2,6,15,145,8,5,8,48,2,5,17,147,8,5,8,43,3,6,17,150,8,5,8,40,2,6,18,153,8,5,8,36,3,5,20,155,8,5,8,32,4,5,19,1,2,156,8,5,8,29,3,6,19,95,1,66,8,5,8,25,4,5,21,97,1,66,8,5,8,22,4,5,21,167,8,5,8,18,5,5,21,170,8,5,8,14,6,4,23,105,1,66,8,5,8,11,4,6,23,108,1,66,8,5,8,8,4,6,23,111,1,66,8,5,8,4,4,6,24,114,1,66,8,5,14,7,23,116,1,66,8,6,8,2,1,4,25,119,1,66,8,5,8,3,1,2,24,122,1,66,8,3,38,124,1,65,24,1,22,127,1,63,1,1,44,130,1,63,7,1,5,1,30,132,1,58,3,1,42,135,1,58,14,2,27,138,1,56,10,1,32,140,1,53,8,4,27,1,3,143,1,49,9,1,1,2,1,1,24,2,2,147,1,47,7,5,32,148,1,30,1,12,8,5,32,151,1,28,1,1,1,3,1,4,4,1,3,6,35,151,1,22,10,1,10,1,1,4,39,151,1,20,25,2,41,151,1,18,47,1,22,151,1,18,70,148,2,1,1,17,71,148,4,17,71,148,4,14,61,2,10,149,6,10,63,2,10,149,8,4,66,4,9,149,80,2,9,149,91,149,92,78,3,67,92,148,80,3,9,148,92,148,92,148,92,148,92,74,1,3,2,68,92,73,3,2,3,67,92,69,1,3,3,2,2,68,94,66,2,1,5,2,3,67,95,58,15,2,1,69,96,55,21,68},
-})

inc/screen/screen.home.lua

@@ -4,16 +4,6 @@ Screen.register({
   decisions = {
     "go_to_toilet",
     "go_to_walking_to_office",
-    "go_to_sleep",
-    "go_to_end",
   },
-  init = function()
-    Audio.music_play_room_work()
-  end,
   background = "bedroom",
-  draw = function()
-    if Context.home_norman_visible and Window.get_current_id() == "game" then
-      Sprite.draw_at("norman", 100, 80)
-    end
-  end
 })

inc/screen/screen.manager.lua

@@ -1,17 +1,13 @@
---- @section Screen
 local _screens = {}
 
---- Registers a screen definition.
+--- Registers a new screen definition with the Screen manager.
---- @within Screen
+-- Overwrites existing screen if an ID conflict occurs.
---- @param screen_data table The screen data table.
+-- @param screen_data table A table containing the screen definition.
---- @param screen_data.id string Unique screen identifier.
+--        Must include an `id` field (string).
---- @param screen_data.name string Display name of the screen.
+--        Optional fields:
---- @param screen_data.decisions table Array of decision ID strings available on this screen.
+--        - `situations` (table): A table of situation IDs allowed on this screen. Defaults to an empty table.
---- @param screen_data.background string Map ID used as background.
+--        - `init` (function): Function to execute once when the screen becomes active. Defaults to an empty function.
---- @param[opt] screen_data.situations table Array of situation ID strings. Defaults to {}.
+--        - `update` (function): Function to execute each frame while the screen is active. Defaults to an empty function.
---- @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)
@@ -21,46 +17,16 @@ function Screen.register(screen_data)
   end
   if not screen_data.init then
     screen_data.init = function() end
-  end
-    if not screen_data.exit then
-    screen_data.exit = function() end
   end
   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.
+--- Retrieves a registered screen by its ID.
---- @within Screen
+-- @param screen_id string The ID of the screen to retrieve.
---- @param screen_id string The ID of the screen.
+-- @return table The screen table, or `nil` if not found.
---- @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 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.mysterious_man.lua

@@ -1,276 +0,0 @@
---- @section MysteriousManScreen
-
-local STATE_TEXT = "text"
-local STATE_DAY = "day"
-local STATE_CHOICE = "choice"
-
-local ASC_01_TEXT = [[
-  Normann seems to be in line,
-  ...
-  and stays seeking for oxes
-  ...
-  within the confines.
-  ...
-  Very good.
-]]
-
-local ASC_12_TEXT = [[
-  We have a problem!
-  ...
-  Normann formed his first thought.
-  ...
-  He saw the tracks.
-]]
-local ASC_23_TEXT = [[
-  Not good, not terrible.
-  ...
-  Normann caught his glimpse
-  ...
-  of another way
-  ...
-  - quite literally -
-  ...
-  if this continues,
-  ...
-  we will lose control.
-]]
-local ASC_34_TEXT = [[
-  There is no turning back now for Norman.
-  ...
-  He caught on.
-  ...
-  I hoped it would never come to this...
-]]
-
---[[ Norman speaks for the first time during MM screen ]]
-local ASC_45_TEXT = [[
-  Wait, who are you?
-  ...
-  *silence*
-  ...
-  Why am I seeing this?
-  ...
-  *silence*
-  ...
-]]
-
-local ascension_texts = {
-  [1] = ASC_01_TEXT,
-  [2] = ASC_12_TEXT,
-  [3] = ASC_23_TEXT,
-  [4] = ASC_34_TEXT,
-  [5] = ASC_45_TEXT,
-}
-
-function MysteriousManScreen.get_text_for_level(level)
-  return ascension_texts[level] or ASC_01_TEXT
-end
-
-local state = STATE_TEXT
-local text_y = Config.screen.height
-local text_speed = 12 -- pixels per second
-local day_timer = 0
-local day_display_seconds = 2
-local text_done = false
-local text_done_timer = 0
-local TEXT_DONE_HOLD_SECONDS = 2
-local selected_choice = 1
-local text = ASC_01_TEXT
-local day_text_override = nil
-local on_text_complete = nil
-local show_mysterious_screen = true
-local trigger_flash_on_wake = false
-
-MysteriousManScreen.choices = {
-  {
-    label = "Wake Up",
-  },
-  {
-    label = "Stay in Bed",
-  },
-}
-
--- Draws the background image
--- @within MysteriousManScreen
-function MysteriousManScreen.draw_background()
-    RLE.draw("mysterious_man_background")
-end
-
-function MysteriousManScreen.draw_day_switch_background()
-  RLE.draw("day_switch_background")
-end
-
--- Transitions from the text phase to the day display phase, starting the timer for how long the day label is shown.
--- @within MysteriousManScreen
-function MysteriousManScreen.go_to_day_state()
-  if on_text_complete then
-    on_text_complete()
-    on_text_complete = nil
-  end
-  if Context.game.current_screen ~= "mysterious_man" then
-    return
-  end
-  state = STATE_DAY
-  day_timer = day_display_seconds
-end
-
--- Norman chooses to wake up, starting the button mash minigame and flash, then going to the next day.
--- @within MysteriousManScreen
-function MysteriousManScreen.wake_up()
-  Context.home_norman_visible = false
-  Util.go_to_screen_by_id("home")
-  MinigameButtonMashWindow.start("game", {
-    focus_center_x = (Config.screen.width / 2) - 22,
-    focus_center_y = (Config.screen.height / 2) - 18,
-    focus_initial_radius = 0,
-    target_points = 100,
-    instruction_text = "Wake up Norman!",
-    show_progress_text = false,
-    on_win = function()
-      Audio.music_play_wakingup()
-      Meter.show()
-      if trigger_flash_on_wake then
-        trigger_flash_on_wake = false
-        Ascension.start_flash()
-      end
-      Window.set_current("game")
-    end,
-  })
-end
-
--- Norman chooses to stay in bed, skipping the minigame and flash, and going straight to the next day.
--- @within MysteriousManScreen
-function MysteriousManScreen.stay_in_bed()
-  Day.increase()
-  state = STATE_DAY
-  day_timer = day_display_seconds
-end
-
---- Starts the mysterious man screen.
---- @param[opt] options table Optional configuration.</br>
---- Fields: </br>
---- * text (string) Override for the scrolling text.<br/>
---- * day_text (string) Override for the centered day label.<br/>
---- * on_text_complete (function) Callback fired once when the text phase ends.<br/>
---- * skip_text (boolean) If true, skip the text phase and go straight to day display.<br/>
-function MysteriousManScreen.start(options)
-  options = options or {}
-  day_timer = 0
-  text_done = false
-  text_done_timer = 0
-  selected_choice = 1
-  text = options.text or ASC_01_TEXT
-  text_y = Config.screen.height
-  day_text_override = options.day_text
-  on_text_complete = options.on_text_complete
-  Meter.hide()
-  trigger_flash_on_wake = not options.skip_text
-  if options.skip_text then
-    show_mysterious_screen = false
-    state = STATE_DAY
-    day_timer = day_display_seconds
-  else
-    show_mysterious_screen = true
-    state = STATE_TEXT
-  end
-  Util.go_to_screen_by_id("mysterious_man")
-  Window.set_current("game")
-end
-
---- Sets the scrolling text content.
---- @param new_text string The text to display.
-function MysteriousManScreen.set_text(new_text)
-  text = new_text
-end
-
-Screen.register({
-  id = "mysterious_man",
-  name = "Mysterious Man",
-  decisions = {},
-  background_color = Config.colors.black,
-  init = function()
-    Audio.music_play_mystery()
-  end,
-  exit = function()
-    Audio.music_stop()
-  end,
-  update = function()
-    if state == STATE_TEXT then
-      if not text_done then
-        text_y = text_y - (text_speed * Context.delta_time)
-
-        local lines = 1
-        for _ in string.gmatch(text, "\n") do
-          lines = lines + 1
-        end
-
-        if text_y < -lines * 8 or Input.select() then
-          text_done = true
-          text_done_timer = TEXT_DONE_HOLD_SECONDS
-          -- If skipped by user, go to day state immediately
-          if Input.select() then
-            MysteriousManScreen.go_to_day_state()
-          end
-        end
-      else
-        text_done_timer = text_done_timer - Context.delta_time
-        if text_done_timer <= 0 or Input.select() then
-          MysteriousManScreen.go_to_day_state()
-          -- to be continued
-          if 4 <= Ascension.get_level() then
-            Window.set_current("continued")
-          end
-        end
-      end
-    elseif state == STATE_DAY then
-      day_timer = day_timer - Context.delta_time
-
-      if day_timer <= 0 or Input.select() then
-        if trigger_flash_on_wake or Ascension.get_level() < 1 then
-          MysteriousManScreen.wake_up()
-        else
-          state = STATE_CHOICE
-          selected_choice = 1
-        end
-      end
-    elseif state == STATE_CHOICE then
-      selected_choice = UI.update_menu(MysteriousManScreen.choices, selected_choice)
-
-      if Input.select() then
-        Audio.sfx_select()
-        if selected_choice == 1 then
-          MysteriousManScreen.wake_up()
-        else
-          MysteriousManScreen.stay_in_bed()
-        end
-      end
-    end
-  end,
-  draw = function()
-    if show_mysterious_screen then
-      MysteriousManScreen.draw_background()
-    end
-
-    if state == STATE_TEXT then
-      local cx = Config.screen.width / 2
-      local line_y = text_y
-      for line in (text .. "\n"):gmatch("(.-)\n") do
-        Print.text_center(line, cx, line_y, Config.colors.light_grey)
-        line_y = line_y + 8
-      end
-    elseif state == STATE_DAY then
-      MysteriousManScreen.draw_day_switch_background()
-      local day_text = day_text_override or ("Day " .. Context.day_count)
-      Print.text_center(
-        day_text,
-        Config.screen.width / 2,
-        Config.screen.height / 2 - 3,
-        Config.colors.white
-      )
-    elseif state == STATE_CHOICE then
-      local menu_x = (Config.screen.width - 60) / 2
-      local menu_y = (Config.screen.height - 20) / 2
-      UI.draw_menu(MysteriousManScreen.choices, selected_choice, menu_x, menu_y)
-    end
-  end,
-})

inc/screen/screen.office.lua

@@ -2,30 +2,13 @@ Screen.register({
   id = "office",
   name = "Office",
   decisions = {
-    "do_work",
+    "play_button_mash",
+    "play_rhythm",
+    "play_ddr",
     "go_to_walking_to_home",
     "have_a_coffee",
   },
   situations = {
     "drink_coffee",
   },
-  init = function()
-    Audio.music_play_room_work()
-  end,
-  background = "office",
-  draw = function()
-    if Window.get_current_id() == "game" then
-      Sprite.draw_at("norman",              13 * 8,  9 * 8)
-      Sprite.draw_at("dev_buddy",           15 * 8,  9 * 8)
-      Sprite.draw_at("dev_project_manager",  6 * 8,  4 * 8)
-      Sprite.draw_at("dev_hr_girl",         12 * 8,  4 * 8)
-      Sprite.draw_at("dev_introvert",   -4 + 5 * 8,  9 * 8)
-      Sprite.draw_at("dev_extrovert",       20 * 8,  4 * 8)
-      Sprite.draw_at("dev_girl",            23 * 8,  5 * 8)
-      Sprite.draw_at("dev_boy",             10 * 8, 11 * 8 + 4)
-      Sprite.draw_at("dev_guru",            22 * 8, 10 * 8 + 4)
-      Sprite.draw_at("dev_operator",        27 * 8, 10 * 8 + 4)
-    end
-    Context.have_been_to_office = true
-  end
 })

inc/screen/screen.toilet.lua

@@ -3,88 +3,5 @@ Screen.register({
   name = "Toilet",
   decisions = {
     "go_to_home",
-  },
-  background = "bedroom",
-  init = function()
-    Audio.music_play_mystery()
-    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()
-      Util.go_to_screen_by_id("home")
-    end
-  end,
-  draw = function()
-    if not Context.stat_screen_active then return end
-
-    local sw = Config.screen.width
-    local cx = sw / 2
-    local norman_x = math.floor(sw * 0.75)
-    local norman_y = math.floor(Config.screen.height * 0.75)
-    local bar_w = math.floor(sw * 0.75)
-    local bar_x = math.floor((sw - bar_w) / 2)
-    local bar_h = 4
-
-    Sprite.draw_at("norman", norman_x, norman_y)
-
-    Print.text_center("day " .. Context.day_count, cx, 10, Config.colors.white)
-
-    local narrative = "reflecting on my past and present\n...\nboth eventually flushed."
-    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_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
-
-    if Ascension.get_level() > 0 then
-      local asc_y = meter_start_y + #meter_list * 20
-      local asc_letter_y = asc_y + 10
-      local asc_spacing = 8
-      local asc_total_w = Ascension.get_level() * asc_spacing
-      local asc_x = math.floor((sw - asc_total_w) / 2)
-      Ascension.draw(asc_x, asc_letter_y, { spacing = asc_spacing })
-    end
-  end,
 })

inc/screen/screen.walking_to_home.lua

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

inc/screen/screen.walking_to_office.lua

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

inc/screen/screen.work.lua

@@ -1,6 +0,0 @@
-Screen.register({
-  id = "work",
-  name = "Work",
-  decisions = {},
-  background_color = Config.colors.blue,
-})

inc/situation/situation.drink_coffee.lua

@@ -2,5 +2,6 @@ Situation.register({
   id = "drink_coffee",
   handle = function()
     Audio.sfx_select()
+    Sprite.show("norman", 100, 100)
   end,
 })

inc/situation/situation.manager.lua

@@ -1,13 +1,12 @@
---- @section Situation
 local _situations = {}
 
---- Registers a situation definition.
+--- Registers a new situation with the Situation manager.
---- @within Situation
+-- Overwrites existing situation if an ID conflict occurs.
---- @param situation table The situation data table.
+-- @param situation table A table containing the situation definition.
---- @param situation.id string Unique situation identifier.<br/>
+--        Must include an `id` field (string).
---- @param[opt] situation.screen_id string ID of the screen this situation belongs to.<br/>
+--        Optional fields:
---- @param[opt] situation.handle function Called when the situation is applied. Defaults to noop.<br/>
+--        - `handle` (function): Function to execute when the situation is applied. Defaults to an empty function.
---- @param[opt] situation.update function Called each frame while situation is active. Defaults to noop.<br/>
+--        - `update` (function): Function to execute each frame while the situation is active. Defaults to an empty function.
 function Situation.register(situation)
   if not situation or not situation.id then
     PopupWindow.show({"Error: Invalid situation object registered (missing id)!"})
@@ -25,60 +24,32 @@ function Situation.register(situation)
   _situations[situation.id] = situation
 end
 
---- Gets a situation by ID.
+--- Retrieves a registered situation by its ID.
---- @within Situation
+-- @param id string The ID of the situation to retrieve.
---- @param id string The situation ID.
+-- @return table The situation table, or `nil` if not found.
---- @return result table The situation table or nil. </br>
+function Situation.get(id)
---- 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.
+--- Applies a situation, making it the current active situation.
---- @within Situation
+-- The situation's `handle` function is executed.
---- @param screen_id string Optional. If provided, returns situations associated with this screen ID.
+-- This function first checks if the situation is valid and if it's allowed
---- @return result table A table containing all registered situation data, indexed by their IDs, or an array filtered by screen_id. </br>
+-- on the current screen (as defined in `Context.screens[Context.current_screen].situations`).
---- Fields: </br>
+-- If successful, `Context.current_situation` is updated with the ID of the applied situation.
---- * id (string) Unique situation identifier.<br/>
+-- @param id string The ID of the situation to apply.
---- * screen_id (string) ID of the screen this situation belongs to.<br/>
+function Situation.apply(id)
---- * handle (function) Called when the situation is applied.<br/>
+  local situation = Situation.get(id)
---- * update (function) Called each frame while situation is active.<br/>
-function Situation.get_all(screen_id)
-  if screen_id then
-    local filtered_situations = {}
-    for _, situation in pairs(_situations) do
-      if situation.screen_id == screen_id then
-        table.insert(filtered_situations, situation)
-      end
-    end
-    return filtered_situations
-  end
-  return _situations
-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 current_screen_id string The ID of the currently active screen.
---- @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)
-
   if not situation then
     trace("Error: No situation found with id: " .. id)
-    return nil
+    return
   end
 
-  if Util.contains(screen.situations, id) then
+  local current_screen_obj = Screen.get_by_id(Context.current_screen)
-    situation.handle()
+  if current_screen_obj and not current_screen_obj.situations[id] then
-    return id
+    trace("Info: Situation " .. id .. " cannot be applied to current screen (id: " .. Context.current_screen .. ").")
-  else
+    return
-    trace("Info: Situation " .. id .. " cannot be applied to current screen (id: " .. current_screen_id .. ").")
-    return nil
   end
+
+  Context.current_situation = id
+  situation.handle()
 end

inc/sprite/sprite.dev_boy.lua

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

inc/sprite/sprite.dev_buddy.lua

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

inc/sprite/sprite.dev_extrovert.lua

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

inc/sprite/sprite.dev_girl.lua

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

inc/sprite/sprite.dev_guard.lua

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

inc/sprite/sprite.dev_guru.lua

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

inc/sprite/sprite.dev_hr_girl.lua

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

inc/sprite/sprite.dev_introvert.lua

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

inc/sprite/sprite.dev_operator.lua

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

inc/sprite/sprite.dev_project_manager.lua

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

inc/sprite/sprite.manager.lua

@@ -1,15 +1,84 @@
---- @section Sprite
 local _sprites = {}
-local _active_sprites = {}
 
-local function draw_sprite_instance(sprite_data, params)
+--- Registers a new sprite or complex sprite definition with the Sprite manager.
+-- Overwrites existing sprite if an ID conflict occurs.
+-- @param sprite_data table A table containing the sprite definition.
+--        Must include an `id` field (string) and either an `s` field (number, for simple sprites)
+--        or a `sprites` field (table, for complex sprites).
+--        For complex sprites, `sprites` is a table of sub-sprite definitions, each with:
+--        - `s` (number): Sprite index.
+--        - `x_offset` (number): X-offset relative to the parent sprite's position.
+--        - `y_offset` (number): Y-offset relative to the parent sprite's position.
+--        - Optional `colorkey`, `scale`, `flip_x`, `flip_y`, `rot` for individual sub-sprites.
+function Sprite.register(sprite_data)
+  if not sprite_data or not sprite_data.id then
+    trace("Error: Invalid sprite object registered (missing id)!")
+    return
+  end
+  if _sprites[sprite_data.id] then
+    trace("Warning: Overwriting sprite with id: " .. sprite_data.id)
+  end
+  _sprites[sprite_data.id] = sprite_data
+end
+
+--- Schedules a registered sprite to be drawn at a specific position with optional transformations.
+-- The sprite's parameters are stored in `Context.sprites` for deferred rendering by `Sprite.draw()`.
+-- If the sprite with the given `id` is already scheduled, its parameters will be updated.
+-- @param id string The unique identifier of the sprite to show. Must be registered via `Sprite.register`.
+-- @param x number The x-coordinate on the screen where the sprite will be drawn.
+-- @param y number The y-coordinate on the screen where the sprite will be drawn.
+-- @param[opt] colorkey number The color index to be treated as transparent (default: 0).
+-- @param[opt] scale number The scaling factor for the sprite (default: 1).
+-- @param[opt] flip_x number Set to 1 to flip the sprite horizontally (default: 0).
+-- @param[opt] flip_y number Set to 1 to flip the sprite vertically (default: 0).
+-- @param[opt] rot number The rotation of the sprite in degrees (default: 0).
+function Sprite.show(id, x, y, colorkey, scale, flip_x, flip_y, rot)
+  -- Ensure the sprite exists before attempting to show it
+  if not _sprites[id] then
+    trace("Error: Attempted to show non-registered sprite with id: " .. id)
+    return
+  end
+
+  Context.sprites[id] = {
+    id = id,
+    x = x,
+    y = y,
+    colorkey = colorkey,
+    scale = scale,
+    flip_x = flip_x,
+    flip_y = flip_y,
+    rot = rot,
+  }
+end
+
+--- Hides a currently displayed sprite by removing it from the `Context.sprites` table.
+-- The sprite will no longer be drawn in subsequent frames.
+-- @param id string The unique identifier of the sprite to hide.
+function Sprite.hide(id)
+  Context.sprites[id] = nil
+end
+
+--- Draws all sprites currently scheduled in `Context.sprites`.
+-- This function retrieves the registered sprite definitions and applies the stored
+-- position and transformation parameters. It handles both simple and complex sprites.
+function Sprite.draw()
+  for id, params in pairs(Context.sprites) do
+    local sprite_data = _sprites[id]
+    if not sprite_data then
+      trace("Error: Sprite id " .. id .. " in Context.sprites is not registered.")
+      Context.sprites[id] = nil -- Clean up invalid entry
+      -- We should probably continue to the next sprite instead of returning
+      -- so that other valid sprites can still be drawn.
+    end
+
+    -- Use parameters from Context.sprites, or fall back to sprite_data, then to defaults
     local colorkey = params.colorkey or sprite_data.colorkey or 0
     local scale = params.scale or sprite_data.scale or 1
     local flip_x = params.flip_x or sprite_data.flip_x or 0
     local flip_y = params.flip_y or sprite_data.flip_y or 0
     local rot = params.rot or sprite_data.rot or 0
 
-  if sprite_data.sprites then
+    if sprite_data.sprites then -- Complex sprite
       for i = 1, #sprite_data.sprites do
         local sub_sprite = sprite_data.sprites[i]
         spr(
@@ -23,130 +92,8 @@ local function draw_sprite_instance(sprite_data, params)
           sub_sprite.rot or rot
         )
       end
-  else
+    else -- Simple sprite
       spr(sprite_data.s, params.x, params.y, colorkey, scale, flip_x, flip_y, rot)
     end
-end
-
---- Registers a sprite definition.
---- @within Sprite
---- @param sprite_data table A table containing the sprite definition.
---- @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)!")
-    return
-  end
-  if _sprites[sprite_data.id] then
-    trace("Warning: Overwriting sprite with id: " .. sprite_data.id)
-  end
-  _sprites[sprite_data.id] = sprite_data
-end
-
---- Generates a sprites table for a rectangular composite sprite.
---- @within Sprite
---- @param width number The number of sprites wide.<br/>
---- @param height number The number of sprites tall.<br/>
---- @param starting_s number The sprite index of the top-left tile.<br/>
---- @param x_base number The base x-offset for the leftmost column.<br/>
---- @param y_base number The base y-offset for the topmost row.<br/>
---- @param x_step number The x-offset increment per column.<br/>
---- @param y_step number The y-offset increment per row.<br/>
---- @return table The sprites table array.
-function Sprite.generate_table(width, height, starting_s, x_base, y_base, x_step, y_step)
-  local sprites = {}
-  for row = 0, height - 1 do
-    for col = 0, width - 1 do
-      local s = starting_s + row * 16 + col
-      local x_offset = x_base + col * x_step
-      local y_offset = y_base + row * y_step
-      table.insert(sprites, { s = s, x_offset = x_offset, y_offset = y_offset })
-    end
-  end
-  return sprites
-end
-
---- Schedules a sprite for drawing.
---- @within Sprite
---- @param id string The unique identifier of the sprite.<br/>
---- @param x number The x-coordinate.<br/>
---- @param y number The y-coordinate.<br/>
---- @param[opt] colorkey number The color index for transparency.<br/>
---- @param[opt] scale number The scaling factor.<br/>
---- @param[opt] flip_x number Set to 1 to flip horizontally.<br/>
---- @param[opt] flip_y number Set to 1 to flip vertically.<br/>
---- @param[opt] rot number The rotation in degrees.<br/>
-function Sprite.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)
-    return
-  end
-
-  _active_sprites[id] = {
-    id = id,
-    x = x,
-    y = y,
-    colorkey = colorkey,
-    scale = scale,
-    flip_x = flip_x,
-    flip_y = flip_y,
-    rot = rot,
-  }
-end
-
---- Hides a displayed sprite.
---- @within Sprite
---- @param id string The unique identifier of the sprite.<br/>
-function Sprite.hide(id)
-  _active_sprites[id] = nil
-end
-
---- Draws a sprite immediately without scheduling it.
---- @within Sprite
---- @param id string The unique identifier of the sprite.<br/>
---- @param x number The x-coordinate.<br/>
---- @param y number The y-coordinate.<br/>
---- @param[opt] colorkey number The color index for transparency.<br/>
---- @param[opt] scale number The scaling factor.<br/>
---- @param[opt] flip_x number Set to 1 to flip horizontally.<br/>
---- @param[opt] flip_y number Set to 1 to flip vertically.<br/>
---- @param[opt] rot number The rotation in degrees.<br/>
-function Sprite.draw_at(id, x, y, colorkey, scale, flip_x, flip_y, rot)
-  local sprite_data = _sprites[id]
-  if not sprite_data then
-    trace("Error: Attempted to draw non-registered sprite with id: " .. id)
-    return
-  end
-
-  draw_sprite_instance(sprite_data, {
-    x = x,
-    y = y,
-    colorkey = colorkey,
-    scale = scale,
-    flip_x = flip_x,
-    flip_y = flip_y,
-    rot = rot,
-  })
-end
-
---- Draws all scheduled sprites.
---- @within Sprite
-function Sprite.draw()
-  for id, params in pairs(_active_sprites) do
-    local sprite_data = _sprites[id]
-    if not sprite_data then
-      trace("Error: Sprite id " .. id .. " in _active_sprites is not registered.")
-      _active_sprites[id] = nil
-    end
-    if sprite_data then
-      draw_sprite_instance(sprite_data, params)
-    end
   end
 end

inc/sprite/sprite.matrix_architect.lua

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

inc/sprite/sprite.matrix_neo.lua

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

inc/sprite/sprite.matrix_oraculum.lua

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

inc/sprite/sprite.matrix_trinity.lua

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

inc/sprite/sprite.norman.lua

@@ -1,23 +1,17 @@
 Sprite.register({
   id = "norman",
   sprites = {
-    { s = 272, x_offset = -4, y_offset = -4 },
+    -- Body (sprite index 0)
-    { s = 273, x_offset = 4, y_offset = -4 },
+    { s = 0, x_offset = 0, y_offset = 0 },
-    { s = 288, x_offset = -4, y_offset = 4 },
+    -- Head (sprite index 1)
-    { s = 289, x_offset = 4, y_offset = 4 },
+    { s = 1, x_offset = 0, y_offset = -8 },
-    { s = 304, x_offset = -4, y_offset = 12 },
+    -- Left Arm (sprite index 2)
-    { s = 305, x_offset = 4, y_offset = 12 }
+    { s = 2, x_offset = -4, y_offset = 4 },
-  }
+    -- Right Arm (sprite index 3, flipped)
-})
+    { s = 3, x_offset = 4, y_offset = 4, flip_x = 1 }, -- Flipped arm
-
+    -- Left Leg (sprite index 4)
-Sprite.register({
+    { s = 4, x_offset = -2, y_offset = 8 },
-  id = "sleeping_norman",
+    -- Right Leg (sprite index 5, flipped)
-  sprites = {
+    { s = 5, x_offset = 2, y_offset = 8, flip_x = 1 } -- Flipped leg
-    { s = 272, x_offset = 12, y_offset = -4, flip_y = 1 },
-    { s = 273, x_offset = 12, y_offset = 4, flip_y = 1 },
-    { s = 288, x_offset = 4, y_offset = -4, flip_y = 1 },
-    { s = 289, x_offset = 4, y_offset = 4, flip_y = 1 },
-    { s = 304, x_offset = -4, y_offset = -4, flip_y = 1 },
-    { s = 305, x_offset = -4, y_offset = 4, flip_y = 1 }
   }
 })

inc/sprite/sprite.pizza_vendor.lua

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

inc/sprite/sprite.sumphore.lua

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

inc/system/system.asciiart.lua

@@ -1,63 +0,0 @@
---- @section AsciiArt
-AsciiArt = {}
-
---- Draws ASCII art text using rectangles.
---- @param text string The ASCII art text to draw.
---- @param options table Configuration options (char_w, char_h, line_gap, word_gap, color, x, y).
-function AsciiArt.draw(text, options)
-  options = options or {}
-  local char_w = options.char_w or 4
-  local char_h = options.char_h or 5
-  local line_gap = options.line_gap or 0
-  local word_gap = options.word_gap or 6
-  local color = options.color or Config.colors.light_blue
-
-  local lines = {}
-  local max_len = 0
-  -- Get all lines and find max length
-  for line in (text .. "\n"):gmatch("(.-)\n") do
-    table.insert(lines, line)
-    if #line > max_len then max_len = #line end
-  end
-
-  -- Clean up empty lines from the start/end
-  while #lines > 0 and lines[1]:gsub("%s+", "") == "" do table.remove(lines, 1) end
-  while #lines > 0 and lines[#lines]:gsub("%s+", "") == "" do table.remove(lines, #lines) end
-
-  if #lines == 0 then return end
-
-  local total_h = 0
-  for _, line in ipairs(lines) do
-    if line:find("#") then
-      total_h = total_h + char_h + line_gap
-    else
-      total_h = total_h + word_gap
-    end
-  end
-  total_h = total_h - line_gap
-
-  local current_y = options.y or (Config.screen.height - total_h) / 2
-  local x_offset = options.x or (Config.screen.width - (max_len * char_w)) / 2
-
-  for _, line in ipairs(lines) do
-    if line:find("#") then
-      for j = 1, #line do
-        local char = line:sub(j, j)
-        if char == "#" then
-          rect(x_offset + (j - 1) * char_w, current_y, char_w, char_h, color)
-        end
-      end
-      current_y = current_y + char_h + line_gap
-    else
-      current_y = current_y + word_gap
-    end
-  end
-
-  return {
-    x = x_offset,
-    y = options.y or (Config.screen.height - total_h) / 2,
-    width = max_len * char_w,
-    height = total_h,
-    bottom = (options.y or (Config.screen.height - total_h) / 2) + total_h
-  }
-end

inc/system/system.audio.lua

@@ -0,0 +1,14 @@
+function Audio.music_stop() music() end
+function Audio.music_play_mainmenu() end
+function Audio.music_play_wakingup() end
+function Audio.music_play_room_morning() end
+function Audio.music_play_room_street_1() end
+function Audio.music_play_room_street_2() end
+function Audio.music_play_room_() end
+function Audio.music_play_room_work() end
+
+function Audio.sfx_select() sfx(17, 'C-7', 30) end
+function Audio.sfx_deselect() sfx(18, 'C-7', 30) end
+function Audio.sfx_beep() sfx(19, 'C-6', 30) end
+function Audio.sfx_success() sfx(16, 'C-7', 60) end
+function Audio.sfx_bloop() sfx(21, 'C-3', 60) end

inc/system/system.input.lua

@@ -1,43 +1,17 @@
---- @section Input
 local INPUT_KEY_UP = 0
 local INPUT_KEY_DOWN = 1
 local INPUT_KEY_LEFT = 2
 local INPUT_KEY_RIGHT = 3
-local INPUT_KEY_A = 4
+local INPUT_KEY_A = 4 local INPUT_KEY_B = 5 local INPUT_KEY_Y = 7
-local INPUT_KEY_B = 5
-local INPUT_KEY_Y = 7
 local INPUT_KEY_SPACE = 48
 local INPUT_KEY_BACKSPACE = 51
 local INPUT_KEY_ENTER = 50
 
---- Checks if Up is pressed.
---- @within Input
 function Input.up() return btnp(INPUT_KEY_UP) end
---- Checks if Down is pressed.
---- @within Input
 function Input.down() return btnp(INPUT_KEY_DOWN) end
---- Checks if Left is pressed.
---- @within Input
 function Input.left() return btnp(INPUT_KEY_LEFT) end
---- Checks if Right is pressed.
---- @within Input
 function Input.right() return btnp(INPUT_KEY_RIGHT) end
---- Checks if Space is pressed.
---- @within Input
-function Input.space() return keyp(INPUT_KEY_SPACE) end
-
---- Checks if Select is pressed.
---- @within Input
 function Input.select() return btnp(INPUT_KEY_A) or keyp(INPUT_KEY_SPACE) end
---- Checks if Menu Confirm is pressed.
---- @within Input
 function Input.menu_confirm() return btnp(INPUT_KEY_A) or keyp(INPUT_KEY_ENTER) end
---- Checks if Player Interact is pressed.
+function Input.player_interact() return btnp(INPUT_KEY_B) or keyp(INPUT_KEY_ENTER) end function Input.menu_back() return btnp(INPUT_KEY_Y) or keyp(INPUT_KEY_BACKSPACE) end
---- @within Input
-function Input.player_interact() return btnp(INPUT_KEY_B) or keyp(INPUT_KEY_ENTER) end
---- Checks if Menu Back is pressed.
---- @within Input
-function Input.menu_back() return btnp(INPUT_KEY_Y) or keyp(INPUT_KEY_BACKSPACE) end
---- Checks if Toggle Popup is pressed.
---- @within Input
 function Input.toggle_popup() return keyp(INPUT_KEY_ENTER) end

inc/system/system.main.lua

@@ -1,44 +1,65 @@
---- @section Main
+local STATE_HANDLERS = {
+  [WINDOW_SPLASH] = function()
+    SplashWindow.update()
+    SplashWindow.draw()
+  end,
+  [WINDOW_INTRO] = function()
+    IntroWindow.update()
+    IntroWindow.draw()
+  end,
+  [WINDOW_MENU] = function()
+    MenuWindow.update()
+    MenuWindow.draw()
+  end,
+  [WINDOW_GAME] = function()
+    GameWindow.update()
+    GameWindow.draw()
+  end,
+  [WINDOW_POPUP] = function()
+    GameWindow.draw()
+    PopupWindow.update()
+    PopupWindow.draw()
+  end,
+  [WINDOW_CONFIGURATION] = function()
+    ConfigurationWindow.update()
+    ConfigurationWindow.draw()
+  end,
+  [WINDOW_AUDIOTEST] = function()
+    AudioTestWindow.update()
+    AudioTestWindow.draw()
+  end,
+  [WINDOW_MINIGAME_BUTTON_MASH] = function()
+    MinigameButtonMashWindow.update()
+    MinigameButtonMashWindow.draw()
+  end,
+  [WINDOW_MINIGAME_RHYTHM] = function()
+    MinigameRhythmWindow.update()
+    MinigameRhythmWindow.draw()
+  end,
+  [WINDOW_MINIGAME_DDR] = function()
+    MinigameDDRWindow.update()
+    MinigameDDRWindow.draw()
+  end,
+}
+
 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 false end
+  if initialized_game then return end
-  Context.reset()
+
-  Window.set_current("intro_title") -- Set initial window using new manager
   MenuWindow.refresh_menu_items()
   initialized_game = true
-  return true
 end
 
---- Main game loop (TIC-80 callback).
---- @within Main
 function TIC()
   init_game()
-
-  local now = time()
-  if Context.last_frame_time == 0 then
-    Context.delta_time = 0
-  else
-    Context.delta_time = (now - Context.last_frame_time) / 1000
-  end
-  Context.last_frame_time = now
-
   cls(Config.colors.black)
-  local handler = Window.get_current_handler() -- Get handler from Window manager
+  local handler = STATE_HANDLERS[Context.active_window]
   if handler then
     handler()
   end
-  Meter.update()
+  Meters.update()
-  Timer.update()
-  Trigger.update()
-  Glitch.draw()
-  Ascension.update_fade()
   if Context.game_in_progress then
-    Meter.draw()
+    UI.draw_meters()
-    Timer.draw()
   end
-  Ascension.draw_flash()
 end