Merge pull request #14 from mikedinicola/main

Merge dev in to main

Author: thacuber2a03

.nova/Tasks/Playdate Simulator.json

@@ -0,0 +1,7 @@
+{
+  "extensionTemplate" : "simulator",
+  "extension" : {
+    "name" : "Playdate",
+    "identifier" : "com.panic.Playdate"
+  }
+}

main.lua

@@ -576,16 +576,13 @@ local function updateGame()
 end
 
 local function drawScores()
-	local bold = gfx.getSystemFont("bold")
 	gfx.drawTextAligned("*Score*", (UITimer.value-2)*uiBlockSize, 9*uiBlockSize, kTextAlignment.center)
 	gfx.drawTextAligned("*"..math.floor(score).."*", (UITimer.value-2)*uiBlockSize, 11*uiBlockSize, kTextAlignment.center)
 	gfx.drawTextAligned("*Highscore*", (UITimer.value-2)*uiBlockSize, 13*uiBlockSize, kTextAlignment.center)
 	gfx.drawTextAligned("*"..highscore.."*", (UITimer.value-2)*uiBlockSize, 15*uiBlockSize, kTextAlignment.center)
 end
 
 local function drawLevelInfo()
-	local bold = gfx.getSystemFont("bold")
-
 	gfx.drawTextAligned("*Level*", dwidth-(UITimer.value-2)*uiBlockSize, 9*uiBlockSize,kTextAlignment.center)
 	gfx.drawTextAligned("*"..level.."*", dwidth-(UITimer.value-2)*uiBlockSize, 11*uiBlockSize,kTextAlignment.center)
 	gfx.drawTextAligned("*Lines*", dwidth-(UITimer.value-2)*uiBlockSize, 13*uiBlockSize, kTextAlignment.center)
@@ -794,6 +791,8 @@ local bold = gfx.getSystemFont("bold")
 local menuYTimer, menuWidth
 
 local function closeMenu()
+	menuOpen = false
+
 	-- Sorry, I love back easing XD
 	menuYTimer = time.new(250, dheight/2, dheight, easings.inBack)
 	patternTimer = time.new(250, #patterns, 1,easings.inBack)
@@ -805,7 +804,6 @@ local menu = {
 		type = "button",
 		onpress = function()
 			closeMenu()
-			menuOpen = false
 		end,
 	},
 	{
@@ -887,6 +885,7 @@ local menu = {
 		onchange = function(val)
 			musicVolume = val
 			saveData("music", musicVolume)
+			updateMusicVolume()
 		end,
 	},
 	{
@@ -898,6 +897,7 @@ local menu = {
 		onchange = function(val)
 			soundsVolume = val
 			saveData("sounds", soundsVolume)
+			updateSoundVolume()
 		end,
 	},
 }
@@ -928,6 +928,11 @@ function updateMenu()
 
 			commitSaveData()
 		end
+		
+		if btnp("b") then
+			menuClickSound:play()
+			closeMenu()
+		end
 
 		if menuItem.type == "slider" then
 			if btn("right") then
@@ -1019,7 +1024,6 @@ sysmenu: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 = ""
@@ -1056,26 +1060,50 @@ sysmenu:addMenuItem("restart", function()
 	end
 end)
 
-bgmIntro:play()
-
-function playdate.update()
-	if not bgmIntro:isPlaying() and not bgmLoop:isPlaying() then
-		bgmLoop:play(0)
-	end
+function updateMusicVolume()
 	for i,v in ipairs(songs) do
 		if v:getVolume() ~= musicVolume then
 			v:setVolume(musicVolume)
 		end
 	end
+end
+
+function updateSoundVolume()
 	for i,v in ipairs(sfx) do
 		if v:getVolume() ~= soundsVolume then
 			v:setVolume(soundsVolume)
 		end
 	end
+end
+
+updateMusicVolume()
+updateSoundVolume()
+bgmIntro:play()
+
+function playdate.update()
+	if not bgmIntro:isPlaying() and not bgmLoop:isPlaying() then
+		bgmLoop:play(0)
+	end
 	_update()
 	_draw()
 end
 
+function playdate.gameWillPause()
+	
+	local img = gfx.image.new(dwidth, dheight, gfx.kColorWhite)
+	local text = "Score\n" .. math.floor(score) .. "\nHighscore\n" .. highscore .. "\nLevel\n" .. level .. "\nLines\n" .. completedLines
+	
+	gfx.lockFocus(img)
+	gfx.setFont(bold)
+	gfx.drawTextAligned(text, dwidth/4, 42, kTextAlignment.center)
+	gfx.unlockFocus()
+
+	img:setInverted(darkMode)
+
+	playdate.setMenuImage(img)
+
+end
+
 function playdate.gameWillTerminate() commitSaveData() end
 
 function playdate.deviceWillSleep() commitSaveData() end