Revert "made the experience feel closer to arcade stackers"

Happy April Fools!
This reverts commit bfbba75f17.
This commit is contained in:
--global 2022-04-01 18:43:35 -04:00
parent bfbba75f17
commit 23a8c400ba
7 changed files with 6 additions and 63 deletions

View File

@ -39,7 +39,7 @@ function initConfig()
else else
if config.current_mode then current_mode = config.current_mode end if config.current_mode then current_mode = config.current_mode end
if config.current_ruleset then current_ruleset = config.current_ruleset end if config.current_ruleset then current_ruleset = config.current_ruleset end
scene = ArcadeScene() scene = TitleScene()
end end
end end

View File

@ -103,9 +103,6 @@ function love.keypressed(key, scancode)
scene = InputConfigScene() scene = InputConfigScene()
switchBGM(nil) switchBGM(nil)
loadSave() loadSave()
elseif scancode == "f8" and scene.title == "Arcade" then
scene = TitleScene()
playSE("mode_decide")
-- secret sound playing :eyes: -- secret sound playing :eyes:
elseif scancode == "f8" and scene.title == "Title" then elseif scancode == "f8" and scene.title == "Title" then
config.secret = not config.secret config.secret = not config.secret

View File

@ -8,7 +8,6 @@ function Scene:render() end
function Scene:onInputPress() end function Scene:onInputPress() end
function Scene:onInputRelease() end function Scene:onInputRelease() end
ArcadeScene = require "scene.arcade"
ExitScene = require "scene.exit" ExitScene = require "scene.exit"
GameScene = require "scene.game" GameScene = require "scene.game"
ReplayScene = require "scene.replay" ReplayScene = require "scene.replay"

View File

@ -1,52 +0,0 @@
local ArcadeScene = Scene:extend()
ArcadeScene.title = "Arcade"
function ArcadeScene:new()
self.frames = 0
DiscordRPC:update({
details = "In menus",
state = "Waiting for a credit",
largeImageKey = "icon2",
largeImageText = version
})
end
local block_offsets = {
{color = "M", x = 0, y = 0},
{color = "G", x = 32, y = 0},
{color = "Y", x = 64, y = 0},
{color = "B", x = 0, y = 32},
{color = "O", x = 0, y = 64},
{color = "C", x = 32, y = 64},
{color = "R", x = 64, y = 64}
}
function ArcadeScene:update()
self.frames = self.frames + 1
end
function ArcadeScene:render()
love.graphics.setFont(font_3x5_3)
love.graphics.setColor(1, 1, 1, 1)
love.graphics.draw(
backgrounds["title_no_icon"],
0, 0, 0,
0.5, 0.5
)
for _, b in ipairs(block_offsets) do
love.graphics.draw(
blocks["2tie"][b.color],
272 + b.x, 144 + b.y, 0,
2, 2
)
end
love.graphics.printf("CAMBRIDGE: THE OPEN SOURCE ARCADE STACKER", 0, 256, 640, "center")
love.graphics.setFont(font_3x5_2)
love.graphics.setColor(1, 1, 1, 1 - (math.floor(self.frames / 60) % 2))
love.graphics.printf("Insert 1 credit(s)", 0, 416, 640, "center")
end
return ArcadeScene

View File

@ -64,19 +64,18 @@ function GameScene:onInputPress(e)
highscore_hash = self.game.hash .. "-" .. self.ruleset.hash highscore_hash = self.game.hash .. "-" .. self.ruleset.hash
submitHighscore(highscore_hash, highscore_entry) submitHighscore(highscore_hash, highscore_entry)
self.game:onExit() self.game:onExit()
scene = ArcadeScene() scene = e.input == "retry" and GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs) or ModeSelectScene()
-- e.input == "retry" and GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs) or ModeSelectScene()
elseif e.input == "retry" then elseif e.input == "retry" then
switchBGM(nil) switchBGM(nil)
self.game:onExit() self.game:onExit()
scene = ArcadeScene() --GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs) scene = GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs)
elseif e.input == "pause" and not (self.game.game_over or self.game.completed) then elseif e.input == "pause" and not (self.game.game_over or self.game.completed) then
self.paused = not self.paused self.paused = not self.paused
if self.paused then pauseBGM() if self.paused then pauseBGM()
else resumeBGM() end else resumeBGM() end
elseif e.input == "menu_back" then elseif e.input == "menu_back" then
self.game:onExit() self.game:onExit()
scene = ArcadeScene() -- ModeSelectScene() scene = ModeSelectScene()
elseif e.input and string.sub(e.input, 1, 5) ~= "menu_" then elseif e.input and string.sub(e.input, 1, 5) ~= "menu_" then
self.inputs[e.input] = true self.inputs[e.input] = true
end end

View File

@ -78,7 +78,7 @@ function KeyConfigScene:onInputPress(e)
if not config.input then config.input = {} end if not config.input then config.input = {} end
config.input.keys = self.new_input config.input.keys = self.new_input
saveConfig() saveConfig()
scene = had_config and InputConfigScene() or ArcadeScene() scene = had_config and InputConfigScene() or TitleScene()
elseif e.scancode == "delete" or e.scancode == "backspace" then elseif e.scancode == "delete" or e.scancode == "backspace" then
-- retry -- retry
self.input_state = 1 self.input_state = 1

View File

@ -86,7 +86,7 @@ function StickConfigScene:onInputPress(e)
if not config.input then config.input = {} end if not config.input then config.input = {} end
config.input.joysticks = self.new_input config.input.joysticks = self.new_input
saveConfig() saveConfig()
scene = had_config and InputConfigScene() or ArcadeScene() scene = had_config and InputConfigScene() or TitleScene()
elseif e.scancode == "delete" or e.scancode == "backspace" then elseif e.scancode == "delete" or e.scancode == "backspace" then
-- retry -- retry
self.input_state = 1 self.input_state = 1