diff --git a/.gitignore b/.gitignore index d9d6961..afb1f44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -mranderson.lua +impostor.lua diff --git a/.woodpecker.yml b/.woodpecker.yml index 5f5c35e..d11b62b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,5 +1,5 @@ environment: &environment - GAME_NAME: mranderson + GAME_NAME: impostor GAME_LANG: lua steps: diff --git a/GEMINI.md b/GEMINI.md index d7533a9..4b70aa1 100644 --- a/GEMINI.md +++ b/GEMINI.md @@ -1,6 +1,6 @@ # TIC-80 Lua Code Regularities -Based on the analysis of `mranderson.lua`, the following regularities and conventions should be followed for future modifications and development within this project: +Based on the analysis of `impostor.lua`, the following regularities and conventions should be followed for future modifications and development within this project: ## General Structure & Lifecycle diff --git a/Makefile b/Makefile index edacc7a..34adda0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # ----------------------------------------- # Makefile – TIC-80 project builder # Usage: -# make PROJECT=mranderson -# make build PROJECT=mranderson -# make watch PROJECT=mranderson -# make export PROJECT=mranderson +# make PROJECT=impostor +# make build PROJECT=impostor +# make watch PROJECT=impostor +# make export PROJECT=impostor # ----------------------------------------- ifndef PROJECT diff --git a/README.md b/README.md index 798c0e2..1381601 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This game is designed for the TIC-80 fantasy computer. To play, follow these ste 2. **Clone this repository** Clone this repository to tic80's cartridge folder (MacOS: ~Library/Application Support/com.nesbox.tic/TIC-80) 2. **Launch TIC-80:** Start the TIC-80 application. 3. **Load the Game:** - * Navigate to the directory where `game.lua` is located using the TIC-80 command line (`cd mranderson`). + * Navigate to the directory where `game.lua` is located using the TIC-80 command line (`cd impostor`). * Type `load game.lua` and press Enter. * Once loaded, type `run` and press Enter to start the game. diff --git a/mranderson.inc b/impostor.inc similarity index 95% rename from mranderson.inc rename to impostor.inc index a5d4536..07b66eb 100644 --- a/mranderson.inc +++ b/impostor.inc @@ -9,6 +9,7 @@ entity/entity.item.lua entity/entity.player.lua system/system.input.lua system/system.ui.lua +map/map.bedroom.lua window/window.splash.lua window/window.intro.lua window/window.menu.lua diff --git a/inc/map/map.bedroom.lua b/inc/map/map.bedroom.lua new file mode 100644 index 0000000..23351fd --- /dev/null +++ b/inc/map/map.bedroom.lua @@ -0,0 +1,19 @@ +MapBedroom = { + "10101010101010101010101010101010", + "10141410101010101010101010101010", + "10141410101010101010101010101010", + "10101010101010101010101010101010", + "10101010101010101010101010101010", + "10101010101010101010101010101010", + "10101010101010101010101010101010", + "10101010101010101010101010101010", + "10101010101010101010101010101010", + "11111111111111111111111111111111", + "11111111111111111111111111111111", + "11111111111111111111111111111111", + "11111516111213111111111111111111", + "11111111111111111111111111111111", + "11111111111111111111111111111111", + "11111111111111111111111111111111", + "11111111111111111111111111111111" +} diff --git a/inc/meta/meta.assets.lua b/inc/meta/meta.assets.lua index f2b56df..847a76a 100644 --- a/inc/meta/meta.assets.lua +++ b/inc/meta/meta.assets.lua @@ -8,6 +8,13 @@ -- 006:9999999999999999999999999999999999999999999999999999999999999999 -- 007:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- 008:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +-- 016:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd +-- 017:eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee +-- 018:cc222222cc222222cc222222cc222222222222222222222222222222eeeeeeee +-- 019:222222cc222222cc222222cc222222cc222222222222222222222222eeeeeeee +-- 020:daaaabdddaaaabdddaaaabdddaaaabdddaaaabdddaaaabdddddddddddddddddd +-- 021:f888888ff888888ff888888ff888888f8888888f8888888ffeeeeffeeeeffee +-- 022:e000000ee000000ee000000ee000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee -- -- diff --git a/inc/meta/meta.header.lua b/inc/meta/meta.header.lua index b03e811..72d6840 100644 --- a/inc/meta/meta.header.lua +++ b/inc/meta/meta.header.lua @@ -1,7 +1,7 @@ --- title: Mr Anderson's Adventure --- author: Zsolt Tasnadi +-- title: Definitely not an Impostor +-- author: Teletype Games -- desc: Life of a programmer in the Vector --- site: https://github.com/rastasi/mranderson +-- site: https://git.teletype.hu/games/impostor -- license: MIT License -- version: 0.15 -- script: lua diff --git a/inc/window/window.splash.lua b/inc/window/window.splash.lua index 956c82e..8c29813 100644 --- a/inc/window/window.splash.lua +++ b/inc/window/window.splash.lua @@ -1,6 +1,13 @@ function SplashWindow.draw() - Print.text("Mr. Anderson's", 78, 60, Config.colors.green) - Print.text("Addventure", 90, 70, Config.colors.green) + for y, row in ipairs(MapBedroom) do + for x = 1, #row, 2 do + local tile_id_hex = string.sub(row, x, x + 1) + local tile_id = tonumber(tile_id_hex, 16) + local screen_x = (x - 1) / 2 * 8 + local screen_y = (y - 1) * 8 + spr(tile_id, screen_x, screen_y, -1, 1, 0, 0, 1, 1) + end + end end function SplashWindow.update()