diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3873692..8669db6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -11,17 +11,19 @@ { "label": "Build & Run TIC80", "type": "shell", - "command": "make build && tic80 --fs=. impostor.lua" + "command": "make build && tic80 --fs=. impostor.lua", + "problemMatcher": [] }, { "label": "Export assets", "type": "shell", - "command": "make export_assets" + "command": "make export_assets", + "problemMatcher": [] }, { "label": "Make build", "type": "shell", "command": "make build" - }, + } ] } diff --git a/Makefile b/Makefile index bc9d612..41c5fc2 100644 --- a/Makefile +++ b/Makefile @@ -164,6 +164,8 @@ export_assets: @$(call f_export_asset_awk,MAP,$(OUTPUT),$(ASSETS_LUA)) @$(call f_export_asset_awk,SFX,$(OUTPUT),$(ASSETS_LUA)) @$(call f_export_asset_awk,WAVES,$(OUTPUT),$(ASSETS_LUA)) + @$(call f_export_asset_awk,PATTERNS,$(OUTPUT),$(ASSETS_LUA)) + @$(call f_export_asset_awk,TRACKS,$(OUTPUT),$(ASSETS_LUA)) clean: @rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(PROJECT)-*-docs.zip $(PROJECT)-docs.zip $(OUTPUT) $(OUTPUT_ORIGINAL) diff --git a/inc/audio/audio.manager.lua b/inc/audio/audio.manager.lua index 2e9f0eb..b302fc7 100644 --- a/inc/audio/audio.manager.lua +++ b/inc/audio/audio.manager.lua @@ -23,7 +23,7 @@ function Audio.music_play_room_street_2() end function Audio.music_play_room_() end --- Plays room work music. --- @within Audio -function Audio.music_play_room_work() end +function Audio.music_play_room_work() music(0) end --- Plays select sound effect. --- @within Audio diff --git a/inc/meta/meta.assets.lua b/inc/meta/meta.assets.lua index 563354f..97884b0 100644 --- a/inc/meta/meta.assets.lua +++ b/inc/meta/meta.assets.lua @@ -305,13 +305,15 @@ -- 033:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004 -- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006004600000f0f00 -- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000004600000f0f00 --- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004 --- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100100000080800 --- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000 +-- 048:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900400000000000 +-- 056:4100510061406140717081709100b100c100d100e100e100e100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100580000000600 +-- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000004 +-- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100400000080800 +-- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000 -- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200100000000000 -- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00400000000000 -- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100484000000000 --- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000405000000000 +-- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000200000000000 -- -- -- 000:bcceefceedddddc84333121268abaa99 @@ -325,3 +327,11 @@ -- 008:0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f -- 009:fff000fff000fff000fff000fff000ff -- +-- +-- 000:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000008c10000000008c10000000000000000000000000000000000000000000000000000000000000000004008b50000000000000000001008c10000004008b50000001008c10000000008c1000000e008b30000004008b50000001008c10000000008c10000000008c10000000008c10000000008c10000000008c1000000000000000000000000000000 +-- 001:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007008b50000007008b50000001008c10000007008b50000001008c10000000008c10000007008b50000009008b50000001008c10000009008b50000001008c10000009008b50000009008b50000001008c10000009008b50000001008c1000000 +-- 003:4008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d9000000000000000000000000000000000000000000 +-- +-- +-- 000:100001200001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +-- diff --git a/inc/window/window.audiotest.lua b/inc/window/window.audiotest.lua index 13de851..3c46419 100644 --- a/inc/window/window.audiotest.lua +++ b/inc/window/window.audiotest.lua @@ -1,11 +1,9 @@ --- @section AudioTestWindow -AudioTestWindow = { - index_menu = 1, - index_func = 1, - list_func = {}, - menuitems = {}, - last_pressed = false -} +AudioTestWindow.index_menu = 1 +AudioTestWindow.index_func = 1 +AudioTestWindow.list_func = {} +AudioTestWindow.menuitems = {} +AudioTestWindow.last_pressed = false --- Generates menu items for audio test. --- @within AudioTestWindow diff --git a/inc/window/window.configuration.lua b/inc/window/window.configuration.lua index 12392f4..938da45 100644 --- a/inc/window/window.configuration.lua +++ b/inc/window/window.configuration.lua @@ -1,8 +1,6 @@ --- @section ConfigurationWindow -ConfigurationWindow = { - controls = {}, - selected_control = 1, -} +ConfigurationWindow.controls = {} +ConfigurationWindow.selected_control = 1 --- Initializes configuration window. --- @within ConfigurationWindow