From d9920c37727d5894cfb8c03804d22999c078581d Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 16 Sep 2020 18:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=B8=B8=E6=88=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modes/custom_puzzle.lua |  3 +--
 parts/default_data.lua  |  2 +-
 parts/player.lua        | 12 ++++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/modes/custom_puzzle.lua b/modes/custom_puzzle.lua
index 3660172d..99a408f1 100644
--- a/modes/custom_puzzle.lua
+++ b/modes/custom_puzzle.lua
@@ -20,7 +20,6 @@ end
 return{
 	color=color.white,
 	env={
-		puzzle=true,
 		Fkey=function(P)P.modeData.event=1-P.modeData.event end,
 		dropPiece=puzzleCheck,
 	},
@@ -65,7 +64,7 @@ return{
 		setFont(55)
 		mStr(P.stat.row,69,295)
 		mText(drawableText.line,69,360)
-		if P.gameEnv.puzzle and P.modeData.event==0 then
+		if P.modeData.event==0 then
 			local m=puzzleMark
 			for y=1,preField.h do for x=1,10 do
 				local T=preField[y][x]
diff --git a/parts/default_data.lua b/parts/default_data.lua
index 136d2da9..3c1ceb57 100644
--- a/parts/default_data.lua
+++ b/parts/default_data.lua
@@ -17,7 +17,7 @@ setting={
 	face={},
 
 	--Graphic
-	ghost=.3,center=1,
+	block=1,ghost=.3,center=1,
 	smooth=true,grid=false,
 	bagLine=false,
 	lockFX=2,
diff --git a/parts/player.lua b/parts/player.lua
index 6193f6df..431c4c97 100644
--- a/parts/player.lua
+++ b/parts/player.lua
@@ -10,9 +10,7 @@ local setFont=setFont
 
 --------------------------<Data>--------------------------
 local gameEnv0={
-	noTele=false,
-	das=10,arr=2,
-	sddas=2,sdarr=2,
+	das=10,arr=2,sddas=2,sdarr=2,
 	ihs=true,irs=true,ims=true,
 	swap=true,
 
@@ -36,15 +34,16 @@ local gameEnv0={
 	hold=true,oncehold=true,
 	ospin=true,
 	sequence="bag",bag={1,2,3,4,5,6,7},
-	freshMethod=NULL,
 	face=NULL,skin=NULL,
 
 	life=0,
 	pushSpeed=3,
 	block=true,
+	noTele=false,
 	visible="show",
-	Fkey=NULL,puzzle=false,
 	freshLimit=1e99,easyFresh=true,
+
+	Fkey=NULL,
 	fine=false,fineKill=false,
 	target=1e99,dropPiece=NULL,
 	mindas=0,minarr=0,minsdarr=0,
@@ -3010,10 +3009,7 @@ function PLY.newDemoPlayer(id,x,y,size)
 		pushSpeed=3,
 		block=true,
 		visible="show",
-		Fkey=nil,puzzle=false,
 		freshLimit=1e99,easyFresh=true,
-		fine=false,fineKill=false,
-		target=1e99,dropPiece=NULL,
 		mindas=0,minarr=0,minsdarr=0,
 	}
 	applyGameEnv(P)