经典模式全部换新，只保留三个从9/18/29开始的模式

注意：提速的行数和分数显示不完全和原版一致

parts/eventsets/classic_e.lua

@@ -1,14 +1,9 @@
 return{
-    das=16,
+    das=16,arr=6,
-    arr=6,
+    sddas=6,sdarr=6,
-    sddas=2,
+    irs=false,ims=false,
-    sdarr=2,
+    drop=6,lock=6,
-    irs=false,
+    wait=10,fall=25,
-    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
+        local r=P.modeData.target/10
-        mStr(r<11 and 9 or r<22 and r or("%02x"):format(r*10-220),63,210)
+        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
+                P:win('finish')
-                SFX.play('blip_1')
+                return
-            elseif D.target==300 then
-                P.gameEnv.drop,P.gameEnv.lock=1,1
-                SFX.play('blip_1')
             else
                 SFX.play('reach')
             end
+            D.target=D.target+10
         end
     end,
 }

parts/eventsets/classic_h.lua

@@ -1,14 +1,9 @@
 return{
-    das=16,
+    das=16,arr=6,
-    arr=6,
+    sddas=3,sdarr=3,
-    sddas=2,
+    irs=false,ims=false,
-    sdarr=2,
+    drop=3,lock=3,
-    irs=false,
+    wait=10,fall=25,
-    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
+                P:win('finish')
-                SFX.play('blip_1')
+                return
             else
                 SFX.play('reach')
             end
+            D.target=D.target+10
         end
     end,
 }

parts/eventsets/classic_l.lua

@@ -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,
-}

parts/eventsets/classic_n.lua

@@ -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,
-}

parts/eventsets/classic_u.lua

@@ -1,14 +1,9 @@
 return{
-    das=16,
+    das=16,arr=6,
-    arr=6,
+    sddas=1,sdarr=1,
-    sddas=2,
+    irs=false,ims=false,
-    sdarr=2,
+    drop=1,lock=1,
-    irs=false,
+    wait=10,fall=25,
-    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
+        local r=P.modeData.target/10
-        mStr(r<22 and 29 or("%02x"):format(r*10-220),63,210)
+        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

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"},

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"},

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"},

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"},

parts/language/lang_yygq.lua

@@ -329,7 +329,6 @@ return{
 
         ['master_l']=       {"大师",         "疯狂"},
         ['master_u']=       {"大师",         "极限"},
-        ['classic_fast']=   {"高速经典",      "CTWC"},
 
         ['custom_clear']=   {"自定义",       "普通"},
         ['custom_puzzle']=  {"自定义",       "拼图"},

parts/language/lang_zh.lua

@@ -841,7 +841,6 @@ return{
 
         ['master_l']=       {"大师",        "疯狂"},
         ['master_u']=       {"大师",        "极限"},
-        ['classic_fast']=   {"高速经典",    "CTWC"},
 
         ['custom_clear']=   {"自定义",       "普通"},
         ['custom_puzzle']=  {"自定义",       "拼图"},

parts/language/lang_zh2.lua

@@ -227,7 +227,6 @@ return{
 
         ['master_l']=       {"大师",        "疯狂"},
         ['master_u']=       {"大师",        "极限"},
-        ['classic_fast']=   {"高速经典",     "CTWC"},
 
         ['custom_clear']=   {"自定义",       "普通"},
         ['custom_puzzle']=  {"自定义",       "拼图"},

parts/language/lang_zh3.lua

@@ -158,7 +158,7 @@ return{
         "收到:",
         "清除:",
         "旋转:",
-        "商对商/商对商对商/个人电脑/直升机性能计算机:",
+        "商对商/商商商/个人电脑/直升机性能电脑:",
         "技巧:",
     },
     radar={"很棒","关","攻击","发送","自给能探测器","挖掘"},
@@ -173,7 +173,7 @@ return{
         "挖掘/挖掘:",
         "效率/挖掘效率:",
         "商对商/商对商对商:",
-        "个人电脑/直升机性能计算机:",
+        "个人电脑/直升机性能电脑:",
         "技巧错误/技巧率:",
     },
     aboutTexts={
@@ -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']= {"习俗",            "令人费解的"},

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_h',     x=-150,      y=-970,     size=35,shape=2,icon="classic",     unlock={'classic_u'}},
-    {name='classic_u',     x=-150,      y=-1050,    size=30,shape=2,icon="classic"},
+    {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'},

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]<b[2]end,
     getRank=function(P)
         local L=P.stat.row
         return
-        L>=150 and 5 or
+        L>=200 and 5 or
-        L>=120 and 4 or
+        L>=140 and 4 or
-        L>=90 and 3 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,
 }

parts/modes/classic_fast.lua

@@ -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]<b[2]end,
-    getRank=function(P)
-        local L=P.stat.row
-        return
-        L>=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,
-}

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]<b[2]end,
     getRank=function(P)
         local L=P.stat.row
         return
-        L>=100 and 5 or
+        L>=200 and 5 or
-        L>=70 and 4 or
+        L>=140 and 4 or
-        L>=50 and 3 or
+        L>=100 and 3 or
-        L>=30 and 2 or
+        L>=60 and 2 or
-        L>=10 and 1 or
+        L>=30 and 1 or
         L>=1 and 0
     end,
 }

parts/modes/classic_l.lua

@@ -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]<b[2]end,
-    getRank=function(P)
-        local L=P.stat.row
-        return
-        L>=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,
-}

parts/modes/classic_n.lua

@@ -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]<b[2]end,
-    getRank=function(P)
-        local L=P.stat.row
-        return
-        L>=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,
-}

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]<b[2]end,