Add the street background and update the office.

.gitignore

@@ -1,4 +1,2 @@
 .local
 impostor.lua
-prompts
-docs

.luacheckrc

@@ -1,46 +0,0 @@
--- .luacheckrc
--- Configuration for luacheck
-
-globals = {
-  "Util",
-  "DesitionManager",
-  "ScreenManager",
-  "UI",
-  "Print",
-  "Input",
-  "Audio",
-  "Context",
-  "mset",
-  "mget",
-  "btnp",
-  "keyp",
-  "music",
-  "sfx",
-  "rect",
-  "rectb",
-  "circ",
-  "circb",
-  "cls",
-  "tri",
-  "Songs",
-  "frame_from_beat",
-  "beats_to_pattern",
-  "MapBedroom",
-  "TIC",
-  "exit",
-  "trace",
-  "index_menu",
-  "MapManager",
-  "map",
-}
-
-
-
--- Exclude certain warnings globally
-exclude_warnings = {
-    "undefined_global", -- Will be covered by 'globals' table
-    "redefined_loop_variable", -- Common in Lua for iterators
-}
-
--- Options for unused variables
-std = "lua51" -- Assuming Lua 5.1, common for TIC-80

.vscode/settings.json

@@ -15,17 +15,5 @@
   ],
   "Lua.diagnostics.disable": [
     "undefined-global"
-  ],
+  ]
-  "python.autoComplete.extraPaths": [
-    "${workspaceFolder}/sources/poky/bitbake/lib",
-    "${workspaceFolder}/sources/poky/meta/lib"
-  ],
-  "python.analysis.extraPaths": [
-    "${workspaceFolder}/sources/poky/bitbake/lib",
-    "${workspaceFolder}/sources/poky/meta/lib"
-  ],
-  "files.associations": {
-    "*.conf": "bitbake",
-    "*.inc": "bitbake"
-  }
 }

.vscode/tasks.json

@@ -1,27 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Run TIC80",
-            "type": "shell",
-            "command": "tic80 --fs=. impostor.lua"
-        },
-        {
-            "label": "Build & Run TIC80",
-            "type": "shell",
-            "command": "make build && tic80 --fs=. impostor.lua"
-        },
-        {
-            "label": "Export assets",
-            "type": "shell",
-            "command": "make export_assets"
-        },
-        {
-            "label": "Make build",
-            "type": "shell",
-            "command": "make build"
-        },
-    ]
-}

GEMINI.md

@@ -51,107 +51,4 @@ Based on the analysis of `impostor.lua`, the following regularities and conventi
 
 ## Agent Directives
 
-- **Git Operations:** In the future, do not perform `git add` or `git commit` operations. This responsibility will be handled by the user.
+- **Git Operations:** In the future, do not perform `git add` or `git commit` operations. This responsibility will be handled by the user.
-
----
-
-# 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).
-
-## Table of Contents
-
-- [Overview](#overview)
-- [Button Mash Minigame](#button-mash-minigame)
-- [Rhythm Minigame](#rhythm-minigame)
-- [DDR Minigame](#ddr-minigame)
-- [Integration Guide](#integration-guide)
-- [Common Features](#common-features)
-
----
-
-## Overview
-
-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** - 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
-
----
-
-## Button Mash Minigame
-
-**File**: `inc/window/window.minigame.mash.lua`
-
-### Description
-
-A fast-paced minigame where the player must repeatedly press the Z button to fill a progress bar. The bar automatically degrades over time, and the degradation rate increases as the bar fills up, creating increasing difficulty.
-
-### Gameplay Mechanics
-
-- **Objective**: Fill the progress bar to 100% by pressing Z repeatedly
-- **Challenge**: The bar degrades automatically, with degradation increasing as it fills
-- **Win Condition**: Bar reaches 100%
-- **No Fail State**: Player can keep trying until successful
-
-### Visual Elements
-
-#### Simple sketch
-![button_mash.png](/button_mash.png)
-
-```
-Progress Bar (200x12px at 20,10):
-┌────────────────────────────────────┐
-│████████████████░░░░░░░░░░░░░░  45%│
-└────────────────────────────────────┘
-
-Button Indicator (Bottom):
-╔═══╗
-║ Z ║  ← Press repeatedly!
-╚═══╝
-
-Text: "MASH Z!"
-```
-
-#### Configuration Parameters
-
-```lua
-bar_fill = 0                    -- Current fill level (0-100)
-max_fill = 100                  -- Target fill level
-fill_per_press = 8              -- Points gained per button press
-base_degradation = 0.15         -- Base degradation per frame
-degradation_multiplier = 0.006  -- Increases degradation with bar fill
-button_press_duration = 8       -- Visual feedback duration (frames)
-```
-
-#### Usage Example
-
-```lua
--- Start button mash minigame
-MinigameButtonMashWindow.start(WINDOW_GAME)
-
--- Or from any window
-MinigameButtonMashWindow.start(WINDOW_POPUP)
-```
-
-#### Color Coding
-
-- **Green**: Low fill (0-33%)
-- **Medium (NPC color)**: Medium fill (34-66%)
-- **Yellow (Item color)**: High fill (67-100%)
-
----
-
-## Rhythm Minigame
-
-**File**: `inc/window/window.minigame.rhythm.lua`
-
-### Description
-
-A timing-based minigame where the player must press Z when a moving line crosses a green target zone. The target zone shrinks with each successful hit, making the game progressively more challenging.
-
-### Gameplay Mechanics
-
-- **Objective**: Score 10 points by timing button presses correctly

Makefile

@@ -14,10 +14,7 @@ SRC        = $(shell sed 's|^|$(SRC_DIR)/|' $(ORDER))
 
 ASSETS_LUA = inc/meta/meta.assets.lua
 ASSETS_DIR = assets
-ASSET_TYPES = tiles sprites sfx music
+ASSET_TYPES = map tiles sprites sfx music
-
-LINT_TMP_LUA  := /tmp/_lint_combined.lua
-LINT_TMP_MAP   := /tmp/_lint_map.txt
 
 # CI/CD variables
 VERSION_FILE = .version
@@ -34,10 +31,10 @@ build: $(OUTPUT)
 
 $(OUTPUT): $(SRC) $(ORDER)
 	@rm -f $(OUTPUT)
-	@sed 's/\r$$//' $(ORDER) | while read f; do \
+	@while read f; do \
 		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
 		echo "" >> $(OUTPUT); \
-	done
+	done < $(ORDER)
 
 export: build
 	@if [ -z "$(VERSION)" ]; then \
@@ -79,68 +76,6 @@ define f_export_asset_awk
 	cat $(2) | awk '/-- <$(1)>/,/<\/$(1)>/' >> $(3)
 endef
 
-lint:
-	@echo "==> Merging..."
-	@rm -f $(LINT_TMP_LUA) $(LINT_TMP_MAP)
-	@touch $(LINT_TMP_LUA)
-	@line=1; \
-	while IFS= read -r f || [ -n "$$f" ]; do \
-	    [ -z "$$f" ] && continue; \
-	    before=$$(wc -l < $(LINT_TMP_LUA)); \
-	    cat "$(SRC_DIR)/$$f" >> $(LINT_TMP_LUA); \
-	    printf '\n' >> $(LINT_TMP_LUA); \
-	    after=$$(wc -l < $(LINT_TMP_LUA)); \
-	    linecount=$$((after - before)); \
-	    echo "$$line $$linecount $(SRC_DIR)/$$f" >> $(LINT_TMP_MAP); \
-	    line=$$((line + linecount)); \
-	done < $(ORDER)
-	@echo "==> luacheck..."
-	@LINT_OUTPUT=$$(luacheck --no-max-line-length $(LINT_TMP_LUA) 2>&1 | awk -v map=$(LINT_TMP_MAP) ' \
-	BEGIN { \
-	    NR_map = 0; \
-	    while ((getline line < map) > 0) { \
-	        n = split(line, a, " "); \
-	        start[NR_map] = a[1]+0; \
-	        count[NR_map] = a[2]+0; \
-	        fname[NR_map] = a[3]; \
-	        NR_map++; \
-	    } \
-	} \
-	/^[^:]+:[0-9]+:[0-9]+:/ { \
-	    colon1 = index($$0, ":"); \
-	    rest1  = substr($$0, colon1+1); \
-	    colon2 = index(rest1, ":"); \
-	    absline = substr(rest1, 1, colon2-1) + 0; \
-	    rest2  = substr(rest1, colon2+1); \
-	    colon3 = index(rest2, ":"); \
-	    col    = substr(rest2, 1, colon3-1); \
-	    rest   = substr(rest2, colon3); \
-	    found  = 0; \
-	    for (i = 0; i < NR_map; i++) { \
-	        end_line = start[i] + count[i] -1; \
-	        if (absline >= start[i] && absline <= end_line) { \
-	            relline = absline - start[i] + 1; \
-	            print fname[i] ":" relline ":" col ":" rest; \
-	            found = 1; \
-	            break; \
-	        } \
-	    } \
-	    if (!found) print $$0; \
-	    next; \
-	} \
-	{ print } \
-	'); \
-	echo "$$LINT_OUTPUT"; \
-	NUM_ISSUES=$$(echo "$$LINT_OUTPUT" | grep -cE "^[^:]+:[0-9]+:[0-9]+:"); \
-	if [ "$$NUM_ISSUES" -gt 0 ]; then \
-	    echo "Total: $$NUM_ISSUES issue(s) found, commit aborted."; \
-	    exit 1; \
-	else \
-	    echo "Checking /tmp/_lint_combined.lua                  OK"; \
-	    echo "Total: 0 warnings / 0 errors in 1 file"; \
-	fi
-	@rm -f $(LINT_TMP_LUA) $(LINT_TMP_MAP)
-
 export_assets:
 # $(OUTPUT) would be a circular dependency
 	@test -e $(OUTPUT)
@@ -160,7 +95,7 @@ clean:
 
 # CI/CD Targets
 ci-version:
-	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
+	@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 \
@@ -190,20 +125,7 @@ ci-update:
 	echo "==> Triggering update for version $$VERSION"; \
 	curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=tic80&version=$$VERSION"
 
-install_precommit_hook:
+.PHONY: all build export watch import_assets export_assets clean ci-version ci-export ci-upload ci-update
-	@echo "Installing Git pre-commit hook (lint check)..."
-	@mkdir -p .git/hooks
-	@printf '#!/bin/bash\n' > .git/hooks/pre-commit
-	@printf 'echo "Running lint before commit..."\n' >> .git/hooks/pre-commit
-	@printf 'make lint\n' >> .git/hooks/pre-commit
-	@printf 'if [ $$? -ne 0 ]; then\n' >> .git/hooks/pre-commit
-	@printf '    echo "Lint failed! Commit aborted."\n' >> .git/hooks/pre-commit
-	@printf '    exit 1\n' >> .git/hooks/pre-commit
-	@printf 'fi\n' >> .git/hooks/pre-commit
-	@chmod +x .git/hooks/pre-commit
-	@echo "Pre-commit hook installed successfully."
-
-.PHONY: all build export watch import_assets export_assets clean lint ci-version ci-export ci-upload ci-update install_precommit_hook
 
 #-- <WAVES>
 #-- 000:224578acdeeeeddcba95434567653100

impostor.inc

@@ -1,40 +1,19 @@
 meta/meta.header.lua
 init/init.modules.lua
 init/init.config.lua
-system/system.util.lua
 init/init.windows.lua
-desition/desition.manager.lua
-desition/desition.go_to_home.lua
-desition/desition.go_to_toilet.lua
-desition/desition.go_to_walking_to_office.lua
-desition/desition.go_to_office.lua
-desition/desition.go_to_walking_to_home.lua
-desition/desition.play_button_mash.lua
-desition/desition.play_rhythm.lua
-desition/desition.play_ddr.lua
-map/map.manager.lua
-map/map.bedroom.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
 init/init.context.lua
-data/data.songs.lua
 system/system.print.lua
+entity/entity.npc.lua
+entity/entity.item.lua
 system/system.input.lua
-system/system.audio.lua
 system/system.ui.lua
+map/map.bedroom.lua
 window/window.splash.lua
 window/window.intro.lua
 window/window.menu.lua
 window/window.configuration.lua
-window/window.audiotest.lua
 window/window.popup.lua
-window/window.minigame.mash.lua
-window/window.minigame.rhythm.lua
-window/window.minigame.ddr.lua
 window/window.game.lua
 system/system.main.lua
 meta/meta.assets.lua

inc/data/data.songs.lua

@@ -1,150 +0,0 @@
--- DDR Arrow Spawn Patterns
--- Each song defines when arrows should spawn, synced to music beats
-
-Songs = {
-  -- Example song pattern
-  test_song = {
-    name = "Test Song",
-    bpm = 120, -- Beats per minute (for reference)
-    fps = 60, -- Frames per second (TIC-80 default)
-    end_frame = 570, -- Frame when song ends (last note)
-    -- Arrow spawn pattern
-    -- Each entry defines when (in frames) and which direction arrow spawns
-    -- Formula: frame = (beat / bpm) * 60 * fps
-    -- For 120 BPM: 1 beat = 30 frames, 2 beats = 60 frames, etc.
-    pattern = {
-      -- Beat 1-4 (intro)
-      {frame = 30, dir = "left"},
-      {frame = 60, dir = "down"},
-      {frame = 90, dir = "up"},
-      {frame = 120, dir = "right"},
-      -- Beat 5-8 (faster)
-      {frame = 135, dir = "left"},
-      {frame = 150, dir = "right"},
-      {frame = 165, dir = "left"},
-      {frame = 180, dir = "right"},
-      -- Beat 9-12 (complex pattern)
-      {frame = 210, dir = "left"},
-      {frame = 210, dir = "right"}, -- simultaneous
-      {frame = 240, dir = "up"},
-      {frame = 240, dir = "down"}, -- simultaneous
-      {frame = 270, dir = "left"},
-      {frame = 300, dir = "right"},
-      -- Beat 13-16 (rapid sequence)
-      {frame = 330, dir = "left"},
-      {frame = 345, dir = "down"},
-      {frame = 360, dir = "up"},
-      {frame = 375, dir = "right"},
-      {frame = 390, dir = "left"},
-      {frame = 405, dir = "down"},
-      {frame = 420, dir = "up"},
-      {frame = 435, dir = "right"},
-      -- Beat 17-20 (finale)
-      {frame = 465, dir = "up"},
-      {frame = 465, dir = "down"},
-      {frame = 495, dir = "left"},
-      {frame = 495, dir = "right"},
-      {frame = 525, dir = "up"},
-      {frame = 540, dir = "down"},
-      {frame = 555, dir = "left"},
-      {frame = 570, dir = "right"}
-    }
-  },
-  test_song_2 = {
-    name = "Test Song 2",
-    bpm = 120, -- Beats per minute (for reference)
-    fps = 60, -- Frames per second (TIC-80 default)
-    end_frame = 570, -- Frame when song ends (last note)
-    -- Arrow spawn pattern
-    -- Each entry defines when (in frames) and which direction arrow spawns
-    -- Formula: frame = (beat / bpm) * 60 * fps
-    -- For 120 BPM: 1 beat = 30 frames, 2 beats = 60 frames, etc.
-    pattern = {
-      -- Beat 1-4 (intro)
-      {frame = 30, dir = "left"},
-      {frame = 60, dir = "down"},
-      {frame = 90, dir = "up"},
-      {frame = 120, dir = "right"},
-      -- Beat 5-8 (faster)
-      {frame = 135, dir = "left"},
-      {frame = 150, dir = "right"},
-      {frame = 165, dir = "left"},
-      {frame = 180, dir = "right"},
-      -- Beat 9-12 (complex pattern)
-      {frame = 210, dir = "left"},
-      {frame = 210, dir = "right"}, -- simultaneous
-      {frame = 240, dir = "up"},
-      {frame = 240, dir = "down"}, -- simultaneous
-      {frame = 270, dir = "left"},
-      {frame = 300, dir = "right"},
-      -- Beat 13-16 (rapid sequence)
-      {frame = 330, dir = "left"},
-      {frame = 345, dir = "down"},
-      {frame = 360, dir = "up"},
-      {frame = 375, dir = "right"},
-      {frame = 390, dir = "left"},
-      {frame = 405, dir = "down"},
-      {frame = 420, dir = "up"},
-      {frame = 435, dir = "right"},
-      -- Beat 17-20 (finale)
-      {frame = 465, dir = "up"},
-      {frame = 465, dir = "down"},
-      {frame = 495, dir = "left"},
-      {frame = 495, dir = "right"},
-      {frame = 525, dir = "up"},
-      {frame = 540, dir = "down"},
-      {frame = 555, dir = "left"},
-      {frame = 570, dir = "right"}
-    }
-  },
-  -- Random mode (no predefined pattern, spawns randomly)
-  random = {
-    name = "Random Mode",
-    bpm = 0, -- Not applicable for random mode
-    fps = 60,
-    end_frame = nil, -- No end frame for random mode
-    pattern = {} -- Empty, will spawn randomly in game
-  }
-}
-
--- Helper function to calculate frame from beat
--- Usage: frame_from_beat(beat_number, bpm, fps)
-function frame_from_beat(beat, bpm, fps)
-  fps = fps or 60
-  local seconds_per_beat = 60 / bpm
-  local frames_per_beat = seconds_per_beat * fps
-  return math.floor(beat * frames_per_beat)
-end
-
--- Helper function to convert simple beat notation to frame pattern
--- Usage: beats_to_pattern({{1, "left"}, {2, "down"}}, 120)
-function beats_to_pattern(beats, bpm, fps)
-  fps = fps or 60
-  local pattern = {}
-  for _, beat_data in ipairs(beats) do
-    local beat = beat_data[1]
-    local dir = beat_data[2]
-    table.insert(pattern, {
-      frame = frame_from_beat(beat, bpm, fps),
-      dir = dir
-    })
-  end
-  return pattern
-end
-
--- Example of creating a song using beat notation:
---[[
-Songs.custom_song = {
-  name = "Custom Song",
-  bpm = 130,
-  fps = 60,
-  pattern = beats_to_pattern({
-    {1, "left"},
-    {2, "down"},
-    {3, "up"},
-    {4, "right"},
-    {4.5, "left"},
-    {5, "right"}
-  }, 130)
-}
-]]

inc/desition/desition.go_to_home.lua

@@ -1,8 +0,0 @@
-DesitionManager.register({
-  id = "go_to_home",
-  label = "Go to Home",
-  handle = function()
-    Util.go_to_screen_by_id("home")
-  end,
-  condition = function() return true end
-})

inc/desition/desition.go_to_office.lua

@@ -1,8 +0,0 @@
-DesitionManager.register({
-  id = "go_to_office",
-  label = "Go to Office",
-  handle = function()
-    Util.go_to_screen_by_id("office")
-  end,
-  condition = function() return true end
-})

inc/desition/desition.go_to_toilet.lua

@@ -1,8 +0,0 @@
-DesitionManager.register({
-  id = "go_to_toilet",
-  label = "Go to Toilet",
-  handle = function()
-    Util.go_to_screen_by_id("toilet")
-  end,
-  condition = function() return true end
-})

inc/desition/desition.go_to_walking_to_home.lua

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

inc/desition/desition.go_to_walking_to_office.lua

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

inc/desition/desition.manager.lua

@@ -1,31 +0,0 @@
-local _desitions = {}
-
-function DesitionManager.register(desition)
-  if not desition or not desition.id then
-    PopupWindow.show({"Error: Invalid desition object registered (missing id)!"})
-    return
-  end
-  if not desition.label then
-    PopupWindow.show({"Error: Invalid desition object registered (missing label)!"})
-    return
-  end
-
-  if not desition.condition then
-    desition.condition = function() return true end
-  end
-  if not desition.handle then
-    desition.handle = function() end
-  end
-  if _desitions[desition.id] then
-    trace("Warning: Overwriting desition with id: " .. desition.id)
-  end
-  _desitions[desition.id] = desition
-end
-
-function DesitionManager.get(id)
-  return _desitions[id]
-end
-
-function DesitionManager.get_all()
-  return _desitions
-end

inc/desition/desition.play_button_mash.lua

@@ -1,6 +0,0 @@
-DesitionManager.register({
-  id = "play_button_mash",
-  label = "Play Button Mash",
-  handle = function() MinigameButtonMashWindow.start(WINDOW_GAME) end,
-  condition = function() return true end
-})

inc/desition/desition.play_ddr.lua

@@ -1,6 +0,0 @@
-DesitionManager.register({
-  id = "play_ddr",
-  label = "Play DDR (Random)",
-  handle = function() MinigameDDRWindow.start(WINDOW_GAME, nil) end,
-  condition = function() return true end
-})

inc/desition/desition.play_rhythm.lua

@@ -1,6 +0,0 @@
-DesitionManager.register({
-  id = "play_rhythm",
-  label = "Play Rhythm Game",
-  handle = function() MinigameRhythmWindow.start(WINDOW_GAME) end,
-  condition = function() return true end
-})

inc/entity/entity.item.lua

@@ -0,0 +1,7 @@
+function Item.use()
+  Print.text("Used item: " .. Context.dialog.active_entity.name)
+end
+function Item.look_at()
+  PopupWindow.show_description_dialog(Context.dialog.active_entity, Context.dialog.active_entity.desc)
+end
+

inc/entity/entity.npc.lua

@@ -0,0 +1,13 @@
+function NPC.talk_to()
+  local npc = Context.dialog.active_entity
+  if npc.dialog and npc.dialog.start then
+    PopupWindow.set_dialog_node("start")
+  else
+    -- if no dialog, go back
+    GameWindow.set_state(WINDOW_GAME)
+  end
+end
+function NPC.fight() end
+function NPC.go_back()
+  GameWindow.set_state(WINDOW_GAME)
+end

inc/init/init.config.lua

@@ -8,7 +8,8 @@ local DEFAULT_CONFIG = {
     light_grey = 13,
     dark_grey = 14,
     green = 6,
-    item = 12
+    npc = 8,
+    item = 12 -- yellow
   },
   player = {
     sprite_id = 1
@@ -19,6 +20,7 @@ local DEFAULT_CONFIG = {
 }
 
 local Config = {
+  -- Copy default values initially
   screen = DEFAULT_CONFIG.screen,
   colors = DEFAULT_CONFIG.colors,
   player = DEFAULT_CONFIG.player,
@@ -27,23 +29,21 @@ local Config = {
 
 local CONFIG_SAVE_BANK = 7
 local CONFIG_MAGIC_VALUE_ADDRESS = 2
-local CONFIG_SPLASH_DURATION_ADDRESS = 3
+local CONFIG_MAGIC_VALUE = 0xDE -- A magic number to check if config is saved
-local CONFIG_MAGIC_VALUE = 0xDE
 
 function Config.save()
-  mset(CONFIG_MAGIC_VALUE, CONFIG_MAGIC_VALUE_ADDRESS, CONFIG_SAVE_BANK)
+  -- Save physics settings
+  mset(CONFIG_MAGIC_VALUE, CONFIG_MAGIC_VALUE_ADDRESS, CONFIG_SAVE_BANK) -- Mark as saved
 end
 
 function Config.load()
-  if mget(CONFIG_MAGIC_VALUE_ADDRESS, CONFIG_SAVE_BANK) == CONFIG_MAGIC_VALUE then
+  Config.restore_defaults()
-    Config.timing.splash_duration = mget(CONFIG_SPLASH_DURATION_ADDRESS, CONFIG_SAVE_BANK)
+  -- Check if config has been saved before using a magic value
-  else
-    Config.restore_defaults()
-  end
 end
 
 function Config.restore_defaults()
-  Config.timing.splash_duration = DEFAULT_CONFIG.timing.splash_duration
+  -- Any other configurable items should be reset here
 end
 
+-- Load configuration on startup
 Config.load()

inc/init/init.context.lua

@@ -2,31 +2,46 @@ local SAVE_GAME_BANK = 6
 local SAVE_GAME_MAGIC_VALUE_ADDRESS = 0
 local SAVE_GAME_MAGIC_VALUE = 0xCA
 
+local SAVE_GAME_PLAYER_X_ADDRESS = 1
+local SAVE_GAME_PLAYER_Y_ADDRESS = 2
+local SAVE_GAME_PLAYER_VX_ADDRESS = 3
+local SAVE_GAME_PLAYER_VY_ADDRESS = 4
+local SAVE_GAME_selectS_ADDRESS = 5
 local SAVE_GAME_CURRENT_SCREEN_ADDRESS = 6
 
+local VX_VY_OFFSET = 128 -- Offset for negative velocities
+
+-- Helper for deep copying tables
+local function clone_table(t)
+  local copy = {}
+  for k, v in pairs(t) do
+    if type(v) == "table" then
+      copy[k] = clone_table(v)
+    else
+      copy[k] = v
+    end
+  end
+  return copy
+end
+
+-- This function returns a table containing only the initial *data* for Context
 local function get_initial_data()
   return {
     active_window = WINDOW_SPLASH,
     intro = {
       y = Config.screen.height,
       speed = 0.5,
-      text = [[Norman Reds’ everyday life
+      text = "Norman Reds’ everyday life\nseems ordinary: work,\nmeetings, coffee, and\nendless notifications.\nBut beneath the surface\n— within him, or around\nhim — something is\nconstantly building, and\nit soon becomes clear\nthat there is more going\non than meets the eye."
-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 = {
+    dialog = {
-      show = false,
+      text = "",
-      content = {}
+      menu_items = {},
+      selected_menu_item = 1,
+      active_entity = nil,
+      showing_description = false,
+      current_node_key = nil
     },
     player = {
       sprite_id = Config.player.sprite_id
@@ -39,9 +54,320 @@ on than meets the eye.]]
     },
     menu_items = {},
     selected_menu_item = 1,
-    selected_desition_index = 1,
+    game_in_progress = false, -- New flag
-    game_in_progress = false,
+    screens = clone_table({
-    screens = {}
+      {
+        -- Screen 1
+        name = "Screen 1",
+        npcs = {
+          {
+            name = "Trinity",
+            sprite_id = 2,
+            dialog = {
+              start = {
+                text = "Hello, Neo.",
+                options = {
+                  {label = "Who are you?", next_node = "who_are_you"},
+                  {label = "My name is not Neo.", next_node = "not_neo"},
+                  {label = "...", next_node = "silent"}
+                }
+              },
+              who_are_you = {
+                text = "I am Trinity. I've been looking for you.",
+                options = {
+                  {label = "The famous hacker?", next_node = "famous_hacker"},
+                  {label = "Why me?", next_node = "why_me"}
+                }
+              },
+              not_neo = {
+                text = "I know. But you will be.",
+                options = {
+                  {label = "What are you talking about?", next_node = "who_are_you"}
+                }
+              },
+              silent = {
+                text = "You're not much of a talker, are you?",
+                options = {
+                  {label = "I guess not.", next_node = "dialog_end"}
+                }
+              },
+              famous_hacker = {
+                  text = "The one and only.",
+                  options = {
+                      {label = "Wow.", next_node = "dialog_end"}
+                  }
+              },
+              why_me = {
+                  text = "Morpheus believes you are The One.",
+                  options = {
+                      {label = "The One?", next_node = "the_one"}
+                  }
+              },
+              the_one = {
+                  text = "The one who will save us all.",
+                  options = {
+                      {label = "I'm just a programmer.", next_node = "dialog_end"}
+                  }
+              },
+              dialog_end = {
+                text = "We'll talk later.",
+                options = {} -- No options, ends conversation
+              }
+            }
+          },
+          {
+            name = "Oracle",
+            sprite_id = 3,
+            dialog = {
+              start = {
+                  text = "I know what you're thinking. 'Am I in the right place?'",
+                  options = {
+                      {label = "Who are you?", next_node = "who_are_you"},
+                      {label = "I guess I am.", next_node = "you_are"}
+                  }
+              },
+              who_are_are = {
+                  text = "I'm the Oracle. And you're right on time. Want a cookie?",
+                  options = {
+                      {label = "Sure.", next_node = "cookie"},
+                      {label = "No, thank you.", next_node = "no_cookie"}
+                  }
+              },
+              you_are = {
+                  text = "Of course you are. Sooner or later, everyone comes to see me. Want a cookie?",
+                  options = {
+                      {label = "Yes, please.", next_node = "cookie"},
+                      {label = "I'm good.", next_node = "no_cookie"}
+                  }
+              },
+              cookie = {
+                  text = "Here you go. Now, what's really on your mind?",
+                  options = {
+                      {label = "Am I The One?", next_node = "the_one"},
+                      {label = "What is the Matrix?", next_node = "the_matrix"}
+                  }
+              },
+              no_cookie = {
+                  text = "Suit yourself. Now, what's troubling you?",
+                  options = {
+                      {label = "Am I The One?", next_node = "the_one"},
+                      {label = "What is the Matrix?", next_node = "the_matrix"}
+                  }
+              },
+              the_one = {
+                  text = "Being The One is just like being in love. No one can tell you you're in love, you just know it. Through and through. Balls to bones.",
+                  options = {
+                      {label = "So I'm not?", next_node = "dialog_end"}
+                  }
+              },
+              the_matrix = {
+                  text = "The Matrix is a system, Neo. That system is our enemy. But when you're inside, you look around, what do you see? The very minds of the people we are trying to save.",
+                  options = {
+                      {label = "I see.", next_node = "dialog_end"}
+                  }
+              },
+              dialog_end = {
+                  text = "You have to understand, most of these people are not ready to be unplugged.",
+                  options = {}
+              }
+            }
+          }
+        },
+        items = {
+          {
+            name = "Key",
+            sprite_id = 4,
+            desc = "A rusty old key. It might open something."
+          }
+        }
+      },
+      {
+        -- Screen 2
+        name = "Screen 2",
+        npcs = {
+          {
+            name = "Morpheus",
+            sprite_id = 5,
+            dialog = {
+              start = {
+                  text = "At last. Welcome, Neo. As you no doubt have guessed, I am Morpheus.",
+                  options = {
+                      {label = "It's an honor to meet you.", next_node = "honor"},
+                      {label = "You've been looking for me.", next_node = "looking_for_me"}
+                  }
+              },
+              honor = {
+                  text = "No, the honor is mine.",
+                  options = {
+                      {label = "What is this place?", next_node = "what_is_this_place"}
+                  }
+              },
+              looking_for_me = {
+                  text = "I have. For some time.",
+                  options = {
+                      {label = "What is this place?", next_node = "what_is_this_place"}
+                  }
+              },
+              what_is_this_place = {
+                  text = "This is the construct. It's our loading program. We can load anything from clothing, to equipment, weapons, training simulations. Anything we need.",
+                  options = {
+                      {label = "Right.", next_node = "dialog_end"}
+                  }
+              },
+              dialog_end = {
+                  text = "I've been waiting for you, Neo. We have much to discuss.",
+                  options = {} -- Ends conversation
+              }
+            }
+          },
+          {
+            name = "Tank",
+            sprite_id = 6,
+            dialog = {
+              start = {
+                  text = "Hey, Neo! Welcome to the construct. I'm Tank.",
+                  options = {
+                      {label = "Good to meet you.", next_node = "good_to_meet_you"},
+                      {label = "This place is incredible.", next_node = "incredible"}
+                  }
+              },
+              good_to_meet_you = {
+                  text = "You too! We've been waiting for you. Need anything? Training? Weapons?",
+                  options = {
+                      {label = "Training?", next_node = "training"},
+                      {label = "I'm good for now.", next_node = "dialog_end"}
+                  }
+              },
+              incredible = {
+                  text = "Isn't it? The boss's design. We can load anything we need. What do you want to learn?",
+                  options = {
+                      {label = "Show me.", next_node = "training"}
+                  }
+              },
+              training = {
+                  text = "Jujitsu? Kung Fu? How about... all of them?",
+                  options = {
+                      {label = "All of them.", next_node = "all_of_them"}
+                  }
+              },
+              all_of_them = {
+                  text = "Operator, load the combat training program.",
+                  options = {
+                      {label = "...", next_node = "dialog_end"}
+                  }
+              },
+              dialog_end = {
+                  text = "Just holler if you need anything. Anything at all.",
+                  options = {}
+              }
+            }
+          }
+        },
+        items = {
+          {
+            name = "Potion",
+            sprite_id = 7,
+            desc = "A glowing red potion. It looks potent."
+          }
+        }
+      },
+      {
+        -- Screen 3
+        name = "Screen 3",
+        npcs = {
+          {
+            name = "Agent Smith",
+            sprite_id = 8,
+            dialog = {
+              start = {
+                  text = "Mr. Anderson. We've been expecting you.",
+                  options = {
+                      {label = "My name is Neo.", next_node = "name_is_neo"},
+                      {label = "...", next_node = "silent"}
+                  }
+              },
+              name_is_neo = {
+                  text = "Whatever you say. You're here for a reason.",
+                  options = {
+                      {label = "What reason?", next_node = "what_reason"}
+                  }
+              },
+              silent = {
+                  text = "The silent type. It doesn't matter. You are an anomaly.",
+                  options = {
+                      {label = "What do you want?", next_node = "what_reason"}
+                  }
+              },
+              what_reason = {
+                  text = "To be deleted. The system has no place for your kind.",
+                  options = {
+                      {label = "I won't let you.", next_node = "wont_let_you"}
+                  }
+              },
+              wont_let_you = {
+                  text = "You hear that, Mr. Anderson? That is the sound of inevitability.",
+                  options = {
+                      {label = "...", next_node = "dialog_end"}
+                  }
+              },
+              dialog_end = {
+                  text = "It is purpose that created us. Purpose that connects us. Purpose that pulls us. That guides us. That drives us. It is purpose that defines. Purpose that binds us.",
+                  options = {}
+              }
+            }
+          },
+          {
+            name = "Cypher",
+            sprite_id = 9,
+            dialog = {
+              start = {
+                  text = "Well, well. The new messiah. Welcome to the real world.",
+                  options = {
+                      {label = "You don't seem happy.", next_node = "not_happy"},
+                      {label = "...", next_node = "silent"}
+                  }
+              },
+              not_happy = {
+                  text = "Happy? Ignorance is bliss, Neo. We've been fighting this war for years. For what?",
+                  options = {
+                      {label = "For freedom.", next_node = "freedom"}
+                  }
+              },
+              silent = {
+                  text = "Not a talker, huh? Smart. Less to regret later. Want a drink?",
+                  options = {
+                      {label = "Sure.", next_node = "drink"},
+                      {label = "No thanks.", next_node = "no_drink"}
+                  }
+              },
+              drink = {
+                  text = "Good stuff. The little things you miss, you know? Like a good steak.",
+                  options = {
+                      {label = "I guess.", next_node = "dialog_end"}
+                  }
+              },
+              no_drink = {
+                  text = "Your loss. More for me.",
+                  options = {
+                      {label = "...", next_node = "dialog_end"}
+                  }
+              },
+              freedom = {
+                  text = "Freedom... right. If Morpheus told you you could fly, would you believe him?",
+                  options = {
+                      {label = "He's our leader.", next_node = "dialog_end"}
+                  }
+              },
+              dialog_end = {
+                  text = "Just be careful who you trust.",
+                  options = {}
+              }
+            }
+          }
+        },
+        items = {}
+      }
+    })
   }
 end
 
@@ -50,30 +376,23 @@ Context = {}
 local function reset_context_to_initial_state()
   local initial_data = get_initial_data()
 
+  -- Clear existing data properties from Context (but not methods)
   for k in pairs(Context) do
-    if type(Context[k]) ~= "function" then       Context[k] = nil
+    if type(Context[k]) ~= "function" then -- Only clear data, leave functions
+      Context[k] = nil
     end
   end
 
+  -- Copy all initial data properties into Context
   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 = ScreenManager.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
 
+-- Initially populate Context with data
 reset_context_to_initial_state()
 
+-- Now define the methods for Context
 function Context.new_game()
   reset_context_to_initial_state()
   Context.game_in_progress = true
@@ -89,13 +408,15 @@ end
 
 function Context.load_game()
   if mget(SAVE_GAME_MAGIC_VALUE_ADDRESS, SAVE_GAME_BANK) ~= SAVE_GAME_MAGIC_VALUE then
-        Context.new_game()
+    -- No saved game found, start a new one
+    Context.new_game()
     return
   end
 
-  reset_context_to_initial_state()
+  reset_context_to_initial_state() -- Reset data, preserve methods
+
   Context.current_screen = mget(SAVE_GAME_CURRENT_SCREEN_ADDRESS, SAVE_GAME_BANK)
 
   Context.game_in_progress = true
   MenuWindow.refresh_menu_items()
-end
+end

inc/init/init.modules.lua

@@ -4,16 +4,10 @@ local MenuWindow = {}
 local GameWindow = {}
 local PopupWindow = {}
 local ConfigurationWindow = {}
-local AudioTestWindow = {}
-local MinigameButtonMashWindow = {}
-local MinigameRhythmWindow = {}
-local MinigameDDRWindow = {}
-Util = {}
-DesitionManager = {}
-ScreenManager = {}
-MapManager = {}
-UI = {}
-Print = {}
-Input = {}
 
-Audio = {}
+local UI = {}
+local Print = {}
+local Input = {}
+local NPC = {}
+local Item = {}
+local Player = {}

inc/init/init.windows.lua

@@ -4,7 +4,3 @@ 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/map/map.bedroom.lua

@@ -1,9 +1,19 @@
-MapManager.register({
+MapBedroom = {
-  id = "bedroom",
+  "10101010101010101010101010101010",
-  from_x =  0,
+  "10141410101010101010101010101010",
-  from_y =  0,
+  "10141410101010101010101010101010",
-  width  = 30,
+  "10101010101010101010101010101010",
-  height = 17,
+  "10101010101010101010101010101010",
-  to_x   =  0,
+  "10101010101010101010101010101010",
-  to_y   =  0,
+  "10101010101010101010101010101010",
-})
+  "10101010101010101010101010101010",
+  "10101010101010101010101010101010",
+  "11111111111111111111111111111111",
+  "11111111111111111111111111111111",
+  "11111111111111111111111111111111",
+  "11111516111213111111111111111111",
+  "11111111111111111111111111111111",
+  "11111111111111111111111111111111",
+  "11111111111111111111111111111111",
+  "11111111111111111111111111111111"
+}

inc/map/map.manager.lua

@@ -1,35 +0,0 @@
-local _maps = {}
-
-function MapManager.get_maps_array()
-  local maps_array = {}
-  for _, map_data in pairs(_maps) do
-    table.insert(maps_array, map_data)
-  end
-  return maps_array
-end
-
-function MapManager.register(map_data)
-  if _maps[map_data.id] then
-    trace("Warning: Overwriting map with id: " .. map_data.id)
-  end
-  _maps[map_data.id] = map_data
-end
-
-function MapManager.get_by_id(map_id)
-  return _maps[map_id]
-end
-
-function MapManager.draw(map_id)
-  local map_data = MapManager.get_by_id(map_id)
-  if not map_data then
-    return
-  end
-  map(
-    map_data.from_x,
-    map_data.from_y,
-    map_data.width,
-    map_data.height,
-    map_data.to_x,
-    map_data.to_y
-  )
-end

inc/meta/meta.assets.lua

@@ -1,39 +1,6 @@
---luacheck: ignore max_line_length
 -- <PALETTE>
 -- 000:ab53375f574f0101017f2553c3c3c71d2b53fff1e929adff83779d3b5dc941a6f673eff7f4f4f494b0c2566c86333c57
 -- </PALETTE>
--- <SFX>
--- 000:060006400600064006000640060006400600060006000600060006000600060006000600060006000600060006000600060006000600060006000600300000000900
--- 016:05000500050005400540054005700570057005400540054005700570057005c005c005c005c005c005c005c005c005c005c005c005c005c005c005c0470000000000
--- 017:040004000400040004000400046004600460046004600460146024c034c054c064c084c0a4c0b4c0c4c0c4c0d4c0d4c0e4c0f4c0f4c0f4c0f4c0f4c0400000000000
--- 018:04c004c004c004c004c004c0046004600460046004600460240034005400640084009400a400b400c400d400d400e400e400e400f400f400f400f400300000000000
--- 019:0400040004000400040004d014d014d024d034d054d074d094d0b4d0c4d0e4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0f4d0400000000000
--- 020:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900500000000000
--- 021:01000100010001000100f10001100110011001100110f11001200120012001200120f1201130113011302130213021302130313041308130a130d130380000000000
--- 032:010001100100011001000110010001100100010001000100010001000100010001000100010001000100010001000100010001000100010001000100301000000800
--- 033:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
--- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006004600000f0f00
--- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000004600000f0f00
--- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
--- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100100000080800
--- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000
--- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200100000000000
--- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00400000000000
--- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100484000000000
--- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000405000000000
--- </SFX>
--- <WAVES>
--- 000:bcceefceedddddc84333121268abaa99
--- 001:6789bdd96adc83248dd6334adda7578b
--- 002:0123456789abcdef0123456789abcdef
--- 003:224578acdeeeeddcba95434567653100
--- 004:00000000ffffffff00000000ffffffff
--- 005:0123456789abcdeffedcba9876543210
--- 006:0123456789abcdef0123456789abcdef
--- 007:76543210123456789abcdefedcba9878
--- 008:0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
--- 009:fff000fff000fff000fff000fff000ff
--- </WAVES>
 -- <TILES>
 -- 000:2222222223333332233232322353533223323232232353322333333222222222
 -- 001:2222222223333333232322322333333323222322233333332355355522222222

inc/screen/screen.home.lua

@@ -1,9 +0,0 @@
-ScreenManager.register({
-  id = "home",
-  name = "Home",
-  decisions = {
-    "go_to_toilet",
-    "go_to_walking_to_office",
-  },
-  background = "bedroom",
-})

inc/screen/screen.manager.lua

@@ -1,20 +0,0 @@
-local _screens = {}
-
-function ScreenManager.get_screens_array()
-  local screens_array = {}
-  for _, screen_data in pairs(_screens) do
-    table.insert(screens_array, screen_data)
-  end
-  return screens_array
-end
-
-function ScreenManager.register(screen_data)
-  if _screens[screen_data.id] then
-    trace("Warning: Overwriting screen with id: " .. screen_data.id)
-  end
-  _screens[screen_data.id] = screen_data
-end
-
-function ScreenManager.get_by_id(screen_id)
-  return _screens[screen_id]
-end

inc/screen/screen.office.lua

@@ -1,10 +0,0 @@
-ScreenManager.register({
-  id = "office",
-  name = "Office",
-  decisions = {
-    "play_button_mash",
-    "play_rhythm",
-    "play_ddr",
-    "go_to_walking_to_home",
-  }
-})

inc/screen/screen.toilet.lua

@@ -1,7 +0,0 @@
-ScreenManager.register({
-  id = "toilet",
-  name = "Toilet",
-  decisions = {
-    "go_to_home",
-  }
-})

inc/screen/screen.walking_to_home.lua

@@ -1,8 +0,0 @@
-ScreenManager.register({
-  id = "walking_to_home",
-  name = "Walking to home",
-  decisions = {
-    "go_to_home",
-    "go_to_office",
-  }
-})

inc/screen/screen.walking_to_office.lua

@@ -1,8 +0,0 @@
-ScreenManager.register({
-  id = "walking_to_office",
-  name = "Walking to office",
-  decisions = {
-    "go_to_home",
-    "go_to_office",
-  }
-})

inc/system/system.audio.lua

@@ -1,14 +0,0 @@
-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,17 +1,25 @@
+-- Gamepad buttons
 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_B = 5 local INPUT_KEY_Y = 7
+local INPUT_KEY_A = 4 -- Z key
+local INPUT_KEY_B = 5 -- X key
+local INPUT_KEY_X = 6 -- A key
+local INPUT_KEY_Y = 7 -- S key
+
+-- Keyboard keys
+-- TODO: Find correct key codes for SPACE and LCTRL
 local INPUT_KEY_SPACE = 48
 local INPUT_KEY_BACKSPACE = 51
 local INPUT_KEY_ENTER = 50
 
 function Input.up() return btnp(INPUT_KEY_UP) end
 function Input.down() return btnp(INPUT_KEY_DOWN) end
-function Input.left() return btnp(INPUT_KEY_LEFT) end
+function Input.left() return btn(INPUT_KEY_LEFT) end
-function Input.right() return btnp(INPUT_KEY_RIGHT) end
+function Input.right() return btn(INPUT_KEY_RIGHT) end
 function Input.select() return btnp(INPUT_KEY_A) or keyp(INPUT_KEY_SPACE) end
 function Input.menu_confirm() return btnp(INPUT_KEY_A) or keyp(INPUT_KEY_ENTER) end
-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
+function Input.player_interact() return btnp(INPUT_KEY_B) or keyp(INPUT_KEY_ENTER) end -- B button
+function Input.menu_back() return btnp(INPUT_KEY_Y) or keyp(INPUT_KEY_BACKSPACE) end
 function Input.toggle_popup() return keyp(INPUT_KEY_ENTER) end

inc/system/system.main.lua

@@ -24,22 +24,6 @@ local STATE_HANDLERS = {
     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
@@ -53,6 +37,7 @@ end
 
 function TIC()
   init_game()
+
   cls(Config.colors.black)
   local handler = STATE_HANDLERS[Context.active_window]
   if handler then

inc/system/system.print.lua

@@ -5,11 +5,4 @@ function Print.text(text, x, y, color, fixed, scale)
   scale = scale or 1
   print(text, x + 1, y + 1, shadow_color, fixed, scale)
   print(text, x, y, color, fixed, scale)
-end
+end
-
-function Print.text_center(text, x, y, color, fixed, scale)
-  scale = scale or 1
-  local text_width = print(text, 0, -6, 0, fixed, scale)
-  local centered_x = x - (text_width / 2)
-  Print.text(text, centered_x, y, color, fixed, scale)
-end

inc/system/system.ui.lua

@@ -19,13 +19,11 @@ end
 
 function UI.update_menu(items, selected_item)
   if Input.up() then
-    Audio.sfx_beep()
     selected_item = selected_item - 1
     if selected_item < 1 then
       selected_item = #items
     end
   elseif Input.down() then
-    Audio.sfx_beep()
     selected_item = selected_item + 1
     if selected_item > #items then
       selected_item = 1
@@ -37,6 +35,7 @@ end
 function UI.word_wrap(text, max_chars_per_line)
     if text == nil then return {""} end
     local lines = {}
+    
     for input_line in (text .. "\n"):gmatch("(.-)\n") do
         local current_line = ""
         local words_in_line = 0
@@ -51,15 +50,18 @@ function UI.word_wrap(text, max_chars_per_line)
                 current_line = word
             end
         end
+        
         if words_in_line > 0 then
             table.insert(lines, current_line)
         else
             table.insert(lines, "")
         end
     end
+    
     if #lines == 0 then
         return {""}
     end
+    
     return lines
 end
 
@@ -83,27 +85,3 @@ function UI.create_action_item(label, action)
     type = "action_item"
   }
 end
-
-function UI.draw_desition_selector(desitions, selected_desition_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 #desitions > 0 then
-    local selected_desition = desitions[selected_desition_index]
-    local desition_label = selected_desition.label
-    local text_width = #desition_label * 4     local text_y = bar_y + 4
-        local text_x = (Config.screen.width - text_width) / 2
-        Print.text("<", 2, text_y, Config.colors.green)
-        Print.text(desition_label, text_x, text_y, Config.colors.item)         Print.text(">", Config.screen.width - 6, text_y, Config.colors.green)   end
-end
-
-function UI.update_desition_selector(desitions, selected_desition_index)
-  if Input.left() then
-    Audio.sfx_beep()
-    selected_desition_index = Util.safeindex(desitions, selected_desition_index - 1)
-  elseif Input.right() then
-    Audio.sfx_beep()
-    selected_desition_index = Util.safeindex(desitions, selected_desition_index + 1)
-  end
-  return selected_desition_index
-end

inc/system/system.util.lua

@@ -1,14 +0,0 @@
-Util = {}
-
-function Util.safeindex(array, index)
-    return ((index - 1 + #array) % #array) + 1
-end
-
-function Util.go_to_screen_by_id(screen_id)
-  local screen_index = Context.screen_indices_by_id[screen_id]
-  if screen_index then
-    Context.current_screen = screen_index
-    Context.selected_desition_index = 1   else
-    PopupWindow.show({"Error: Screen '" .. screen_id .. "' not found or not indexed!"})
-  end
-end

inc/window/window.audiotest.lua

@@ -1,97 +0,0 @@
-AudioTestWindow = {
-    index_menu = 1,
-    index_func = 1,
-    list_func = {},
-    menuitems = {},
-    last_pressed = false
-}
-
-function AudioTestWindow.generate_menuitems(list_func, index_func)
-    return {
-        {
-            label = "Play music/sound: " .. (list_func[index_func] or "?"),
-            desition = function()
-                local current_func = Audio[list_func[index_func]]
-                if current_func then
-                    current_func()
-                else
-                    trace("Invalid Audio function: " .. list_func[index_menu])
-                end
-            end
-        },
-        {
-            label = "Stop playing music",
-            desition = function()
-                Audio.music_stop()
-            end
-        },
-        {
-            label = "Back",
-            desition = function()
-                AudioTestWindow.back()
-            end
-        },
-    }
-end
-
-function AudioTestWindow.generate_listfunc()
-    local result = {}
-
-    for k, v in pairs(Audio) do
-        if type(v) == "function" then
-            result[#result + 1] = k
-        end
-    end
-
-    table.sort(result)
-
-    return result
-end
-
-function AudioTestWindow.back()
-    Audio.sfx_deselect()
-    GameWindow.set_state(WINDOW_MENU)
-end
-
-function AudioTestWindow.init()
-    AudioTestWindow.last_pressed = false
-    AudioTestWindow.index_menu = 1
-    AudioTestWindow.index_func = 1
-    AudioTestWindow.list_func = AudioTestWindow.generate_listfunc()
-    AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(
-        AudioTestWindow.list_func, AudioTestWindow.index_func
-    )
-end
-
-function AudioTestWindow.draw()
-    UI.draw_top_bar("Audio test")
-    UI.draw_menu(AudioTestWindow.menuitems, AudioTestWindow.index_menu, 20, 50)
-end
-
-function AudioTestWindow.update()
-    if Input.up() then
-        AudioTestWindow.index_menu = Util.safeindex(AudioTestWindow.menuitems, AudioTestWindow.index_menu - 1)
-    elseif Input.down() then
-        AudioTestWindow.index_menu = Util.safeindex(AudioTestWindow.menuitems, AudioTestWindow.index_menu + 1)
-    elseif Input.left() then
-        AudioTestWindow.index_func = Util.safeindex(
-            AudioTestWindow.list_func,
-            AudioTestWindow.index_func - 1
-        )
-        AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(
-            AudioTestWindow.list_func, AudioTestWindow.index_func
-        )
-    elseif Input.right() then
-        AudioTestWindow.index_func = Util.safeindex(
-            AudioTestWindow.list_func,
-            AudioTestWindow.index_func + 1
-        )
-        AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(
-            AudioTestWindow.list_func, AudioTestWindow.index_func
-        )
-    elseif Input.menu_confirm() then
-        AudioTestWindow.menuitems[AudioTestWindow.index_menu].desition()
-    elseif Input.menu_back() then
-        AudioTestWindow.back()
-    end
-end

inc/window/window.configuration.lua

@@ -5,11 +5,11 @@ ConfigurationWindow = {
 
 function ConfigurationWindow.init()
   ConfigurationWindow.controls = {
-    UI.create_desition_item(
+    UI.create_action_item(
       "Save",
       function() Config.save() end
     ),
-    UI.create_desition_item(
+    UI.create_action_item(
       "Restore Defaults",
       function() Config.restore_defaults() end
     ),
@@ -19,28 +19,34 @@ end
 function ConfigurationWindow.draw()
   UI.draw_top_bar("Configuration")
 
-  local x_start = 10   local y_start = 40
+  local x_start = 10 -- Left margin for labels
-  local x_value_right_align = Config.screen.width - 10
+  local y_start = 40
-  local char_width = 4
+  local x_value_right_align = Config.screen.width - 10 -- Right margin for values
+  local char_width = 4 -- Approximate character width for default font
+
   for i, control in ipairs(ConfigurationWindow.controls) do
     local current_y = y_start + (i - 1) * 12
     local color = Config.colors.green
+    
     if control.type == "numeric_stepper" then
       local value = control.get()
       local label_text = control.label
       local value_text = string.format(control.format, value)
-
+      
-            local value_x = x_value_right_align - (#value_text * char_width)
+      -- Calculate x position for right-aligned value
-
+      local value_x = x_value_right_align - (#value_text * char_width)
+      
       if i == ConfigurationWindow.selected_control then
         color = Config.colors.item
         Print.text("<", x_start -8, current_y, color)
-        Print.text(label_text, x_start, current_y, color)         Print.text(value_text, value_x, current_y, color)
+        Print.text(label_text, x_start, current_y, color) -- Shift label due to '<'
-        Print.text(">", x_value_right_align + 4, current_y, color)       else
+        Print.text(value_text, value_x, current_y, color)
+        Print.text(">", x_value_right_align + 4, current_y, color) -- Print '>' after value
+      else
         Print.text(label_text, x_start, current_y, color)
         Print.text(value_text, value_x, current_y, color)
       end
-    elseif control.type == "desition_item" then
+    elseif control.type == "action_item" then
       local label_text = control.label
       if i == ConfigurationWindow.selected_control then
         color = Config.colors.item
@@ -52,6 +58,7 @@ function ConfigurationWindow.draw()
       end
     end
   end
+  
   Print.text("Press B to go back", x_start, 120, Config.colors.light_grey)
 end
 
@@ -77,15 +84,17 @@ function ConfigurationWindow.update()
   if control then
     if control.type == "numeric_stepper" then
       local current_value = control.get()
-      if btnp(2) then         local new_value = math.max(control.min, current_value - control.step)
+      if btnp(2) then -- Left
+        local new_value = math.max(control.min, current_value - control.step)
         control.set(new_value)
-      elseif btnp(3) then         local new_value = math.min(control.max, current_value + control.step)
+      elseif btnp(3) then -- Right
+        local new_value = math.min(control.max, current_value + control.step)
         control.set(new_value)
       end
-    elseif control.type == "desition_item" then
+    elseif control.type == "action_item" then
       if Input.menu_confirm() then
-        control.desition()
+        control.action()
       end
     end
   end
-end
+end

inc/window/window.game.lua

@@ -1,19 +1,16 @@
 function GameWindow.draw()
-  local screen = Context.screens[Context.current_screen]
+  local currentScreenData = Context.screens[Context.current_screen]
-  MapManager.draw(screen.background)
+
-  UI.draw_top_bar(screen.name)
+  UI.draw_top_bar(currentScreenData.name)
-  if screen and screen.decisions and #screen.decisions > 0 then
+
-    local available_desitions = {}
+  -- Draw Norman's bedroom
-    for _, desition_id in ipairs(screen.decisions) do
+  local from_x =  0 -- top-left coordinate of the large MAP (screen 1)
-      local desition = DesitionManager.get(desition_id)
+  local from_y =  0 -- top-left coordinate of the large MAP (screen 1)
-      if desition and desition.condition() then
+  local width  = 30 -- width of the standard screen (number of tiles)
-        table.insert(available_desitions, desition)
+  local height = 17 -- height of the standard screen (number of tiles)
-      end
+  local to_x   =  0 -- target x (of the displayed screen)([0-29])
-    end
+  local to_y   =  0 -- target y (of the displayed screen)([0-16])
-        if #available_desitions > 0 then
+  map(from_x, from_y, width, height, to_x, to_y)
-      UI.draw_desition_selector(available_desitions, Context.selected_desition_index)
-    end
-  end
 end
 
 function GameWindow.update()
@@ -22,47 +19,24 @@ function GameWindow.update()
     MenuWindow.refresh_menu_items()
     return
   end
-
+  if Input.select() then
-    if Input.up() then
+    if Context.current_screen == #Context.screens then
-    Context.current_screen = Context.current_screen - 1
-    if Context.current_screen < 1 then
-      Context.current_screen = #Context.screens
-    end
-    Context.selected_desition_index = 1   elseif Input.down() then
-    Context.current_screen = Context.current_screen + 1
-    if Context.current_screen > #Context.screens then
       Context.current_screen = 1
+    else
+      Context.current_screen = Context.current_screen + 1
     end
-    Context.selected_desition_index = 1   end
+  end
 
-  local screen = Context.screens[Context.current_screen]
+  if Input.player_interact() then
-  if screen and screen.decisions and #screen.decisions > 0 then
+      PopupWindow.show_menu_dialog(npc, {
-    local available_desitions = {}
+        {label = "Talk to", action = NPC.talk_to},
-    for _, desition_id in ipairs(screen.decisions) do
+        {label = "Fight", action = NPC.fight},
-      local desition = DesitionManager.get(desition_id)
+        {label = "Go back", action = NPC.go_back}
-      if desition and desition.condition() then         table.insert(available_desitions, desition)
+      }, WINDOW_POPUP)
-      end
-    end
-
-        if #available_desitions == 0 then return end
-
-        local new_selected_desition_index = UI.update_desition_selector(
-      available_desitions,
-      Context.selected_desition_index
-    )
-
-        if new_selected_desition_index ~= Context.selected_desition_index then
-      Context.selected_desition_index = new_selected_desition_index
-    end
-
-        if Input.select() then
-      local selected_desition = available_desitions[Context.selected_desition_index]
-      if selected_desition and selected_desition.handle then         Audio.sfx_select()         selected_desition.handle()
-      end
-    end
   end
 end
 
 function GameWindow.set_state(new_state)
   Context.active_window = new_state
-  end
+  -- Add any state-specific initialization/cleanup here later if needed
+end

inc/window/window.intro.lua

@@ -1,21 +1,25 @@
-function IntroWindow.draw()
+function IntroWindow.draw() 
-  local x = (Config.screen.width - 132) / 2
+  local x = (Config.screen.width - 132) / 2 -- Centered text
   Print.text(Context.intro.text, x, Context.intro.y, Config.colors.green)
 end
 
-function IntroWindow.update()
+function IntroWindow.update() 
   Context.intro.y = Context.intro.y - Context.intro.speed
 
-    local lines = 1
+  -- Count lines in intro text to determine when scrolling is done
+  local lines = 1
   for _ in string.gmatch(Context.intro.text, "\n") do
     lines = lines + 1
   end
 
-    if Context.intro.y < -lines * 8 then
+  -- When text is off-screen, go to menu
+  if Context.intro.y < -lines * 8 then
     GameWindow.set_state(WINDOW_MENU)
   end
 
-    if Input.menu_confirm() then
+  -- Skip intro by pressing A
+  if Input.menu_confirm() then
     GameWindow.set_state(WINDOW_MENU)
   end
-end
+end
+

inc/window/window.menu.lua

@@ -8,23 +8,25 @@ function MenuWindow.update()
 
   if Input.menu_confirm() then
     local selected_item = Context.menu_items[Context.selected_menu_item]
-    if selected_item and selected_item.desition then
+    if selected_item and selected_item.action then
-      Audio.sfx_select()
+      selected_item.action()
-      selected_item.desition()
     end
   end
 end
 
 function MenuWindow.new_game()
-  Context.new_game()   GameWindow.set_state(WINDOW_GAME)
+  Context.new_game() -- This function will be created in Context
+  GameWindow.set_state(WINDOW_GAME)
 end
 
 function MenuWindow.load_game()
-  Context.load_game()   GameWindow.set_state(WINDOW_GAME)
+  Context.load_game() -- This function will be created in Context
+  GameWindow.set_state(WINDOW_GAME)
 end
 
 function MenuWindow.save_game()
-  Context.save_game() end
+  Context.save_game() -- This function will be created in Context
+end
 
 function MenuWindow.resume_game()
   GameWindow.set_state(WINDOW_GAME)
@@ -39,22 +41,20 @@ function MenuWindow.configuration()
   GameWindow.set_state(WINDOW_CONFIGURATION)
 end
 
-function MenuWindow.audio_test()
-  AudioTestWindow.init()
-  GameWindow.set_state(WINDOW_AUDIOTEST)
-end
-
 function MenuWindow.refresh_menu_items()
-  Context.menu_items = {}
+  Context.menu_items = {} -- Start with an empty table
+
   if Context.game_in_progress then
-    table.insert(Context.menu_items, {label = "Resume Game", desition = MenuWindow.resume_game})
+    table.insert(Context.menu_items, {label = "Resume Game", action = MenuWindow.resume_game})
-    table.insert(Context.menu_items, {label = "Save Game", desition = MenuWindow.save_game})
+    table.insert(Context.menu_items, {label = "Save Game", action = MenuWindow.save_game})
   end
 
-  table.insert(Context.menu_items, {label = "New Game", desition = MenuWindow.new_game})
+  table.insert(Context.menu_items, {label = "New Game", action = MenuWindow.new_game})
-  table.insert(Context.menu_items, {label = "Load Game", desition = MenuWindow.load_game})
+  table.insert(Context.menu_items, {label = "Load Game", action = MenuWindow.load_game})
-  table.insert(Context.menu_items, {label = "Configuration", desition = MenuWindow.configuration})
+  table.insert(Context.menu_items, {label = "Configuration", action = MenuWindow.configuration})
-  table.insert(Context.menu_items, {label = "Audio Test", desition = MenuWindow.audio_test})
+  table.insert(Context.menu_items, {label = "Exit", action = MenuWindow.exit})
-  table.insert(Context.menu_items, {label = "Exit", desition = MenuWindow.exit})
+  
+  Context.selected_menu_item = 1 -- Reset selection after refreshing
+end
+
 
-  Context.selected_menu_item = 1 end

inc/window/window.minigame.ddr.lua

@@ -1,323 +0,0 @@
-function MinigameDDRWindow.init()
-  -- Calculate evenly spaced arrow positions
-  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
-  Context.minigame_ddr = {
-    -- Progress bar (matching button mash style)
-    bar_fill = 0, -- 0 to 100
-    max_fill = 100,
-    fill_per_hit = 10, -- Points gained per perfect hit
-    miss_penalty = 5, -- Points lost per miss
-    bar_x = 20,
-    bar_y = 10,
-    bar_width = 200,
-    bar_height = 12,
-    -- Arrow settings
-    arrow_size = arrow_size,
-    arrow_spawn_timer = 0,
-    arrow_spawn_interval = 45, -- Frames between arrow spawns (for random mode)
-    arrow_fall_speed = 1.5, -- Pixels per frame
-    arrows = {}, -- Active falling arrows {dir, x, y}
-    -- Target arrows at bottom (evenly spaced, centered on screen)
-    target_y = 115, -- Y position of target arrows
-    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 detection
-    hit_threshold = 8, -- Pixels of tolerance for perfect hit
-    button_pressed_timers = {}, -- Visual feedback per arrow
-    button_press_duration = 8,
-    -- Input cooldown per direction
-    input_cooldowns = {
-      left = 0,
-      down = 0,
-      up = 0,
-      right = 0
-    },
-    input_cooldown_duration = 10,
-    -- Song/Pattern system
-    frame_counter = 0, -- Tracks frames since start
-    current_song = nil, -- Current song data
-    pattern_index = 1, -- Current position in pattern
-    use_pattern = false, -- If true, use song pattern; if false, use random spawning
-    return_window = WINDOW_GAME
-  }
-end
-
-function MinigameDDRWindow.start(return_window, song_key)
-  MinigameDDRWindow.init()
-  Context.minigame_ddr.return_window = return_window or WINDOW_GAME
-  -- Debug: Store song_key for display
-  Context.minigame_ddr.debug_song_key = song_key
-  -- Load song pattern if specified
-  if song_key and Songs and Songs[song_key] then
-    Context.minigame_ddr.current_song = Songs[song_key]
-    Context.minigame_ddr.use_pattern = true
-    Context.minigame_ddr.pattern_index = 1
-    Context.minigame_ddr.debug_status = "Pattern loaded: " .. song_key
-  else
-    -- Default to random spawning
-    Context.minigame_ddr.use_pattern = false
-    if song_key then
-      Context.minigame_ddr.debug_status = "Song not found: " .. tostring(song_key)
-    else
-      Context.minigame_ddr.debug_status = "Random mode"
-    end
-  end
-  Context.active_window = WINDOW_MINIGAME_DDR
-end
-
--- Spawn a new arrow (random direction)
-local function spawn_arrow()
-  local mg = Context.minigame_ddr
-  local target = mg.target_arrows[math.random(1, 4)]
-  table.insert(mg.arrows, {
-    dir = target.dir,
-    x = target.x,
-    y = mg.bar_y + mg.bar_height + 10 -- Start below progress bar
-  })
-end
-
--- Spawn an arrow with specific direction
-local function spawn_arrow_dir(direction)
-  local mg = Context.minigame_ddr
-  -- Find the target arrow for this direction
-  for _, target in ipairs(mg.target_arrows) do
-    if target.dir == direction then
-      table.insert(mg.arrows, {
-        dir = direction,
-        x = target.x,
-        y = mg.bar_y + mg.bar_height + 10
-      })
-      break
-    end
-  end
-end
-
--- Check if arrow is close enough for a hit
-local function check_hit(arrow)
-  local mg = Context.minigame_ddr
-  local distance = math.abs(arrow.y - mg.target_y)
-  return distance <= mg.hit_threshold
-end
-
--- Check if arrow has passed the target
-local function check_miss(arrow)
-  local mg = Context.minigame_ddr
-  return arrow.y > mg.target_y + mg.hit_threshold
-end
-
--- Draw a single arrow sprite
-local function draw_arrow(x, y, direction, color)
-  local size = 12
-  local half = size / 2
-  -- Draw arrow shape based on direction
-  if direction == "left" then
-    -- Triangle pointing left
-    tri(x + half, y, x, y + half, x + half, y + size, color)
-    rect(x + half, y + half - 2, half, 4, color)
-  elseif direction == "right" then
-    -- Triangle pointing right
-    tri(x + half, y, x + size, y + half, x + half, y + size, color)
-    rect(x, y + half - 2, half, 4, color)
-  elseif direction == "up" then
-    -- Triangle pointing up
-    tri(x, y + half, x + half, y, x + size, y + half, color)
-    rect(x + half - 2, y + half, 4, half, color)
-  elseif direction == "down" then
-    -- Triangle pointing down
-    tri(x, y + half, x + half, y + size, x + size, y + half, color)
-    rect(x + half - 2, y, 4, half, color)
-  end
-end
-
-function MinigameDDRWindow.update()
-  local mg = Context.minigame_ddr
-  -- Check for completion (bar filled to 100%)
-  if mg.bar_fill >= mg.max_fill then
-    Context.active_window = mg.return_window
-    return
-  end
-  -- Increment frame counter
-  mg.frame_counter = mg.frame_counter + 1
-  -- Check if song has ended (pattern mode only)
-  if mg.use_pattern and mg.current_song and mg.current_song.end_frame then
-    -- Song has ended if we've passed the end frame AND all arrows are cleared
-    if mg.frame_counter > mg.current_song.end_frame and #mg.arrows == 0 then
-      -- Song complete! Return to previous window
-      Context.active_window = mg.return_window
-      return
-    end
-  end
-  -- Spawn arrows based on mode (pattern or random)
-  if mg.use_pattern and mg.current_song and mg.current_song.pattern then
-    -- Pattern-based spawning (synced to song)
-    local pattern = mg.current_song.pattern
-    -- Check if current frame matches any pattern entry
-    while mg.pattern_index <= #pattern do
-      local spawn_entry = pattern[mg.pattern_index]
-      if mg.frame_counter >= spawn_entry.frame then
-        -- Time to spawn this arrow!
-        spawn_arrow_dir(spawn_entry.dir)
-        mg.pattern_index = mg.pattern_index + 1
-      else
-        -- Not time yet, break the loop
-        break
-      end
-    end
-  else
-    -- Random spawning mode (original behavior)
-    mg.arrow_spawn_timer = mg.arrow_spawn_timer + 1
-    if mg.arrow_spawn_timer >= mg.arrow_spawn_interval then
-      spawn_arrow()
-      mg.arrow_spawn_timer = 0
-    end
-  end
-  -- Update falling arrows
-  local arrows_to_remove = {}
-  for i, arrow in ipairs(mg.arrows) do
-    arrow.y = arrow.y + mg.arrow_fall_speed
-    -- Check if arrow went off-screen (miss)
-    if check_miss(arrow) then
-      table.insert(arrows_to_remove, i)
-      -- Penalty for missing
-      mg.bar_fill = mg.bar_fill - mg.miss_penalty
-      if mg.bar_fill < 0 then
-        mg.bar_fill = 0
-      end
-    end
-  end
-  -- Remove off-screen arrows (iterate backwards to avoid index issues)
-  for i = #arrows_to_remove, 1, -1 do
-    table.remove(mg.arrows, arrows_to_remove[i])
-  end
-  -- Update input cooldowns
-  for dir, _ in pairs(mg.input_cooldowns) do
-    if mg.input_cooldowns[dir] > 0 then
-      mg.input_cooldowns[dir] = mg.input_cooldowns[dir] - 1
-    end
-  end
-  -- Update button press timers
-  for dir, _ in pairs(mg.button_pressed_timers) do
-    if mg.button_pressed_timers[dir] > 0 then
-      mg.button_pressed_timers[dir] = mg.button_pressed_timers[dir] - 1
-    end
-  end
-  -- Check for arrow key inputs
-  local input_map = {
-    left = Input.left(),
-    down = Input.down(),
-    up = Input.up(),
-    right = Input.right()
-  }
-  for dir, pressed in pairs(input_map) do
-    if pressed and mg.input_cooldowns[dir] == 0 then
-      mg.input_cooldowns[dir] = mg.input_cooldown_duration
-      mg.button_pressed_timers[dir] = mg.button_press_duration
-      -- Check if any arrow matches this direction and is in hit range
-      local hit = false
-      for i, arrow in ipairs(mg.arrows) do
-        if arrow.dir == dir and check_hit(arrow) then
-          -- Perfect hit!
-          mg.bar_fill = mg.bar_fill + mg.fill_per_hit
-          if mg.bar_fill > mg.max_fill then
-            mg.bar_fill = mg.max_fill
-          end
-          table.remove(mg.arrows, i)
-          hit = true
-          break
-        end
-      end
-      -- If pressed but no arrow to hit, apply small penalty
-      if not hit then
-        mg.bar_fill = mg.bar_fill - 2
-        if mg.bar_fill < 0 then
-          mg.bar_fill = 0
-        end
-      end
-    end
-  end
-end
-
-function MinigameDDRWindow.draw()
-  local mg = Context.minigame_ddr
-  -- Safety check
-  if not mg then
-    cls(0)
-    print("DDR ERROR: Context not initialized", 10, 10, 12)
-    print("Press Z to return", 10, 20, 12)
-    if Input.select() then
-      Context.active_window = WINDOW_GAME
-    end
-    return
-  end
-  -- Draw the underlying window first (for overlay effect)
-  if mg.return_window == WINDOW_GAME then
-    GameWindow.draw()
-  end
-  -- Draw semi-transparent overlay background
-  rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
-  -- Draw progress bar background
-  rect(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.light_grey)
-  rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
-  -- Draw progress bar fill
-  local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
-  if fill_width > 0 then
-    -- Color changes as bar fills
-    local bar_color = Config.colors.green
-    if mg.bar_fill > 66 then
-      bar_color = Config.colors.item -- yellow
-    elseif mg.bar_fill > 33 then
-      bar_color = Config.colors.bar
-    end
-    rect(mg.bar_x, mg.bar_y, fill_width, mg.bar_height, bar_color)
-  end
-  -- Draw progress percentage
-  local percentage = math.floor((mg.bar_fill / mg.max_fill) * 100)
-  Print.text_center(percentage .. "%", mg.bar_x + mg.bar_width / 2, mg.bar_y + 2, Config.colors.black)
-  -- Draw target arrows at bottom (light grey when not pressed)
-  if mg.target_arrows then
-    for _, target in ipairs(mg.target_arrows) do
-      local is_pressed = mg.button_pressed_timers[target.dir] and mg.button_pressed_timers[target.dir] > 0
-      local color = is_pressed and Config.colors.green or Config.colors.light_grey
-      draw_arrow(target.x, mg.target_y, target.dir, color)
-    end
-  end
-  -- Draw falling arrows (blue)
-  if mg.arrows then
-    for _, arrow in ipairs(mg.arrows) do
-      draw_arrow(arrow.x, arrow.y, arrow.dir, Config.colors.bar) -- blue color
-    end
-  end
-  -- Draw instruction text
-  Print.text_center("Hit the arrows!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
-  -- Debug info (large and visible)
-  local debug_y = 60
-  if mg.debug_status then
-    Print.text_center(mg.debug_status, Config.screen.width / 2, debug_y, Config.colors.item)
-    debug_y = debug_y + 10
-  end
-  if mg.use_pattern then
-    Print.text_center(
-      "PATTERN MODE - Frame:" .. mg.frame_counter,
-      Config.screen.width / 2,
-      debug_y,
-      Config.colors.green
-    )
-    if mg.current_song and mg.current_song.pattern then
-      Print.text_center(
-        "Pattern Len:" .. #mg.current_song.pattern .. " Index:" .. mg.pattern_index,
-        Config.screen.width / 2,
-        debug_y + 10,
-        Config.colors.green
-      )
-    end
-  else
-    Print.text_center("RANDOM MODE", Config.screen.width / 2, debug_y, Config.colors.bar)
-  end
-end

inc/window/window.minigame.mash.lua

@@ -1,96 +0,0 @@
-function MinigameButtonMashWindow.init()
-  Context.minigame_button_mash = {
-    bar_fill = 0, -- 0 to 100
-    max_fill = 100,
-    fill_per_press = 8,
-    base_degradation = 0.15, -- Base degradation per frame
-    degradation_multiplier = 0.006, -- Increases with bar fill
-    button_pressed_timer = 0, -- Visual feedback timer
-    button_press_duration = 8, -- Frames to show button press
-    return_window = WINDOW_GAME, -- Window to return to after completion
-    bar_x = 20,
-    bar_y = 10,
-    bar_width = 200,
-    bar_height = 12,
-    button_x = 20,
-    button_y = 110,
-    button_size = 12
-  }
-end
-
-function MinigameButtonMashWindow.start(return_window)
-  MinigameButtonMashWindow.init()
-  Context.minigame_button_mash.return_window = return_window or WINDOW_GAME
-  Context.active_window = WINDOW_MINIGAME_BUTTON_MASH
-end
-
-function MinigameButtonMashWindow.update()
-  local mg = Context.minigame_button_mash
-  -- Check for Z button press
-  if Input.select() then
-    mg.bar_fill = mg.bar_fill + mg.fill_per_press
-    mg.button_pressed_timer = mg.button_press_duration
-    -- Clamp to max
-    if mg.bar_fill > mg.max_fill then
-      mg.bar_fill = mg.max_fill
-    end
-  end
-  -- Check if bar is full (completed)
-  if mg.bar_fill >= mg.max_fill then
-    Context.active_window = mg.return_window
-    return
-  end
-  -- Automatic degradation (increases with bar fill level)
-  local degradation = mg.base_degradation + (mg.bar_fill * mg.degradation_multiplier)
-  mg.bar_fill = mg.bar_fill - degradation
-  -- Clamp to minimum
-  if mg.bar_fill < 0 then
-    mg.bar_fill = 0
-  end
-  -- Update button press timer
-  if mg.button_pressed_timer > 0 then
-    mg.button_pressed_timer = mg.button_pressed_timer - 1
-  end
-end
-
-function MinigameButtonMashWindow.draw()
-  local mg = Context.minigame_button_mash
-  -- Draw the underlying window first (for overlay effect)
-  if mg.return_window == WINDOW_GAME then
-    GameWindow.draw()
-  end
-  -- Draw semi-transparent overlay background
-  -- Draw darker rectangles to create overlay effect
-  rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
-  -- Draw progress bar background
-  rect(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.light_grey)
-  rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
-  -- Draw progress bar fill
-  local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
-  if fill_width > 0 then
-    -- Color changes as bar fills (green -> yellow -> red analogy using available colors)
-    local bar_color = Config.colors.green
-    if mg.bar_fill > 66 then
-      bar_color = Config.colors.item -- yellow
-    elseif mg.bar_fill > 33 then
-      bar_color = Config.colors.bar -- medium color
-    end
-    rect(mg.bar_x, mg.bar_y, fill_width, bar_color)
-  end
-  -- Draw button indicator
-  local button_color = Config.colors.light_grey
-  if mg.button_pressed_timer > 0 then
-    button_color = Config.colors.green -- Highlight when pressed
-  end
-  circb(mg.button_x, mg.button_y, mg.button_size, button_color)
-  if mg.button_pressed_timer > 0 then
-    circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
-  end
-  -- Draw Z text in the button
-  Print.text_center(" Z", mg.button_x - 2, mg.button_y - 3, Config.colors.light_grey)
-  -- Draw instruction text
-  Print.text_center("MASH Z!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
-  -- Draw progress percentage
-  local percentage = math.floor((mg.bar_fill / mg.max_fill) * 100)
-  Print.text_center(percentage .. "%", mg.bar_x + mg.bar_width / 2, mg.bar_y + 2, Config.colors.black)
-end

inc/window/window.minigame.rhythm.lua

@@ -1,132 +0,0 @@
-function MinigameRhythmWindow.init()
-  Context.minigame_rhythm = {
-    line_position = 0, -- Normalized position (0 to 1)
-    line_speed = 0.015, -- Movement speed per frame
-    line_direction = 1, -- 1 for left-to-right, -1 for right-to-left
-    target_center = 0.5, -- Center of target area (middle of bar)
-    target_width = 0.3, -- Width of target area (normalized)
-    initial_target_width = 0.3,
-    min_target_width = 0.08, -- Minimum width to keep game possible
-    target_shrink_rate = 0.9, -- Multiplier per successful hit (0.9 = 10% shrink)
-    score = 0,
-    max_score = 10,
-    button_pressed_timer = 0,
-    button_press_duration = 10,
-    return_window = WINDOW_GAME,
-    -- Visual layout (match button mash minigame dimensions)
-    bar_x = 20,
-    bar_y = 10,
-    bar_width = 200,
-    bar_height = 12,
-    -- Button indicator
-    button_x = 210,
-    button_y = 110,
-    button_size = 10,
-    -- Cooldown to prevent multiple presses in one frame
-    press_cooldown = 0,
-    press_cooldown_duration = 15
-  }
-end
-
-function MinigameRhythmWindow.start(return_window)
-  MinigameRhythmWindow.init()
-  Context.minigame_rhythm.return_window = return_window or WINDOW_GAME
-  Context.active_window = WINDOW_MINIGAME_RHYTHM
-end
-
-function MinigameRhythmWindow.update()
-  local mg = Context.minigame_rhythm
-  -- Move the line across the bar (bidirectional)
-  mg.line_position = mg.line_position + (mg.line_speed * mg.line_direction)
-  -- Reverse direction when reaching either end
-  if mg.line_position > 1 then
-    mg.line_position = 1
-    mg.line_direction = -1
-  elseif mg.line_position < 0 then
-    mg.line_position = 0
-    mg.line_direction = 1
-  end
-  -- Decrease cooldown timer
-  if mg.press_cooldown > 0 then
-    mg.press_cooldown = mg.press_cooldown - 1
-  end
-  -- Check for Z button press (only if cooldown expired)
-  if Input.select() and mg.press_cooldown == 0 then
-    mg.button_pressed_timer = mg.button_press_duration
-    mg.press_cooldown = mg.press_cooldown_duration
-    -- Calculate if line is within target area
-    local target_left = mg.target_center - (mg.target_width / 2)
-    local target_right = mg.target_center + (mg.target_width / 2)
-    if mg.line_position >= target_left and mg.line_position <= target_right then
-      -- HIT! Award point
-      mg.score = mg.score + 1
-    else
-      -- MISS! Deduct point (but not below 0)
-      mg.score = mg.score - 1
-      if mg.score < 0 then
-        mg.score = 0
-      end
-    end
-    -- Calculate target width dynamically based on score
-    -- Each point shrinks by 10%, so reverse the formula
-    mg.target_width = mg.initial_target_width * (mg.target_shrink_rate ^ mg.score)
-    if mg.target_width < mg.min_target_width then
-      mg.target_width = mg.min_target_width
-    end
-  end
-  -- Check win condition
-  if mg.score >= mg.max_score then
-    Context.active_window = mg.return_window
-    return
-  end
-  -- Update button press timer
-  if mg.button_pressed_timer > 0 then
-    mg.button_pressed_timer = mg.button_pressed_timer - 1
-  end
-end
-
-function MinigameRhythmWindow.draw()
-  local mg = Context.minigame_rhythm
-  -- Draw the underlying window first (for overlay effect)
-  if mg.return_window == WINDOW_GAME then
-    GameWindow.draw()
-  end
-  -- Draw semi-transparent overlay background
-  rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
-  -- Calculate actual pixel positions
-  -- Draw bar container background
-  rect(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.light_grey)
-  rectb(mg.bar_x - 2, mg.bar_y - 2, mg.bar_width + 4, mg.bar_height + 4, Config.colors.dark_grey)
-  -- Draw bar background (empty area)
-  rect(mg.bar_x, mg.bar_y, mg.bar_width, mg.bar_height, Config.colors.dark_grey)
-  -- Draw target area (highlighted section in middle)
-  local target_left = mg.target_center - (mg.target_width / 2)
-  local target_x = mg.bar_x + (target_left * mg.bar_width)
-  local target_width_pixels = mg.target_width * mg.bar_width
-  rect(target_x, mg.bar_y, target_width_pixels, mg.bar_height, Config.colors.green)
-  -- Draw the moving line
-  local line_x = mg.bar_x + (mg.line_position * mg.bar_width)
-  rect(line_x - 1, mg.bar_y, 2, mg.bar_height, Config.colors.item) -- Yellow line
-  -- Draw score text
-  local score_text = "SCORE: " .. mg.score .. " / " .. mg.max_score
-  Print.text_center(score_text, Config.screen.width / 2, mg.bar_y + mg.bar_height + 8, Config.colors.light_grey)
-  -- Draw instruction text
-  Print.text_center(
-    "Press Z when line is in green!",
-    Config.screen.width / 2,
-    mg.bar_y + mg.bar_height + 20,
-    Config.colors.light_grey
-  )
-  -- Draw button indicator in bottom-right corner
-  local button_color = Config.colors.light_grey
-  if mg.button_pressed_timer > 0 then
-    button_color = Config.colors.green -- Highlight when pressed
-  end
-  -- Draw button circle
-  circb(mg.button_x, mg.button_y, mg.button_size, button_color)
-  if mg.button_pressed_timer > 0 then
-    circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
-  end
-  -- Draw Z text in the button
-  Print.text_center("Z", mg.button_x - 2, mg.button_y - 3, button_color)
-end

inc/window/window.popup.lua

@@ -1,36 +1,102 @@
-local POPUP_X = 40
+function PopupWindow.set_dialog_node(node_key)
-local POPUP_Y = 40
+  local npc = Context.dialog.active_entity
-local POPUP_WIDTH = 160
+  local node = npc.dialog[node_key]
-local POPUP_HEIGHT = 80
-local TEXT_MARGIN_X = POPUP_X + 10
-local TEXT_MARGIN_Y = POPUP_Y + 10
-local LINE_HEIGHT = 8
-function PopupWindow.show(content_strings)
-  Context.popup.show = true
-  Context.popup.content = content_strings or {}   GameWindow.set_state(WINDOW_POPUP) end
 
-function PopupWindow.hide()
+  if not node then
-  Context.popup.show = false
+    GameWindow.set_state(WINDOW_GAME)
-  Context.popup.content = {}   GameWindow.set_state(WINDOW_GAME) end
+    return
+  end
 
-function PopupWindow.update()
+  Context.dialog.current_node_key = node_key
-  if Context.popup.show then
+  Context.dialog.text = node.text
-    if Input.menu_confirm() or Input.menu_back() then       PopupWindow.hide()
+
+  local menu_items = {}
+  if node.options then
+    for _, option in ipairs(node.options) do
+      table.insert(menu_items, {
+        label = option.label,
+        action = function()
+          PopupWindow.set_dialog_node(option.next_node)
+        end
+      })
     end
   end
+
+  -- if no options, it's the end of this branch.
+  if #menu_items == 0 then
+      table.insert(menu_items, {
+          label = "Go back",
+          action = function() GameWindow.set_state(WINDOW_GAME) end
+      })
+  end
+
+  Context.dialog.menu_items = menu_items
+  Context.dialog.selected_menu_item = 1
+  Context.dialog.showing_description = false
+  GameWindow.set_state(WINDOW_POPUP)
+end
+
+function PopupWindow.update()
+  if Context.dialog.showing_description then
+    if Input.menu_confirm() or Input.menu_back() then
+      Context.dialog.showing_description = false
+      Context.dialog.text = "" -- Clear the description text
+      -- No need to change active_window, as it remains in WINDOW_POPUP
+    end
+  else
+    Context.dialog.selected_menu_item = UI.update_menu(Context.dialog.menu_items, Context.dialog.selected_menu_item)
+
+    if Input.menu_confirm() then
+      local selected_item = Context.dialog.menu_items[Context.dialog.selected_menu_item]
+      if selected_item and selected_item.action then
+        selected_item.action()
+      end
+    end
+    
+    if Input.menu_back() then
+      GameWindow.set_state(WINDOW_GAME)
+    end
+  end
+end
+
+function PopupWindow.show_menu_dialog(entity, menu_items, dialog_active_window)
+  Context.dialog.active_entity = entity
+  Context.dialog.text = "" -- Initial dialog text is empty, name is title
+  GameWindow.set_state(dialog_active_window or WINDOW_POPUP)
+  Context.dialog.showing_description = false
+  Context.dialog.menu_items = menu_items
+  Context.dialog.selected_menu_item = 1
+end
+
+function PopupWindow.show_description_dialog(entity, description_text)
+  Context.dialog.active_entity = entity
+  Context.dialog.text = description_text
+  GameWindow.set_state(WINDOW_POPUP)
+  Context.dialog.showing_description = true
+  -- No menu items needed for description dialog
 end
 
 function PopupWindow.draw()
-  if Context.popup.show then
+  rect(40, 40, 160, 80, Config.colors.black)
-    rect(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.black)
+  rectb(40, 40, 160, 80, Config.colors.green)
-    rectb(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.green)
 
-    local current_y = TEXT_MARGIN_Y
+  -- Display the entity's name as the dialog title
-    for _, line in ipairs(Context.popup.content) do
+  if Context.dialog.active_entity and Context.dialog.active_entity.name then
-      Print.text(line, TEXT_MARGIN_X, current_y, Config.colors.light_grey)
+    Print.text(Context.dialog.active_entity.name, 120 - #Context.dialog.active_entity.name * 2, 45, Config.colors.green)
-      current_y = current_y + LINE_HEIGHT
+  end
-    end
 
-        Print.text("[A] Close", TEXT_MARGIN_X, POPUP_Y + POPUP_HEIGHT - LINE_HEIGHT - 2, Config.colors.green)
+  -- Display the dialog content (description for "look at", or initial name/dialog for others)
+  local wrapped_lines = UI.word_wrap(Context.dialog.text, 25) -- Max 25 chars per line
+  local current_y = 55 -- Starting Y position for the first line of content
+  for _, line in ipairs(wrapped_lines) do
+    Print.text(line, 50, current_y, Config.colors.light_grey)
+    current_y = current_y + 8 -- Move to the next line (8 pixels for default font height + padding)
+  end
+  
+  -- Adjust menu position based on the number of wrapped lines
+  if not Context.dialog.showing_description then
+    UI.draw_menu(Context.dialog.menu_items, Context.dialog.selected_menu_item, 50, current_y + 2)
+  else
+    Print.text("[A] Go Back", 50, current_y + 10, Config.colors.green)
   end
 end