From aa0f2ccdc692c2e659ccd384ba198382adc2d76f Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 20 Nov 2020 11:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=8E=A9=E5=AE=B6=E7=89=B9?=
 =?UTF-8?q?=E6=95=88=E7=9B=B8=E5=85=B3=E7=9A=84=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=BB=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?Demo=E7=8E=A9=E5=AE=B6=E5=A4=8D=E6=B4=BB=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E5=9D=90=E6=A0=87=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player/init.lua   | 38 +++++++++++++++++++-------------------
 parts/player/player.lua |  9 +++++----
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/parts/player/init.lua b/parts/player/init.lua
index 6d500c2b..3e8fc08d 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -95,21 +95,21 @@ local function newEmptyPlayer(id,x,y,size)
 
 	P.small=P.size<.1--If draw in small mode
 	if P.small then
+		P.fieldX,P.fieldY=P.x,P.y
 		P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size
 		P.canvas=love.graphics.newCanvas(60,120)
 		P.frameWait=rnd(30,120)
 		P.draw=PLY.draw.small
 	else
 		P.keyRec=true--If calculate keySpeed
+		P.fieldX,P.fieldY=P.x+150*P.size,P.y+70*P.size
 		P.centerX,P.centerY=P.x+300*P.size,P.y+370*P.size
-		P.absFieldX=P.x+150*P.size
-		P.absFieldY=P.y+60*P.size
+		P.absFieldX,P.absFieldY=P.x+150*P.size,P.y+60*P.size
 		P.draw=PLY.draw.norm
 		P.bonus={}--Text objects
 	end
 	P.randGen=mt.newRandomGenerator(GAME.seed)
 
-	P.small=false
 	P.alive=true
 	P.control=false
 	P.timing=false
@@ -269,12 +269,19 @@ local function applyGameEnv(P)--Finish gameEnv processing
 
 	if ENV.nextCount==0 then ENV.nextPos=false end
 
-	if ENV.lockFX==0 then	ENV.lockFX=nil	end
-	if ENV.dropFX==0 then	ENV.dropFX=nil	end
-	if ENV.moveFX==0 then	ENV.moveFX=nil	end
-	if ENV.clearFX==0 then	ENV.clearFX=nil end
-	if ENV.shakeFX==0 then	ENV.shakeFX=nil	end
-
+	if P.small then
+		ENV.lockFX=nil
+		ENV.dropFX=nil
+		ENV.moveFX=nil
+		ENV.clearFX=nil
+		ENV.shakeFX=nil
+	else
+		if ENV.lockFX==0 then	ENV.lockFX=nil	end
+		if ENV.dropFX==0 then	ENV.dropFX=nil	end
+		if ENV.moveFX==0 then	ENV.moveFX=nil	end
+		if ENV.clearFX==0 then	ENV.clearFX=nil end
+		if ENV.shakeFX==0 then	ENV.shakeFX=nil	end
+	end
 	if ENV.ghost==0 then	ENV.ghost=nil	end
 	if ENV.center==0 then	ENV.center=nil	end
 end
@@ -304,10 +311,9 @@ function PLY.newDemoPlayer(id,x,y,size)
 	P.sound=true
 
 	-- rewrite some args
-	P.small=false
+	P.fieldX,P.fieldY=P.x,P.y
 	P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size
-	P.absFieldX=P.x+150*P.size
-	P.absFieldY=P.y+60*P.size
+	P.absFieldX,P.absFieldY=P.x+150*P.size,P.y+60*P.size
 	P.draw=PLY.draw.demo
 	P.control=true
 	GAME.modeEnv=DemoEnv
@@ -335,6 +341,7 @@ function PLY.newRemotePlayer(id,x,y,size)
 	applyGameEnv(P)
 	prepareSequence(P)
 end
+
 function PLY.newAIPlayer(id,x,y,size,AIdata)
 	local P=newEmptyPlayer(id,x,y,size)
 
@@ -342,13 +349,6 @@ function PLY.newAIPlayer(id,x,y,size,AIdata)
 	local ENV=P.gameEnv
 	ENV.face={0,0,0,0,0,0,0}
 	ENV.skin={1,7,11,3,14,4,9}
-	if P.small then
-		ENV.text=false
-		ENV.lockFX=nil
-		ENV.dropFX=nil
-		ENV.moveFX=nil
-		ENV.shakeFX=nil
-	end
 	applyGameEnv(P)
 	prepareSequence(P)
 	P:loadAI(AIdata)
diff --git a/parts/player/player.lua b/parts/player/player.lua
index c9be4886..da483806 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1427,7 +1427,8 @@ function Player.lose(P,force)
 	if P.result then return end
 	if P.life>0 and not force then
 		P.waiting=62
-		for _=#P.field,1,-1 do
+		local h=#P.field
+		for _=h,1,-1 do
 			FREEROW.discard(P.field[_])
 			FREEROW.discard(P.visTime[_])
 			P.field[_],P.visTime[_]=nil
@@ -1452,11 +1453,11 @@ function Player.lose(P,force)
 		end
 		P.atkBuffer.sum=0
 
-		for i=1,21 do
+		for i=1,h do
 			P:createClearingFX(i,1.5)
 		end
-		SYSFX.newShade(.7,1,1,1,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
-		SYSFX.newRectRipple(.5,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
+		SYSFX.newShade(.7,1,1,1,P.fieldX,P.fieldY,300*P.size,610*P.size)
+		SYSFX.newRectRipple(.5,P.fieldX,P.fieldY,300*P.size,610*P.size)
 		SYSFX.newRipple(.5,P.x+(475+25*(P.life<3 and P.life or 0)+12)*P.size,P.y+(665+12)*P.size,20)
 		--300+25*i,595
 		SFX.play("clear_3")