Merge pull request #81 from Tetro48/std-rs-lockpatch

Patch standard.lua to prevent midair lock

scene/replay.lua

@@ -38,6 +38,7 @@ function ReplayScene:new(replay, game_mode, ruleset)
 	self.replay_index = 1
 	self.replay_speed = 1
 	self.show_invisible = false
+	self.frame_steps = 0
 	DiscordRPC:update({
 		details = "Viewing a replay",
 		state = self.game.name,
@@ -47,7 +48,10 @@ end
 
 function ReplayScene:update()
 	local frames_left = self.replay_speed
-	if not self.paused then
+	if not self.paused or self.frame_steps > 0 then
+		if self.frame_steps > 0 then
+			self.frame_steps = self.frame_steps - 1
+		end
 		while frames_left > 0 do
 			frames_left = frames_left - 1
 			self.inputs = self.replay["inputs"][self.replay_index]["inputs"]
@@ -123,6 +127,9 @@ function ReplayScene:onInputPress(e)
 		self.paused = not self.paused
 		if self.paused then pauseBGM()
 		else resumeBGM() end
+	--frame step
+	elseif e.input == "rotate_left" then
+		self.frame_steps = self.frame_steps + 1
 	elseif e.input == "left" then
 		self.replay_speed = self.replay_speed - 1
 		if self.replay_speed < 1 then

tetris/modes/gamemode.lua

@@ -179,6 +179,9 @@ function GameMode:update(inputs, ruleset)
 	if self.game_over or self.completed then
 		if self.save_replay and self.game_over_frames == 0 then
 			self:saveReplay()
+
+			-- ensure replays are only saved once per game, incase self.game_over_frames == 0 for longer than one frame
+			self.save_replay = false
 		end
 		self.game_over_frames = self.game_over_frames + 1
 		return

tetris/rulesets/standard.lua

@@ -93,6 +93,8 @@ function SRS:onPieceMove(piece, grid)
 		if piece.manipulations >= SRS.MANIPULATIONS_MAX then
 			piece.locked = true
 		end
+	else
+		piece.locked = false
 	end
 end