SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 17:19:02 -06:00
Code Issues Projects Releases Wiki Activity

Updated DAS last key setting to not use hacky workaround

Browse Source 
DAS last key is off by default
This commit is contained in:
Ishaan Bhardwaj 2021-02-22 21:43:01 -05:00
parent 4c4a818c5c
commit b15cd9802f
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.lua
View File

@ -10,8 +10,10 @@ function love.load()
require "load.bigint" require "load.bigint"
loadSave() loadSave()
require "scene" require "scene"
--config["side_next"] = false --config["side_next"] = false
--config["reverse_rotate"] = true --config["reverse_rotate"] = true
--config["das_last_key"] = false
config["fullscreen"] = false config["fullscreen"] = false
love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true}); love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true});
@ -29,12 +31,7 @@ function love.load()
if config.secret == nil then config.secret = false if config.secret == nil then config.secret = false
elseif config.secret == true then playSE("welcome") end elseif config.secret == true then playSE("welcome") end
if not config.gamesettings then if not config.gamesettings then config.gamesettings = {} end
config.gamesettings = {}
config["das_last_key"] = false
else
config["das_last_key"] = config.gamesettings.das_last_key == 2
end
for _, option in ipairs(GameConfigScene.options) do for _, option in ipairs(GameConfigScene.options) do
if not config.gamesettings[option[1]] then if not config.gamesettings[option[1]] then
config.gamesettings[option[1]] = 1 config.gamesettings[option[1]] = 1

3
scene/game_config.lua
View File

@ -13,7 +13,7 @@ ConfigScene.options = {
{"world_reverse", "A Button Rotation", false, {"Left", "Auto", "Right"}}, {"world_reverse", "A Button Rotation", false, {"Left", "Auto", "Right"}},
{"spawn_positions", "Spawn Positions", false, {"Per ruleset", "In field", "Out of field"}}, {"spawn_positions", "Spawn Positions", false, {"Per ruleset", "In field", "Out of field"}},
{"display_gamemode", "Display Gamemode", false, {"On", "Off"}}, {"display_gamemode", "Display Gamemode", false, {"On", "Off"}},
{"das_last_key", "DAS Switch", false, {"Default", "Instant"}}, {"das_last_key", "DAS Last Key", false, {"Off", "On"}},
{"smooth_movement", "Smooth Piece Drop", false, {"On", "Off"}}, {"smooth_movement", "Smooth Piece Drop", false, {"On", "Off"}},
{"synchroes_allowed", "Synchroes", false, {"Per ruleset", "On", "Off"}}, {"synchroes_allowed", "Synchroes", false, {"Per ruleset", "On", "Off"}},
{"diagonal_input", "Diagonal Input", false, {"On", "Off"}}, {"diagonal_input", "Diagonal Input", false, {"On", "Off"}},
@ -38,7 +38,6 @@ function ConfigScene:new()
end end
function ConfigScene:update() function ConfigScene:update()
config["das_last_key"] = config.gamesettings.das_last_key == 2
self.sfxSlider:update() self.sfxSlider:update()
self.bgmSlider:update() self.bgmSlider:update()
end end

2
tetris/modes/gamemode.lua
View File

@ -378,7 +378,7 @@ function GameMode:stopDAS()
end end
function GameMode:chargeDAS(inputs) function GameMode:chargeDAS(inputs)
if config["das_last_key"] then if config.gamesettings.das_last_key == 2 then
if inputs["right"] == true and self.das.direction ~= "right" and not self.prev_inputs["right"] then if inputs["right"] == true and self.das.direction ~= "right" and not self.prev_inputs["right"] then
self:startRightDAS() self:startRightDAS()
elseif inputs["left"] == true and self.das.direction ~= "left" and not self.prev_inputs["left"] then elseif inputs["left"] == true and self.das.direction ~= "left" and not self.prev_inputs["left"] then