From fa1cebca2d42455c799fef124e903110df258a98 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 2 Mar 2021 01:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AF=E5=8F=98=E5=9C=BA?=
 =?UTF-8?q?=E5=9C=B0=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gametoolfunc.lua    |  2 +-
 parts/player/draw.lua     | 12 +++++++-----
 parts/player/gameEnv0.lua |  1 +
 parts/player/player.lua   |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index d4129114..261c71fc 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -818,7 +818,7 @@ function checkWarning()
 					end
 				end
 			end
-			GAME.warnLVL0=math.log(height-15+P1.atkBuffer.sum*.8)
+			GAME.warnLVL0=math.log(height-(P1.gameEnv.fieldH-5)+P1.atkBuffer.sum*.8)
 		end
 		local _=GAME.warnLVL
 		if _<GAME.warnLVL0 then
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index abed2a26..688e8eae 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -212,7 +212,7 @@ local function drawBlock(P,clr)
 end
 local function drawNextPreview(P,B)
 	gc_setColor(1,1,1,.8)
-	local y=int(21-modf(B.sc[1]))+ceil(P.fieldBeneath/30)
+	local y=int(P.gameEnv.fieldH+1-modf(B.sc[1]))+ceil(P.fieldBeneath/30)
 	B=B.bk
 	local x=int(6-#B[1]*.5)
 	for i=1,#B do for j=1,#B[1]do
@@ -572,9 +572,10 @@ function draw.norm(P)
 					--Set scissor
 					gc.setScissor(SCR.x+(P.absFieldX+P.fieldOff.x)*SCR.k,SCR.y+(P.absFieldY+P.fieldOff.y)*SCR.k,300*P.size*SCR.k,610*P.size*SCR.k)
 
+					local fieldTop=-ENV.fieldH*30
 					--Draw dangerous area
 					gc_setColor(1,0,0,.3)
-					gc_rectangle("fill",0,-600,300,-FUP-FBN-10)
+					gc_rectangle("fill",0,fieldTop,300,-FUP-FBN-fieldTop-620)
 
 					--Draw field
 					drawField(P)
@@ -582,7 +583,7 @@ function draw.norm(P)
 					--Draw spawn line
 					gc_setColor(1,sin(t)*.4+.5,0,.5)
 					gc_setLineWidth(4)
-					gc_line(0,-600-FBN,300,-600-FBN)
+					gc_line(0,fieldTop-FBN,300,fieldTop-FBN)
 
 					--Draw FXs
 					drawFXs(P)
@@ -729,9 +730,10 @@ function draw.norm_remote(P)
 					--Set scissor
 					gc.setScissor(SCR.x+(P.absFieldX+P.fieldOff.x)*SCR.k,SCR.y+(P.absFieldY+P.fieldOff.y)*SCR.k,300*P.size*SCR.k,610*P.size*SCR.k)
 
+					local fieldTop=-ENV.fieldH*30
 					--Draw dangerous area
 					gc_setColor(1,0,0,.3)
-					gc_rectangle("fill",0,-600,300,-FUP-FBN-10)
+					gc_rectangle("fill",0,fieldTop,300,-FUP-FBN-fieldTop-620)
 
 					--Draw field
 					drawField(P)
@@ -739,7 +741,7 @@ function draw.norm_remote(P)
 					--Draw spawn line
 					gc_setColor(1,sin(t)*.4+.5,0,.5)
 					gc_setLineWidth(4)
-					gc_line(0,-600-FBN,300,-600-FBN)
+					gc_line(0,fieldTop-FBN,300,fieldTop-FBN)
 
 					--Draw FXs
 					drawFXs(P)
diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua
index 7ae7ee23..333e9107 100644
--- a/parts/player/gameEnv0.lua
+++ b/parts/player/gameEnv0.lua
@@ -1,4 +1,5 @@
 return{
+	fieldH=20,
 	das=10,
 	arr=2,
 	dascut=0,
diff --git a/parts/player/player.lua b/parts/player/player.lua
index b4f32b37..51dd7bc6 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -533,7 +533,7 @@ function Player.resetBlock(P)
 	local sc=P.cur.sc
 	local id=P.cur.id
 	P.curX=int(6-#B[1]*.5)
-	local y=int(21-modf(sc[1]))+ceil(P.fieldBeneath/30)
+	local y=int(P.gameEnv.fieldH+1-modf(sc[1]))+ceil(P.fieldBeneath/30)
 	P.curY=y
 	P.minY=y+sc[1]