SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-23 04:39:03 -06:00
Code Issues Projects Releases Wiki Activity

Stop cambridge from usurping the secret inputs table. Fixes a problem in modpack.

Browse Source
This commit is contained in:
Rin 2021-08-21 20:56:32 +01:00
parent 80104d2085
commit 33b69abbb8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/game.lua
View File

@ -8,7 +8,7 @@ function GameScene:new(game_mode, ruleset, inputs)
self.retry_mode = game_mode self.retry_mode = game_mode
self.retry_ruleset = ruleset self.retry_ruleset = ruleset
self.secret_inputs = inputs self.secret_inputs = inputs
self.game = game_mode(config.gamemodesettings[game_mode.hash], self.secret_inputs) self.game = game_mode(self.secret_inputs, config.gamemodesettings[game_mode.hash])
self.ruleset = ruleset(self.game) self.ruleset = ruleset(self.game)
self.game:initialize(self.ruleset) self.game:initialize(self.ruleset)
self.inputs = { self.inputs = {

2
tetris/modes/gamemode.lua
View File

@ -15,7 +15,7 @@ GameMode.hash = ""
GameMode.tagline = "" GameMode.tagline = ""
GameMode.rollOpacityFunction = function(age) return 0 end GameMode.rollOpacityFunction = function(age) return 0 end
function GameMode:new(config, secret_inputs) function GameMode:new(secret_inputs, config)
self.grid = Grid(10, 24) self.grid = Grid(10, 24)
self.randomizer = Randomizer() self.randomizer = Randomizer()
self.piece = nil self.piece = nil

4
tetris/modes/marathon_a1.lua
View File

@ -14,8 +14,8 @@ MarathonA1Game.tagline = "Can you score enough points to reach the title of Gran
function MarathonA1Game:new(cfg) function MarathonA1Game:new(_, cfg)
MarathonA1Game.super:new(cfg) MarathonA1Game.super:new(_, cfg)
self.roll_frames = 0 self.roll_frames = 0
self.combo = 1 self.combo = 1

4
tetris/modes/marathon_a2.lua
View File

@ -14,8 +14,8 @@ MarathonA2Game.tagline = "The points don't matter! Can you reach the invisible r
function MarathonA2Game:new(cfg) function MarathonA2Game:new(_, cfg)
MarathonA2Game.super:new(cfg) MarathonA2Game.super:new(_, cfg)
self.roll_frames = 0 self.roll_frames = 0
self.combo = 1 self.combo = 1

4
tetris/modes/survival_a2.lua
View File

@ -14,8 +14,8 @@ SurvivalA2Game.tagline = "The game starts fast and only gets faster!"
function SurvivalA2Game:new(cfg) function SurvivalA2Game:new(_, cfg)
SurvivalA2Game.super:new(cfg) SurvivalA2Game.super:new(_, cfg)
self.roll_frames = 0 self.roll_frames = 0
self.combo = 1 self.combo = 1
self.randomizer = History6RollsRandomizer() self.randomizer = History6RollsRandomizer()