From 993866ab5b5da6adfc909221886d6c21140986f2 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 11 Oct 2021 02:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8Fmaster=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=A7=BB=E5=85=A5=E8=A7=84=E5=88=99=E5=8C=85?= =?UTF-8?q?=20=E5=BD=BB=E5=BA=95=E7=A7=BB=E9=99=A4=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E9=81=97=E7=95=99=E7=9A=84L=E5=92=8CU=E9=9A=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/eventsets/master_ex.lua | 13 +++++-- parts/eventsets/master_final.lua | 10 +++-- parts/eventsets/master_h.lua | 2 + parts/eventsets/master_l.lua | 54 --------------------------- parts/eventsets/master_n.lua | 2 + parts/eventsets/master_ph.lua | 14 +++++-- parts/eventsets/master_u.lua | 63 -------------------------------- parts/modes.lua | 4 -- parts/modes/master_ex.lua | 7 ---- parts/modes/master_final.lua | 4 -- parts/modes/master_h.lua | 2 - parts/modes/master_l.lua | 33 ----------------- parts/modes/master_n.lua | 2 - parts/modes/master_ph.lua | 8 ---- parts/modes/master_u.lua | 28 -------------- 15 files changed, 29 insertions(+), 217 deletions(-) delete mode 100644 parts/eventsets/master_l.lua delete mode 100644 parts/eventsets/master_u.lua delete mode 100644 parts/modes/master_l.lua delete mode 100644 parts/modes/master_u.lua diff --git a/parts/eventsets/master_ex.lua b/parts/eventsets/master_ex.lua index 3f9d3900..acc6bc0a 100644 --- a/parts/eventsets/master_ex.lua +++ b/parts/eventsets/master_ex.lua @@ -3,10 +3,15 @@ local sectionName={"D","C","B","A","A+","S-","S","S+","S+","SS","SS","U","U","X" local passPoint=16 return{ - drop=0, - lock=15, - wait=15, - fall=6, + drop=0,lock=15, + wait=15,fall=6, + noTele=true, + minarr=1, + nextCount=3, + sequence='hisPool', + visible='fast', + freshLimit=15, + noInitSZO=true, mesDisp=function(P) local h=(3600-P.stat.frame)/10 if h>0 then diff --git a/parts/eventsets/master_final.lua b/parts/eventsets/master_final.lua index c96a5a28..a8f54a2d 100644 --- a/parts/eventsets/master_final.lua +++ b/parts/eventsets/master_final.lua @@ -1,8 +1,10 @@ return{ - drop=0, - lock=12, - wait=10, - fall=10, + drop=0,lock=12, + wait=10,fall=10, + noTele=true, + das=5,arr=1, + freshLimit=15, + easyFresh=false,bone=true, mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, diff --git a/parts/eventsets/master_h.lua b/parts/eventsets/master_h.lua index be7bd792..7f9775d0 100644 --- a/parts/eventsets/master_h.lua +++ b/parts/eventsets/master_h.lua @@ -7,6 +7,8 @@ return{ lock=death_lock[1], wait=death_wait[1], fall=death_fall[1], + noTele=true, + das=6,arr=1, mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, diff --git a/parts/eventsets/master_l.lua b/parts/eventsets/master_l.lua deleted file mode 100644 index 42eedc6a..00000000 --- a/parts/eventsets/master_l.lua +++ /dev/null @@ -1,54 +0,0 @@ -local rush_lock={20,18,16,15,14} -local rush_wait={12,10, 9, 8, 7} -local rush_fall={18,16,14,13,12} - -return{ - drop=0, - lock=rush_lock[1], - wait=rush_wait[1], - fall=rush_fall[1], - mesDisp=function(P) - PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) - end, - dropPiece=function(P) - local D=P.modeData - - local c=#P.clearedRow - if c==0 and D.pt%100==99 then return end - local s=c<3 and c+1 or c==3 and 5 or 7 - if P.combo>7 then s=s+2 - elseif P.combo>3 then s=s+1 - end - D.pt=D.pt+s - - if D.pt%100==99 then - SFX.play('blip_1') - elseif D.pt>=D.target then--Level up! - s=D.target/100 - local E=P.gameEnv - BG.set(s==1 and'bg1'or s==2 and'bg2'or s==3 and'rainbow'or 'rainbow2') - E.lock=rush_lock[s] - E.wait=rush_wait[s] - E.fall=rush_fall[s] - E.das=10-s - if s==2 then - E.arr=2 - elseif s==4 then - E.bone=true - end - - if s==5 then - D.pt=500 - P:win('finish') - else - D.target=D.target+100 - P:stageComplete(s) - end - SFX.play('reach') - end - end, - task=function(P) - P.modeData.pt=0 - P.modeData.target=100 - end, -} diff --git a/parts/eventsets/master_n.lua b/parts/eventsets/master_n.lua index 2e187e7f..1abbcaf2 100644 --- a/parts/eventsets/master_n.lua +++ b/parts/eventsets/master_n.lua @@ -7,6 +7,8 @@ return{ lock=rush_lock[1], wait=rush_wait[1], fall=rush_fall[1], + noTele=true, + das=10,arr=3, mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, diff --git a/parts/eventsets/master_ph.lua b/parts/eventsets/master_ph.lua index 2266b212..c2e62127 100644 --- a/parts/eventsets/master_ph.lua +++ b/parts/eventsets/master_ph.lua @@ -1,9 +1,15 @@ return { - drop=0, - lock=15, - wait=10, - fall=10, + drop=0,lock=15, + wait=10,fall=10, + noTele=true, + das=5,arr=1, + nextCount=2, + sequence='his', + mission={4,4,4,64}, + missionKill=true, + freshLimit=12, + noInitSZO=true, mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, diff --git a/parts/eventsets/master_u.lua b/parts/eventsets/master_u.lua deleted file mode 100644 index c204545c..00000000 --- a/parts/eventsets/master_u.lua +++ /dev/null @@ -1,63 +0,0 @@ -local death_lock={12,11,10,9,8, 7,7,7,6,6} -local death_wait={10, 9, 8,7,6, 6,5,4,4,3} -local death_fall={10, 9, 8,7,6, 5,5,4,3,3} - -return{ - drop=0, - lock=death_lock[1], - wait=death_wait[1], - fall=death_fall[1], - mesDisp=function(P) - PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) - end, - dropPiece=function(P) - local D=P.modeData - - local c=#P.clearedRow - if c==0 and D.pt%100==99 then return end - local s=c<3 and c+1 or c==3 and 5 or 7 - if P.combo>7 then s=s+2 - elseif P.combo>3 then s=s+1 - end - D.pt=D.pt+s - - if D.pt%100==99 then - SFX.play('blip_1') - elseif D.pt>=D.target then--Level up! - s=D.target/100 - local E=P.gameEnv - SFX.play('reach') - E.lock=death_lock[s] - E.wait=death_wait[s] - E.fall=death_fall[s] - E.das=math.floor(6.9-s*.4) - if s==1 then - BG.set('rainbow') - elseif s==2 then - BG.set('rainbow2') - elseif s==3 then - BG.set('glow') - elseif s==5 then - if P.stat.frame>183*60 then - D.pt=500 - P:win('finish') - return - else - P.gameEnv.freshLimit=10 - BG.set('lightning') - BGM.play('secret7th remix') - end - elseif s==10 then - D.pt=1000 - P:win('finish') - return - end - D.target=D.target+100 - P:stageComplete(s) - end - end, - task=function(P) - P.modeData.pt=0 - P.modeData.target=100 - end, -} diff --git a/parts/modes.lua b/parts/modes.lua index 5dd10b77..66ce4717 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -127,10 +127,6 @@ return{ {name='sprintSym'}, {name='techrash_u'}, - --Old - {name='master_l'}, - {name='master_u'}, - --Special {name='custom_puzzle'}, {name='custom_clear'}, diff --git a/parts/modes/master_ex.lua b/parts/modes/master_ex.lua index f5e7ff8f..f3d39c0b 100644 --- a/parts/modes/master_ex.lua +++ b/parts/modes/master_ex.lua @@ -3,13 +3,6 @@ local sectionName={"D","C","B","A","A+","S-","S","S+","S+","SS","SS","U","U","X" return{ color=COLOR.lBlue, env={ - noTele=true, - minarr=1, - nextCount=3, - sequence='hisPool', - visible='fast', - freshLimit=15, - noInitSZO=true, eventSet='master_ex', bg='blockspace',bgm='hope', }, diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 77c402a3..7d7ce853 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -1,10 +1,6 @@ return{ color=COLOR.lGray, env={ - noTele=true, - das=5,arr=1, - freshLimit=15, - easyFresh=false,bone=true, sequence="bagES", eventSet='master_final', bg='lightning',bgm='rectification', diff --git a/parts/modes/master_h.lua b/parts/modes/master_h.lua index 52b2f900..8b03548b 100644 --- a/parts/modes/master_h.lua +++ b/parts/modes/master_h.lua @@ -1,8 +1,6 @@ return{ color=COLOR.red, env={ - noTele=true, - das=6,arr=1, freshLimit=15, sequence="bagES", eventSet='master_h', diff --git a/parts/modes/master_l.lua b/parts/modes/master_l.lua deleted file mode 100644 index 070d67fe..00000000 --- a/parts/modes/master_l.lua +++ /dev/null @@ -1,33 +0,0 @@ -return{ - color=COLOR.red, - env={ - noTele=true, - das=9,arr=3, - freshLimit=15, - sequence="bagES", - eventSet='master_l', - bg='bg1',bgm='secret8th', - }, - slowMark=true, - score=function(P)return{P.modeData.pt,P.stat.time}end, - scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, - comp=function(a,b) - return a[1]>b[1]or(a[1]==b[1]and a[2]=460 and 3 or - S>=350 and 2 or - S>=200 and 1 or - S>=50 and 0 - end - end, -} diff --git a/parts/modes/master_n.lua b/parts/modes/master_n.lua index a989a035..2120f8fd 100644 --- a/parts/modes/master_n.lua +++ b/parts/modes/master_n.lua @@ -1,8 +1,6 @@ return{ color=COLOR.red, env={ - noTele=true, - das=10,arr=3, sequence="bagES", freshLimit=15, eventSet='master_n', diff --git a/parts/modes/master_ph.lua b/parts/modes/master_ph.lua index bdf3dcf8..591d9338 100644 --- a/parts/modes/master_ph.lua +++ b/parts/modes/master_ph.lua @@ -1,14 +1,6 @@ return{ color=COLOR.black, env={ - noTele=true, - das=5,arr=1, - nextCount=2, - sequence='his', - mission={4,4,4,64}, - missionKill=true, - freshLimit=12, - noInitSZO=true, eventSet='master_ph', bg='blockspace',bgm='super7th', }, diff --git a/parts/modes/master_u.lua b/parts/modes/master_u.lua deleted file mode 100644 index 940ffe36..00000000 --- a/parts/modes/master_u.lua +++ /dev/null @@ -1,28 +0,0 @@ - -return{ - color=COLOR.red, - env={ - noTele=true, - das=6,arr=1, - freshLimit=15, - sequence="bagES", - eventSet='master_u', - bg='bg2',bgm='secret7th', - }, - slowMark=true, - score=function(P)return{P.modeData.pt,P.stat.time}end, - scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, - comp=function(a,b) - return a[1]>b[1]or(a[1]==b[1]and a[2]=1000 and 5 or - S>=800 and 4 or - S>=500 and 3 or - S>=300 and 2 or - S>=100 and 1 or - S>=50 and 0 - end, -}