0.8.8

scene.lua

@@ -47,7 +47,7 @@ local sceneInit={
 		end
 	end,
 	mode=function()
-		curBG="glow"
+		curBG="black"
 		BGM("blank")
 		destroyPlayers()
 		local cam=mapCam
@@ -141,7 +141,7 @@ local sceneInit={
 		sceneTemp={
 			S.run,
 			S.game,
-			format("%0.1fHr",S.time*2.78e-4),
+			format("%.1fHr",S.time*2.78e-4),
 			S.key,
 			S.rotate,
 			S.hold,
@@ -155,8 +155,8 @@ local sceneInit={
 			"["..S.spin_0.."]/"..S.spin_1.."/"..S.spin_2.."/"..S.spin_3,
 			S.b2b.."[+"..S.b3b.."]",
 			S.pc,
-			format("%0.2f",S.atk/S.row),
-			S.extraPiece.."["..(int(S.extraRate/S.piece*10000)*.01).."%]",
+			format("%.2f",S.atk/S.row),
+			format("%d[%.2f%%]",S.extraPiece,max(100-S.extraRate/S.piece*100,0)),
 		}
 	end,
 	history=function()
@@ -168,17 +168,6 @@ local sceneInit={
 		love.event.quit()
 	end,
 }
-local swapDeck_data={
-	{4,0,1,1},{6,0,15,1},{5,0,9,1},{6,0,6,1},
-	{1,0,3,1},{3,0,12,1},{1,1,8,1},{2,1,4,2},
-	{3,2,13,2},{4,1,12,2},{5,2,1,2},{7,1,11,2},
-	{2,1,9,3},{3,0,6,3},{4,2,14,3},{1,0,4,4},
-	{7,1,1,4},{6,0,2,4},{5,2,6,4},{6,0,14,5},
-	{3,3,15,5},{4,0,7,6},{7,1,10,5},{5,0,2,6},
-	{2,1,1,7},{1,0,4,6},{4,1,13,5},{1,1,6,7},
-	{5,3,11,5},{3,2,11,7},{6,0,8,7},{4,2,12,8},
-	{7,0,8,9},{1,0,2,8},{5,2,4,8},{6,0,15,8},
-}--Block id [ZSLJTOI] ,dir,x,y
 local gc=love.graphics
 local swap={
 	none={1,0,NULL},
@@ -186,37 +175,17 @@ local swap={
 	fade={30,15,function(t)
 		local t=t>15 and 2-t/15 or t/15
 		gc.setColor(0,0,0,t)
-		gc.rectangle("fill",0,0,1280,720)
+		gc.rectangle("fill",0,0,scr.w,scr.h)
 	end},
 	fade_togame={120,20,function(t)
 		local t=t>20 and (120-t)/100 or t/20
 		gc.setColor(0,0,0,t)
-		gc.rectangle("fill",0,0,1280,720)
+		gc.rectangle("fill",0,0,scr.w,scr.h)
 	end},
 	slowFade={180,90,function(t)
 		local t=t>90 and 2-t/90 or t/90
 		gc.setColor(0,0,0,t)
-		gc.rectangle("fill",0,0,1280,720)
-	end},
-	deck={50,8,function(t)
-		gc.setColor(1,1,1)
-		if t>8 then
-			local t=t<15 and 15 or t
-			for i=1,51-t do
-				local bn=swapDeck_data[i][1]
-				local b=blocks[bn][swapDeck_data[i][2]]
-				local cx,cy=swapDeck_data[i][3],swapDeck_data[i][4]
-				for y=1,#b do for x=1,#b[1]do
-					if b[y][x]then
-						gc.draw(blockSkin[bn],80*(cx+x-2),80*(10-cy-y),nil,8/3)
-					end
-				end end
-			end
-		end
-		if t<17 then
-			gc.setColor(1,1,1,1-(t>8 and t-8 or 8-t)*.125)
-			gc.rectangle("fill",0,0,1280,720)
-		end
+		gc.rectangle("fill",0,0,scr.w,scr.h)
 	end},
 }--Scene swapping animations
 local backFunc={