Merge pull request #77 from Kirby703/master-1

easter egg

funcs.lua

@@ -60,6 +60,9 @@ function formatTime(frames)
 	min  = math.floor(frames/3600)
 	sec  = math.floor(frames/60) % 60
 	hund = math.floor(frames/.6) % 100
+	if frames == 15641 then
+		hund = math.ceil(frames/.6) % 100
+	end
 	str = string.format("%02d:%02d.%02d", min, sec, hund)
 	return str
 end

load/bgm.lua

@@ -6,6 +6,7 @@ bgm = {
 }
 
 local current_bgm = nil
+local pitch = 1
 local bgm_locked = false
 
 function switchBGM(sound, subsound)
@@ -84,5 +85,13 @@ end
 function resumeBGM()
 	if current_bgm ~= nil then
 		current_bgm:play()
+		current_bgm:setPitch(pitch)
+	end
+end
+
+function pitchBGM(new_pitch)
+	pitch = new_pitch
+	if current_bgm ~= nil then
+		current_bgm:setPitch(pitch)
 	end
 end

load/graphics.lua

@@ -4,7 +4,7 @@ named_backgrounds = {
 }
 current_playing_bgs = {}
 extended_bgs = {}
-image_formats = {".png", ".jpg"}
+image_formats = {".jpg", ".png"}
 bgpath = "res/backgrounds/"
 dir = love.filesystem.getDirectoryItems(bgpath)
 

main.lua

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

scene/game.lua

@@ -81,6 +81,7 @@ function GameScene:onInputPress(e)
 		scene = e.input == "retry" and GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs) or ModeSelectScene()
 	elseif e.input == "retry" then
 		switchBGM(nil)
+		pitchBGM(1)
 		self.game:onExit()
 		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

scene/key_config.lua

@@ -45,7 +45,7 @@ end
 
 function KeyConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
-	drawBackground("input_config")
+	drawBackground("options_input")
 
 	love.graphics.setFont(font_3x5_2)
 	for i, input in ipairs(configurable_inputs) do

scene/replay.lua

@@ -107,6 +107,8 @@ function ReplayScene:onInputPress(e)
 		e.input == "menu_decide" or
 		e.input == "retry"
  	) then
+		switchBGM(nil)
+		pitchBGM(1)
 		self.game:onExit()
 		loadSave()
 		love.math.setRandomSeed(os.time())
@@ -126,11 +128,13 @@ function ReplayScene:onInputPress(e)
 		if self.replay_speed < 1 then
 			self.replay_speed = 1
 		end
+		pitchBGM(self.replay_speed)
 	elseif e.input == "right" then
 		self.replay_speed = self.replay_speed + 1
 		if self.replay_speed > 99 then
 			self.replay_speed = 99
 		end
+		pitchBGM(self.replay_speed)
 	elseif e.input == "hold" then
 		self.show_invisible = not self.show_invisible
 	end

scene/replay_select.lua

@@ -47,8 +47,6 @@ function ReplaySelectScene:new()
 end
 
 function ReplaySelectScene:update()
-	switchBGM(nil) -- experimental
-	
 	if self.das_up or self.das_down or self.das_left or self.das_right then
 		self.das = self.das + 1
 	else

tetris/modes/big_a2.lua

@@ -10,41 +10,10 @@ BigA2Game.tagline = "Big blocks in the most celebrated TGM mode!"
 function BigA2Game:new()
 	BigA2Game.super:new()
 	self.big_mode = true
-end
+	local getClearedRowCount = self.grid.getClearedRowCount
-
+	self.grid.getClearedRowCount = function(self)
-function BigA2Game:updateScore(level, drop_bonus, cleared_lines)
+		return getClearedRowCount(self) / 2
-	cleared_lines = cleared_lines / 2
-	if not self.clear then
-		self:updateGrade(cleared_lines)
-		if cleared_lines >= 4 then
-			self.tetris_count = self.tetris_count + 1
 	end
-		if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
-		if cleared_lines > 0 then
-			self.combo = self.combo + (cleared_lines - 1) * 2
-			self.score = self.score + (
-				(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-				cleared_lines * self.combo * self.bravo
-			)
-		else
-			self.combo = 1
-		end
-		self.drop_bonus = 0
-	else self.lines = self.lines + cleared_lines end
-end
-
-function BigA2Game:onLineClear(cleared_row_count)
-	cleared_row_count = cleared_row_count / 2
-	self:updateSectionTimes(self.level, self.level + cleared_row_count)
-	self.level = math.min(self.level + cleared_row_count, 999)
-	if self.level == 999 and not self.clear then
-		self.clear = true
-		self.grid:clear()
-		if self:qualifiesForMRoll() then self.grade = 32 end
-		self.roll_frames = -150
-	end
-	self.lock_drop = self.level >= 900
-	self.lock_hard_drop = self.level >= 900
 end
 
 return BigA2Game

tetris/modes/gamemode.lua

@@ -400,6 +400,7 @@ end
 
 function GameMode:onGameOver()
 	switchBGM(nil)
+	pitchBGM(1)
 	local alpha = 0
 	local animation_length = 120
 	if self.game_over_frames < animation_length then

tetris/modes/survival_2020.lua

@@ -201,7 +201,7 @@ end
 
 Survival2020Game.opacityFunction = function(age)
 	if age > 300 then return 0
-	else return 1 - Math.max(age - 240, 0) / 60 end
+	else return 1 - math.max(age - 240, 0) / 60 end
 end
 
 function Survival2020Game:drawGrid()