Renaming and moving some modules

This commit is contained in:
Squishy (C6H12O6+NaCl+H2O)
2024-04-19 22:24:22 +07:00
parent 9c8628a014
commit 35edf8fbd6
24 changed files with 261 additions and 290 deletions

View File

@@ -2,7 +2,7 @@ local KeyConfigScene = SCENE:extend()
KeyConfigScene.title = "Key Config"
require 'load.save'
require 'settings'
local minos = {'R_d', 'O_d', 'Y_d', 'G_d', 'C_d', 'B_d', 'M_d'}
@@ -59,7 +59,7 @@ function KeyConfigScene:render()
end
end
if self.input_state > #configurable_inputs then
drawText("Press enter to confirm, delete/backspace to retry" .. (config.input and ", escape to cancel" or ""),0,0,1000)
drawText("Press enter to confirm, delete/backspace to retry" .. (SETTINGS.input and ", escape to cancel" or ""),0,0,1000)
else
drawText("Press key input for " .. input_names[configurable_inputs[self.input_state]] .. ", tab to skip, escape to cancel",0,0,1000)
drawText("Function keys (F1, F2, etc.), escape, and tab can't be changed", 0, 20,1000)
@@ -73,10 +73,9 @@ function KeyConfigScene:onInputPress(e)
SCENE = InputConfigScene()
elseif self.input_state > #configurable_inputs then
if e.scancode == "return" then
config.input.keys = self.new_input
saveConfig()
SCENE = config.firstTime and TitleScene() or InputConfigScene()
config.firstTime = false
SETTINGS.input.keys = self.new_input
SCENE = SETTINGS.firstTime and TitleScene() or InputConfigScene()
SETTINGS.firstTime = false
elseif e.scancode == "delete" or e.scancode == "backspace" then
-- retry
self.input_state = 1