Merge branch 'master' of https://github.com/MillaBasset/cambridge

I apologize that it took me 2 years to think of this workaround.

CONTRIBUTING.md

@@ -57,13 +57,13 @@ Coding conventions
 Use tabs to indent, spaces to align.
 
 * Specifically, spaces should not appear at the beginning of a line, and tabs should not appear _except_ at the beginning of a line.
-* The sole exception is in a multiline `if` statement; the initial `if` should have four spaces before it to align it with an `elseif` on the next line. For example:
+* If you're aligning multiline if-statements, the initial "if", "elseif" or "else" should be flush left with the indentation level, with spaces padding the gap to the next word as necessary. For example:
 
 ```lua
-	---- 4 spaces
+	if     self.level <  900 then return 12
-	    if self.level <  900 then return 12
+	elseif self.level < 1200 then return  8
-	elseif self.level < 1200 then return 8
+	else                          return  6
-	else return 6 end
+	end
 ```
 
 Comments at the end of lines of code must be one line long. Multi-line comments must appear in their own block.

main.lua

@@ -78,7 +78,10 @@ function love.draw()
 	if config.gamesettings.display_gamemode == 1 or scene.title == "Title" then
 		love.graphics.setFont(font_3x5_2)
 		love.graphics.setColor(1, 1, 1, 1)
-		love.graphics.printf(version, 0, 460, 635, "right")
+		love.graphics.printf(
+			string.format("%.2f", 1 / love.timer.getAverageDelta()) ..
+			"fps - " .. version, 0, 460, 635, "right"
+		)
 	end
 	
 	love.graphics.pop()

scene/title.lua

@@ -44,8 +44,8 @@ function TitleScene:new()
 	DiscordRPC:update({
 		details = "In menus",
 		state = mainmenuidle[math.random(#mainmenuidle)],
-		largeImageKey = "icon2",
+		largeImageKey = "1year",
-		largeImageText = version
+		largeImageText = version.." | Thanks for 1 year!"
 	})
 end
 

tetris/modes/gamemode.lua

@@ -530,6 +530,8 @@ function GameMode:onEnterOrHold(inputs, ruleset)
 	if not self.grid:canPlacePiece(self.piece) then
 		self.game_over = true
 		return
+	elseif self.piece:isDropBlocked(self.grid) then
+		playSE("bottom")
 	end
 	ruleset:dropPiece(
 		inputs, self.piece, self.grid, self:getGravity(),
@@ -578,10 +580,6 @@ function GameMode:initializeNextPiece(
 	self.piece_soft_locked = false
 	self.buffer_hard_drop = false
 	self.buffer_soft_drop = false
-	if self.piece:isDropBlocked(self.grid) and
-	   self.grid:canPlacePiece(self.piece) then
-		playSE("bottom")
-	end
 	if generate_next_piece == nil then
 		table.remove(self.next_queue, 1)
 		table.insert(self.next_queue, self:getNextPiece(ruleset))

tetris/modes/marathon_a2.lua

@@ -112,7 +112,7 @@ function MarathonA2Game:advanceOneFrame()
 	if self.clear then
 		self.roll_frames = self.roll_frames + 1
 		if self.roll_frames < 0 then return false end
-		if self.roll_frames > 3694 then
+		if self.roll_frames > 3701 then
 			self.completed = true
 			if self.grade == 32 then
 				self.grade = 33
@@ -365,10 +365,10 @@ function MarathonA2Game:drawScoringInfo()
 	love.graphics.setFont(font_3x5_3)
 	if self.clear then
 		if self:qualifiesForMRoll() then
-			if self.lines >= 32 and self.roll_frames > 3694 then love.graphics.setColor(1, 0.5, 0, 1)
+			if self.lines >= 32 and self.roll_frames > 3701 then love.graphics.setColor(1, 0.5, 0, 1)
 			else love.graphics.setColor(0, 1, 0, 1) end
 		else
-			if self.roll_frames > 3694 then love.graphics.setColor(1, 0.5, 0, 1)
+			if self.roll_frames > 3701 then love.graphics.setColor(1, 0.5, 0, 1)
 			else love.graphics.setColor(0, 1, 0, 1) end
 		end
 	end