Add Strategy+ (#539)

parts/eventsets/strategy_e_plus.lua

@@ -0,0 +1,38 @@
+local waitSpeed={60,59,58,57,56,55,54,52,50,48,46,44,42,40,38,36,34,32,30}
+
+return
+{
+	holdCount=0,
+    das=5,arr=1,
+    drop=0,lock=7,
+    wait=60,fall=0,
+    freshLimit=12,
+    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.modeData.target=10
+    end,
+    hook_drop=function(P)
+        if P.stat.row>=P.modeData.target then
+            if P.modeData.target==200 then
+                P:win('finish')
+            else
+                if P.modeData.target==40 then
+                    BG.set('rainbow')
+                elseif P.modeData.target==80 then
+                    BG.set('rainbow2')
+                elseif P.modeData.target==100 then
+                    BG.set('glow')
+                    P.modeData.lock=6
+                elseif P.modeData.target==120 then
+                    BG.set('lightning')
+                end
+                P.gameEnv.wait=waitSpeed[P.modeData.target/10]
+                P.modeData.target=P.modeData.target+10
+                SFX.play('reach')
+            end
+        end
+    end
+}

parts/eventsets/strategy_h_plus.lua

@@ -0,0 +1,39 @@
+local waitSpeed={30,29,28,27,26,25,24,23,22,21,20,19,18,18,17,17,16,16,15}
+
+return
+{
+	holdCount=0,
+    das=4,arr=1,
+    drop=0,lock=6,
+    wait=30,fall=0,
+    freshLimit=12,
+    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.modeData.target=10
+    end,
+    hook_drop=function(P)
+        if P.stat.row>=P.modeData.target then
+            if P.modeData.target==200 then
+                P:win('finish')
+            else
+                if P.modeData.target==40 then
+                    BG.set('rainbow')
+                elseif P.modeData.target==80 then
+                    BG.set('rainbow2')
+                elseif P.modeData.target==100 then
+                    BG.set('glow')
+                    P.modeData.lock=5
+                    BGM.play('secret8th remix')
+                elseif P.modeData.target==120 then
+                    BG.set('lightning')
+                end
+                P.gameEnv.wait=waitSpeed[P.modeData.target/10]
+                P.modeData.target=P.modeData.target+10
+                SFX.play('reach')
+            end
+        end
+    end
+}

parts/eventsets/strategy_u_plus.lua

@@ -0,0 +1,39 @@
+local waitSpeed={15,15,14,14,13,13,12,12,11,11,10,10,9,9,8,8,7,7,7}
+
+return
+{
+	holdCount=0,
+    das=3,arr=1,
+    drop=0,lock=5,
+    wait=15,fall=0,
+    freshLimit=12,
+    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.modeData.target=10
+    end,
+    hook_drop=function(P)
+        if P.stat.row>=P.modeData.target then
+            if P.modeData.target==200 then
+                P:win('finish')
+            else
+                if P.modeData.target==40 then
+                    BG.set('rainbow')
+                elseif P.modeData.target==80 then
+                    BG.set('rainbow2')
+                elseif P.modeData.target==100 then
+                    BG.set('glow')
+                    P.modeData.lock=4
+                    BGM.play('secret7th remix')
+                elseif P.modeData.target==120 then
+                    BG.set('lightning')
+                end
+                P.gameEnv.wait=waitSpeed[P.modeData.target/10]
+                P.modeData.target=P.modeData.target+10
+                SFX.play('reach')
+            end
+        end
+    end
+}

parts/language/lang_en.lua

@@ -716,6 +716,9 @@ return{
         ['strategy_e']=     {"Strategy",          "EASY",       "Fast 20G decision"},
         ['strategy_h']=     {"Strategy",          "HARD",       "Fast 20G decision"},
         ['strategy_u']=     {"Strategy",          "ULTIMATE",   "Fast 20G decision"},
+        ['strategy_e_plus']={"Strategy",          "EASY+",      "Fast 20G decision"},
+        ['strategy_h_plus']={"Strategy",          "HARD+",      "Fast 20G decision"},
+        ['strategy_u_plus']={"Strategy",          "ULTIMATE+",  "Fast 20G decision"},
         ['blind_e']=        {"Invisible",         "HALF",       "For novices"},
         ['blind_n']=        {"Invisible",         "ALL",        "For intermediates"},
         ['blind_h']=        {"Invisible",         "SUDDEN",     "For the experienced"},
@@ -752,7 +755,7 @@ return{
         ['tech_l']=         {"Tech",              "LUNATIC",    "Try to keep the\nBack-to-Back chain!"},
         ['tech_l_plus']=    {"Tech",              "LUNATIC+",   "Spins & PCs only"},
         ['tech_finesse']=   {"Tech",              "FINESSE",    "No finesse faults!"},
-        ['tech_finesse_f']={"Tech",              "FINESSE+",   "No normal clears and finesse faults!"},
+        ['tech_finesse_f']= {"Tech",              "FINESSE+",   "No normal clears and finesse faults!"},
         ['tsd_e']=          {"TSD Challenge",     "EASY",       "T-Spin Doubles only!"},
         ['tsd_h']=          {"TSD Challenge",     "HARD",       "T-Spin Doubles only!"},
         ['tsd_u']=          {"TSD Challenge",     "ULTIMATE",   "T-Spin Doubles only!"},

parts/language/lang_es.lua

@@ -672,6 +672,9 @@ return{
         -- ['strategy_e']=     {"Strategy",                "EASY",          "Fast 20G decision"},
         -- ['strategy_h']=     {"Strategy",                "HARD",          "Fast 20G decision"},
         -- ['strategy_u']=     {"Strategy",                "ULTIMATE",      "Fast 20G decision"},
+        -- ['strategy_e_plus']={"Strategi",          "MUDAH+",       "Keputusan 20G cepat"},
+        -- ['strategy_h_plus']={"Strategi",          "SULIT+",       "Keputusan 20G cepat"},
+        -- ['strategy_u_plus']={"Strategi",          "TERAKHIR+",    "Keputusan 20G cepat"},
         ['blind_e']=        {"A Ciegas",                "Parcial",       "Para novatos."},
         ['blind_n']=        {"A Ciegas",                "Total",         "Para jugadores intermedios."},
         ['blind_h']=        {"A Ciegas",                "Inmediato",     "Para jugadores experimentados"},

parts/language/lang_fr.lua

@@ -675,6 +675,9 @@ return{
         -- ['strategy_e']=     {"Strategy",        "EASY",        "Fast 20G decision"},
         -- ['strategy_h']=     {"Strategy",        "HARD",        "Fast 20G decision"},
         -- ['strategy_u']=     {"Strategy",        "ULTIMATE",    "Fast 20G decision"},
+        -- ['strategy_e_plus']={"Strategi",          "MUDAH+",       "Keputusan 20G cepat"},
+        -- ['strategy_h_plus']={"Strategi",          "SULIT+",       "Keputusan 20G cepat"},
+        -- ['strategy_u_plus']={"Strategi",          "TERAKHIR+",    "Keputusan 20G cepat"},
         ['blind_e']=       {"Aveugle",         "MOITIE",      "Pour les novices."},
         ['blind_n']=       {"Aveugle",         "TOUT",        "Pour les joueurs intermédiaires."},
         ['blind_h']=       {"Aveugle",         "SOUDAIN",     "Pour les bons jooeurs."},

parts/language/lang_id.lua

@@ -716,6 +716,9 @@ return{
         ['strategy_e']=     {"Strategi",          "MUDAH",        "Keputusan 20G cepat"},
         ['strategy_h']=     {"Strategi",          "SULIT",        "Keputusan 20G cepat"},
         ['strategy_u']=     {"Strategi",          "TERAKHIR",     "Keputusan 20G cepat"},
+        ['strategy_e_plus']={"Strategi",          "MUDAH+",       "Keputusan 20G cepat"},
+        ['strategy_h_plus']={"Strategi",          "SULIT+",       "Keputusan 20G cepat"},
+        ['strategy_u_plus']={"Strategi",          "TERAKHIR+",    "Keputusan 20G cepat"},
         ['blind_e']=        {"Tak Terlihat",      "MUDAH",        "Untuk pemula"},
         ['blind_n']=        {"Tak Terlihat",      "NORMAL",       "Untuk amatir"},
         ['blind_h']=        {"Tak Terlihat",      "SULIT",        "Untuk orang berpengalaman"},
@@ -752,7 +755,7 @@ return{
         ['tech_l']=         {"Tech",              "GILA",         "Coba jaga deret Back-To-Back!"},
         ['tech_l_plus']=    {"Tech",              "GILA+",        "Hanya Spins & PCs dibolehkan"},
         ['tech_finesse']=   {"Tech",              "EF. TOMBOL",   "Efisiensi tombol harus maksimal!"},
-        ['tech_finesse_f']={"Tech",              "EF. TOMBOL+",  "Efisiensi tombol maksimal dan tidak ada garis normal!"},
+        ['tech_finesse_f']= {"Tech",              "EF. TOMBOL+",  "Efisiensi tombol maksimal dan tidak ada garis normal!"},
         ['tsd_e']=          {"Tantangan TSD",     "MUDAH",        "Hanya T-Spin Double dibolehkan!"},
         ['tsd_h']=          {"Tantangan TSD",     "SULIT",        "Hanya T-Spin Double dibolehkan!"},
         ['tsd_u']=          {"Tantangan TSD",     "TERAKHIR",     "Hanya T-Spin Double dibolehkan!"},

parts/language/lang_pt.lua

@@ -706,6 +706,9 @@ return{
         -- ['strategy_e']=         {"Strategy",         "EASY",         "Fast 20G decision"},
         -- ['strategy_h']=         {"Strategy",         "HARD",         "Fast 20G decision"},
         -- ['strategy_u']=         {"Strategy",         "ULTIMATE",     "Fast 20G decision"},
+        -- ['strategy_e_plus']={"Strategi",          "MUDAH+",       "Keputusan 20G cepat"},
+        -- ['strategy_h_plus']={"Strategi",          "SULIT+",       "Keputusan 20G cepat"},
+        -- ['strategy_u_plus']={"Strategi",          "TERAKHIR+",    "Keputusan 20G cepat"},
         ['blind_e']=            {"Cego",             "METADE",       "Para novatos."},
         ['blind_n']=            {"Cego",             "TUDO",         "Para intermediários."},
         ['blind_h']=            {"Cego",             "DE REPENTE",   "Para experientes."},

parts/language/lang_yygq.lua

@@ -232,6 +232,9 @@ return{fallback='zh',
         ['strategy_e']=     {"策略堆叠",      "简单",      "有区别吗"},
         ['strategy_h']=     {"策略堆叠",      "困难",      "没区别吧"},
         ['strategy_u']=     {"策略堆叠",      "极限",      "没区别"},
+        ['strategy_e_plus']={"策略堆叠",      "简单+",     "有区别吗"},
+        ['strategy_h_plus']={"策略堆叠",      "困难+",     "没区别吧"},
+        ['strategy_u_plus']={"策略堆叠",      "极限+",     "没区别"},
         ['blind_e']=        {"隐形",         "半隐",      "谁都能玩"},
         ['blind_n']=        {"隐形",         "全隐",      "稍加练习即可"},
         ['blind_h']=        {"隐形",         "瞬隐",      "和上一个一样"},

parts/language/lang_zh.lua

@@ -715,6 +715,9 @@ return{
         ['strategy_e']=     {"策略堆叠",     "简单",      "20G堆叠中速决策练习"},
         ['strategy_h']=     {"策略堆叠",     "困难",      "20G堆叠快速决策练习"},
         ['strategy_u']=     {"策略堆叠",     "极限",      "20G堆叠极速决策练习"},
+        ['strategy_e_plus']={"策略堆叠",     "简单+",     "20G堆叠中速决策练习"},
+        ['strategy_h_plus']={"策略堆叠",     "困难+",     "20G堆叠快速决策练习"},
+        ['strategy_u_plus']={"策略堆叠",     "极限+",     "20G堆叠极速决策练习"},
         ['blind_e']=        {"隐形",        "半隐",      "不强大脑"},
         ['blind_n']=        {"隐形",        "全隐",      "挺强大脑"},
         ['blind_h']=        {"隐形",        "瞬隐",      "很强大脑"},

parts/language/lang_zh_full.lua

@@ -122,6 +122,9 @@ return{
         ['strategy_e']=     {"策略堆叠",     "简单",      "20G堆叠中速决策练习"},
         ['strategy_h']=     {"策略堆叠",     "困难",      "20G堆叠快速决策练习"},
         ['strategy_u']=     {"策略堆叠",     "极限",      "20G堆叠极速决策练习"},
+        ['strategy_e_plus']={"策略堆叠",     "简单+",     "20G堆叠中速决策练习"},
+        ['strategy_h_plus']={"策略堆叠",     "困难+",     "20G堆叠快速决策练习"},
+        ['strategy_u_plus']={"策略堆叠",     "极限+",     "20G堆叠极速决策练习"},
         ['blind_e']=        {"隐形",        "半隐",      "不强大脑"},
         ['blind_n']=        {"隐形",        "全隐",      "挺强大脑"},
         ['blind_h']=        {"隐形",        "瞬隐",      "很强大脑"},

parts/language/lang_zh_grass.lua

@@ -713,6 +713,9 @@ return{
         ['strategy_e']=     {"策略堆叠",         "简单",         "20G堆叠中速决策练习"},
         ['strategy_h']=     {"策略堆叠",         "困难",         "20G堆叠快速决策练习"},
         ['strategy_u']=     {"策略堆叠",         "极限",         "20G堆叠极速决策练习"},
+        ['strategy_e_plus']={"策略堆叠",         "简单",         "20G堆叠中速决策练习"},
+        ['strategy_h_plus']={"策略堆叠",         "困难",         "20G堆叠快速决策练习"},
+        ['strategy_u_plus']={"策略堆叠",         "极限",         "20G堆叠极速决策练习"},
         ['blind_e']=        {"看不见的",         "一半",         "对于新手来说"},
         ['blind_n']=        {"看不见的",         "全部",         "对于中间产品"},
         ['blind_h']=        {"看不见的",         "突然",         "对于有经验的人"},
@@ -749,7 +752,7 @@ return{
         ['tech_l']=         {"技术人员",          "疯子",         "试着保持背靠背的链条！"},
         ['tech_l_plus']=    {"技术人员",          "疯子+",        "仅限旋转和个人电脑"},
         ['tech_finesse']=   {"技术人员",          "手腕",         "没有技巧错误！"},
-        ['tech_finesse_f']={"技术人员",          "技巧+",        "没有正常的清除和技巧错误！"},
+        ['tech_finesse_f']= {"技术人员",          "技巧+",        "没有正常的清除和技巧错误！"},
         ['tsd_e']=          {"热关断挑战赛",       "容易",         "只有T-Spin双打！"},
         ['tsd_h']=          {"热关断挑战赛",       "硬的",         "只有T-Spin双打！"},
         ['tsd_u']=          {"热关断挑战赛",       "终极",         "只有T-Spin双打！"},

parts/language/lang_zh_trad.lua

@@ -715,6 +715,9 @@ return{
         ['strategy_e']=     {"策略堆疊",     "簡單",       "20G堆疊中速決策練習"},
         ['strategy_h']=     {"策略堆疊",     "困難",       "20G堆疊快速決策練習"},
         ['strategy_u']=     {"策略堆疊",     "極限",       "20G堆疊極速決策練習"},
+        ['strategy_e_plus']={"策略堆疊",     "簡單+",      "20G堆疊中速決策練習"},
+        ['strategy_h_plus']={"策略堆疊",     "困難+",      "20G堆疊快速決策練習"},
+        ['strategy_u_plus']={"策略堆疊",     "極限+",      "20G堆疊極速決策練習"},
         ['blind_e']=        {"隱形",        "半隱",      "不強大腦"},
         ['blind_n']=        {"隱形",        "全隱",      "挺強大腦"},
         ['blind_h']=        {"隱形",        "瞬隱",      "很強大腦"},

parts/modes/strategy_e_plus.lua

@@ -0,0 +1,21 @@
+return{
+    env={
+        sequence="bagES",
+        eventSet='strategy_e_plus',
+        bg='bg2',bgm='push',
+    },
+    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]<b[2]end,
+    getRank=function(P)
+        local L=P.stat.row
+        return
+        L>=200 and 5 or
+        L>=170 and 4 or
+        L>=150 and 3 or
+        L>=120 and 2 or
+        L>=60 and 1 or
+        L>=26 and 0
+    end,
+}

parts/modes/strategy_h_plus.lua

@@ -0,0 +1,21 @@
+return{
+    env={
+        sequence="bagES",
+        eventSet='strategy_h_plus',
+        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]<b[2]end,
+    getRank=function(P)
+        local L=P.stat.row
+        return
+        L>=200 and 5 or
+        L>=160 and 4 or
+        L>=120 and 3 or
+        L>=70 and 2 or
+        L>=40 and 1 or
+        L>=16 and 0
+    end,
+}

parts/modes/strategy_u_plus.lua

@@ -0,0 +1,21 @@
+return{
+    env={
+        sequence="bagES",
+        eventSet='strategy_u_plus',
+        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]<b[2]end,
+    getRank=function(P)
+        local L=P.stat.row
+        return
+        L>=200 and 5 or
+        L>=150 and 4 or
+        L>=80 and 3 or
+        L>=40 and 2 or
+        L>=20 and 1 or
+        L>=10 and 0
+    end,
+}