From dc3ad825dcc29cc1a3a17c04541460046bbce912 Mon Sep 17 00:00:00 2001
From: Ishaan Bhardwaj <sashlilac109@gmail.com>
Date: Mon, 9 Aug 2021 00:29:22 -0400
Subject: [PATCH] Fix to #27 + some other gamemode functionality

---
 res/img/frame.png         | Bin 926 -> 1151 bytes
 tetris/modes/gamemode.lua |  38 ++++++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/res/img/frame.png b/res/img/frame.png
index 38fd30cbcbba969da69cf57286d05961e3d605c5..7d9e71458b22c7af76395869eaba11f960391f3a 100644
GIT binary patch
literal 1151
zcmeAS@N?(olHy`uVBq!ia0vp^2N)O_6FAs_thd|CVi_1%+&o<zLn`LHy?ZeCwgZE!
zV_v<bX01x;l9@Yr88x+59x!2=ee3DIp9kh_Rrqp%+f}xGCIX~>|NVRW{_Wo*9`Kld
z*!Hkg=)hF7KZo8tJI(at^K11#%jGZIMKdhnY%pP*pvG`1PUyhrpDiz!u@%U$`zSM9
zVsV(oaIS~-+<~PamWMDyCX<3MLODe6z_DWzm(Opo0-JzG9ahaC!Q8hDf1J6+qpcZs
z%)qqd98*O#N5k2j%peCsjepN=)2j{VVRIBt%P^b|RhcV$AmRbj=51@48~Qn*!2$K(
z++M@~Jm%`;+Na*OT`$KUJ=BPE;H^uHJ%<08Hf~?a+^`xJOXP$x$lDKk%rEB>bVz|J
z|7Bf*szAxXn)iVsgV}RFAUon(#X<fqk{z~w^Mm?j_`OxIaN_|<3xa_kF{AzEI-IHw
z{603LzO5U-O}JAyj<||uH(*--{aNugJ_b7_T&d&0u47;4E8>zR*-o_lck2s7!nRDt
u1FH~0|MoO<gS8Mt=6t>bXAmH7cRiPfzv9n()enIM3xlVtpUXO@geCw$<Y18i

literal 926
zcmeAS@N?(olHy`uVBq!ia0vp^2N)O_6FAs_thd|CVu2J}lDE4H!+#K5uy^@npa^Gy
zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-uX&&FzU;VRo(ppa~4NJNQqer|4RUI~!Pz~Eez
znpl#WqEMb$lA+-4=^K!um&(q-z|7?7;uunK>+Q{rf=vbz4Hp&GBtGSno68-M`Lrb@
zVkbjvpX`bmhY$0L^eef4ikrLm$HUz!?i^qv9oDUi=brcdb&}7Ut843P{~qIab2&L{
zD|i3%$(b9aKU=JgN@rh?!Q{Z8z)-;X@BHsi29A?fx9j;bD7IYKmitt6f>%%B<$5i5
zg*%KOH3AGA3@i*x42%s7ROZsgR3!HzF{$iyu*nS!Jv0av6i3r4=;4;oGJZjppr;y#
zwpnZWI}G)Xc}!%y;+)=O!PE#&Rwv#I+4N7&Oa!KV5NNRd!LTM+{KrW_i)0Yr)78&q
Iol`;+0Lwa<Jpcdz

diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua
index bf494be..231013e 100644
--- a/tetris/modes/gamemode.lua
+++ b/tetris/modes/gamemode.lua
@@ -490,7 +490,8 @@ end
 
 function GameMode:initializeOrHold(inputs, ruleset)
 	if (
-		(self.frames == 0 or (ruleset.are and self:getARE() ~= 0)) and self.ihs or false
+		(self.frames == 0 or (ruleset.are and self:getARE() ~= 0))
+		and self.ihs or false
 	) and self.enable_hold and inputs["hold"] == true then
 		self:hold(inputs, ruleset, true)
 	else
@@ -499,6 +500,7 @@ function GameMode:initializeOrHold(inputs, ruleset)
 	self:onPieceEnter()
 	if not self.grid:canPlacePiece(self.piece) then
 		self.game_over = true
+		return
 	end
 	ruleset:dropPiece(
 		inputs, self.piece, self.grid, self:getGravity(),
@@ -533,13 +535,15 @@ function GameMode:hold(inputs, ruleset, ihs)
 	end
 end
 
-function GameMode:initializeNextPiece(inputs, ruleset, piece_data, generate_next_piece)
-	if not self.buffer_soft_drop and self.lock_drop or (
+function GameMode:initializeNextPiece(
+	inputs, ruleset, piece_data, generate_next_piece
+)
+	if not inputs.hold and not self.buffer_soft_drop and self.lock_drop or (
 		not ruleset.are or self:getARE() == 0
 	) then
 		self.drop_locked = true
 	end
-	if not self.buffer_hard_drop and self.lock_hard_drop or (
+	if not inputs.hold and not self.buffer_hard_drop and self.lock_hard_drop or (
 		not ruleset.are or self:getARE() == 0
 	) then
 		self.hard_drop_locked = true
@@ -683,7 +687,9 @@ function GameMode:drawPiece()
 end
 
 function GameMode:drawGhostPiece(ruleset)
-	if self.piece == nil then return end
+	if self.piece == nil or not self.grid:canPlacePiece(self.piece) then
+		return
+	end
 	local ghost_piece = self.piece:withOffset({x=0, y=0})
 	ghost_piece.ghost = true
 	ghost_piece:dropToBottom(self.grid)
@@ -853,15 +859,7 @@ function GameMode:drawFrame()
 	-- game frame
 	if self.grid.width == 10 and self.grid.height == 24 then
 		love.graphics.draw(misc_graphics["frame"], 48, 64)
-	end
-	
-	love.graphics.setColor(0, 0, 0, 200)
-	love.graphics.rectangle(
-		"fill", 64, 80,
-		16 * self.grid.width, 16 * (self.grid.height - 4)
-	)
-	
-	if self.grid.width ~= 10 or self.grid.height ~= 24 then
+	else
 		love.graphics.setColor(174/255, 83/255, 76/255, 1)
 		love.graphics.setLineWidth(8)
 		love.graphics.line(
@@ -881,6 +879,11 @@ function GameMode:drawFrame()
 			60,76
 		)
 		love.graphics.setLineWidth(1)
+		love.graphics.setColor(0, 0, 0, 200)
+		love.graphics.rectangle(
+			"fill", 64, 80,
+			16 * self.grid.width, 16 * (self.grid.height - 4)
+		)
 	end
 end
 
@@ -897,7 +900,14 @@ end
 
 function GameMode:drawCustom() end
 
+-- transforms specified in here will transform the whole screen
+-- if you want a transform for a particular component, specify
+-- it in that component's draw function and then make sure to
+-- reset it to origin at the end of that component's draw call!
+function GameMode:transformScreen() end
+
 function GameMode:draw(paused)
+	self:transformScreen()
 	self:drawBackground()
 	self:drawFrame()
 	self:drawGrid()