Merge branch 'Tetro48-replay-qol'

fix lategame levelling bug

load/version.lua

@@ -1 +1 @@
-version = "v0.3.3.1"
+version = "v0.3.3.2"

main.lua

@@ -114,7 +114,7 @@ function love.keypressed(key, scancode)
 		scene.restart_message = true
 		if config.secret then playSE("mode_decide")
 		else playSE("erase") end
-		-- f12 is reserved for saving screenshots
+	-- f12 is reserved for saving screenshots
 	elseif scancode == "f12" then
 		local ss_name = os.date("ss/%Y-%m-%d_%H-%M-%S.png")
 		local info = love.filesystem.getInfo("ss", "directory")

scene/replay.lua

@@ -36,6 +36,7 @@ function ReplayScene:new(replay, game_mode, ruleset)
 	self.game.pause_time = replay["pause_time"]
 	self.replay = deepcopy(replay)
 	self.replay_index = 1
+	self.replay_speed = 1
 	DiscordRPC:update({
 		details = "Viewing a replay",
 		state = self.game.name,
@@ -44,18 +45,22 @@ function ReplayScene:new(replay, game_mode, ruleset)
 end
 
 function ReplayScene:update()
+	local frames_left = self.replay_speed
 	if not self.paused then
-		self.inputs = self.replay["inputs"][self.replay_index]["inputs"]
+		while frames_left > 0 do
-		self.replay["inputs"][self.replay_index]["frames"] = self.replay["inputs"][self.replay_index]["frames"] - 1
+			frames_left = frames_left - 1
-		if self.replay["inputs"][self.replay_index]["frames"] == 0 and self.replay_index < table.getn(self.replay["inputs"]) then
+			self.inputs = self.replay["inputs"][self.replay_index]["inputs"]
-			self.replay_index = self.replay_index + 1
+			self.replay["inputs"][self.replay_index]["frames"] = self.replay["inputs"][self.replay_index]["frames"] - 1
+			if self.replay["inputs"][self.replay_index]["frames"] == 0 and self.replay_index < table.getn(self.replay["inputs"]) then
+				self.replay_index = self.replay_index + 1
+			end
+			local input_copy = {}
+			for input, value in pairs(self.inputs) do
+				input_copy[input] = value
+			end
+			self.game:update(input_copy, self.ruleset)
+			self.game.grid:update()
 		end
-		local input_copy = {}
-		for input, value in pairs(self.inputs) do
-			input_copy[input] = value
-		end
-		self.game:update(input_copy, self.ruleset)
-		self.game.grid:update()
 		DiscordRPC:update({
 			details = "Viewing a replay",
 			state = self.game.name,
@@ -69,6 +74,11 @@ function ReplayScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf("REPLAY", 0, 0, 635, "right")
+	local pauses_y_coordinate = 23
+	if self.replay_speed > 1 then
+		pauses_y_coordinate = pauses_y_coordinate + 20
+		love.graphics.printf(self.replay_speed.."X", 0, 20, 635, "right")
+	end
 	love.graphics.setFont(font_3x5_2)
 	if self.game.pause_time and self.game.pause_count then
 		if self.game.pause_time > 0 or self.game.pause_count > 0 then
@@ -77,10 +87,10 @@ function ReplayScene:render()
 				self.game.pause_count,
 				self.game.pause_count == 1 and "" or "S",
 				formatTime(self.game.pause_time)
-			), 0, 23, 635, "right")
+			), 0, pauses_y_coordinate, 635, "right")
 		end
 	else
-		love.graphics.printf("?? PAUSES (--:--.--)", 0, 23, 635, "right")
+		love.graphics.printf("?? PAUSES (--:--.--)", 0, pauses_y_coordinate, 635, "right")
 	end
 end
 
@@ -104,6 +114,16 @@ function ReplayScene:onInputPress(e)
 		self.paused = not self.paused
 		if self.paused then pauseBGM()
 		else resumeBGM() end
+	elseif e.input == "left" then
+		self.replay_speed = self.replay_speed - 1
+		if self.replay_speed < 1 then
+			self.replay_speed = 1
+		end
+	elseif e.input == "right" then
+		self.replay_speed = self.replay_speed + 1
+		if self.replay_speed > 99 then
+			self.replay_speed = 99
+		end
 	end
 end
 

tetris/components/grid.lua

@@ -231,12 +231,15 @@ function Grid:applyBigPiece(piece)
 	end
 end
 
-function Grid:checkForBravo(cleared_row_count)
+-- places where you see this take an argument used the old, buggy method
-	for i = 0, self.height - 1 - cleared_row_count do
+function Grid:checkForBravo()
-				for j = 0, self.width - 1 do
+	for i = 0, self.height - 1 do
-						if self:isOccupied(j, i) then return false end
+		if not self:isRowFull(i+1) then
-				end
+			for j = 0, self.width - 1 do
+				if self:isOccupied(j, i) then return false end
+			end
 		end
+	end
 	return true
 end
 

tetris/modes/marathon_2020.lua

@@ -283,7 +283,7 @@ function Marathon2020Game:sectionPassed(old_level, new_level)
 		)
 	else
 		return (
-			(new_level < 2001 and math.floor(old_level / 100) < math.floor(new_level / 100)) or
+			(new_level < 2000 and math.floor(old_level / 100) < math.floor(new_level / 100)) or
 			(new_level >= 2020)
 		)
 	end
@@ -352,9 +352,13 @@ function Marathon2020Game:updateSectionTimes(old_level, new_level)
 		table.insert(self.section_times, section_time)
 		self.section_start_time = self.frames
 
-		if self.secondary_section_times[section] < cool_cutoffs[self.delay_level] and
+		if (
-		  (section == 1 or self.secondary_section_times[section] <= self.secondary_section_times[section - 1] + 120) then
+			(self.secondary_section_times[section] < cool_cutoffs[self.delay_level]) and
+		  	(section == 1 or self.secondary_section_times[section] <= self.secondary_section_times[section - 1] + 120)
+		) then
 			sectionCool(section)
+		else
+			table.insert(self.section_status, "none")
 		end
 
 		if section > 5 then

tetris/modes/survival_2020.lua

@@ -143,7 +143,7 @@ end
 function Survival2020Game:onPieceEnter()
 	if not self.clear and (
 		(self.level < 1900 and self.level % 100 ~= 99) or
-		self.level == 2019
+		(1900 <= self.level and self.level < 2019)
 	) then
 		self.level = self.level + 1
 	end
@@ -249,7 +249,7 @@ function Survival2020Game:drawScoringInfo()
 end
 
 function Survival2020Game:getBackground()
-	return math.floor(self.level / 100)
+	return math.min(19, math.floor(self.level / 100))
 end
 
 function Survival2020Game:getHighscoreData()

tetris/rulesets/standard.lua

@@ -8,6 +8,8 @@ SRS.hash = "Standard"
 SRS.softdrop_lock = false
 SRS.harddrop_lock = true
 
+SRS.enable_IRS_wallkicks = true
+
 SRS.MANIPULATIONS_MAX = 15
 
 SRS.wallkicks_line = {
@@ -108,4 +110,6 @@ end
 
 function SRS:canPieceRotate() return true end
 
+function SRS:get180RotationValue() return 2 end
+
 return SRS