From 30297385af1c2677fece56db94c85af09efa6da7 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 25 May 2021 01:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=9A=84=E8=80=81=E7=89=88=E6=9C=AC=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4bagLen=E5=8F=98=E9=87=8F=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=94=A8bagLine=E4=BF=9D=E5=AD=98=E5=8C=85=E9=97=B4=E9=9A=94?=
 =?UTF-8?q?=E5=9D=97=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/modes/custom_clear.lua  | 16 +++++++---------
 parts/modes/custom_puzzle.lua |  5 ++---
 parts/player/draw.lua         |  4 ++--
 parts/player/init.lua         |  6 +-----
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/parts/modes/custom_clear.lua b/parts/modes/custom_clear.lua
index d59d5040..1fab764c 100644
--- a/parts/modes/custom_clear.lua
+++ b/parts/modes/custom_clear.lua
@@ -31,10 +31,10 @@ local function checkClear(P)
 		D.finished=D.finished+1
 		if FIELD[D.finished+1]then
 			P.waiting=26
-			for _=#P.field,1,-1 do
-				FREEROW.discard(P.field[_])
-				FREEROW.discard(P.visTime[_])
-				P.field[_],P.visTime[_]=nil
+			for i=#P.field,1,-1 do
+				FREEROW.discard(P.field[i])
+				FREEROW.discard(P.visTime[i])
+				P.field[i],P.visTime[i]=nil
 			end
 			setField(P,D.finished+1)
 			SYSFX.newShade(1.4,P.absFieldX,P.absFieldY,300*P.size,610*P.size,.6,.8,.6)
@@ -50,19 +50,17 @@ return{
 	load=function()
 		applyCustomGame()
 
-		local ENV=GAME.modeEnv
-		ENV.dropPiece=PLY.check_lineReach
 		for y=1,20 do
 			if notAir(FIELD[1][y])then
 				--Switch clear sprint mode on
-				ENV.dropPiece=checkClear
+				GAME.modeEnv.dropPiece=checkClear
 				break
 			end
 		end
 
 		PLY.newPlayer(1)
-		local AItype=ENV.opponent:sub(1,2)
-		local AIlevel=tonumber(ENV.opponent:sub(-1))
+		local AItype=GAME.modeEnv.opponent:sub(1,2)
+		local AIlevel=tonumber(GAME.modeEnv.opponent:sub(-1))
 		if AItype=='9S'then
 			PLY.newAIPlayer(2,AIBUILDER('9S',2*AIlevel))
 		elseif AItype=='CC'then
diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua
index 722fddbd..3b1e3b64 100644
--- a/parts/modes/custom_puzzle.lua
+++ b/parts/modes/custom_puzzle.lua
@@ -39,10 +39,9 @@ return{
 	},
 	load=function()
 		applyCustomGame()
+		local AItype=GAME.modeEnv.opponent:sub(1,2)
+		local AIlevel=tonumber(GAME.modeEnv.opponent:sub(-1))
 		PLY.newPlayer(1)
-		local ENV=GAME.modeEnv
-		local AItype=ENV.opponent:sub(1,2)
-		local AIlevel=tonumber(ENV.opponent:sub(-1))
 		if AItype=='9S'then
 			PLY.newAIPlayer(2,AIBUILDER('9S',2*AIlevel))
 		elseif AItype=='CC'then
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index c9dba9f7..7f6f04e8 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -494,7 +494,7 @@ function draw.drawNext_norm(P)
 
 		if ENV.bagLine then
 			gc_setColor(.8,.5,.5)
-			for i=-P.pieceCount%ENV.bagLen,N-1,ENV.bagLen do--i=phase
+			for i=-P.pieceCount%ENV.bagLine,N-1,ENV.bagLine do--i=phase
 				gc_rectangle('fill',2,72*i+3,120,2)
 			end
 		end
@@ -528,7 +528,7 @@ function draw.drawNext_hidden(P)
 
 		if ENV.bagLine then
 			gc_setColor(.8,.5,.5)
-			for i=-P.pieceCount%ENV.bagLen,N-1,ENV.bagLen do--i=phase
+			for i=-P.pieceCount%ENV.bagLine,N-1,ENV.bagLine do--i=phase
 				gc_rectangle('fill',2,72*i+3,120,2)
 			end
 		end
diff --git a/parts/player/init.lua b/parts/player/init.lua
index 1a88c2ae..36a5a464 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -311,11 +311,7 @@ local function applyGameEnv(P)--Finish gameEnv processing
 	ENV.arr=max(ENV.arr,ENV.minarr)
 	ENV.sdarr=max(ENV.sdarr,ENV.minsdarr)
 
-	if ENV.sequence~='bag'and ENV.sequence~='loop'then
-		ENV.bagLine=false
-	else
-		ENV.bagLen=#ENV.seqData
-	end
+	ENV.bagLine=(ENV.sequence=='bag'or ENV.sequence=='loop')and #ENV.seqData
 
 	if ENV.nextCount==0 then ENV.nextPos=false end