From 0eea1ae0c6636c0f9e175d1cebddc11505f8a79b Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 21 Sep 2021 04:31:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E5=85=B8=E6=A8=A1=E5=BC=8F=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=8D=A2=E6=96=B0=EF=BC=8C=E5=8F=AA=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E4=BB=8E9/18/29=E5=BC=80=E5=A7=8B=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E6=B3=A8=E6=84=8F=EF=BC=9A=E6=8F=90?= =?UTF-8?q?=E9=80=9F=E7=9A=84=E8=A1=8C=E6=95=B0=E5=92=8C=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C=E5=85=A8=E5=92=8C=E5=8E=9F?= =?UTF-8?q?=E7=89=88=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/eventsets/classic_e.lua | 37 ++++++++++++--------------- parts/eventsets/classic_h.lua | 24 ++++++++---------- parts/eventsets/classic_l.lua | 42 ------------------------------ parts/eventsets/classic_n.lua | 48 ----------------------------------- parts/eventsets/classic_u.lua | 23 ++++++++--------- parts/language/lang_en.lua | 1 - parts/language/lang_es.lua | 1 - parts/language/lang_fr.lua | 1 - parts/language/lang_pt.lua | 1 - parts/language/lang_yygq.lua | 1 - parts/language/lang_zh.lua | 1 - parts/language/lang_zh2.lua | 1 - parts/language/lang_zh3.lua | 9 +++---- parts/modes.lua | 5 ++-- parts/modes/classic_e.lua | 15 +++-------- parts/modes/classic_fast.lua | 31 ---------------------- parts/modes/classic_h.lua | 17 ++++--------- parts/modes/classic_l.lua | 31 ---------------------- parts/modes/classic_n.lua | 31 ---------------------- parts/modes/classic_u.lua | 7 ----- 20 files changed, 52 insertions(+), 275 deletions(-) delete mode 100644 parts/eventsets/classic_l.lua delete mode 100644 parts/eventsets/classic_n.lua delete mode 100644 parts/modes/classic_fast.lua delete mode 100644 parts/modes/classic_l.lua delete mode 100644 parts/modes/classic_n.lua diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua index e834b2f1..772accc6 100644 --- a/parts/eventsets/classic_e.lua +++ b/parts/eventsets/classic_e.lua @@ -1,14 +1,9 @@ return{ - das=16, - arr=6, - sddas=2, - sdarr=2, - irs=false, - ims=false, - drop=6, - lock=6, - wait=10, - fall=25, + das=16,arr=6, + sddas=6,sdarr=6, + irs=false,ims=false, + drop=6,lock=6, + wait=10,fall=25, freshLimit=0, fieldH=19, nextCount=1, @@ -19,8 +14,8 @@ return{ keyCancel={5,6}, mesDisp=function(P) setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 9 or r<22 and r or("%02x"):format(r*10-220),63,210) + local r=P.modeData.target/10 + mStr(r<10 and 9 or r<30 and r or("%02x"):format(r*10-300),63,210) mText(drawableText.speedLV,63,290) PLY.draw.drawProgress(P.stat.row,P.modeData.target) end, @@ -30,25 +25,25 @@ return{ dropPiece=function(P) local D=P.modeData if P.stat.row>=D.target then - D.target=D.target+10 if D.target==110 then P.gameEnv.drop,P.gameEnv.lock=5,5 - SFX.play('blip_1') + P.gameEnv.sddas,P.gameEnv.sdarr=5,5 + SFX.play('blip_2',.7) elseif D.target==140 then P.gameEnv.drop,P.gameEnv.lock=4,4 - SFX.play('blip_1') + P.gameEnv.sddas,P.gameEnv.sdarr=4,4 + SFX.play('blip_2',.7) elseif D.target==170 then P.gameEnv.drop,P.gameEnv.lock=3,3 - SFX.play('blip_1') + P.gameEnv.sddas,P.gameEnv.sdarr=3,3 + SFX.play('blip_2',.7) elseif D.target==200 then - P.gameEnv.drop,P.gameEnv.lock=2,2 - SFX.play('blip_1') - elseif D.target==300 then - P.gameEnv.drop,P.gameEnv.lock=1,1 - SFX.play('blip_1') + P:win('finish') + return else SFX.play('reach') end + D.target=D.target+10 end end, } diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index 82cb43c3..0813b42f 100644 --- a/parts/eventsets/classic_h.lua +++ b/parts/eventsets/classic_h.lua @@ -1,14 +1,9 @@ return{ - das=16, - arr=6, - sddas=2, - sdarr=2, - irs=false, - ims=false, - drop=3, - lock=3, - wait=10, - fall=25, + das=16,arr=6, + sddas=3,sdarr=3, + irs=false,ims=false, + drop=3,lock=3, + wait=10,fall=25, freshLimit=0, fieldH=19, nextCount=1, @@ -19,7 +14,7 @@ return{ keyCancel={5,6}, mesDisp=function(P) setFont(75) - local r=P.modeData.target*.1 + local r=P.modeData.target/10 mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210) mText(drawableText.speedLV,63,290) PLY.draw.drawProgress(P.stat.row,P.modeData.target) @@ -30,16 +25,17 @@ return{ dropPiece=function(P) local D=P.modeData if P.stat.row>=D.target then - D.target=D.target+10 if D.target==110 then P.gameEnv.drop,P.gameEnv.lock=2,2 + P.gameEnv.sddas,P.gameEnv.sdarr=2,2 SFX.play('blip_1') elseif D.target==200 then - P.gameEnv.drop,P.gameEnv.lock=1,1 - SFX.play('blip_1') + P:win('finish') + return else SFX.play('reach') end + D.target=D.target+10 end end, } diff --git a/parts/eventsets/classic_l.lua b/parts/eventsets/classic_l.lua deleted file mode 100644 index c12d2cec..00000000 --- a/parts/eventsets/classic_l.lua +++ /dev/null @@ -1,42 +0,0 @@ -return{ - das=16, - arr=6, - sddas=2, - sdarr=2, - irs=false, - ims=false, - drop=2, - lock=2, - wait=10, - fall=25, - freshLimit=0, - fieldH=19, - nextCount=1, - holdCount=0, - RS='Classic', - sequence='rnd', - noTele=true, - keyCancel={5,6}, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 19 or r<22 and r+8 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, - task=function(P) - P.modeData.target=10 - end, - dropPiece=function(P) - local D=P.modeData - if P.stat.row>=D.target then - D.target=D.target+10 - if D.target==200 then - P.gameEnv.drop,P.gameEnv.lock=1,1 - SFX.play('blip_1') - else - SFX.play('reach') - end - end - end, -} diff --git a/parts/eventsets/classic_n.lua b/parts/eventsets/classic_n.lua deleted file mode 100644 index a1681bb4..00000000 --- a/parts/eventsets/classic_n.lua +++ /dev/null @@ -1,48 +0,0 @@ -return{ - das=16, - arr=6, - sddas=2, - sdarr=2, - irs=false, - ims=false, - drop=4, - lock=4, - wait=10, - fall=25, - freshLimit=0, - fieldH=19, - nextCount=1, - holdCount=0, - RS='Classic', - sequence='rnd', - noTele=true, - keyCancel={5,6}, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 15 or r<22 and r+5 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, - task=function(P) - P.modeData.target=10 - end, - dropPiece=function(P) - local D=P.modeData - if P.stat.row>=D.target then - D.target=D.target+10 - if D.target==110 then - P.gameEnv.drop,P.gameEnv.lock=3,3 - SFX.play('blip_1') - elseif D.target==140 then - P.gameEnv.drop,P.gameEnv.lock=2,2 - SFX.play('blip_1') - elseif D.target==240 then - P.gameEnv.drop,P.gameEnv.lock=1,1 - SFX.play('blip_1') - else - SFX.play('reach') - end - end - end, -} diff --git a/parts/eventsets/classic_u.lua b/parts/eventsets/classic_u.lua index 59d4b88a..9af635a2 100644 --- a/parts/eventsets/classic_u.lua +++ b/parts/eventsets/classic_u.lua @@ -1,14 +1,9 @@ return{ - das=16, - arr=6, - sddas=2, - sdarr=2, - irs=false, - ims=false, - drop=1, - lock=1, - wait=10, - fall=25, + das=16,arr=6, + sddas=1,sdarr=1, + irs=false,ims=false, + drop=1,lock=1, + wait=10,fall=25, freshLimit=0, fieldH=19, nextCount=1, @@ -19,8 +14,8 @@ return{ keyCancel={5,6}, mesDisp=function(P) setFont(75) - local r=P.modeData.target*.1 - mStr(r<22 and 29 or("%02x"):format(r*10-220),63,210) + local r=P.modeData.target/10 + mStr(r==1 and 29 or("%02x"):format(r*10-20),63,210) mText(drawableText.speedLV,63,290) PLY.draw.drawProgress(P.stat.row,P.modeData.target) end, @@ -30,6 +25,10 @@ return{ dropPiece=function(P) local D=P.modeData if P.stat.row>=D.target then + if D.target==100 then + P:win('finish') + return + end D.target=D.target+10 SFX.play('reach') end diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 6a770e70..13940fd7 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -840,7 +840,6 @@ return{ ['master_l']= {"Master", "LUNATIC"}, ['master_u']= {"Master", "ULTIMATE"}, - ['classic_fast']= {"Classic", "CTWC"}, ['custom_clear']= {"Custom", "NORMAL"}, ['custom_puzzle']= {"Custom", "PUZZLE"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 0dfde2ac..7480286d 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -744,7 +744,6 @@ return{ ['master_l']= {"Master", "Lunático"}, ['master_u']= {"Master", "Supremo"}, - ['classic_fast']= {"Clásico", "CTWC"}, ['custom_clear']= {"Personalizado", "Normal"}, ['custom_puzzle']= {"Personalizado", "Puzzle"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 836e5040..57f795d3 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -747,7 +747,6 @@ return{ ['master_l']= {"Master", "LUNATIQUE"}, ['master_u']= {"Master", "ULTIME"}, - ['classic_fast']= {"Classic", "CTWC"}, ['custom_clear']= {"Perso.", "NORMAL"}, ['custom_puzzle']= {"Perso.", "PUZZLE"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 316f4d2b..8c7a8818 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -829,7 +829,6 @@ return{ ['master_l']= {"Mestre", "LUNÁTICO"}, ['master_u']= {"Mestre", "ULTIMATE"}, - ['classic_fast']= {"Clássico", "CTWC"}, ['custom_clear']= {"Custom", "NORMAL"}, ['custom_puzzle']= {"Custom", "PUZZLE"}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 03185684..a1c8d194 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -329,7 +329,6 @@ return{ ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, - ['classic_fast']= {"高速经典", "CTWC"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index d616110e..f3ab04ed 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -841,7 +841,6 @@ return{ ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, - ['classic_fast']= {"高速经典", "CTWC"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index db394ac3..21c17b98 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -227,7 +227,6 @@ return{ ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, - ['classic_fast']= {"高速经典", "CTWC"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index d7e25c8f..9455a988 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -158,7 +158,7 @@ return{ "收到:", "清除:", "旋转:", - "商对商/商对商对商/个人电脑/直升机性能计算机:", + "商对商/商商商/个人电脑/直升机性能电脑:", "技巧:", }, radar={"很棒","关","攻击","发送","自给能探测器","挖掘"}, @@ -173,7 +173,7 @@ return{ "挖掘/挖掘:", "效率/挖掘效率:", "商对商/商对商对商:", - "个人电脑/直升机性能计算机:", + "个人电脑/直升机性能电脑:", "技巧错误/技巧率:", }, aboutTexts={ @@ -450,7 +450,7 @@ return{ b13="音降:", b14="下降1:", b15="下降4:", b16="下降10:", b17="左下降:", b18="右下角:",b19="左桑吉:", b20="右桑吉:", - norm="正常", + norm="正常", pro="专业的", hide="显示虚拟密钥", icon="偶像", @@ -788,7 +788,7 @@ return{ ['blind_l']= {"看不见的", "突然+", "对于专业人士"}, ['blind_u']= {"看不见的", "?", "你准备好了吗?"}, ['blind_wtf']= {"看不见的", "世界跆拳道联盟", "你还没准备好"}, - ['classic_e']= {"经典", "正常", "80年代的低速娱乐"}, + ['classic_e']= {"经典", "容易", "80年代的低速娱乐"}, ['classic_h']= {"经典", "困难", "80年代的中速娱乐"}, ['classic_u']= {"经典", "终极", "80年代的高速娱乐"}, ['survivor_e']= {"幸存者", "容易", "你能活多久?"}, @@ -839,7 +839,6 @@ return{ ['master_l']= {"主人", "疯子"}, ['master_u']= {"主人", "终极"} , - ['classic_fast']= {"经典", "CTWC"}, ['custom_clear']= {"习俗", "正常"} , ['custom_puzzle']= {"习俗", "令人费解的"}, diff --git a/parts/modes.lua b/parts/modes.lua index 67115730..086729b2 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -62,8 +62,8 @@ return{ {name='blind_wtf', x=150, y=-1200, size=25,shape=2,icon="hidden"}, {name='classic_e', x=-150, y=-850, size=40,shape=1,icon="classic", unlock={'classic_h'}}, - {name='classic_h', x=-150, y=-950, size=35,shape=2,icon="classic", unlock={'classic_u'}}, - {name='classic_u', x=-150, y=-1050, size=30,shape=2,icon="classic"}, + {name='classic_h', x=-150, y=-970, size=35,shape=2,icon="classic", unlock={'classic_u'}}, + {name='classic_u', x=-150, y=-1090, size=30,shape=2,icon="classic"}, {name='survivor_e', x=300, y=-600, size=40,shape=1,icon="survivor", unlock={'survivor_n'}}, {name='survivor_n', x=500, y=-600, size=40,shape=1,icon="survivor", unlock={'survivor_h','attacker_h','defender_n','dig_h'}}, @@ -127,7 +127,6 @@ return{ --Old {name='master_l'}, {name='master_u'}, - {name='classic_fast'}, --Special {name='custom_puzzle'}, diff --git a/parts/modes/classic_e.lua b/parts/modes/classic_e.lua index 591f5b43..64cd21e2 100644 --- a/parts/modes/classic_e.lua +++ b/parts/modes/classic_e.lua @@ -8,24 +8,17 @@ return{ bg='rgb',bgm='magicblock', }, slowMark=true, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 9 or r<22 and r or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, score=function(P)return{P.stat.score,P.stat.row}end, scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=150 and 5 or - L>=120 and 4 or - L>=90 and 3 or + L>=200 and 5 or + L>=140 and 4 or + L>=100 and 3 or L>=60 and 2 or - L>=40 and 1 or + L>=30 and 1 or L>=10 and 0 end, } diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua deleted file mode 100644 index 2f1028e2..00000000 --- a/parts/modes/classic_fast.lua +++ /dev/null @@ -1,31 +0,0 @@ -return{ - color=COLOR.lBlue, - env={ - center=0,ghost=0, - smooth=false, - face={0,0,2,2,2,0,0}, - eventSet='classic_h', - bg='rgb',bgm='magicblock', - }, - slowMark=true, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, - score=function(P)return{P.stat.score,P.stat.row}end, - scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=191 and 4 or - L>=110 and 3 or - L>=50 and 2 or - L>=5 and 1 or - L>=1 and 0 - end, -} diff --git a/parts/modes/classic_h.lua b/parts/modes/classic_h.lua index d45eca98..b0ec0fbb 100644 --- a/parts/modes/classic_h.lua +++ b/parts/modes/classic_h.lua @@ -8,24 +8,17 @@ return{ bg='rgb',bgm='magicblock', }, slowMark=true, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, score=function(P)return{P.stat.score,P.stat.row}end, scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=100 and 5 or - L>=70 and 4 or - L>=50 and 3 or - L>=30 and 2 or - L>=10 and 1 or + L>=200 and 5 or + L>=140 and 4 or + L>=100 and 3 or + L>=60 and 2 or + L>=30 and 1 or L>=1 and 0 end, } diff --git a/parts/modes/classic_l.lua b/parts/modes/classic_l.lua deleted file mode 100644 index e749b486..00000000 --- a/parts/modes/classic_l.lua +++ /dev/null @@ -1,31 +0,0 @@ -return{ - color=COLOR.lBlue, - env={ - center=0,ghost=0, - smooth=false, - face={0,0,2,2,2,0,0}, - eventSet='classic_l', - bg='rgb',bgm='magicblock', - }, - slowMark=true, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<12 and 19 or r<22 and r+8 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, - score=function(P)return{P.stat.score,P.stat.row}end, - scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=30 and 5 or - L>=20 and 4 or - L>=15 and 3 or - L>=10 and 2 or - L>=5 and 1 or - L>=1 and 0 - end, -} diff --git a/parts/modes/classic_n.lua b/parts/modes/classic_n.lua deleted file mode 100644 index ebb9af3e..00000000 --- a/parts/modes/classic_n.lua +++ /dev/null @@ -1,31 +0,0 @@ -return{ - color=COLOR.lBlue, - env={ - center=0,ghost=0, - smooth=false, - face={0,0,2,2,2,0,0}, - eventSet='classic_n', - bg='rgb',bgm='magicblock', - }, - slowMark=true, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<11 and 15 or r<22 and r+5 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, - score=function(P)return{P.stat.score,P.stat.row}end, - scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=110 and 5 or - L>=80 and 4 or - L>=50 and 3 or - L>=30 and 2 or - L>=10 and 1 or - L>=1 and 0 - end, -} diff --git a/parts/modes/classic_u.lua b/parts/modes/classic_u.lua index c1a80611..512312fb 100644 --- a/parts/modes/classic_u.lua +++ b/parts/modes/classic_u.lua @@ -8,13 +8,6 @@ return{ bg='rgb',bgm='magicblock', }, slowMark=true, - mesDisp=function(P) - setFont(75) - local r=P.modeData.target*.1 - mStr(r<22 and 29 or("%02x"):format(r*10-220),63,210) - mText(drawableText.speedLV,63,290) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - end, score=function(P)return{P.stat.score,P.stat.row}end, scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]