From 621d753a5f9fb96a4660b85d8732e6c6497c2c56 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 13 Nov 2020 20:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=A4=E4=B8=AA=E6=97=A0?= =?UTF-8?q?=E5=B0=BD=E6=A8=A1=E5=BC=8F=E7=9A=84=E8=AF=84=E7=BA=A7=E8=A6=81?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=B2=99=E7=9B=92=E5=85=B3?= =?UTF-8?q?=E5=8D=A1=EF=BC=9B=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=B8=8A=EF=BC=88=E8=99=BD=E7=84=B6=E4=B9=8B=E5=89=8D=E4=B9=9F?= =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E8=A7=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 6 ++++++ modes/infinite.lua | 13 ------------- modes/infinite_dig.lua | 13 ------------- parts/modes.lua | 4 ++-- parts/player/player.lua | 2 +- parts/scenes/mode.lua | 6 +++--- 6 files changed, 12 insertions(+), 32 deletions(-) diff --git a/main.lua b/main.lua index 0f671989..131fed83 100644 --- a/main.lua +++ b/main.lua @@ -197,6 +197,12 @@ do R.tech_finesse2=R["tech_finesse+"] R["tech_normal+"],R["tech_hard+"],R["tech_lunatic+"],R["tech_finesse+"]=nil end + if R.infinite and R.infinite~=6 then + R.infinite=6 + R.infinite_dig=6 + fs.remove("infinite.dat") + fs.remove("infinite_dig.dat") + end if not text.modes[STAT.lastPlay]then STAT.lastPlay="sprint_10" end diff --git a/modes/infinite.lua b/modes/infinite.lua index aaf855a3..46128619 100644 --- a/modes/infinite.lua +++ b/modes/infinite.lua @@ -16,17 +16,4 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.score}end, - scoreDisp=function(D)return tostring(D[1])end, - comp=function(a,b)return a[1]>b[1]end, - getRank=function(P) - local L=P.stat.row - return - L>=1200 and 5 or - L>=900 and 4 or - L>=600 and 3 or - L>=300 and 2 or - L>=100 and 1 or - L>=20 and 0 - end, } \ No newline at end of file diff --git a/modes/infinite_dig.lua b/modes/infinite_dig.lua index 81d8fdad..89ae2485 100644 --- a/modes/infinite_dig.lua +++ b/modes/infinite_dig.lua @@ -51,17 +51,4 @@ return{ mText(drawableText.atk,69,433) mText(drawableText.eff,69,545) end, - score=function(P)return{P.stat.dig}end, - scoreDisp=function(D)return D[1].." Lines"end, - comp=function(a,b)return a[1]>b[1]end, - getRank=function(P) - local L=P.stat.dig - return - L>=400 and 5 or - L>=300 and 4 or - L>=200 and 3 or - L>=100 and 2 or - L>=40 and 1 or - L>=5 and 0 - end, } \ No newline at end of file diff --git a/parts/modes.lua b/parts/modes.lua index 4d4d6f88..8764dec1 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -102,6 +102,6 @@ return{ {name="infinite", x=-800, y=-400, size=35,shape=1,icon="infinite"}, {name="infinite_dig", x=-1000, y=-600, size=35,shape=1,icon="infinite"}, - {name="custom_puzzle", x=0, y=2600, size=45,shape=1,icon="none"}, - {name="custom_clear", x=0, y=2600, size=45,shape=1,icon="none"}, + {name="custom_puzzle"}, + {name="custom_clear"}, } \ No newline at end of file diff --git a/parts/player/player.lua b/parts/player/player.lua index eb2cbef9..ce7994a1 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1264,7 +1264,7 @@ local function gameOver()--Save record local m=M.unlock[i] local n=MODES[m].name if not RANKS[n]then - RANKS[n]=MODES[m].score and 0 or 6 + RANKS[n]=MODES[m].getRank and 0 or 6 needSave=true end end diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index d35456e6..b21bfdaa 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -38,7 +38,7 @@ local function onMode(x,y) x=(cam.x1-640+x)/cam.k1 y=(cam.y1-360+y)/cam.k1 for name,M in next,MODES do - if RANKS[name]then + if RANKS[name]and M.x then local s=M.size if M.shape==1 then if x>M.x-s and xM.y-s and y