diff --git a/parts/eventsets/master_m.lua b/parts/eventsets/master_m.lua new file mode 100644 index 00000000..c0234890 --- /dev/null +++ b/parts/eventsets/master_m.lua @@ -0,0 +1,33 @@ +return +{ + mesDisp=function(P) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) + PLY.draw.drawTargetLine(P,200-P.stat.row) + end, + task=function(P) + P.gameEnv.das=6 + P.gameEnv.arr=2 + P:set20G(true) + P.gameEnv.lock=15 + P.lockDelay=15 + P.gameEnv.wait=6 + P.gameEnv.fall=2 + + P.modeData.target=10 + end, + dropPiece=function(P) + if P.stat.row>=P.modeData.target then + if P.modeData.target==200 then + P:win('finish') + else + P.gameEnv.lock=math.max(6,P.gameEnv.lock-1) + if P.modeData.target<100 then + P.modeData.target=P.modeData.target+10 + else + P.modeData.target=200 + end + SFX.play('reach') + end + end + end +} diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 903cb1a6..ec9582f3 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -768,6 +768,7 @@ return{ ['round_u']= {"Turn-Based", "ULTIMATE", "Chess mode"}, ['master_n']= {"Master", "NORMAL", "For 20G beginners."}, ['master_h']= {"Master", "HARD", "For 20G pros."}, + ['master_m']= {"Master", "M21", "For 20G Masters."}, ['master_final']= {"Master", "FINAL", "20G and beyond."}, ['master_ph']= {"Master", "PHANTASM", "???"}, ['master_ex']= {"GrandMaster", "EXTRA", "An eternity shorter than an instant."}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index a4ea96b2..b4c31a84 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -673,6 +673,7 @@ return{ ['round_u']= {"Por Turnos", "Supremo", "Modo ajedrez."}, ['master_n']= {"Master", "Normal", "Para principiantes en 20G"}, ['master_h']= {"Master", "Difícil", "¡Desafío profesional de 20G!"}, + -- ['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."}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index e0088299..eebd90ef 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -675,6 +675,7 @@ return{ ['round_u']= {"Tour à tour", "ULTIME", "Mode échecs"}, ['master_n']= {"Master", "NORMAL", "Pour les débutants en 20G."}, ['master_h']= {"Master", "DIFFICILE", "Challenge 20G pro !"}, + -- ['master_m']= {"Master", "M21", "For 20G Masters."}, ['master_final']= {"Master", "FINAL", "20G : Un point final impossible à atteindre !"}, -- ['master_ph']= {"Mester", "FANTASMA", "20G: ???"}, ['master_ex']= {"GrandMaster", "EXTRA", "Tentez de devenir un Grandmaster."}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 238ca0e8..045c0b2f 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -757,6 +757,7 @@ return{ ['round_u']= {"Baseado Turnos", "ULTIMATE", "Modo xadrez"}, ['master_n']= {"Mestre", "NORMAL", "Pra iniciantes de 20G."}, ['master_h']= {"Mestre", "DIFÍCIL", "Desafio 20G profissional!"}, + -- ['master_m']= {"Master", "M21", "For 20G Masters."}, ['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."}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 04dac5f2..41db25c1 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -246,9 +246,10 @@ return{ ['round_u']= {"回合制", "极限", "下棋"}, ['master_n']= {"大师", "普通", "无脑20G"}, ['master_h']= {"大师", "困难", "简单20G"}, - ['master_final']= {"大师", "终点", "究极20G:真正的游戏"}, - ['master_ph']= {"大师", "虚幻", "虚幻20G:好玩"}, - ['master_ex']= {"宗师", "EX", "你行你上"}, + ['master_m']= {"大师", "M21", "一般20G"}, + ['master_final']= {"大师", "终点", "真正的20G"}, + ['master_ph']= {"大师", "虚幻", "好玩的20G"}, + ['master_ex']= {"宗师", "EX", "考试20G"}, ['rhythm_e']= {"节奏", "简单", "很无聊的"}, ['rhythm_h']= {"节奏", "困难", "好玩么?"}, ['rhythm_u']= {"节奏", "极限", "真男人不玩低难度"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index da81cbb9..fe57bdcc 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -769,6 +769,7 @@ return{ ['round_u']= {"回合制", "极限", "下棋模式"}, ['master_n']= {"大师", "普通", "20G初心者练习"}, ['master_h']= {"大师", "困难", "上级者20G挑战"}, + ['master_m']= {"大师", "大师", "大师20G"}, ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, ['master_ph']= {"大师", "虚幻", "虚幻20G:???"}, ['master_ex']= {"宗师", "EX", "成为方块大师"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 509c2de7..eebacf21 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -163,6 +163,7 @@ return{ ['round_u']= {"回合制", "极限", "下棋模式"}, ['master_n']= {"大师", "普通", "20G初心者练习"}, ['master_h']= {"大师", "困难", "上级者20G挑战"}, + ['master_m']= {"大师", "大师", "大师20G"}, ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, ['master_ph']= {"大师", "虚幻", "虚幻20G:???"}, ['master_ex']= {"宗师", "EX", "成为方块大师"}, diff --git a/parts/modes.lua b/parts/modes.lua index 2048b6a9..f05e634a 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -44,7 +44,8 @@ return{ {name='round_u', x=-1400, y=-800, size=40,shape=1,icon="round"}, {name='master_n', x=0, y=-1000, size=40,shape=1,icon="master", unlock={'master_h'}}, - {name='master_h', x=0, y=-1200, size=40,shape=3,icon="master", unlock={'master_final','master_ex','master_ph'}}, + {name='master_h', x=0, y=-1200, size=40,shape=3,icon="master", unlock={'master_final','master_ex','master_ph','master_m'}}, + {name='master_m', x=-150, y=-1320, size=30,shape=3,icon="master"}, {name='master_final', x=0, y=-1600, size=40,shape=2,icon="master"}, {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"}, diff --git a/parts/modes/master_m.lua b/parts/modes/master_m.lua new file mode 100644 index 00000000..7ccce488 --- /dev/null +++ b/parts/modes/master_m.lua @@ -0,0 +1,22 @@ +return{ + color=COLOR.green, + env={ + noInitSZO=true, + eventSet='master_m', + bg='bg2',bgm='super7th', + }, + 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>=140 and 4 or + L>=100 and 3 or + L>=70 and 2 or + L>=30 and 1 or + L>=5 and 0 + end, +}