Separate in-game bindings from menu bindings

Also preemptive version bump
This commit is contained in:
Ishaan Bhardwaj
2021-10-19 18:35:32 -04:00
parent aa56248e34
commit 0fce4b632f
12 changed files with 140 additions and 44 deletions

View File

@@ -1,6 +1,6 @@
local ConfigScene = Scene:extend()
ConfigScene.title = "Input Config"
ConfigScene.title = "Game Controls"
local menu_screens = {
KeyConfigScene,
@@ -27,7 +27,7 @@ function ConfigScene:render()
)
love.graphics.setFont(font_3x5_4)
love.graphics.print("INPUT CONFIG", 80, 40)
love.graphics.print("IN-GAME CONTROLS", 80, 40)
love.graphics.setFont(font_3x5_2)
love.graphics.print("Which controls do you want to configure?", 80, 90)
@@ -48,18 +48,17 @@ function ConfigScene:changeOption(rel)
end
function ConfigScene:onInputPress(e)
if e.input == "menu_decide" or e.scancode == "return" then
local had_config = config.input ~= nil
if e.input == "menu_decide" or (not had_config and e.scancode == "return") then
playSE("main_decide")
scene = menu_screens[self.menu_state]()
elseif e.input == "up" or e.scancode == "up" then
elseif e.input == "menu_up" or (not had_config and e.scancode == "up") then
self:changeOption(-1)
playSE("cursor")
elseif e.input == "down" or e.scancode == "down" then
elseif e.input == "menu_down" or (not had_config and e.scancode == "down") then
self:changeOption(1)
playSE("cursor")
elseif config.input and (
e.input == "menu_back" or e.scancode == "backspace" or e.scancode == "delete"
) then
elseif had_config and e.input == "menu_back" then
scene = SettingsScene()
end
end