From a4357d0843a4d53779421bcf2b69fe5f6db8d942 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 11 Nov 2021 18:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=8A=82=E5=A5=8F=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=87=86=E5=A4=87=E4=B9=8B=E5=90=8E=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=9F=B3=E6=B8=B8=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 8 +++++ parts/eventsets/rhythm_e.lua | 53 ----------------------------- parts/eventsets/rhythm_h.lua | 53 ----------------------------- parts/eventsets/rhythm_u.lua | 58 -------------------------------- parts/gameTables.lua | 1 - parts/language/lang_en.lua | 3 -- parts/language/lang_es.lua | 3 -- parts/language/lang_fr.lua | 3 -- parts/language/lang_pt.lua | 3 -- parts/language/lang_yygq.lua | 3 -- parts/language/lang_zh.lua | 3 -- parts/language/lang_zh_full.lua | 3 -- parts/language/lang_zh_grass.lua | 3 -- parts/language/lang_zh_trad.lua | 3 -- parts/modes.lua | 12 +++---- parts/modes/rhythm_e.lua | 23 ------------- parts/modes/rhythm_h.lua | 23 ------------- parts/modes/rhythm_u.lua | 23 ------------- 18 files changed, 12 insertions(+), 269 deletions(-) delete mode 100644 parts/eventsets/rhythm_e.lua delete mode 100644 parts/eventsets/rhythm_h.lua delete mode 100644 parts/eventsets/rhythm_u.lua delete mode 100644 parts/modes/rhythm_e.lua delete mode 100644 parts/modes/rhythm_h.lua delete mode 100644 parts/modes/rhythm_u.lua diff --git a/main.lua b/main.lua index 15d65745..896f63d1 100644 --- a/main.lua +++ b/main.lua @@ -466,6 +466,14 @@ do fs.remove('record/stack_40l.rec') fs.remove('record/stack_100l.rec') end + if RANKS.rhythm_e then + RANKS.rhythm_e=nil + RANKS.rhythm_h=nil + RANKS.rhythm_u=nil + fs.remove('record/rhythm_e.rec') + fs.remove('record/rhythm_h.rec') + fs.remove('record/rhythm_u.rec') + end if STAT.version~=VERSION.code then for k,v in next,MODE_UPDATE_MAP do if RANKS[k]then diff --git a/parts/eventsets/rhythm_e.lua b/parts/eventsets/rhythm_e.lua deleted file mode 100644 index 4e0843a3..00000000 --- a/parts/eventsets/rhythm_e.lua +++ /dev/null @@ -1,53 +0,0 @@ -local gc=love.graphics -local dropSpeed={[0]=40,33,27,20,16,12,11,10,9,8,7,6,5,4,3,3,2,2,1,1} - -return{ - drop=40, - lock=1e99, - wait=20, - fall=90, - mesDisp=function(P) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - - setFont(30) - mStr(P.modeData.bpm,63,178) - - gc.setLineWidth(4) - gc.circle('line',63,200,30) - - local beat=P.modeData.counter/P.modeData.beatFrame - gc.setColor(1,1,1,1-beat) - gc.setLineWidth(3) - gc.circle('line',63,200,30+45*beat) - end, - dropPiece=function(P) - if P.stat.row>=P.modeData.target then - if P.modeData.target==200 then - P:win('finish') - else - P.modeData.bpm=40+2*P.modeData.target/10 - P.modeData.beatFrame=math.floor(3600/P.modeData.bpm) - P.gameEnv.fall=P.modeData.beatFrame - P.gameEnv.wait=math.max(P.gameEnv.wait-2,0) - P.gameEnv.drop=dropSpeed[P.modeData.target/10] - P.modeData.target=P.modeData.target+10 - SFX.play('reach') - end - end - end, - task=function(P) - P.modeData.target=10 - P.modeData.bpm=40 - P.modeData.beatFrame=90 - P.modeData.counter=90 - while true do - YIELD() - P.modeData.counter=P.modeData.counter-1 - if P.modeData.counter==0 then - P.modeData.counter=P.modeData.beatFrame - SFX.play('click',.3) - P:act_hardDrop() - end - end - end, -} diff --git a/parts/eventsets/rhythm_h.lua b/parts/eventsets/rhythm_h.lua deleted file mode 100644 index 7d46406b..00000000 --- a/parts/eventsets/rhythm_h.lua +++ /dev/null @@ -1,53 +0,0 @@ -local gc=love.graphics -local dropSpeed={[0]=30,26,23,20,17,14,12,10,8,6,5,4,3,2,1,1,.5,.5,.25,.25} - -return{ - drop=30, - lock=1e99, - wait=10, - fall=60, - mesDisp=function(P) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - - setFont(30) - mStr(P.modeData.bpm,63,178) - - gc.setLineWidth(4) - gc.circle('line',63,200,30) - - local beat=P.modeData.counter/P.modeData.beatFrame - gc.setColor(1,1,1,1-beat) - gc.setLineWidth(3) - gc.circle('line',63,200,30+45*beat) - end, - dropPiece=function(P) - if P.stat.row>=P.modeData.target then - if P.modeData.target==200 then - P:win('finish') - else - P.modeData.bpm=60+3*P.modeData.target/10 - P.modeData.beatFrame=math.floor(3600/P.modeData.bpm) - P.gameEnv.fall=P.modeData.beatFrame - P.gameEnv.wait=math.max(P.gameEnv.wait-1,0) - P.gameEnv.drop=dropSpeed[P.modeData.target/10] - P.modeData.target=P.modeData.target+10 - SFX.play('reach') - end - end - end, - task=function(P) - P.modeData.target=10 - P.modeData.bpm=60 - P.modeData.beatFrame=60 - P.modeData.counter=60 - while true do - YIELD() - P.modeData.counter=P.modeData.counter-1 - if P.modeData.counter==0 then - P.modeData.counter=P.modeData.beatFrame - SFX.play('click',.3) - P:act_hardDrop() - end - end - end, -} diff --git a/parts/eventsets/rhythm_u.lua b/parts/eventsets/rhythm_u.lua deleted file mode 100644 index a5db95b3..00000000 --- a/parts/eventsets/rhythm_u.lua +++ /dev/null @@ -1,58 +0,0 @@ -local gc=love.graphics - -return{ - drop=.5, - lock=1e99, - wait=5, - fall=30, - mesDisp=function(P) - PLY.draw.drawProgress(P.stat.row,P.modeData.target) - - setFont(30) - mStr(P.modeData.bpm,63,178) - - gc.setLineWidth(4) - gc.circle('line',63,200,30) - - local beat=P.modeData.counter/P.modeData.beatFrame - gc.setColor(1,1,1,1-beat) - gc.setLineWidth(3) - gc.circle('line',63,200,30+45*beat) - end, - dropPiece=function(P) - if P.stat.row>=P.modeData.target then - if P.modeData.target==200 then - P:win('finish') - else - P.modeData.bpm=120+2*P.modeData.target/10 - P.modeData.beatFrame=math.floor(3600/P.modeData.bpm) - P.gameEnv.fall=P.modeData.beatFrame - P.gameEnv.wait=math.max(P.gameEnv.wait-1,0) - if P.modeData.target==50 then - P.gameEnv.das=5 - P.gameEnv.drop=.25 - elseif P.modeData.target==100 then - P.gameEnv.das=4 - P:set20G(true) - end - P.modeData.target=P.modeData.target+10 - SFX.play('reach') - end - end - end, - task=function(P) - P.modeData.target=10 - P.modeData.bpm=120 - P.modeData.beatFrame=30 - P.modeData.counter=30 - while true do - YIELD() - P.modeData.counter=P.modeData.counter-1 - if P.modeData.counter==0 then - P.modeData.counter=P.modeData.beatFrame - SFX.play('click',.3) - P:act_hardDrop() - end - end - end, -} diff --git a/parts/gameTables.lua b/parts/gameTables.lua index d546ab11..5e9df18b 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -345,7 +345,6 @@ EVENTSETS={ 'marathon_n','marathon_h', 'master_n','master_h','master_final','master_m','master_ex','master_ph', 'pctrain_n','pctrain_l','pc_inf', - 'rhythm_e','rhythm_h','rhythm_u', 'survivor_e','survivor_n','survivor_h','survivor_l','survivor_u', 'tsd_e','tsd_h','tsd_u', 'ultra', diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index f03455b3..3268b3ce 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -704,9 +704,6 @@ return{ ['master_final']= {"Master", "FINAL", "20G and beyond"}, ['master_ph']= {"Master", "PHANTASM", "???"}, ['master_ex']= {"GrandMaster", "EXTRA", "An eternity shorter than an instant"}, - ['rhythm_e']= {"Rhythm", "EASY", "200-line low-BPM rhythm marathon"}, - ['rhythm_h']= {"Rhythm", "HARD", "200-line medium BPM rhythm marathon"}, - ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-BPM rhythm marathon"}, ['blind_e']= {"Invisible", "HALF", "For novices"}, ['blind_n']= {"Invisible", "ALL", "For intermediates"}, ['blind_h']= {"Invisible", "SUDDEN", "For the experienced"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index c6bd3589..8f94aa1c 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -662,9 +662,6 @@ return{ -- ['master_m']= {"Master", "M21", "For 20G Masters."}, ['master_final']= {"Master", "FINAL", "El verdadero 20G Supremo: el final es inalcanzable."}, ['master_ex']= {"GrandMaster", "EXTRA", "Para ser un gran maestro, acepta este desafío"}, - ['rhythm_e']= {"Al Ritmo", "Fácil", "Maratón rítmica de 200 líneas con bajo bpm."}, - ['rhythm_h']= {"Al Ritmo", "Difícil", "Maratón rítmica de 200 líneas con bpm moderado."}, - ['rhythm_u']= {"Al Ritmo", "Supremo", "Maratón rítmica de 200 líneas con bpm elevado."}, ['blind_e']= {"A Ciegas", "Parcial", "Para novatos."}, ['blind_n']= {"A Ciegas", "Total", "Para jugadores intermedios."}, ['blind_h']= {"A Ciegas", "Inmediato", "Para jugadores experimentados"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 020cbdef..13cc167c 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -664,9 +664,6 @@ return{ ['master_final']= {"Master", "FINAL", "20G : Un point final impossible à atteindre !"}, -- ['master_ph']= {"Mester", "FANTASMA", "20G: ???"}, ['master_ex']= {"GrandMaster", "EXTRA", "Tentez de devenir un Grandmaster."}, - -- ['rhythm_e']= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, - -- ['rhythm_h']= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, - -- ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, ['blind_e']= {"Aveugle", "MOITIE", "Pour les novices."}, ['blind_n']= {"Aveugle", "TOUT", "Pour les joueurs intermédiaires."}, ['blind_h']= {"Aveugle", "SOUDAIN", "Pour les bons jooeurs."}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 5be71dbf..47d4f808 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -694,9 +694,6 @@ return{ ['master_final']= {"Mestre", "FINAL", "20G: Final inalcançável!"}, ['master_ph']= {"Mestre", "FANTASMA", "20G: ???"}, ['master_ex']= {"GrandMaster", "EXTRA", "Para ser um Grand Master, aceite \nesse desafio."}, - -- ['rhythm_e']= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, - -- ['rhythm_h']= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, - -- ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, ['blind_e']= {"Cego", "METADE", "Para novatos."}, ['blind_n']= {"Cego", "TUDO", "Para intermediários."}, ['blind_h']= {"Cego", "DE REPENTE", "Para experientes."}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 5f37f667..5c80cf32 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -233,9 +233,6 @@ return{fallback='zh', ['master_final']= {"大师", "终点", "真正的20G"}, ['master_ph']= {"大师", "虚幻", "好玩的20G"}, ['master_ex']= {"宗师", "EX", "考试20G"}, - ['rhythm_e']= {"节奏", "简单", "很无聊的"}, - ['rhythm_h']= {"节奏", "困难", "好玩么?"}, - ['rhythm_u']= {"节奏", "极限", "真男人不玩低难度"}, ['blind_e']= {"隐形", "半隐", "谁都能玩"}, ['blind_n']= {"隐形", "全隐", "稍加练习即可"}, ['blind_h']= {"隐形", "瞬隐", "和上一个一样"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index bb2076f5..a606cf3c 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -708,9 +708,6 @@ return{ ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, ['master_ph']= {"大师", "虚幻", "虚幻20G:？？？"}, ['master_ex']= {"宗师", "EX", "成为方块大师"}, - ['rhythm_e']= {"节奏", "简单", "200行低速节奏马拉松"}, - ['rhythm_h']= {"节奏", "困难", "200行中速节奏马拉松"}, - ['rhythm_u']= {"节奏", "极限", "200行高速节奏马拉松"}, ['blind_e']= {"隐形", "半隐", "不强大脑"}, ['blind_n']= {"隐形", "全隐", "挺强大脑"}, ['blind_h']= {"隐形", "瞬隐", "很强大脑"}, diff --git a/parts/language/lang_zh_full.lua b/parts/language/lang_zh_full.lua index 0d8fa57d..bb580f2c 100644 --- a/parts/language/lang_zh_full.lua +++ b/parts/language/lang_zh_full.lua @@ -122,9 +122,6 @@ return{ ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, ['master_ph']= {"大师", "虚幻", "虚幻20G:???"}, ['master_ex']= {"宗师", "EX", "成为方块大师"}, - ['rhythm_e']= {"节奏", "简单", "200行低速节奏马拉松"}, - ['rhythm_h']= {"节奏", "困难", "200行中速节奏马拉松"}, - ['rhythm_u']= {"节奏", "极限", "200行高速节奏马拉松"}, ['blind_e']= {"隐形", "半隐", "不强大脑"}, ['blind_n']= {"隐形", "全隐", "挺强大脑"}, ['blind_h']= {"隐形", "瞬隐", "很强大脑"}, diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 6190ce0a..72d9e223 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -705,9 +705,6 @@ return{ ['master_final']= {"主人", "最终", "20G及以上"}, ['master_ph']= {"主人", "幻觉", "？？？"}, ['master_ex']= {"大师", "额外的", "比瞬间还短的永恒"}, - ['rhythm_e']= {"节奏", "容易", "200线低节奏马拉松"}, - ['rhythm_h']= {"节奏", "硬的", "200线中等节奏马拉松"}, - ['rhythm_u']= {"节奏", "终极", "200线高节奏马拉松"}, ['blind_e']= {"看不见的", "一半", "对于新手来说"}, ['blind_n']= {"看不见的", "全部", "对于中间产品"}, ['blind_h']= {"看不见的", "突然", "对于有经验的人"}, diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index fef41fda..7238e6be 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -708,9 +708,6 @@ return{ ['master_final']= {"大師", "究極", "究極20G:無法觸及的終點"}, ['master_ph']= {"大師", "虛幻", "虛幻20G:？？？"}, ['master_ex']= {"宗師", "EX", "成為方塊大師"}, - ['rhythm_e']= {"節奏", "簡單", "200行低速節奏馬拉松"}, - ['rhythm_h']= {"節奏", "困難", "200行中速節奏馬拉松"}, - ['rhythm_u']= {"節奏", "極限", "200行高速節奏馬拉松"}, ['blind_e']= {"隱形", "半隱", "不強大腦"}, ['blind_n']= {"隱形", "全隱", "挺強大腦"}, ['blind_h']= {"隱形", "瞬隱", "很強大腦"}, diff --git a/parts/modes.lua b/parts/modes.lua index 89a7ceee..b451567e 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -21,7 +21,7 @@ return{ {name='dig_100l', x=-600, y=-200, size=40,shape=1,icon="dig_sprint", unlock={'dig_400l'}}, {name='dig_400l', x=-800, y=-200, size=40,shape=1,icon="dig_sprint"}, - {name='marathon_n', x=0, y=-600, size=60,shape=1,icon="marathon", unlock={'marathon_h','rhythm_e','solo_e','round_e','blind_e','classic_e','survivor_e','bigbang','zen'}}, + {name='marathon_n', x=0, y=-600, size=60,shape=1,icon="marathon", unlock={'marathon_h','solo_e','round_e','blind_e','classic_e','survivor_e','bigbang','zen'}}, {name='marathon_h', x=0, y=-800, size=50,shape=1,icon="marathon", unlock={'master_n'}}, {name='solo_e', x=-600, y=-1000, size=40,shape=1,icon="solo", unlock={'solo_n'}}, @@ -50,10 +50,6 @@ return{ {name='master_ph', x=-150, y=-1500, size=40,shape=2,icon="master"}, {name='master_ex', x=150, y=-1500, size=40,shape=2,icon="master_ex"}, - {name='rhythm_e', x=-350, y=-1000, size=40,shape=1,icon="rhythm", unlock={'rhythm_h'}}, - {name='rhythm_h', x=-350, y=-1200, size=40,shape=3,icon="rhythm", unlock={'rhythm_u'}}, - {name='rhythm_u', x=-350, y=-1400, size=40,shape=2,icon="rhythm"}, - {name='blind_e', x=150, y=-700, size=40,shape=1,icon="hidden", unlock={'blind_n'}}, {name='blind_n', x=150, y=-800, size=40,shape=1,icon="hidden", unlock={'blind_h'}}, {name='blind_h', x=150, y=-900, size=35,shape=1,icon="hidden", unlock={'blind_l'}}, @@ -61,9 +57,9 @@ return{ {name='blind_u', x=150, y=-1100, size=30,shape=3,icon="hidden", unlock={'blind_wtf'}}, {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=-970, size=35,shape=2,icon="classic", unlock={'classic_u'}}, - {name='classic_u', x=-150, y=-1090, size=30,shape=2,icon="classic"}, + {name='classic_e', x=-170, y=-850, size=40,shape=1,icon="classic", unlock={'classic_h'}}, + {name='classic_h', x=-180, y=-1000, size=35,shape=2,icon="classic", unlock={'classic_u'}}, + {name='classic_u', x=-190, y=-1150, 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'}}, diff --git a/parts/modes/rhythm_e.lua b/parts/modes/rhythm_e.lua deleted file mode 100644 index 18354ad2..00000000 --- a/parts/modes/rhythm_e.lua +++ /dev/null @@ -1,23 +0,0 @@ -return{ - color=COLOR.green, - env={ - mindas=7,minarr=1,minsdarr=1, - keyCancel={6}, - eventSet='rhythm_e', - bg='bg2',bgm='magicblock', - }, - slowMark=true, - score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=170 and 4 or - L>=140 and 3 or - L>=100 and 2 or - L>=50 and 1 or - L>=20 and 0 - end, -} diff --git a/parts/modes/rhythm_h.lua b/parts/modes/rhythm_h.lua deleted file mode 100644 index 5e5063dc..00000000 --- a/parts/modes/rhythm_h.lua +++ /dev/null @@ -1,23 +0,0 @@ -return{ - color=COLOR.magenta, - env={ - mindas=7,minarr=1,minsdarr=1, - keyCancel={6}, - eventSet='rhythm_h', - bg='bg2',bgm='secret8th', - }, - slowMark=true, - score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=170 and 4 or - L>=140 and 3 or - L>=100 and 2 or - L>=50 and 1 or - L>=20 and 0 - end, -} diff --git a/parts/modes/rhythm_u.lua b/parts/modes/rhythm_u.lua deleted file mode 100644 index 6b6deed2..00000000 --- a/parts/modes/rhythm_u.lua +++ /dev/null @@ -1,23 +0,0 @@ -return{ - color=COLOR.magenta, - env={ - das=6,minarr=1,minsdarr=1, - keyCancel={6}, - eventSet='rhythm_u', - bg='bg2',bgm='secret7th', - }, - slowMark=true, - score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=170 and 4 or - L>=140 and 3 or - L>=100 and 2 or - L>=50 and 1 or - L>=20 and 0 - end, -}