From ae19255b2fbfdb5d90a2d74de89f32b78ff2e0c4 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 2 Sep 2020 19:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=BA=A6=E6=9D=9F=E5=8F=98?= =?UTF-8?q?=E9=87=8FnoFly=E6=94=B9=E4=B8=BAnoTele=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modes/GM.lua | 2 +- modes/classic_fast.lua | 2 +- modes/marathon_hard.lua | 2 +- modes/marathon_normal.lua | 2 +- modes/master_advance.lua | 2 +- modes/master_beginner.lua | 2 +- modes/master_final.lua | 2 +- modes/ultra.lua | 2 +- parts/player.lua | 25 ++++++++++++++----------- 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/modes/GM.lua b/modes/GM.lua index cccc8301..c8dea5db 100644 --- a/modes/GM.lua +++ b/modes/GM.lua @@ -15,7 +15,7 @@ end return{ color=color.lBlue, env={ - noFly=true, + noTele=true, minarr=1, _20G=true, drop=0,lock=15, diff --git a/modes/classic_fast.lua b/modes/classic_fast.lua index 99389155..f998fe81 100644 --- a/modes/classic_fast.lua +++ b/modes/classic_fast.lua @@ -16,7 +16,7 @@ end return{ color=color.lBlue, env={ - noFly=true, + noTele=true, das=16,arr=6,sddas=2,sdarr=2, center=0,ghost=0, drop=3,lock=3,wait=10,fall=25, diff --git a/modes/marathon_hard.lua b/modes/marathon_hard.lua index 4d3ec1a6..0b45aa9d 100644 --- a/modes/marathon_hard.lua +++ b/modes/marathon_hard.lua @@ -17,7 +17,7 @@ end return{ color=color.magenta, env={ - noFly=true, + noTele=true, mindas=7,minarr=1,minsdarr=1, drop=.5,wait=8,fall=20, target=50,dropPiece=check, diff --git a/modes/marathon_normal.lua b/modes/marathon_normal.lua index 63df366a..6363fc80 100644 --- a/modes/marathon_normal.lua +++ b/modes/marathon_normal.lua @@ -16,7 +16,7 @@ end return{ color=color.green, env={ - noFly=true, + noTele=true, wait=8,fall=20, target=10,dropPiece=check_LVup, mindas=7,minarr=1,minsdarr=1, diff --git a/modes/master_advance.lua b/modes/master_advance.lua index 9e12421e..bb711e06 100644 --- a/modes/master_advance.lua +++ b/modes/master_advance.lua @@ -36,7 +36,7 @@ end return{ color=color.red, env={ - noFly=true, + noTele=true, das=6,arr=1, _20G=true, lock=death_lock[1], diff --git a/modes/master_beginner.lua b/modes/master_beginner.lua index 9dca7aa4..b77fe722 100644 --- a/modes/master_beginner.lua +++ b/modes/master_beginner.lua @@ -40,7 +40,7 @@ end return{ color=color.red, env={ - noFly=true, + noTele=true, das=9,arr=3, _20G=true, lock=rush_lock[1], diff --git a/modes/master_final.lua b/modes/master_final.lua index 9b132400..064059de 100644 --- a/modes/master_final.lua +++ b/modes/master_final.lua @@ -39,7 +39,7 @@ end return{ color=color.lGrey, env={ - noFly=true, + noTele=true, das=5,arr=1, _20G=true,lock=12, wait=10,fall=10, diff --git a/modes/ultra.lua b/modes/ultra.lua index 92a84b47..e4c16190 100644 --- a/modes/ultra.lua +++ b/modes/ultra.lua @@ -3,7 +3,7 @@ local warnTime={60,90,105,115,116,117,118,119,120} return{ color=color.lGrey, env={ - noFly=true, + noTele=true, minarr=1,minsdarr=1, drop=60,lock=60, fall=20, diff --git a/parts/player.lua b/parts/player.lua index bcb94b2b..f1a253bb 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -8,7 +8,7 @@ local scr=scr--Screen camera local setFont=setFont ---------------------------------------------------- local gameEnv0={ - noFly=false, + noTele=false, das=10,arr=2, sddas=2,sdarr=2, ihs=true,irs=true,ims=true, @@ -2456,7 +2456,7 @@ function player.act.restart(P) end end function player.act.insLeft(P,auto) - if P.gameEnv.nofly or not P.cur then return end + if P.gameEnv.noTele or not P.cur then return end local x0=P.curX while not P:ifoverlap(P.cur.bk,P.curX-1,P.curY)do if P.gameEnv.moveFX and P.gameEnv.block then @@ -2478,7 +2478,7 @@ function player.act.insLeft(P,auto) end end function player.act.insRight(P,auto) - if P.gameEnv.nofly or not P.cur then return end + if P.gameEnv.noTele or not P.cur then return end local x0=P.curX while not P:ifoverlap(P.cur.bk,P.curX+1,P.curY)do if P.gameEnv.moveFX and P.gameEnv.block then @@ -2500,7 +2500,8 @@ function player.act.insRight(P,auto) end end function player.act.insDown(P) - if P.cur and P.curY>P.imgY then + if P.gameEnv.noTele or not P.cur then return end + if P.curY>P.imgY then if P.gameEnv.dropFX and P.gameEnv.block and P.curY-P.imgY-P.r>-1 then P:creatDropFX(P.curX,P.curY-1,P.c,P.curY-P.imgY-P.r+1) end @@ -2524,7 +2525,8 @@ function player.act.down1(P) end end function player.act.down4(P) - if P.cur and P.curY>P.imgY then + if P.gameEnv.noTele or not P.cur then return end + if P.curY>P.imgY then local y=max(P.cur-4,P.imgY) if P.gameEnv.dropFX and P.gameEnv.block and P.curY-y-P.r>-1 then P:creatDropFX(P.curX,P.curY-1,P.c,P.curY-y-P.r+1) @@ -2535,7 +2537,8 @@ function player.act.down4(P) end end function player.act.down10(P) - if P.cur and P.curY>P.imgY then + if P.gameEnv.noTele or not P.cur then return end + if P.curY>P.imgY then local y=max(P.cur-10,P.imgY) if P.gameEnv.dropFX and P.gameEnv.block and P.curY-y-P.r>-1 then P:creatDropFX(P.curX,P.curY-1,P.c,P.curY-y-P.r+1) @@ -2546,24 +2549,24 @@ function player.act.down10(P) end end function player.act.dropLeft(P) - if P.gameEnv.nofly or not P.cur then return end + if P.gameEnv.noTele or not P.cur then return end P.act.insLeft(P) P.act.hardDrop(P) end function player.act.dropRight(P) - if P.gameEnv.nofly or not P.cur then return end + if P.gameEnv.noTele or not P.cur then return end P.act.insRight(P) P.act.hardDrop(P) end function player.act.zangiLeft(P) - if P.gameEnv.nofly or not P.cur then return end + if P.gameEnv.noTele or not P.cur then return end P.act.insLeft(P) P.act.insDown(P) P.act.insRight(P) P.act.hardDrop(P) end function player.act.zangiRight(P) - if P.gameEnv.nofly or not P.cur then return end + if P.gameEnv.noTele or not P.cur then return end P.act.insRight(P) P.act.insDown(P) P.act.insLeft(P) @@ -2803,7 +2806,7 @@ function PLY.newDemoPlayer(id,x,y,size) P.field,P.visTime={},{} P.atkBuffer={sum=0} P.gameEnv={ - noFly=false, + noTele=false, das=10,arr=2, sddas=2,sdarr=2, swap=true,