diff --git a/parts/eventsets/classic_fast.lua b/parts/eventsets/classic_h.lua similarity index 100% rename from parts/eventsets/classic_fast.lua rename to parts/eventsets/classic_h.lua diff --git a/parts/eventsets/classic_l.lua b/parts/eventsets/classic_l.lua new file mode 100644 index 00000000..766a2d40 --- /dev/null +++ b/parts/eventsets/classic_l.lua @@ -0,0 +1,41 @@ +return{ + das=16, + arr=6, + sddas=2, + sdarr=2, + irs=false, + ims=false, + drop=2, + lock=2, + wait=10, + fall=25, + 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_u.lua b/parts/eventsets/classic_u.lua new file mode 100644 index 00000000..e7ea3ee9 --- /dev/null +++ b/parts/eventsets/classic_u.lua @@ -0,0 +1,36 @@ +return{ + das=16, + arr=6, + sddas=2, + sdarr=2, + irs=false, + ims=false, + drop=1, + lock=1, + wait=10, + fall=25, + 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<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, + 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 + SFX.play('reach') + end + end, +} diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 3d43e758..8a94b5c3 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -782,6 +782,9 @@ return{ ['blind_u']= {"Blind", "?", "Are you ready?"}, ['blind_wtf']= {"Blind", "WTF", "You're not ready."}, ['classic_fast']= {"Classic", "CTWC", "High-speed classic mode."}, + ['classic_h']= {"Classic", "HARD", "A medium speed recreation from the 80s."}, + ['classic_l']= {"Classic", "LUNATIC", "A high-speed recreation from the 80s."}, + ['classic_u']= {"Classic", "ULTIMATE", "A very high-speed recreation from the 80s."}, ['survivor_e']= {"Survivor", "EASY", "How long can you survive?"}, ['survivor_n']= {"Survivor", "NORMAL", "How long can you survive?"}, ['survivor_h']= {"Survivor", "HARD", "How long can you survive?"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index b9f8b08b..82ada070 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -686,6 +686,9 @@ return{ ['blind_u']= {"A Ciegas", "?", "¿Estás preparado?"}, ['blind_wtf']= {"A Ciegas", "ELFUF", "No, no lo estás."}, ['classic_fast']= {"Clásico", "CTWC", "Modo clásico con alta velocidad."}, + ['classic_h']= {"Clásico", "Difícil", "Modo clásico con alta velocidad."}, + ['classic_l']= {"Clásico", "Lunático", "Modo clásico con alta velocidad."}, + ['classic_u']= {"Clásico", "Supremo", "Modo clásico con alta velocidad."}, ['survivor_e']= {"Supervivencia", "Fácil", "¿Cuánto tiempo podrás sobrevivir?"}, ['survivor_n']= {"Supervivencia", "Normal", "¿Cuánto tiempo podrás sobrevivir?"}, ['survivor_h']= {"Supervivencia", "Difícil", "¿Cuánto tiempo podrás sobrevivir?"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 5093b6ae..7a913741 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -689,6 +689,9 @@ return{ ['blind_u']= {"Aveugle", "?", "Êtes-vous prêt ?"}, ['blind_wtf']= {"Aveugle", "WTF", "Vous n'êtes pas prêt."}, ['classic_fast']= {"Classic", "CTWC", "Un mode classique rapide."}, + ['classic_h']= {"Classic", "DIFFICILE", "Un mode classique rapide."}, + ['classic_l']= {"Classic", "LUNATIQUE", "Un mode classique rapide."}, + ['classic_u']= {"Classic", "ULTIME", "Un mode classique rapide."}, ['survivor_e']= {"Survivor", "FACILE", "Pendant combien de temps survivrez-vous ?"}, ['survivor_n']= {"Survivor", "NORMAL", "Pendant combien de temps survivrez-vous ?"}, ['survivor_h']= {"Survivor", "DIFFICILE", "Pendant combien de temps survivrez-vous ?"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index b21d2dcb..33a23c00 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -771,6 +771,9 @@ return{ ['blind_u']= {"Cego", "?", "Are you ready?"}, ['blind_wtf']= {"Cego", "WTF", "You're not ready."}, ['classic_fast']= {"Clássico", "CTWC", "Modo clássico rápido. "}, + ['classic_h']= {"Classic", "DIFÍCIL", "Modo clássico rápido."}, + ['classic_l']= {"Classic", "LUNÁTICO", "Modo clássico rápido."}, + ['classic_u']= {"Classic", "ULTIMATE", "Modo clássico rápido."}, ['survivor_e']= {"Sobrevivente", "FACIL", "Por quanto sobrevive?"}, ['survivor_n']= {"Sobrevivente", "NORMAL", "Por quanto sobrevive?"}, ['survivor_h']= {"Sobrevivente", "DIFÍCIL", "Por quanto sobrevive?"}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 41db25c1..7d027c12 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -260,6 +260,9 @@ return{ ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, ['classic_fast']= {"高速经典", "CTWC", "就这?简单"}, + ['classic_h']= {"高速经典", "困难", "就这?简单"}, + ['classic_l']= {"高速经典", "疯狂", "就这?简单"}, + ['classic_u']= {"高速经典", "极限", "就这?简单"}, ['survivor_e']= {"生存", "简单", "这都玩不下去?不会吧"}, ['survivor_n']= {"生存", "普通", "呵,这都玩不过?"}, ['survivor_h']= {"生存", "困难", "所以呢?"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index f8275432..9a585746 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -783,6 +783,9 @@ return{ ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, + ['classic_h']= {"高速经典", "困难", "高速经典"}, + ['classic_l']= {"高速经典", "疯狂", "高速经典"}, + ['classic_u']= {"高速经典", "极限", "高速经典"}, ['survivor_e']= {"生存", "简单", "你能存活多久?"}, ['survivor_n']= {"生存", "普通", "你能存活多久?"}, ['survivor_h']= {"生存", "困难", "你能存活多久?"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index eebacf21..2d4928b0 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -176,7 +176,10 @@ return{ ['blind_l']= {"隐形", "瞬隐+", "超强大脑"}, ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, - ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, + ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, + ['classic_h']= {"高速经典", "困难", "高速经典"}, + ['classic_l']= {"高速经典", "疯狂", "高速经典"}, + ['classic_u']= {"高速经典", "极限", "高速经典"}, ['survivor_e']= {"生存", "简单", "你能存活多久?"}, ['survivor_n']= {"生存", "普通", "你能存活多久?"}, ['survivor_h']= {"生存", "困难", "你能存活多久?"}, diff --git a/parts/modes.lua b/parts/modes.lua index f05e634a..5d7070a4 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_fast','survivor_e','bigbang','zen'}}, + {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_h','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'}}, @@ -45,7 +45,7 @@ return{ {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','master_m'}}, - {name='master_m', x=-150, y=-1320, size=30,shape=3,icon="master"}, + {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"}, @@ -61,7 +61,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_fast', x=-150, y=-950, size=40,shape=2,icon="classic"}, + {name='classic_h', x=-150, y=-950, size=40,shape=2,icon="classic", unlock={'classic_l'}}, + {name='classic_l', x=-150, y=-1100, size=40,shape=2,icon="classic", unlock={'classic_u'}}, + {name='classic_u', x=-150, y=-1250, size=40,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'}}, @@ -125,6 +127,7 @@ return{ --Old {name='master_l'}, {name='master_u'}, + {name='classic_fast'}, --Special {name='custom_puzzle'}, diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua index 557b7960..45910669 100644 --- a/parts/modes/classic_fast.lua +++ b/parts/modes/classic_fast.lua @@ -5,7 +5,7 @@ return{ smooth=false, freshLimit=0, face={0,0,2,2,2,0,0}, - eventSet='classic_fast', + eventSet='classic_h', bg='rgb',bgm='magicblock', }, slowMark=true, diff --git a/parts/modes/classic_h.lua b/parts/modes/classic_h.lua new file mode 100644 index 00000000..45910669 --- /dev/null +++ b/parts/modes/classic_h.lua @@ -0,0 +1,32 @@ +return{ + color=COLOR.lBlue, + env={ + center=0,ghost=0, + smooth=false, + freshLimit=0, + 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_l.lua b/parts/modes/classic_l.lua new file mode 100644 index 00000000..84052cc6 --- /dev/null +++ b/parts/modes/classic_l.lua @@ -0,0 +1,32 @@ +return{ + color=COLOR.lBlue, + env={ + center=0,ghost=0, + smooth=false, + freshLimit=0, + 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]=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_u.lua b/parts/modes/classic_u.lua new file mode 100644 index 00000000..74bad9c8 --- /dev/null +++ b/parts/modes/classic_u.lua @@ -0,0 +1,32 @@ +return{ + color=COLOR.lBlue, + env={ + center=0,ghost=0, + smooth=false, + freshLimit=0, + face={0,0,2,2,2,0,0}, + eventSet='classic_u', + 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]=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, +}