From d20ef85ceb535b8f5daa377aff836094d468f666 Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Tue, 17 Feb 2026 20:26:42 +0100 Subject: [PATCH] rename action to desition --- impostor.inc | 2 +- inc/init/init.modules.lua | 2 +- ...system.actions.lua => system.desitions.lua} | 6 +++--- inc/system/system.ui.lua | 6 +++--- inc/window/window.audiotest.lua | 8 ++++---- inc/window/window.configuration.lua | 10 +++++----- inc/window/window.menu.lua | 18 +++++++++--------- 7 files changed, 26 insertions(+), 26 deletions(-) rename inc/system/{system.actions.lua => system.desitions.lua} (53%) diff --git a/impostor.inc b/impostor.inc index 76dc724..002d650 100644 --- a/impostor.inc +++ b/impostor.inc @@ -6,7 +6,7 @@ init/init.windows.lua init/init.context.lua data/data.songs.lua system/system.print.lua -system/system.actions.lua +system/system.desitions.lua system/system.input.lua system/system.audio.lua system/system.ui.lua diff --git a/inc/init/init.modules.lua b/inc/init/init.modules.lua index f7e323d..d93f72a 100644 --- a/inc/init/init.modules.lua +++ b/inc/init/init.modules.lua @@ -16,4 +16,4 @@ local Print = {} local Input = {} local Player = {} local Audio = {} -local Actions = {} +local Desitions = {} diff --git a/inc/system/system.actions.lua b/inc/system/system.desitions.lua similarity index 53% rename from inc/system/system.actions.lua rename to inc/system/system.desitions.lua index 52d698b..7467807 100644 --- a/inc/system/system.actions.lua +++ b/inc/system/system.desitions.lua @@ -1,12 +1,12 @@ -function Actions.start_minigame_mash() +function Desitions.start_minigame_mash() MinigameButtonMashWindow.start(WINDOW_GAME) end -function Actions.start_minigame_rhythm() +function Desitions.start_minigame_rhythm() MinigameRhythmWindow.start(WINDOW_GAME) end -function Actions.start_minigame_ddr(song_key) +function Desitions.start_minigame_ddr(song_key) MinigameDDRWindow.start(WINDOW_GAME, song_key) end diff --git a/inc/system/system.ui.lua b/inc/system/system.ui.lua index 375c602..4f21ee1 100644 --- a/inc/system/system.ui.lua +++ b/inc/system/system.ui.lua @@ -80,10 +80,10 @@ function UI.create_numeric_stepper(label, value_getter, value_setter, min, max, } end -function UI.create_action_item(label, action) +function UI.create_desition_item(label, desition) return { label = label, - action = action, - type = "action_item" + desition = desition, + type = "desition_item" } end diff --git a/inc/window/window.audiotest.lua b/inc/window/window.audiotest.lua index cbe7a7f..3ea5e5d 100644 --- a/inc/window/window.audiotest.lua +++ b/inc/window/window.audiotest.lua @@ -10,7 +10,7 @@ function AudioTestWindow.generate_menuitems(list_func, index_func) return { { label = "Play music/sound: " .. (list_func[index_func] or "?"), - action = function() + desition = function() local current_func = Audio[list_func[index_func]] if current_func then current_func() @@ -21,13 +21,13 @@ function AudioTestWindow.generate_menuitems(list_func, index_func) }, { label = "Stop playing music", - action = function() + desition = function() Audio.music_stop() end }, { label = "Back", - action = function() + desition = function() AudioTestWindow.back() end }, @@ -78,7 +78,7 @@ function AudioTestWindow.update() 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].action() + AudioTestWindow.menuitems[AudioTestWindow.index_menu].desition() elseif Input.menu_back() then AudioTestWindow.back() end diff --git a/inc/window/window.configuration.lua b/inc/window/window.configuration.lua index 6f1c619..77acd11 100644 --- a/inc/window/window.configuration.lua +++ b/inc/window/window.configuration.lua @@ -5,11 +5,11 @@ ConfigurationWindow = { function ConfigurationWindow.init() ConfigurationWindow.controls = { - UI.create_action_item( + UI.create_desition_item( "Save", function() Config.save() end ), - UI.create_action_item( + UI.create_desition_item( "Restore Defaults", function() Config.restore_defaults() end ), @@ -46,7 +46,7 @@ function ConfigurationWindow.draw() Print.text(label_text, x_start, current_y, color) Print.text(value_text, value_x, current_y, color) end - elseif control.type == "action_item" then + elseif control.type == "desition_item" then local label_text = control.label if i == ConfigurationWindow.selected_control then color = Config.colors.item @@ -91,9 +91,9 @@ function ConfigurationWindow.update() local new_value = math.min(control.max, current_value + control.step) control.set(new_value) end - elseif control.type == "action_item" then + elseif control.type == "desition_item" then if Input.menu_confirm() then - control.action() + control.desition() end end end diff --git a/inc/window/window.menu.lua b/inc/window/window.menu.lua index a5318ce..3fe597a 100644 --- a/inc/window/window.menu.lua +++ b/inc/window/window.menu.lua @@ -8,9 +8,9 @@ function MenuWindow.update() if Input.menu_confirm() then local selected_item = Context.menu_items[Context.selected_menu_item] - if selected_item and selected_item.action then + if selected_item and selected_item.desition then Audio.sfx_select() - selected_item.action() + selected_item.desition() end end end @@ -51,15 +51,15 @@ function MenuWindow.refresh_menu_items() Context.menu_items = {} -- Start with an empty table if Context.game_in_progress then - table.insert(Context.menu_items, {label = "Resume Game", action = MenuWindow.resume_game}) - table.insert(Context.menu_items, {label = "Save Game", action = MenuWindow.save_game}) + table.insert(Context.menu_items, {label = "Resume Game", desition = MenuWindow.resume_game}) + table.insert(Context.menu_items, {label = "Save Game", desition = MenuWindow.save_game}) end - table.insert(Context.menu_items, {label = "New Game", action = MenuWindow.new_game}) - table.insert(Context.menu_items, {label = "Load Game", action = MenuWindow.load_game}) - table.insert(Context.menu_items, {label = "Configuration", action = MenuWindow.configuration}) - table.insert(Context.menu_items, {label = "Audio Test", action = MenuWindow.audio_test}) - table.insert(Context.menu_items, {label = "Exit", action = MenuWindow.exit}) + table.insert(Context.menu_items, {label = "New Game", desition = MenuWindow.new_game}) + table.insert(Context.menu_items, {label = "Load Game", desition = MenuWindow.load_game}) + table.insert(Context.menu_items, {label = "Configuration", desition = MenuWindow.configuration}) + table.insert(Context.menu_items, {label = "Audio Test", desition = MenuWindow.audio_test}) + table.insert(Context.menu_items, {label = "Exit", desition = MenuWindow.exit}) Context.selected_menu_item = 1 -- Reset selection after refreshing end