Rest of 1.5.1

Author: thacuber2a03

effects/sash.lua

@@ -25,17 +25,17 @@ function Sash:init(text)
 	self.text = text
 
 	-- haha bad code go brr
-	self.heightTimer = Timer(125, 0, 40, ease.outBack)
-	self.heightTimer.discardOnCompletion = false
+	self.yTimer = Timer(125, 0, 40, ease.outBack)
+	self.yTimer.discardOnCompletion = false
 	local textWidth = gfx.getSystemFont("bold"):getTextWidth(text)
-	setTimerEndCallback(self.heightTimer, function()
-		self.textPosTimer = Timer(250, -textWidth, dwidth/2-textWidth/2, ease.outCubic)
+	setTimerEndCallback(self.yTimer, function()
+		self.textPosTimer = Timer(250, -textWidth, 10+textWidth/2, ease.outCubic)
 		setTimerEndCallback(self.textPosTimer, function()
 			timer.performAfterDelay(500, function()
-				self.textPosTimer = Timer(250, dwidth/2-textWidth/2, dwidth, ease.inCubic)
+				self.textPosTimer = Timer(250, 10+textWidth/2, dwidth, ease.inCubic)
 				setTimerEndCallback(self.textPosTimer, function()
-					self.heightTimer = Timer(250, 40, 0, ease.inBack)
-					setTimerEndCallback(self.heightTimer, function() self.dead = true end)
+					self.yTimer = Timer(250, 40, 0, ease.inBack)
+					setTimerEndCallback(self.yTimer, function() self.dead = true end)
 				end)
 			end)
 		end)
@@ -46,12 +46,12 @@ function Sash:update() end
 
 function Sash:draw()
 	gfx.pushContext()
-	if self.heightTimer then
-		gfx.fillRect(0, 0, dwidth, self.heightTimer.value)
+	if self.yTimer then
+		gfx.fillRect(0, (dheight-self.yTimer.value)-5, dwidth, gfx.getSystemFont("bold"):getHeight()*2)
 	end
 	if self.textPosTimer then
 		gfx.setImageDrawMode(darkMode and "fillBlack" or "fillWhite")
-		gfx.drawText("*"..self.text.."*", self.textPosTimer.value, gfx.getSystemFont("bold"):getHeight()/2)
+		gfx.drawText("*"..self.text.."*", self.textPosTimer.value, (dheight-gfx.getSystemFont("bold"):getHeight()*1.5)-5)
 	end
 	gfx.popContext()
 end

main.lua

@@ -307,7 +307,7 @@ end
 
 local inputHandlers	= {
 	upButtonDown = function()
-		if not lost then
+		if not lost and not menuOpen then
 			local dist = 0
 			while canPieceMove(piece.x, piece.y + 1, piece.rotation) do
 				piece.y += 1
@@ -367,7 +367,11 @@ local function drawBlock(block, x, y, size)
 		size-1
 	)
 
-	if grid then gfx[(block ~= " " and "fillRect" or "drawRect")](rect)
+	if grid then
+		gfx.setColor(darkMode and gfx.kColorBlack or gfx.kColorWhite)
+		gfx.fillRect(rect)
+		gfx.setColor(darkMode and gfx.kColorWhite or gfx.kColorBlack)
+		gfx[(block ~= " " and "fillRect" or "drawRect")](rect)
 	elseif block ~= " " then gfx.fillRect(rect) end
 end
 
@@ -391,6 +395,13 @@ end
 
 reset()
 
+local function lose()
+	timer = 0
+	lost = true
+	UITimer = time.new(500, 8, -4, easings.outCubic)
+	playdate.inputHandlers.pop()
+end
+
 local function updateGame()
 	if not lost then
 		local crankTicks = playdate.getCrankTicks(4)
@@ -522,12 +533,7 @@ local function updateGame()
 				newPiece(table.remove(sequence))
 				hasHeldPiece = false
 
-				if not canPieceMove(piece.x, piece.y, piece.rotation) then
-					timer = 0
-					lost = true
-					UITimer = time.new(500, 8, -4, easings.outCubic)
-					playdate.inputHandlers.pop()
-				end -- check if lost
+				if not canPieceMove(piece.x, piece.y, piece.rotation) then lose() end
 			end -- complete a row
 		end -- timer is over timerLimit
 	else
@@ -548,7 +554,6 @@ local function updateGame()
 	end -- state machine
 end
 
-
 local function drawScores()
 	local bold = gfx.getSystemFont("bold")
 	gfx.drawTextAligned("*Score*", (UITimer.value-2)*uiBlockSize, 9*uiBlockSize, kTextAlignment.center)
@@ -618,15 +623,28 @@ local function drawGame()
 		end
 	end
 
+	if #sashes > 0 then updateEffect(sashes, #sashes, sashes[#sashes]) end
+
+	if not grid then
+		gfx.setColor(darkMode and gfx.kColorBlack or gfx.kColorWhite)
+		gfx.fillRect(
+			offsetX*blockSize,    offsetY*blockSize,
+			gridXCount*blockSize, gridYCount*blockSize
+		)
+	end
+
 	for i,l in ipairs(lines) do updateEffect(lines,i,l) end
 
 	if not grid then
+		gfx.setColor(darkMode and gfx.kColorWhite or gfx.kColorBlack)
 		gfx.drawRect(
 			offsetX*blockSize,    offsetY*blockSize,
 			gridXCount*blockSize, gridYCount*blockSize
 		)
 	end
 
+	for i, l in ipairs(clearLines) do updateEffect(clearLines,i,l) end
+
 	for y = 1, gridYCount do
 		for x = 1, gridXCount do
 			drawBlock(inert[y][x], x + offsetX, y + offsetY, blockSize)
@@ -651,17 +669,13 @@ local function drawGame()
 		end
 	end)
 
-	for i, l in ipairs(clearLines) do updateEffect(clearLines,i,l) end
-
 	gfx.setDrawOffset(0,0)
 
 	drawHeldPiece()
 	drawNextPiece()
 	drawScores()
 	drawLevelInfo()
 
-	if #sashes > 0 then updateEffect(sashes, #sashes, sashes[#sashes]) end
-
 	gfx.fillRect(0, 0, 400, introRectT.value)
 
 	gfx.popContext()
@@ -803,8 +817,8 @@ function updateMenu()
 			menuScrollSound:play()
 			menuCursor += 1
 		elseif btnp("up") then
-			menuCursor -= 1
 			menuScrollSound:play()
+			menuCursor -= 1
 		end
 		menuCursor %= #menu
 
@@ -903,36 +917,47 @@ end
 -- Playdate-related stuff --
 ----------------------------
 
-playdate.getSystemMenu():addMenuItem("options", function()
-	menuOpen = not menuOpen
-	if not menuOpen then closeMenu()
-	else
-		bold = gfx.getSystemFont("bold")
-		menuYTimer = time.new(250, 0, dheight/2, easings.outBack)
-		menuHeight = #menu*bold:getHeight()
-		local longestString = ""
-		for k, v in pairs(menu) do
-			if #v.name > #longestString then
-				longestString = v.name
+local sysmenu = playdate.getSystemMenu()
+sysmenu:addMenuItem("options", function()
+	if not lost then
+		menuOpen = not menuOpen
+		if not menuOpen then closeMenu()
+		else
+			bold = gfx.getSystemFont("bold")
+			menuYTimer = time.new(250, 0, dheight/2, easings.outBack)
+			menuHeight = #menu*bold:getHeight()
+			local longestString = ""
+			for k, v in pairs(menu) do
+				if #v.name > #longestString then
+					longestString = v.name
+				end
 			end
-		end
 
-		-- playdate.graphics.image:getSize() returns two values. By using it like this,
-		-- I am taking the first value and discarding the rest,
-		-- the first value being the width, which is what i need.
-		menuWidth = bold:getTextWidth(longestString) + crossmarkFieldImage:getSize()
-		menuCursor = 1
+			-- playdate.graphics.image:getSize() returns two values. By using it like this,
+			-- I am taking the first value and discarding the rest,
+			-- the first value being the width, which is what i need.
+			menuWidth = bold:getTextWidth(longestString) + crossmarkFieldImage:getSize()
+			menuCursor = 1
+
+			backgroundImage = gfx.image.new(dwidth, dheight)
+			gfx.pushContext(backgroundImage)
+			drawGame()
+			gfx.popContext()
 
-		backgroundImage = gfx.image.new(dwidth, dheight)
-		gfx.pushContext(backgroundImage)
-		drawGame()
-		gfx.popContext()
+			playdate.inputHandlers.pop()
+			patternTimer = time.new(250, 1, #patterns, easings.outBack)
+		end
+		_update = updateMenu
+		_draw = drawMenu
+	end
+end)
 
-		playdate.inputHandlers.pop()
-		patternTimer = time.new(250, 1, #patterns, easings.outBack)
+sysmenu:addMenuItem("restart", function()
+	if not lost and UITimer.timeLeft == 0 then
+		addPieceToInertGrid()
+		lose()
+		commitSaveData()
 	end
-	_update = updateMenu
-	_draw = drawMenu
 end)
 
 bgmIntro:play()