Compare commits
1 Commits
feature/da
...
3dd6cfcdcb
| Author | SHA1 | Date | |
|---|---|---|---|
| 3dd6cfcdcb |
44
.luacheckrc
Normal file
44
.luacheckrc
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
-- .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",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- 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
|
||||||
2
Makefile
2
Makefile
@@ -92,7 +92,7 @@ lint:
|
|||||||
line=$$((line + linecount + 1)); \
|
line=$$((line + linecount + 1)); \
|
||||||
done < $(ORDER)
|
done < $(ORDER)
|
||||||
@echo "==> luacheck..."
|
@echo "==> luacheck..."
|
||||||
@luacheck $(LINT_TMP_LUA) 2>&1 | awk -v map=$(LINT_TMP_MAP) ' \
|
@luacheck --no-max-line-length $(LINT_TMP_LUA) 2>&1 | awk -v map=$(LINT_TMP_MAP) ' \
|
||||||
BEGIN { \
|
BEGIN { \
|
||||||
NR_map = 0; \
|
NR_map = 0; \
|
||||||
while ((getline line < map) > 0) { \
|
while ((getline line < map) > 0) { \
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ Songs = {
|
|||||||
bpm = 120, -- Beats per minute (for reference)
|
bpm = 120, -- Beats per minute (for reference)
|
||||||
fps = 60, -- Frames per second (TIC-80 default)
|
fps = 60, -- Frames per second (TIC-80 default)
|
||||||
end_frame = 570, -- Frame when song ends (last note)
|
end_frame = 570, -- Frame when song ends (last note)
|
||||||
|
|
||||||
-- Arrow spawn pattern
|
-- Arrow spawn pattern
|
||||||
-- Each entry defines when (in frames) and which direction arrow spawns
|
-- Each entry defines when (in frames) and which direction arrow spawns
|
||||||
-- Formula: frame = (beat / bpm) * 60 * fps
|
-- Formula: frame = (beat / bpm) * 60 * fps
|
||||||
@@ -19,13 +18,11 @@ Songs = {
|
|||||||
{frame = 60, dir = "down"},
|
{frame = 60, dir = "down"},
|
||||||
{frame = 90, dir = "up"},
|
{frame = 90, dir = "up"},
|
||||||
{frame = 120, dir = "right"},
|
{frame = 120, dir = "right"},
|
||||||
|
|
||||||
-- Beat 5-8 (faster)
|
-- Beat 5-8 (faster)
|
||||||
{frame = 135, dir = "left"},
|
{frame = 135, dir = "left"},
|
||||||
{frame = 150, dir = "right"},
|
{frame = 150, dir = "right"},
|
||||||
{frame = 165, dir = "left"},
|
{frame = 165, dir = "left"},
|
||||||
{frame = 180, dir = "right"},
|
{frame = 180, dir = "right"},
|
||||||
|
|
||||||
-- Beat 9-12 (complex pattern)
|
-- Beat 9-12 (complex pattern)
|
||||||
{frame = 210, dir = "left"},
|
{frame = 210, dir = "left"},
|
||||||
{frame = 210, dir = "right"}, -- simultaneous
|
{frame = 210, dir = "right"}, -- simultaneous
|
||||||
@@ -33,7 +30,6 @@ Songs = {
|
|||||||
{frame = 240, dir = "down"}, -- simultaneous
|
{frame = 240, dir = "down"}, -- simultaneous
|
||||||
{frame = 270, dir = "left"},
|
{frame = 270, dir = "left"},
|
||||||
{frame = 300, dir = "right"},
|
{frame = 300, dir = "right"},
|
||||||
|
|
||||||
-- Beat 13-16 (rapid sequence)
|
-- Beat 13-16 (rapid sequence)
|
||||||
{frame = 330, dir = "left"},
|
{frame = 330, dir = "left"},
|
||||||
{frame = 345, dir = "down"},
|
{frame = 345, dir = "down"},
|
||||||
@@ -43,7 +39,6 @@ Songs = {
|
|||||||
{frame = 405, dir = "down"},
|
{frame = 405, dir = "down"},
|
||||||
{frame = 420, dir = "up"},
|
{frame = 420, dir = "up"},
|
||||||
{frame = 435, dir = "right"},
|
{frame = 435, dir = "right"},
|
||||||
|
|
||||||
-- Beat 17-20 (finale)
|
-- Beat 17-20 (finale)
|
||||||
{frame = 465, dir = "up"},
|
{frame = 465, dir = "up"},
|
||||||
{frame = 465, dir = "down"},
|
{frame = 465, dir = "down"},
|
||||||
@@ -60,7 +55,6 @@ Songs = {
|
|||||||
bpm = 120, -- Beats per minute (for reference)
|
bpm = 120, -- Beats per minute (for reference)
|
||||||
fps = 60, -- Frames per second (TIC-80 default)
|
fps = 60, -- Frames per second (TIC-80 default)
|
||||||
end_frame = 570, -- Frame when song ends (last note)
|
end_frame = 570, -- Frame when song ends (last note)
|
||||||
|
|
||||||
-- Arrow spawn pattern
|
-- Arrow spawn pattern
|
||||||
-- Each entry defines when (in frames) and which direction arrow spawns
|
-- Each entry defines when (in frames) and which direction arrow spawns
|
||||||
-- Formula: frame = (beat / bpm) * 60 * fps
|
-- Formula: frame = (beat / bpm) * 60 * fps
|
||||||
@@ -71,13 +65,11 @@ Songs = {
|
|||||||
{frame = 60, dir = "down"},
|
{frame = 60, dir = "down"},
|
||||||
{frame = 90, dir = "up"},
|
{frame = 90, dir = "up"},
|
||||||
{frame = 120, dir = "right"},
|
{frame = 120, dir = "right"},
|
||||||
|
|
||||||
-- Beat 5-8 (faster)
|
-- Beat 5-8 (faster)
|
||||||
{frame = 135, dir = "left"},
|
{frame = 135, dir = "left"},
|
||||||
{frame = 150, dir = "right"},
|
{frame = 150, dir = "right"},
|
||||||
{frame = 165, dir = "left"},
|
{frame = 165, dir = "left"},
|
||||||
{frame = 180, dir = "right"},
|
{frame = 180, dir = "right"},
|
||||||
|
|
||||||
-- Beat 9-12 (complex pattern)
|
-- Beat 9-12 (complex pattern)
|
||||||
{frame = 210, dir = "left"},
|
{frame = 210, dir = "left"},
|
||||||
{frame = 210, dir = "right"}, -- simultaneous
|
{frame = 210, dir = "right"}, -- simultaneous
|
||||||
@@ -85,7 +77,6 @@ Songs = {
|
|||||||
{frame = 240, dir = "down"}, -- simultaneous
|
{frame = 240, dir = "down"}, -- simultaneous
|
||||||
{frame = 270, dir = "left"},
|
{frame = 270, dir = "left"},
|
||||||
{frame = 300, dir = "right"},
|
{frame = 300, dir = "right"},
|
||||||
|
|
||||||
-- Beat 13-16 (rapid sequence)
|
-- Beat 13-16 (rapid sequence)
|
||||||
{frame = 330, dir = "left"},
|
{frame = 330, dir = "left"},
|
||||||
{frame = 345, dir = "down"},
|
{frame = 345, dir = "down"},
|
||||||
@@ -95,7 +86,6 @@ Songs = {
|
|||||||
{frame = 405, dir = "down"},
|
{frame = 405, dir = "down"},
|
||||||
{frame = 420, dir = "up"},
|
{frame = 420, dir = "up"},
|
||||||
{frame = 435, dir = "right"},
|
{frame = 435, dir = "right"},
|
||||||
|
|
||||||
-- Beat 17-20 (finale)
|
-- Beat 17-20 (finale)
|
||||||
{frame = 465, dir = "up"},
|
{frame = 465, dir = "up"},
|
||||||
{frame = 465, dir = "down"},
|
{frame = 465, dir = "down"},
|
||||||
|
|||||||
@@ -21,10 +21,9 @@ function DesitionManager.register(desition_object)
|
|||||||
if not desition_object.handle then
|
if not desition_object.handle then
|
||||||
desition_object.handle = function() end
|
desition_object.handle = function() end
|
||||||
end
|
end
|
||||||
|
|
||||||
if _desitions[desition_object.id] then
|
if _desitions[desition_object.id] then
|
||||||
-- Optional: warning if overwriting an existing desition
|
-- Optional: warning if overwriting an existing desition
|
||||||
-- trace("Warning: Overwriting desition with id: " .. desition_object.id)
|
trace("Warning: Overwriting desition with id: " .. desition_object.id)
|
||||||
end
|
end
|
||||||
_desitions[desition_object.id] = desition_object
|
_desitions[desition_object.id] = desition_object
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5,17 +5,17 @@ local SAVE_GAME_MAGIC_VALUE = 0xCA
|
|||||||
local SAVE_GAME_CURRENT_SCREEN_ADDRESS = 6
|
local SAVE_GAME_CURRENT_SCREEN_ADDRESS = 6
|
||||||
|
|
||||||
-- Helper for deep copying tables
|
-- Helper for deep copying tables
|
||||||
local function clone_table(t)
|
-- local function clone_table(t)
|
||||||
local copy = {}
|
-- local copy = {}
|
||||||
for k, v in pairs(t) do
|
-- for k, v in pairs(t) do
|
||||||
if type(v) == "table" then
|
-- if type(v) == "table" then
|
||||||
copy[k] = clone_table(v)
|
-- copy[k] = clone_table(v)
|
||||||
else
|
-- else
|
||||||
copy[k] = v
|
-- copy[k] = v
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
return copy
|
-- return copy
|
||||||
end
|
-- end
|
||||||
|
|
||||||
-- This function returns a table containing only the initial *data* for Context
|
-- This function returns a table containing only the initial *data* for Context
|
||||||
local function get_initial_data()
|
local function get_initial_data()
|
||||||
@@ -24,7 +24,17 @@ local function get_initial_data()
|
|||||||
intro = {
|
intro = {
|
||||||
y = Config.screen.height,
|
y = Config.screen.height,
|
||||||
speed = 0.5,
|
speed = 0.5,
|
||||||
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."
|
text = [[Norman Reds’ everyday life
|
||||||
|
seems ordinary: work,
|
||||||
|
meetings, coffee, and
|
||||||
|
endless notifications.
|
||||||
|
But beneath the surface
|
||||||
|
— within him, or around
|
||||||
|
him — something is
|
||||||
|
constantly building, and
|
||||||
|
it soon becomes clear
|
||||||
|
that there is more going
|
||||||
|
on than meets the eye.]]
|
||||||
},
|
},
|
||||||
current_screen = 1,
|
current_screen = 1,
|
||||||
splash_timer = Config.timing.splash_duration,
|
splash_timer = Config.timing.splash_duration,
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ local MinigameButtonMashWindow = {}
|
|||||||
local MinigameRhythmWindow = {}
|
local MinigameRhythmWindow = {}
|
||||||
local MinigameDDRWindow = {}
|
local MinigameDDRWindow = {}
|
||||||
|
|
||||||
local Util = {}
|
Util = {}
|
||||||
local DesitionManager = {}
|
DesitionManager = {}
|
||||||
local ScreenManager = {} -- New declaration
|
ScreenManager = {} -- New declaration
|
||||||
local UI = {}
|
UI = {}
|
||||||
local Print = {}
|
Print = {}
|
||||||
local Input = {}
|
Input = {}
|
||||||
local Player = {}
|
|
||||||
local Audio = {}
|
Audio = {}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
--luacheck: ignore max_line_length
|
||||||
-- <PALETTE>
|
-- <PALETTE>
|
||||||
-- 000:1a1c2c5d275db13e53ef7d57ffcd75a7f07038b76425717929366f3b5dc941a6f673eff7f4f4f494b0c2566c86333c57
|
-- 000:1a1c2c5d275db13e53ef7d57ffcd75a7f07038b76425717929366f3b5dc941a6f673eff7f4f4f494b0c2566c86333c57
|
||||||
-- </PALETTE>
|
-- </PALETTE>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ end
|
|||||||
function ScreenManager.register(screen_data)
|
function ScreenManager.register(screen_data)
|
||||||
if _screens[screen_data.id] then
|
if _screens[screen_data.id] then
|
||||||
-- Optional: warning if overwriting an existing screen
|
-- Optional: warning if overwriting an existing screen
|
||||||
-- trace("Warning: Overwriting screen with id: " .. screen_data.id)
|
trace("Warning: Overwriting screen with id: " .. screen_data.id)
|
||||||
end
|
end
|
||||||
_screens[screen_data.id] = screen_data
|
_screens[screen_data.id] = screen_data
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ local INPUT_KEY_LEFT = 2
|
|||||||
local INPUT_KEY_RIGHT = 3
|
local INPUT_KEY_RIGHT = 3
|
||||||
local INPUT_KEY_A = 4 -- Z key
|
local INPUT_KEY_A = 4 -- Z key
|
||||||
local INPUT_KEY_B = 5 -- X key
|
local INPUT_KEY_B = 5 -- X key
|
||||||
local INPUT_KEY_X = 6 -- A key
|
|
||||||
local INPUT_KEY_Y = 7 -- S key
|
local INPUT_KEY_Y = 7 -- S key
|
||||||
|
|
||||||
-- Keyboard keys
|
-- Keyboard keys
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ end
|
|||||||
|
|
||||||
function TIC()
|
function TIC()
|
||||||
init_game()
|
init_game()
|
||||||
|
|
||||||
cls(Config.colors.black)
|
cls(Config.colors.black)
|
||||||
local handler = STATE_HANDLERS[Context.active_window]
|
local handler = STATE_HANDLERS[Context.active_window]
|
||||||
if handler then
|
if handler then
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ end
|
|||||||
function UI.word_wrap(text, max_chars_per_line)
|
function UI.word_wrap(text, max_chars_per_line)
|
||||||
if text == nil then return {""} end
|
if text == nil then return {""} end
|
||||||
local lines = {}
|
local lines = {}
|
||||||
|
|
||||||
for input_line in (text .. "\n"):gmatch("(.-)\n") do
|
for input_line in (text .. "\n"):gmatch("(.-)\n") do
|
||||||
local current_line = ""
|
local current_line = ""
|
||||||
local words_in_line = 0
|
local words_in_line = 0
|
||||||
@@ -52,18 +51,15 @@ function UI.word_wrap(text, max_chars_per_line)
|
|||||||
current_line = word
|
current_line = word
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if words_in_line > 0 then
|
if words_in_line > 0 then
|
||||||
table.insert(lines, current_line)
|
table.insert(lines, current_line)
|
||||||
else
|
else
|
||||||
table.insert(lines, "")
|
table.insert(lines, "")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if #lines == 0 then
|
if #lines == 0 then
|
||||||
return {""}
|
return {""}
|
||||||
end
|
end
|
||||||
|
|
||||||
return lines
|
return lines
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -91,7 +87,6 @@ end
|
|||||||
function UI.draw_desition_selector(desitions, selected_desition_index)
|
function UI.draw_desition_selector(desitions, selected_desition_index)
|
||||||
local bar_height = 16
|
local bar_height = 16
|
||||||
local bar_y = Config.screen.height - bar_height
|
local bar_y = Config.screen.height - bar_height
|
||||||
|
|
||||||
rect(0, bar_y, Config.screen.width, bar_height, Config.colors.dark_grey)
|
rect(0, bar_y, Config.screen.width, bar_height, Config.colors.dark_grey)
|
||||||
|
|
||||||
if #desitions > 0 then
|
if #desitions > 0 then
|
||||||
|
|||||||
@@ -58,7 +58,9 @@ function AudioTestWindow.init()
|
|||||||
AudioTestWindow.index_menu = 1
|
AudioTestWindow.index_menu = 1
|
||||||
AudioTestWindow.index_func = 1
|
AudioTestWindow.index_func = 1
|
||||||
AudioTestWindow.list_func = AudioTestWindow.generate_listfunc()
|
AudioTestWindow.list_func = AudioTestWindow.generate_listfunc()
|
||||||
AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(AudioTestWindow.list_func, AudioTestWindow.index_func)
|
AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(
|
||||||
|
AudioTestWindow.list_func, AudioTestWindow.index_func
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
function AudioTestWindow.draw()
|
function AudioTestWindow.draw()
|
||||||
@@ -72,11 +74,21 @@ function AudioTestWindow.update()
|
|||||||
elseif Input.down() then
|
elseif Input.down() then
|
||||||
AudioTestWindow.index_menu = Util.safeindex(AudioTestWindow.menuitems, AudioTestWindow.index_menu + 1)
|
AudioTestWindow.index_menu = Util.safeindex(AudioTestWindow.menuitems, AudioTestWindow.index_menu + 1)
|
||||||
elseif Input.left() then
|
elseif Input.left() then
|
||||||
AudioTestWindow.index_func = Util.safeindex(AudioTestWindow.list_func, AudioTestWindow.index_func - 1)
|
AudioTestWindow.index_func = Util.safeindex(
|
||||||
AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(AudioTestWindow.list_func, AudioTestWindow.index_func)
|
AudioTestWindow.list_func,
|
||||||
|
AudioTestWindow.index_func - 1
|
||||||
|
)
|
||||||
|
AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(
|
||||||
|
AudioTestWindow.list_func, AudioTestWindow.index_func
|
||||||
|
)
|
||||||
elseif Input.right() then
|
elseif Input.right() then
|
||||||
AudioTestWindow.index_func = Util.safeindex(AudioTestWindow.list_func, AudioTestWindow.index_func + 1)
|
AudioTestWindow.index_func = Util.safeindex(
|
||||||
AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(AudioTestWindow.list_func, AudioTestWindow.index_func)
|
AudioTestWindow.list_func,
|
||||||
|
AudioTestWindow.index_func + 1
|
||||||
|
)
|
||||||
|
AudioTestWindow.menuitems = AudioTestWindow.generate_menuitems(
|
||||||
|
AudioTestWindow.list_func, AudioTestWindow.index_func
|
||||||
|
)
|
||||||
elseif Input.menu_confirm() then
|
elseif Input.menu_confirm() then
|
||||||
AudioTestWindow.menuitems[AudioTestWindow.index_menu].desition()
|
AudioTestWindow.menuitems[AudioTestWindow.index_menu].desition()
|
||||||
elseif Input.menu_back() then
|
elseif Input.menu_back() then
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ function ConfigurationWindow.draw()
|
|||||||
for i, control in ipairs(ConfigurationWindow.controls) do
|
for i, control in ipairs(ConfigurationWindow.controls) do
|
||||||
local current_y = y_start + (i - 1) * 12
|
local current_y = y_start + (i - 1) * 12
|
||||||
local color = Config.colors.green
|
local color = Config.colors.green
|
||||||
|
|
||||||
if control.type == "numeric_stepper" then
|
if control.type == "numeric_stepper" then
|
||||||
local value = control.get()
|
local value = control.get()
|
||||||
local label_text = control.label
|
local label_text = control.label
|
||||||
@@ -58,7 +57,6 @@ function ConfigurationWindow.draw()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
Print.text("Press B to go back", x_start, 120, Config.colors.light_grey)
|
Print.text("Press B to go back", x_start, 120, Config.colors.light_grey)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
function GameWindow.draw()
|
function GameWindow.draw()
|
||||||
local currentScreenData = Context.screens[Context.current_screen]
|
local currentScreenData = Context.screens[Context.current_screen]
|
||||||
|
|
||||||
UI.draw_top_bar(currentScreenData.name)
|
UI.draw_top_bar(currentScreenData.name)
|
||||||
|
|
||||||
if currentScreenData and currentScreenData.decisions and #currentScreenData.decisions > 0 then
|
if currentScreenData and currentScreenData.decisions and #currentScreenData.decisions > 0 then
|
||||||
local available_desitions = {}
|
local available_desitions = {}
|
||||||
for _, desition_id in ipairs(currentScreenData.decisions) do
|
for _, desition_id in ipairs(currentScreenData.decisions) do
|
||||||
@@ -41,7 +39,6 @@ function GameWindow.update()
|
|||||||
end
|
end
|
||||||
|
|
||||||
local currentScreenData = Context.screens[Context.current_screen]
|
local currentScreenData = Context.screens[Context.current_screen]
|
||||||
|
|
||||||
if currentScreenData and currentScreenData.decisions and #currentScreenData.decisions > 0 then
|
if currentScreenData and currentScreenData.decisions and #currentScreenData.decisions > 0 then
|
||||||
local available_desitions = {}
|
local available_desitions = {}
|
||||||
for _, desition_id in ipairs(currentScreenData.decisions) do
|
for _, desition_id in ipairs(currentScreenData.decisions) do
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
function IntroWindow.draw()
|
function IntroWindow.draw()
|
||||||
local x = (Config.screen.width - 132) / 2 -- Centered text
|
local x = (Config.screen.width - 132) / 2 -- Centered text
|
||||||
Print.text(Context.intro.text, x, Context.intro.y, Config.colors.green)
|
Print.text(Context.intro.text, x, Context.intro.y, Config.colors.green)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IntroWindow.update()
|
function IntroWindow.update()
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ function MinigameDDRWindow.init()
|
|||||||
local arrow_spacing = 30
|
local arrow_spacing = 30
|
||||||
local total_width = (4 * arrow_size) + (3 * arrow_spacing)
|
local total_width = (4 * arrow_size) + (3 * arrow_spacing)
|
||||||
local start_x = (Config.screen.width - total_width) / 2
|
local start_x = (Config.screen.width - total_width) / 2
|
||||||
|
|
||||||
Context.minigame_ddr = {
|
Context.minigame_ddr = {
|
||||||
-- Progress bar (matching button mash style)
|
-- Progress bar (matching button mash style)
|
||||||
bar_fill = 0, -- 0 to 100
|
bar_fill = 0, -- 0 to 100
|
||||||
@@ -15,14 +14,12 @@ function MinigameDDRWindow.init()
|
|||||||
bar_y = 10,
|
bar_y = 10,
|
||||||
bar_width = 200,
|
bar_width = 200,
|
||||||
bar_height = 12,
|
bar_height = 12,
|
||||||
|
|
||||||
-- Arrow settings
|
-- Arrow settings
|
||||||
arrow_size = arrow_size,
|
arrow_size = arrow_size,
|
||||||
arrow_spawn_timer = 0,
|
arrow_spawn_timer = 0,
|
||||||
arrow_spawn_interval = 45, -- Frames between arrow spawns (for random mode)
|
arrow_spawn_interval = 45, -- Frames between arrow spawns (for random mode)
|
||||||
arrow_fall_speed = 1.5, -- Pixels per frame
|
arrow_fall_speed = 1.5, -- Pixels per frame
|
||||||
arrows = {}, -- Active falling arrows {dir, x, y}
|
arrows = {}, -- Active falling arrows {dir, x, y}
|
||||||
|
|
||||||
-- Target arrows at bottom (evenly spaced, centered on screen)
|
-- Target arrows at bottom (evenly spaced, centered on screen)
|
||||||
target_y = 115, -- Y position of target arrows
|
target_y = 115, -- Y position of target arrows
|
||||||
target_arrows = {
|
target_arrows = {
|
||||||
@@ -31,12 +28,10 @@ function MinigameDDRWindow.init()
|
|||||||
{dir = "up", x = start_x + (arrow_size + arrow_spacing) * 2},
|
{dir = "up", x = start_x + (arrow_size + arrow_spacing) * 2},
|
||||||
{dir = "right", x = start_x + (arrow_size + arrow_spacing) * 3}
|
{dir = "right", x = start_x + (arrow_size + arrow_spacing) * 3}
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Hit detection
|
-- Hit detection
|
||||||
hit_threshold = 8, -- Pixels of tolerance for perfect hit
|
hit_threshold = 8, -- Pixels of tolerance for perfect hit
|
||||||
button_pressed_timers = {}, -- Visual feedback per arrow
|
button_pressed_timers = {}, -- Visual feedback per arrow
|
||||||
button_press_duration = 8,
|
button_press_duration = 8,
|
||||||
|
|
||||||
-- Input cooldown per direction
|
-- Input cooldown per direction
|
||||||
input_cooldowns = {
|
input_cooldowns = {
|
||||||
left = 0,
|
left = 0,
|
||||||
@@ -45,13 +40,11 @@ function MinigameDDRWindow.init()
|
|||||||
right = 0
|
right = 0
|
||||||
},
|
},
|
||||||
input_cooldown_duration = 10,
|
input_cooldown_duration = 10,
|
||||||
|
|
||||||
-- Song/Pattern system
|
-- Song/Pattern system
|
||||||
frame_counter = 0, -- Tracks frames since start
|
frame_counter = 0, -- Tracks frames since start
|
||||||
current_song = nil, -- Current song data
|
current_song = nil, -- Current song data
|
||||||
pattern_index = 1, -- Current position in pattern
|
pattern_index = 1, -- Current position in pattern
|
||||||
use_pattern = false, -- If true, use song pattern; if false, use random spawning
|
use_pattern = false, -- If true, use song pattern; if false, use random spawning
|
||||||
|
|
||||||
return_window = WINDOW_GAME
|
return_window = WINDOW_GAME
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@@ -59,10 +52,8 @@ end
|
|||||||
function MinigameDDRWindow.start(return_window, song_key)
|
function MinigameDDRWindow.start(return_window, song_key)
|
||||||
MinigameDDRWindow.init()
|
MinigameDDRWindow.init()
|
||||||
Context.minigame_ddr.return_window = return_window or WINDOW_GAME
|
Context.minigame_ddr.return_window = return_window or WINDOW_GAME
|
||||||
|
|
||||||
-- Debug: Store song_key for display
|
-- Debug: Store song_key for display
|
||||||
Context.minigame_ddr.debug_song_key = song_key
|
Context.minigame_ddr.debug_song_key = song_key
|
||||||
|
|
||||||
-- Load song pattern if specified
|
-- Load song pattern if specified
|
||||||
if song_key and Songs and Songs[song_key] then
|
if song_key and Songs and Songs[song_key] then
|
||||||
Context.minigame_ddr.current_song = Songs[song_key]
|
Context.minigame_ddr.current_song = Songs[song_key]
|
||||||
@@ -78,7 +69,6 @@ function MinigameDDRWindow.start(return_window, song_key)
|
|||||||
Context.minigame_ddr.debug_status = "Random mode"
|
Context.minigame_ddr.debug_status = "Random mode"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
Context.active_window = WINDOW_MINIGAME_DDR
|
Context.active_window = WINDOW_MINIGAME_DDR
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -126,7 +116,6 @@ end
|
|||||||
local function draw_arrow(x, y, direction, color)
|
local function draw_arrow(x, y, direction, color)
|
||||||
local size = 12
|
local size = 12
|
||||||
local half = size / 2
|
local half = size / 2
|
||||||
|
|
||||||
-- Draw arrow shape based on direction
|
-- Draw arrow shape based on direction
|
||||||
if direction == "left" then
|
if direction == "left" then
|
||||||
-- Triangle pointing left
|
-- Triangle pointing left
|
||||||
@@ -149,16 +138,13 @@ end
|
|||||||
|
|
||||||
function MinigameDDRWindow.update()
|
function MinigameDDRWindow.update()
|
||||||
local mg = Context.minigame_ddr
|
local mg = Context.minigame_ddr
|
||||||
|
|
||||||
-- Check for completion (bar filled to 100%)
|
-- Check for completion (bar filled to 100%)
|
||||||
if mg.bar_fill >= mg.max_fill then
|
if mg.bar_fill >= mg.max_fill then
|
||||||
Context.active_window = mg.return_window
|
Context.active_window = mg.return_window
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Increment frame counter
|
-- Increment frame counter
|
||||||
mg.frame_counter = mg.frame_counter + 1
|
mg.frame_counter = mg.frame_counter + 1
|
||||||
|
|
||||||
-- Check if song has ended (pattern mode only)
|
-- Check if song has ended (pattern mode only)
|
||||||
if mg.use_pattern and mg.current_song and mg.current_song.end_frame then
|
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
|
-- Song has ended if we've passed the end frame AND all arrows are cleared
|
||||||
@@ -168,16 +154,13 @@ function MinigameDDRWindow.update()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Spawn arrows based on mode (pattern or random)
|
-- Spawn arrows based on mode (pattern or random)
|
||||||
if mg.use_pattern and mg.current_song and mg.current_song.pattern then
|
if mg.use_pattern and mg.current_song and mg.current_song.pattern then
|
||||||
-- Pattern-based spawning (synced to song)
|
-- Pattern-based spawning (synced to song)
|
||||||
local pattern = mg.current_song.pattern
|
local pattern = mg.current_song.pattern
|
||||||
|
|
||||||
-- Check if current frame matches any pattern entry
|
-- Check if current frame matches any pattern entry
|
||||||
while mg.pattern_index <= #pattern do
|
while mg.pattern_index <= #pattern do
|
||||||
local spawn_entry = pattern[mg.pattern_index]
|
local spawn_entry = pattern[mg.pattern_index]
|
||||||
|
|
||||||
if mg.frame_counter >= spawn_entry.frame then
|
if mg.frame_counter >= spawn_entry.frame then
|
||||||
-- Time to spawn this arrow!
|
-- Time to spawn this arrow!
|
||||||
spawn_arrow_dir(spawn_entry.dir)
|
spawn_arrow_dir(spawn_entry.dir)
|
||||||
@@ -195,12 +178,10 @@ function MinigameDDRWindow.update()
|
|||||||
mg.arrow_spawn_timer = 0
|
mg.arrow_spawn_timer = 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Update falling arrows
|
-- Update falling arrows
|
||||||
local arrows_to_remove = {}
|
local arrows_to_remove = {}
|
||||||
for i, arrow in ipairs(mg.arrows) do
|
for i, arrow in ipairs(mg.arrows) do
|
||||||
arrow.y = arrow.y + mg.arrow_fall_speed
|
arrow.y = arrow.y + mg.arrow_fall_speed
|
||||||
|
|
||||||
-- Check if arrow went off-screen (miss)
|
-- Check if arrow went off-screen (miss)
|
||||||
if check_miss(arrow) then
|
if check_miss(arrow) then
|
||||||
table.insert(arrows_to_remove, i)
|
table.insert(arrows_to_remove, i)
|
||||||
@@ -211,26 +192,22 @@ function MinigameDDRWindow.update()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Remove off-screen arrows (iterate backwards to avoid index issues)
|
-- Remove off-screen arrows (iterate backwards to avoid index issues)
|
||||||
for i = #arrows_to_remove, 1, -1 do
|
for i = #arrows_to_remove, 1, -1 do
|
||||||
table.remove(mg.arrows, arrows_to_remove[i])
|
table.remove(mg.arrows, arrows_to_remove[i])
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Update input cooldowns
|
-- Update input cooldowns
|
||||||
for dir, _ in pairs(mg.input_cooldowns) do
|
for dir, _ in pairs(mg.input_cooldowns) do
|
||||||
if mg.input_cooldowns[dir] > 0 then
|
if mg.input_cooldowns[dir] > 0 then
|
||||||
mg.input_cooldowns[dir] = mg.input_cooldowns[dir] - 1
|
mg.input_cooldowns[dir] = mg.input_cooldowns[dir] - 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Update button press timers
|
-- Update button press timers
|
||||||
for dir, _ in pairs(mg.button_pressed_timers) do
|
for dir, _ in pairs(mg.button_pressed_timers) do
|
||||||
if mg.button_pressed_timers[dir] > 0 then
|
if mg.button_pressed_timers[dir] > 0 then
|
||||||
mg.button_pressed_timers[dir] = mg.button_pressed_timers[dir] - 1
|
mg.button_pressed_timers[dir] = mg.button_pressed_timers[dir] - 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check for arrow key inputs
|
-- Check for arrow key inputs
|
||||||
local input_map = {
|
local input_map = {
|
||||||
left = Input.left(),
|
left = Input.left(),
|
||||||
@@ -238,12 +215,10 @@ function MinigameDDRWindow.update()
|
|||||||
up = Input.up(),
|
up = Input.up(),
|
||||||
right = Input.right()
|
right = Input.right()
|
||||||
}
|
}
|
||||||
|
|
||||||
for dir, pressed in pairs(input_map) do
|
for dir, pressed in pairs(input_map) do
|
||||||
if pressed and mg.input_cooldowns[dir] == 0 then
|
if pressed and mg.input_cooldowns[dir] == 0 then
|
||||||
mg.input_cooldowns[dir] = mg.input_cooldown_duration
|
mg.input_cooldowns[dir] = mg.input_cooldown_duration
|
||||||
mg.button_pressed_timers[dir] = mg.button_press_duration
|
mg.button_pressed_timers[dir] = mg.button_press_duration
|
||||||
|
|
||||||
-- Check if any arrow matches this direction and is in hit range
|
-- Check if any arrow matches this direction and is in hit range
|
||||||
local hit = false
|
local hit = false
|
||||||
for i, arrow in ipairs(mg.arrows) do
|
for i, arrow in ipairs(mg.arrows) do
|
||||||
@@ -258,7 +233,6 @@ function MinigameDDRWindow.update()
|
|||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- If pressed but no arrow to hit, apply small penalty
|
-- If pressed but no arrow to hit, apply small penalty
|
||||||
if not hit then
|
if not hit then
|
||||||
mg.bar_fill = mg.bar_fill - 2
|
mg.bar_fill = mg.bar_fill - 2
|
||||||
@@ -272,7 +246,6 @@ end
|
|||||||
|
|
||||||
function MinigameDDRWindow.draw()
|
function MinigameDDRWindow.draw()
|
||||||
local mg = Context.minigame_ddr
|
local mg = Context.minigame_ddr
|
||||||
|
|
||||||
-- Safety check
|
-- Safety check
|
||||||
if not mg then
|
if not mg then
|
||||||
cls(0)
|
cls(0)
|
||||||
@@ -283,19 +256,15 @@ function MinigameDDRWindow.draw()
|
|||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw the underlying window first (for overlay effect)
|
-- Draw the underlying window first (for overlay effect)
|
||||||
if mg.return_window == WINDOW_GAME then
|
if mg.return_window == WINDOW_GAME then
|
||||||
GameWindow.draw()
|
GameWindow.draw()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw semi-transparent overlay background
|
-- Draw semi-transparent overlay background
|
||||||
rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
|
rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
|
||||||
|
|
||||||
-- Draw progress bar background
|
-- 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)
|
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)
|
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
|
-- Draw progress bar fill
|
||||||
local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
|
local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
|
||||||
if fill_width > 0 then
|
if fill_width > 0 then
|
||||||
@@ -306,14 +275,11 @@ function MinigameDDRWindow.draw()
|
|||||||
elseif mg.bar_fill > 33 then
|
elseif mg.bar_fill > 33 then
|
||||||
bar_color = Config.colors.bar
|
bar_color = Config.colors.bar
|
||||||
end
|
end
|
||||||
|
|
||||||
rect(mg.bar_x, mg.bar_y, fill_width, mg.bar_height, bar_color)
|
rect(mg.bar_x, mg.bar_y, fill_width, mg.bar_height, bar_color)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw progress percentage
|
-- Draw progress percentage
|
||||||
local percentage = math.floor((mg.bar_fill / mg.max_fill) * 100)
|
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)
|
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)
|
-- Draw target arrows at bottom (light grey when not pressed)
|
||||||
if mg.target_arrows then
|
if mg.target_arrows then
|
||||||
for _, target in ipairs(mg.target_arrows) do
|
for _, target in ipairs(mg.target_arrows) do
|
||||||
@@ -322,17 +288,14 @@ function MinigameDDRWindow.draw()
|
|||||||
draw_arrow(target.x, mg.target_y, target.dir, color)
|
draw_arrow(target.x, mg.target_y, target.dir, color)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw falling arrows (blue)
|
-- Draw falling arrows (blue)
|
||||||
if mg.arrows then
|
if mg.arrows then
|
||||||
for _, arrow in ipairs(mg.arrows) do
|
for _, arrow in ipairs(mg.arrows) do
|
||||||
draw_arrow(arrow.x, arrow.y, arrow.dir, Config.colors.bar) -- blue color
|
draw_arrow(arrow.x, arrow.y, arrow.dir, Config.colors.bar) -- blue color
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw instruction text
|
-- Draw instruction text
|
||||||
Print.text_center("Hit the arrows!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
|
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)
|
-- Debug info (large and visible)
|
||||||
local debug_y = 60
|
local debug_y = 60
|
||||||
if mg.debug_status then
|
if mg.debug_status then
|
||||||
@@ -340,9 +303,19 @@ function MinigameDDRWindow.draw()
|
|||||||
debug_y = debug_y + 10
|
debug_y = debug_y + 10
|
||||||
end
|
end
|
||||||
if mg.use_pattern then
|
if mg.use_pattern then
|
||||||
Print.text_center("PATTERN MODE - Frame:" .. mg.frame_counter, Config.screen.width / 2, debug_y, Config.colors.green)
|
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
|
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)
|
Print.text_center(
|
||||||
|
"Pattern Len:" .. #mg.current_song.pattern .. " Index:" .. mg.pattern_index,
|
||||||
|
Config.screen.width / 2,
|
||||||
|
debug_y + 10,
|
||||||
|
Config.colors.green
|
||||||
|
)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
Print.text_center("RANDOM MODE", Config.screen.width / 2, debug_y, Config.colors.bar)
|
Print.text_center("RANDOM MODE", Config.screen.width / 2, debug_y, Config.colors.bar)
|
||||||
|
|||||||
@@ -26,33 +26,27 @@ end
|
|||||||
|
|
||||||
function MinigameButtonMashWindow.update()
|
function MinigameButtonMashWindow.update()
|
||||||
local mg = Context.minigame_button_mash
|
local mg = Context.minigame_button_mash
|
||||||
|
|
||||||
-- Check for Z button press
|
-- Check for Z button press
|
||||||
if Input.select() then
|
if Input.select() then
|
||||||
mg.bar_fill = mg.bar_fill + mg.fill_per_press
|
mg.bar_fill = mg.bar_fill + mg.fill_per_press
|
||||||
mg.button_pressed_timer = mg.button_press_duration
|
mg.button_pressed_timer = mg.button_press_duration
|
||||||
|
|
||||||
-- Clamp to max
|
-- Clamp to max
|
||||||
if mg.bar_fill > mg.max_fill then
|
if mg.bar_fill > mg.max_fill then
|
||||||
mg.bar_fill = mg.max_fill
|
mg.bar_fill = mg.max_fill
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check if bar is full (completed)
|
-- Check if bar is full (completed)
|
||||||
if mg.bar_fill >= mg.max_fill then
|
if mg.bar_fill >= mg.max_fill then
|
||||||
Context.active_window = mg.return_window
|
Context.active_window = mg.return_window
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Automatic degradation (increases with bar fill level)
|
-- Automatic degradation (increases with bar fill level)
|
||||||
local degradation = mg.base_degradation + (mg.bar_fill * mg.degradation_multiplier)
|
local degradation = mg.base_degradation + (mg.bar_fill * mg.degradation_multiplier)
|
||||||
mg.bar_fill = mg.bar_fill - degradation
|
mg.bar_fill = mg.bar_fill - degradation
|
||||||
|
|
||||||
-- Clamp to minimum
|
-- Clamp to minimum
|
||||||
if mg.bar_fill < 0 then
|
if mg.bar_fill < 0 then
|
||||||
mg.bar_fill = 0
|
mg.bar_fill = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Update button press timer
|
-- Update button press timer
|
||||||
if mg.button_pressed_timer > 0 then
|
if mg.button_pressed_timer > 0 then
|
||||||
mg.button_pressed_timer = mg.button_pressed_timer - 1
|
mg.button_pressed_timer = mg.button_pressed_timer - 1
|
||||||
@@ -61,20 +55,16 @@ end
|
|||||||
|
|
||||||
function MinigameButtonMashWindow.draw()
|
function MinigameButtonMashWindow.draw()
|
||||||
local mg = Context.minigame_button_mash
|
local mg = Context.minigame_button_mash
|
||||||
|
|
||||||
-- Draw the underlying window first (for overlay effect)
|
-- Draw the underlying window first (for overlay effect)
|
||||||
if mg.return_window == WINDOW_GAME then
|
if mg.return_window == WINDOW_GAME then
|
||||||
GameWindow.draw()
|
GameWindow.draw()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw semi-transparent overlay background
|
-- Draw semi-transparent overlay background
|
||||||
-- Draw darker rectangles to create overlay effect
|
-- Draw darker rectangles to create overlay effect
|
||||||
rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
|
rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
|
||||||
|
|
||||||
-- Draw progress bar background
|
-- 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)
|
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)
|
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
|
-- Draw progress bar fill
|
||||||
local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
|
local fill_width = (mg.bar_fill / mg.max_fill) * mg.bar_width
|
||||||
if fill_width > 0 then
|
if fill_width > 0 then
|
||||||
@@ -85,28 +75,21 @@ function MinigameButtonMashWindow.draw()
|
|||||||
elseif mg.bar_fill > 33 then
|
elseif mg.bar_fill > 33 then
|
||||||
bar_color = Config.colors.bar -- medium color
|
bar_color = Config.colors.bar -- medium color
|
||||||
end
|
end
|
||||||
|
rect(mg.bar_x, mg.bar_y, fill_width, bar_color)
|
||||||
rect(mg.bar_x, mg.bar_y, fill_width, mg.bar_height, bar_color)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw button indicator
|
-- Draw button indicator
|
||||||
local button_color = Config.colors.light_grey
|
local button_color = Config.colors.light_grey
|
||||||
if mg.button_pressed_timer > 0 then
|
if mg.button_pressed_timer > 0 then
|
||||||
button_color = Config.colors.green -- Highlight when pressed
|
button_color = Config.colors.green -- Highlight when pressed
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw button as circle (approximated with rect for TIC-80)
|
|
||||||
circb(mg.button_x, mg.button_y, mg.button_size, button_color)
|
circb(mg.button_x, mg.button_y, mg.button_size, button_color)
|
||||||
if mg.button_pressed_timer > 0 then
|
if mg.button_pressed_timer > 0 then
|
||||||
circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
|
circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw Z text in the button
|
-- Draw Z text in the button
|
||||||
Print.text_center(" Z", mg.button_x - 2, mg.button_y - 3, Config.colors.light_grey)
|
Print.text_center(" Z", mg.button_x - 2, mg.button_y - 3, Config.colors.light_grey)
|
||||||
|
|
||||||
-- Draw instruction text
|
-- Draw instruction text
|
||||||
Print.text_center("MASH Z!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
|
Print.text_center("MASH Z!", Config.screen.width / 2, mg.bar_y + mg.bar_height + 10, Config.colors.light_grey)
|
||||||
|
|
||||||
-- Draw progress percentage
|
-- Draw progress percentage
|
||||||
local percentage = math.floor((mg.bar_fill / mg.max_fill) * 100)
|
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)
|
Print.text_center(percentage .. "%", mg.bar_x + mg.bar_width / 2, mg.bar_y + 2, Config.colors.black)
|
||||||
|
|||||||
@@ -13,18 +13,15 @@ function MinigameRhythmWindow.init()
|
|||||||
button_pressed_timer = 0,
|
button_pressed_timer = 0,
|
||||||
button_press_duration = 10,
|
button_press_duration = 10,
|
||||||
return_window = WINDOW_GAME,
|
return_window = WINDOW_GAME,
|
||||||
|
|
||||||
-- Visual layout (match button mash minigame dimensions)
|
-- Visual layout (match button mash minigame dimensions)
|
||||||
bar_x = 20,
|
bar_x = 20,
|
||||||
bar_y = 10,
|
bar_y = 10,
|
||||||
bar_width = 200,
|
bar_width = 200,
|
||||||
bar_height = 12,
|
bar_height = 12,
|
||||||
|
|
||||||
-- Button indicator
|
-- Button indicator
|
||||||
button_x = 210,
|
button_x = 210,
|
||||||
button_y = 110,
|
button_y = 110,
|
||||||
button_size = 10,
|
button_size = 10,
|
||||||
|
|
||||||
-- Cooldown to prevent multiple presses in one frame
|
-- Cooldown to prevent multiple presses in one frame
|
||||||
press_cooldown = 0,
|
press_cooldown = 0,
|
||||||
press_cooldown_duration = 15
|
press_cooldown_duration = 15
|
||||||
@@ -39,10 +36,8 @@ end
|
|||||||
|
|
||||||
function MinigameRhythmWindow.update()
|
function MinigameRhythmWindow.update()
|
||||||
local mg = Context.minigame_rhythm
|
local mg = Context.minigame_rhythm
|
||||||
|
|
||||||
-- Move the line across the bar (bidirectional)
|
-- Move the line across the bar (bidirectional)
|
||||||
mg.line_position = mg.line_position + (mg.line_speed * mg.line_direction)
|
mg.line_position = mg.line_position + (mg.line_speed * mg.line_direction)
|
||||||
|
|
||||||
-- Reverse direction when reaching either end
|
-- Reverse direction when reaching either end
|
||||||
if mg.line_position > 1 then
|
if mg.line_position > 1 then
|
||||||
mg.line_position = 1
|
mg.line_position = 1
|
||||||
@@ -51,21 +46,17 @@ function MinigameRhythmWindow.update()
|
|||||||
mg.line_position = 0
|
mg.line_position = 0
|
||||||
mg.line_direction = 1
|
mg.line_direction = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Decrease cooldown timer
|
-- Decrease cooldown timer
|
||||||
if mg.press_cooldown > 0 then
|
if mg.press_cooldown > 0 then
|
||||||
mg.press_cooldown = mg.press_cooldown - 1
|
mg.press_cooldown = mg.press_cooldown - 1
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check for Z button press (only if cooldown expired)
|
-- Check for Z button press (only if cooldown expired)
|
||||||
if Input.select() and mg.press_cooldown == 0 then
|
if Input.select() and mg.press_cooldown == 0 then
|
||||||
mg.button_pressed_timer = mg.button_press_duration
|
mg.button_pressed_timer = mg.button_press_duration
|
||||||
mg.press_cooldown = mg.press_cooldown_duration
|
mg.press_cooldown = mg.press_cooldown_duration
|
||||||
|
|
||||||
-- Calculate if line is within target area
|
-- Calculate if line is within target area
|
||||||
local target_left = mg.target_center - (mg.target_width / 2)
|
local target_left = mg.target_center - (mg.target_width / 2)
|
||||||
local target_right = 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
|
if mg.line_position >= target_left and mg.line_position <= target_right then
|
||||||
-- HIT! Award point
|
-- HIT! Award point
|
||||||
mg.score = mg.score + 1
|
mg.score = mg.score + 1
|
||||||
@@ -76,7 +67,6 @@ function MinigameRhythmWindow.update()
|
|||||||
mg.score = 0
|
mg.score = 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Calculate target width dynamically based on score
|
-- Calculate target width dynamically based on score
|
||||||
-- Each point shrinks by 10%, so reverse the formula
|
-- Each point shrinks by 10%, so reverse the formula
|
||||||
mg.target_width = mg.initial_target_width * (mg.target_shrink_rate ^ mg.score)
|
mg.target_width = mg.initial_target_width * (mg.target_shrink_rate ^ mg.score)
|
||||||
@@ -84,13 +74,11 @@ function MinigameRhythmWindow.update()
|
|||||||
mg.target_width = mg.min_target_width
|
mg.target_width = mg.min_target_width
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check win condition
|
-- Check win condition
|
||||||
if mg.score >= mg.max_score then
|
if mg.score >= mg.max_score then
|
||||||
Context.active_window = mg.return_window
|
Context.active_window = mg.return_window
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Update button press timer
|
-- Update button press timer
|
||||||
if mg.button_pressed_timer > 0 then
|
if mg.button_pressed_timer > 0 then
|
||||||
mg.button_pressed_timer = mg.button_pressed_timer - 1
|
mg.button_pressed_timer = mg.button_pressed_timer - 1
|
||||||
@@ -99,56 +87,46 @@ end
|
|||||||
|
|
||||||
function MinigameRhythmWindow.draw()
|
function MinigameRhythmWindow.draw()
|
||||||
local mg = Context.minigame_rhythm
|
local mg = Context.minigame_rhythm
|
||||||
|
|
||||||
-- Draw the underlying window first (for overlay effect)
|
-- Draw the underlying window first (for overlay effect)
|
||||||
if mg.return_window == WINDOW_GAME then
|
if mg.return_window == WINDOW_GAME then
|
||||||
GameWindow.draw()
|
GameWindow.draw()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw semi-transparent overlay background
|
-- Draw semi-transparent overlay background
|
||||||
rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
|
rect(0, 0, Config.screen.width, Config.screen.height, Config.colors.black)
|
||||||
|
|
||||||
-- Calculate actual pixel positions
|
-- Calculate actual pixel positions
|
||||||
local bar_center_x = mg.bar_x + mg.bar_width / 2
|
|
||||||
|
|
||||||
-- Draw bar container background
|
-- 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)
|
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)
|
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)
|
-- Draw bar background (empty area)
|
||||||
rect(mg.bar_x, mg.bar_y, mg.bar_width, mg.bar_height, Config.colors.dark_grey)
|
rect(mg.bar_x, mg.bar_y, mg.bar_width, mg.bar_height, Config.colors.dark_grey)
|
||||||
|
|
||||||
-- Draw target area (highlighted section in middle)
|
-- Draw target area (highlighted section in middle)
|
||||||
local target_left = mg.target_center - (mg.target_width / 2)
|
local target_left = mg.target_center - (mg.target_width / 2)
|
||||||
local target_right = mg.target_center + (mg.target_width / 2)
|
|
||||||
local target_x = mg.bar_x + (target_left * mg.bar_width)
|
local target_x = mg.bar_x + (target_left * mg.bar_width)
|
||||||
local target_width_pixels = mg.target_width * mg.bar_width
|
local target_width_pixels = mg.target_width * mg.bar_width
|
||||||
|
|
||||||
rect(target_x, mg.bar_y, target_width_pixels, mg.bar_height, Config.colors.green)
|
rect(target_x, mg.bar_y, target_width_pixels, mg.bar_height, Config.colors.green)
|
||||||
|
|
||||||
-- Draw the moving line
|
-- Draw the moving line
|
||||||
local line_x = mg.bar_x + (mg.line_position * mg.bar_width)
|
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
|
rect(line_x - 1, mg.bar_y, 2, mg.bar_height, Config.colors.item) -- Yellow line
|
||||||
|
|
||||||
-- Draw score text
|
-- Draw score text
|
||||||
local score_text = "SCORE: " .. mg.score .. " / " .. mg.max_score
|
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)
|
Print.text_center(score_text, Config.screen.width / 2, mg.bar_y + mg.bar_height + 8, Config.colors.light_grey)
|
||||||
|
|
||||||
-- Draw instruction text
|
-- 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)
|
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
|
-- Draw button indicator in bottom-right corner
|
||||||
local button_color = Config.colors.light_grey
|
local button_color = Config.colors.light_grey
|
||||||
if mg.button_pressed_timer > 0 then
|
if mg.button_pressed_timer > 0 then
|
||||||
button_color = Config.colors.green -- Highlight when pressed
|
button_color = Config.colors.green -- Highlight when pressed
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw button circle
|
-- Draw button circle
|
||||||
circb(mg.button_x, mg.button_y, mg.button_size, button_color)
|
circb(mg.button_x, mg.button_y, mg.button_size, button_color)
|
||||||
if mg.button_pressed_timer > 0 then
|
if mg.button_pressed_timer > 0 then
|
||||||
circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
|
circ(mg.button_x, mg.button_y, mg.button_size - 2, button_color)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Draw Z text in the button
|
-- Draw Z text in the button
|
||||||
Print.text_center("Z", mg.button_x - 2, mg.button_y - 3, button_color)
|
Print.text_center("Z", mg.button_x - 2, mg.button_y - 3, button_color)
|
||||||
end
|
end
|
||||||
Reference in New Issue
Block a user