Merge branch 'develop'

# Conflicts: # Panels.lua
cadin · Dec 2, 2023 · 71306bd · 71306bd
2 parents c9cfef1 + ac1f3e1
commit 71306bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Panels.lua b/Panels.lua
@@ -1,4 +1,4 @@
--- Panels version 1.7.1
+-- Panels version 1.7.2
 -- https://cadin.github.io/panels/
 
 import "CoreLibs/object"
@@ -40,6 +40,7 @@ local pdEaseInOutQuad = playdate.easingFunctions.inOutQuad
 local pdButtonJustPressed = playdate.buttonJustPressed
 
 local sequenceDidStart = false
+local sequenceIsFinishing = false
 
 local currentSeqIndex = 1
 local sequences = nil
@@ -199,7 +200,7 @@ end
 
 local function drawButtonIndicators(offset)
 	if transitionOutAnimator == nil then
-		if lastPanelIsShowing() and sequenceDidStart then
+		if lastPanelIsShowing() and sequenceDidStart and not sequenceIsFinishing then
 			for key, button in pairs(buttonIndicators) do
 				button:show()
 			end
@@ -645,6 +646,7 @@ local function updateSequenceTransition()
 		scrollPos = transitionInAnimator:currentValue()
 		if transitionInAnimator:ended() then
 			sequenceDidStart = true
+			sequenceIsFinishing = false
 			transitionInAnimator = nil
 			shouldFadeBG = false
 		end
@@ -694,6 +696,7 @@ end
 
 local function checkInputs()
 	local p = panels[panelNum]
+	if sequenceIsFinishing then return end
 	if lastPanelIsShowing() then
 		if p.advanceFunction == nil then 
 			for i, button in ipairs(buttonIndicators) do
@@ -703,6 +706,7 @@ local function checkInputs()
 					end
 					button:press()
 					hideOtherAdvanceControls(i)
+					sequenceIsFinishing = true
 					if p.advanceDelay then
 						p:exit()
 						playdate.timer.performAfterDelay(p.advanceDelay, finishSequence)
@@ -866,6 +870,7 @@ end
 local function loadGameData()
 	local data = playdate.datastore.read()
 	if data then
+		currentSeqIndex = data.sequence
 		Panels.unlockedSequences = data.unlockedSequences or {}
 		gameDidFinish = data.gameDidFinish
 		Panels.vars = data.vars or {}

diff --git a/modules/Panel.lua b/modules/Panel.lua
@@ -410,8 +410,8 @@ function Panels.Panel.new(data)
 				end
 
 				if layer.pixelLock then 
-					xPos = math.floor((xPos + offset.x) / layer.pixelLock) * layer.pixelLock - offset.x + self.frame.margin
-					yPos = math.floor((yPos + offset.y) / layer.pixelLock) * layer.pixelLock - offset.y + self.frame.margin
+					xPos = math.floor((xPos + offset.x) / layer.pixelLock) * layer.pixelLock - offset.x
+					yPos = math.floor((yPos + offset.y) / layer.pixelLock) * layer.pixelLock - offset.y
 				end
 
 				if layer.effect then
@@ -707,7 +707,7 @@ function Panels.Panel.new(data)
 	end
 
 	function panel:updateAdvanceButton()
-		if self.advanceButton.state == "hidden" then
+		if self.advanceButton.state == "hidden" and not self.didFinish then
 
 			if self.advanceControlPosition and self.advanceControlPosition.delay and self.advanceControlTimer == nil then
 				self.advanceControlTimer = playdate.timer.new(self.advanceControlPosition.delay, nil)