diff --git a/main.lua b/main.lua index e8bb2f58..d78231b0 100644 --- a/main.lua +++ b/main.lua @@ -525,8 +525,8 @@ do fs.remove('record/rhythm_h.rec') fs.remove('record/rhythm_u.rec') end - if RANKS.bigbang then - RANKS.clearRush,RANKS.bigbang=RANKS.bigbang + if RANKS.bigbang or RANKS.clearRush then + fs.remove('record/clearRush.rec') fs.remove('record/bigbang.rec') end if STAT.version~=VERSION.code then diff --git a/parts/eventsets/clearRush.lua b/parts/eventsets/clearRush.lua deleted file mode 100644 index 21ce0dfb..00000000 --- a/parts/eventsets/clearRush.lua +++ /dev/null @@ -1,36 +0,0 @@ -local function task_newBoard(P,init) - local targetLine - local F,L={},{1} - --TODO - P:pushNextList(L) - - P.control=false - if not init then for _=1,26 do YIELD()end end - P.control=true - - P.gameEnv.heightLimit=targetLine or #F - P:pushLineList(F) -end -local function _check(P) - P.gameEnv.heightLimit=P.gameEnv.heightLimit-P.lastPiece.row - if P.gameEnv.heightLimit==0 then - P.modeData.stage=P.modeData.stage+1 - if P.modeData.stage>=100 then - P:win('finish') - else - P:newTask(task_newBoard) - end - end -end -return{ - sequence='none', - RS="TRS", - pushSpeed=5, - mesDisp=function(P) - setFont(60) - mStr(P.modeData.stage,63,280) - mText(TEXTOBJ.wave,63,350) - end, - hook_drop=_check, - task=function(P)task_newBoard(P,true)P.fieldBeneath=0 end,--Just run one time at first to start first level -} diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 5a27d675..d144afb7 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -836,7 +836,6 @@ return{ ['defender_l']= {"Defender", "LUNATIC", "Practice your defensing skills!"}, ['dig_h']= {"Driller", "HARD", "Digging practice!"}, ['dig_u']= {"Driller", "ULTIMATE", "Digging practice!"}, - ['clearRush']= {"Clear Rush", "NORMAL", "All-spin tutorial!\n[Under construction]"}, ['c4wtrain_n']= {"C4W Training", "NORMAL", "Infinite combos"}, ['c4wtrain_l']= {"C4W Training", "LUNATIC", "Infinite combos"}, ['pctrain_n']= {"PC Training", "NORMAL", "Perfect Clear practice"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 0061d1ec..dd724c3c 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -681,7 +681,6 @@ return{ ['defender_l']= {"Defensor", "Lunático", "¡Practica la defensa!"}, ['dig_h']= {"Downstack", "Difícil", "¡Practica el downstackeo!"}, ['dig_u']= {"Downstack", "Supremo", "¡Practica el downstackeo!"}, - ['clearRush']= {"Clear Rush", "NORMAL", "¡Tutorial de Allspins!\n[En construcción]"}, ['c4wtrain_n']= {"Entrenar C4W", "Normal", "Combos infinitos."}, ['c4wtrain_l']= {"Entrenar C4W", "Lunático", "Combos infinitos."}, ['pctrain_n']= {"Entrenar PC", "Normal", "Modo sencillo para practicar Perfect Clears."}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index be8df1d1..849bb56a 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -786,7 +786,6 @@ return{ ['defender_l']= {"Défendant", "LUNATIQUE", "Soyez défensifs !"}, ['dig_h']= {"Perceuse", "DIFFICILE", "Essayez de creuser !"}, ['dig_u']= {"Perceuse", "ULTIME", "Essayez de creuser !"}, - -- ['clearRush']= {"Clear Rush", "NORMAL", "All-spin tutorial!\n[Under construction]"}, ['c4wtrain_n']= {"Mode essai C4W", "NORMAL", "Combos infinis."}, ['c4wtrain_l']= {"Mode essai C4W", "LUNATIQUE", "Combos infinis."}, ['pctrain_n']= {"Mode essai PC", "NORMAL", "Mode Perfect Clear simple"}, diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 2c872a6e..68541d6e 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -837,7 +837,6 @@ return{ ['defender_l']= {"Pembela", "GILA", "Praktekkan keahlian membela Anda!"}, ['dig_h']= {"Pembor", "SULIT", "Praktekkan keahlian menggali Anda!"}, ['dig_u']= {"Pembor", "TERAKHIR", "Praktekkan keahlian menggali Anda!"}, - ['clearRush']= {"Gegas Baris", "NORMAL", "Tutorial all-spin!\n[Dalam pengembangan]"}, ['c4wtrain_n']= {"Latihan C4W", "NORMAL", "Kombo tidak terbatas."}, ['c4wtrain_l']= {"Latihan C4W", "GILA", "Kombo tidak terbatas."}, ['pctrain_n']= {"Latihan PC", "NORMAL", "Latihan PC"}, diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index 1a9d5bfe..d350a4f3 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -829,7 +829,6 @@ return{ ['defender_l']= {"相殺王", "LUNATIC", "防御力を磨け!"}, ['dig_h']= {"堀王", "HARD", "掘りを磨け"}, ['dig_u']= {"堀王", "ULTIMATE", "掘りを磨け"}, - ['clearRush']= {"クリアラッシュ", "NORMAL", "All-Spinチュートリアル!\n[開発中]"}, ['c4wtrain_n']= {"C4Wトレーニング", "NORMAL", "無限中開け"}, ['c4wtrain_l']= {"C4Wトレーニング", "LUNATIC", "無限中開け"}, ['pctrain_n']= {"パフェトレーニング", "NORMAL", "パフェの練習!"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 37fa5632..fcf8c8c8 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -817,7 +817,6 @@ return{ ['defender_l']= {"Defensor", "LUNÁTICO", "Prática de defensiva!"}, ['dig_h']= {"Cavador", "DIFÍCIL", "Prática de cavar!"}, ['dig_u']= {"Cavador", "ULTIMATE", "Prática de cavar!"}, - -- ['clearRush']= {"Clear Rush", "NORMAL", "All-spin tutorial!\n[Under construction]"}, ['c4wtrain_n']= {"Treinamento C4W", "NORMAL", "Combos infinitos."}, ['c4wtrain_l']= {"Treinamento C4W", "LUNÁTICO", "Combos infinitos."}, ['pctrain_n']= {"Treinamento PC", "NORMAL", "Modo simples de limpeza perfeita."}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 24f83de4..8a67d7bf 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -836,7 +836,6 @@ return{ ['defender_l']= {"防守", "疯狂", "防守练习"}, ['dig_h']= {"挖掘", "困难", "挖掘练习"}, ['dig_u']= {"挖掘", "极限", "挖掘练习"}, - ['clearRush']= {"清版竞速", "普通", "All-spin 入门教程\n施工中"}, ['c4wtrain_n']= {"C4W练习", "普通", "无 限 连 击"}, ['c4wtrain_l']= {"C4W练习", "疯狂", "无 限 连 击"}, ['pctrain_n']= {"全清训练", "普通", "简易PC题库，熟悉全清定式的组合"}, diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 7a0aeec9..119ae726 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -828,7 +828,6 @@ return{ ['defender_l']= {"防守者", "疯子", "练习你的防守技巧！"}, ['dig_h']= {"钻机", "硬的", "挖掘练习！"}, ['dig_u']= {"钻机", "终极", "挖掘练习！"}, - ['clearRush']= {"清晰的冲", "普通", "所有旋转教程\n[在建]"}, ['c4wtrain_n']= {"C4W训练", "正常", "无限组合"}, ['c4wtrain_l']= {"C4W训练", "疯子", "无限组合"}, ['pctrain_n']= {"电脑培训", "正常", "完美清晰的实践"}, diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 0ce0088a..380c9107 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -837,7 +837,6 @@ return{ ['defender_l']= {"防守", "瘋狂", "防守練習"}, ['dig_h']= {"挖掘", "困難", "挖掘練習"}, ['dig_u']= {"挖掘", "極限", "挖掘練習"}, - ['clearRush']= {"清版競速", "普通", "All-spin 入門教程\n施工中"}, ['c4wtrain_n']= {"C4W練習", "普通", "無 限 連 擊"}, ['c4wtrain_l']= {"C4W練習", "瘋狂", "無 限 連 擊"}, ['pctrain_n']= {"全清訓練", "普通", "簡易PC題集，熟悉全清定式的組合"}, diff --git a/parts/modes.lua b/parts/modes.lua index af00e59c..1639e438 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -2,13 +2,13 @@ return{ {name='sprint_10l', x=0, y=0, size=40,shape=1,icon="sprint1", unlock={'sprint_20l','sprint_40l'}}, {name='sprint_20l', x=-200, y=200, size=50,shape=1,icon="sprint1"}, {name='sprint_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH','sprint123','secret_grade'}}, - {name='sprint_100l', x=-400, y=200, size=50,shape=1,icon="sprint2", unlock={'sprint_400l','drought_n'}}, - {name='sprint_400l', x=-600, y=200, size=40,shape=1,icon="sprint3", unlock={'sprint_1000l'}}, - {name='sprint_1000l', x=-800, y=200, size=40,shape=1,icon="sprint3"}, + {name='sprint_100l', x=-400, y=200, size=50,shape=1,icon="sprint2", unlock={'sprint_400l','drought_n'}}, + {name='sprint_400l', x=-600, y=200, size=40,shape=1,icon="sprint3", unlock={'sprint_1000l'}}, + {name='sprint_1000l', x=-800, y=200, size=40,shape=1,icon="sprint3"}, - {name='sprintPenta', x=180, y=-160, size=40,shape=3,icon="sprint_pento"}, - {name='sprintMPH', x=220, y=-300, size=40,shape=3,icon="sprint2"}, - {name='sprint123', x=180, y=-440, size=40,shape=1,icon="sprint_tri"}, + {name='sprint123', x=160, y=-400, size=40,shape=1,icon="sprint_tri"}, + {name='sprintMPH', x=200, y=-260, size=40,shape=3,icon="sprint2"}, + {name='sprintPenta', x=130, y=-140, size=40,shape=3,icon="sprint_pento"}, {name='secret_grade', x=-200, y=-400, size=40,shape=1,icon="secret_grade"}, @@ -20,12 +20,12 @@ 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='dig_eff_10l', x=-400, y=0, size=40,shape=1,icon="dig_sprint", unlock={'dig_eff_40l'}}, - {name='dig_eff_40l', x=-600, y=0, size=40,shape=1,icon="dig_sprint", unlock={'dig_eff_100l'}}, - {name='dig_eff_100l', x=-800, y=0, size=40,shape=1,icon="dig_sprint", unlock={'dig_eff_400l'}}, - {name='dig_eff_400l', x=-1000, y=0, size=40,shape=1,icon="dig_sprint"}, + {name='dig_eff_10l', x=-400, y=0, size=40,shape=1,icon="dig_sprint", unlock={'dig_eff_40l'}}, + {name='dig_eff_40l', x=-600, y=0, size=40,shape=1,icon="dig_sprint", unlock={'dig_eff_100l'}}, + {name='dig_eff_100l', x=-800, y=0, size=40,shape=1,icon="dig_sprint", unlock={'dig_eff_400l'}}, + {name='dig_eff_400l', x=-1000, y=0, size=40,shape=1,icon="dig_sprint"}, - {name='marathon_n', x=0, y=-600, size=60,shape=1,icon="marathon", unlock={'marathon_h','solo_e','round_e','big_n','blind_e','classic_e','survivor_e','clearRush','zen'}}, + {name='marathon_n', x=0, y=-600, size=60,shape=1,icon="marathon", unlock={'marathon_h','solo_e','round_e','big_n','blind_e','classic_e','survivor_e','c4wtrain_n','pctrain_n','sprintAtk','zen'}}, {name='marathon_h', x=0, y=-800, size=50,shape=1,icon="marathon", unlock={'master_n','strategy_e'}}, {name='solo_e', x=-600, y=-1000, size=40,shape=1,icon="solo", unlock={'solo_n'}}, @@ -58,12 +58,12 @@ return{ {name='master_g', x=0, y=-1600, size=40,shape=3,icon="master"}, {name='master_ex', x=170, y=-1450, size=40,shape=2,icon="master_ex"}, - {name='strategy_e', x=-150, y=-1020, size=40,shape=3,icon="master", unlock={'strategy_e_plus'}}, - {name='strategy_h', x=-150, y=-1150, size=35,shape=3,icon="master", unlock={'strategy_h_plus'}}, - {name='strategy_u', x=-150, y=-1280, size=30,shape=2,icon="master", unlock={'strategy_u_plus'}}, - {name='strategy_e_plus',x=-300, y=-1120, size=40,shape=3,icon="master"}, - {name='strategy_h_plus',x=-300, y=-1250, size=35,shape=3,icon="master"}, - {name='strategy_u_plus',x=-300, y=-1380, size=30,shape=2,icon="master"}, + {name='strategy_e', x=-150, y=-1020, size=40,shape=3,icon="master", unlock={'strategy_e_plus'}}, + {name='strategy_h', x=-150, y=-1150, size=35,shape=3,icon="master", unlock={'strategy_h_plus'}}, + {name='strategy_u', x=-150, y=-1280, size=30,shape=2,icon="master", unlock={'strategy_u_plus'}}, + {name='strategy_e_plus',x=-300, y=-1120, size=40,shape=3,icon="master"}, + {name='strategy_h_plus',x=-300, y=-1250, size=35,shape=3,icon="master"}, + {name='strategy_u_plus',x=-300, y=-1380, size=30,shape=2,icon="master"}, {name='blind_e', x=150, y=-700, size=40,shape=1,icon="hidden", unlock={'blind_n','master_instinct'}}, {name='blind_n', x=150, y=-800, size=40,shape=1,icon="hidden", unlock={'blind_h'}}, @@ -93,40 +93,39 @@ return{ {name='dig_h', x=850, y=-800, size=40,shape=1,icon="dig", unlock={'dig_u'}}, {name='dig_u', x=850, y=-1000, size=40,shape=1,icon="dig"}, - {name='clearRush', x=400, y=-400, size=50,shape=1,icon="bigbang", unlock={'c4wtrain_n','pctrain_n','sprintAtk'}}, - {name='c4wtrain_n', x=700, y=-400, size=40,shape=1,icon="pc", unlock={'c4wtrain_l'}}, - {name='c4wtrain_l', x=900, y=-400, size=40,shape=1,icon="pc"}, + {name='c4wtrain_n', x=700, y=-450, size=40,shape=1,icon="pc", unlock={'c4wtrain_l'}}, + {name='c4wtrain_l', x=900, y=-450, size=40,shape=1,icon="pc"}, - {name='pctrain_n', x=700, y=-250, size=40,shape=1,icon="pc", unlock={'pctrain_l','pc_n'}}, - {name='pctrain_l', x=900, y=-250, size=40,shape=1,icon="pc"}, + {name='pctrain_n', x=700, y=-300, size=40,shape=1,icon="pc", unlock={'pctrain_l','pc_n'}}, + {name='pctrain_l', x=900, y=-300, size=40,shape=1,icon="pc"}, - {name='pc_n', x=800, y=-110, size=40,shape=1,icon="pc", unlock={'pc_h'}}, - {name='pc_h', x=950, y=-110, size=40,shape=3,icon="pc", unlock={'pc_l','pc_inf'}}, - {name='pc_l', x=1100, y=-110, size=40,shape=3,icon="pc"}, - {name='pc_inf', x=1100, y=-250, size=40,shape=2,icon="pc"}, + {name='pc_n', x=800, y=-140, size=40,shape=1,icon="pc", unlock={'pc_h'}}, + {name='pc_h', x=950, y=-140, size=40,shape=3,icon="pc", unlock={'pc_l','pc_inf'}}, + {name='pc_l', x=1100, y=-140, size=40,shape=3,icon="pc"}, + {name='pc_inf', x=1100, y=-280, size=40,shape=2,icon="pc"}, - {name='sprintAtk', x=530, y=-150, size=40,shape=1,icon="sprint2", unlock={'sprintEff','tech_n','tech_finesse','tsd_e','backfire_n'}}, + {name='sprintAtk', x=500, y=-280, size=40,shape=1,icon="sprint2", unlock={'sprintEff','tech_n','tech_finesse','tsd_e','backfire_n'}}, {name='sprintEff', x=360, y=-150, size=40,shape=1,icon="sprint2"}, - {name='tech_n', x=400, y=50, size=40,shape=1,icon="tech", unlock={'tech_n_plus','tech_h'}}, - {name='tech_n_plus', x=200, y=20, size=40,shape=3,icon="tech"}, - {name='tech_h', x=400, y=200, size=40,shape=1,icon="tech", unlock={'tech_h_plus','tech_l'}}, - {name='tech_h_plus', x=200, y=170, size=35,shape=3,icon="tech"}, - {name='tech_l', x=400, y=350, size=40,shape=1,icon="tech", unlock={'tech_l_plus'}}, - {name='tech_l_plus', x=200, y=320, size=35,shape=3,icon="tech"}, + {name='tech_n', x=400, y=20, size=40,shape=1,icon="tech", unlock={'tech_n_plus','tech_h'}}, + {name='tech_n_plus', x=200, y=-10, size=40,shape=3,icon="tech"}, + {name='tech_h', x=400, y=170, size=40,shape=1,icon="tech", unlock={'tech_h_plus','tech_l'}}, + {name='tech_h_plus', x=200, y=140, size=35,shape=3,icon="tech"}, + {name='tech_l', x=400, y=320, size=40,shape=1,icon="tech", unlock={'tech_l_plus'}}, + {name='tech_l_plus', x=200, y=290, size=35,shape=3,icon="tech"}, - {name='tech_finesse', x=800, y=50, size=40,shape=1,icon="tech", unlock={'tech_finesse_f'}}, - {name='tech_finesse_f',x=1000, y=50, size=40,shape=1,icon="tech"}, + {name='tech_finesse', x=800, y=20, size=40,shape=1,icon="tech", unlock={'tech_finesse_f'}}, + {name='tech_finesse_f',x=1000, y=20, size=40,shape=1,icon="tech"}, - {name='tsd_e', x=720, y=200, size=40,shape=1,icon="tsd", unlock={'tsd_h'}}, - {name='tsd_h', x=960, y=200, size=40,shape=1,icon="tsd", unlock={'tsd_u'}}, - {name='tsd_u', x=1200, y=200, size=40,shape=1,icon="tsd"}, + {name='tsd_e', x=720, y=170, size=40,shape=1,icon="tsd", unlock={'tsd_h'}}, + {name='tsd_h', x=960, y=170, size=40,shape=1,icon="tsd", unlock={'tsd_u'}}, + {name='tsd_u', x=1200, y=170, size=40,shape=1,icon="tsd"}, - {name='backfire_n', x=650, y=350, size=40,shape=1,icon="backfire", unlock={'backfire_h'}}, - {name='backfire_h', x=850, y=350, size=40,shape=1,icon="backfire", unlock={'backfire_l'}}, - {name='backfire_l', x=1050, y=350, size=40,shape=3,icon="backfire", unlock={'backfire_u'}}, - {name='backfire_u', x=1250, y=350, size=35,shape=2,icon="backfire"}, + {name='backfire_n', x=650, y=320, size=40,shape=1,icon="backfire", unlock={'backfire_h'}}, + {name='backfire_h', x=850, y=320, size=40,shape=1,icon="backfire", unlock={'backfire_l'}}, + {name='backfire_l', x=1050, y=320, size=40,shape=3,icon="backfire", unlock={'backfire_u'}}, + {name='backfire_u', x=1250, y=320, size=35,shape=2,icon="backfire"}, {name='zen', x=-1000, y=-600, size=40,shape=1,icon="zen", unlock={'ultra','infinite','infinite_dig','marathon_inf'}}, {name='ultra', x=-1200, y=-600, size=40,shape=1,icon="ultra"}, diff --git a/parts/modes/clearRush.lua b/parts/modes/clearRush.lua deleted file mode 100644 index 43b8b464..00000000 --- a/parts/modes/clearRush.lua +++ /dev/null @@ -1,23 +0,0 @@ -return{ - env={ - das=8,arr=1, - drop=30,lock=30, - holdCount=0, - eventSet='clearRush', - bg='blockhole',bgm='peak', - }, - score=function(P)return{P.modeData.stage,P.stat.time}end, - scoreDisp=function(D)return D[1].." Stage "..STRING.time(D[2])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>=40 and 3 or - L>=20 and 2 or - L>=10 and 1 or - L>=3 and 0 - end, -} diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index fefd6335..62e63718 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -122,8 +122,6 @@ function scene.keyDown(key,isRep) VOC.play('bye') SCN.swapTo('quit','slowFade') end - elseif key=='c'then - enterConsole() else return true end