版本推进

* Added secret_grade and sprint123 to map and added some icons

* Add master_g to map

* add classic_u and master_instinct and misc changes

* added big modes

* Fix some bugs on master_instinct

* fix bugs on big mode

* Simplified Grade Display

.github/actions/automatic-test/action.yml

@@ -4,7 +4,6 @@ description: 'Check for obvious errors.'
 runs:
   using: "composite"
   steps:
-  - uses: actions/checkout@v2
   - uses: ./.github/actions/build-love
     with:
       file-path: Techmino.love
@@ -21,4 +20,4 @@ runs:
     uses: GabrielBB/xvfb-action@v1
     with:
       run: |
-        ./dest/love Techmino.love --test
+        ./dest/love Techmino.love --test

.github/workflows/dev.yml

@@ -31,6 +31,8 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/automatic-test
 
   build-windows:
@@ -38,6 +40,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -60,6 +64,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -78,6 +84,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -103,6 +111,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -131,6 +141,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -159,6 +171,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -192,6 +206,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
     - uses: ./.github/actions/build-love
       with:

.github/workflows/release.yml

@@ -41,6 +41,8 @@ jobs:
     needs: get-info
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: ./.github/actions/update-version
       - uses: ./.github/actions/build-windows
         with:
@@ -62,6 +64,8 @@ jobs:
     needs: get-info
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: ./.github/actions/update-version
       - uses: ./.github/actions/build-windows
         with:
@@ -83,6 +87,8 @@ jobs:
     needs: get-info
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: ./.github/actions/update-version
       - uses: ./.github/actions/build-linux
         with:
@@ -99,6 +105,8 @@ jobs:
     needs: get-info
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: ./.github/actions/update-version
       - uses: ./.github/actions/build-android
         with:
@@ -121,6 +129,8 @@ jobs:
     needs: get-info
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: ./.github/actions/update-version
       - uses: ./.github/actions/build-macos
         with:
@@ -148,6 +158,8 @@ jobs:
     needs: get-info
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: ./.github/actions/update-version
       - uses: ./.github/actions/build-ios
         with:

.github/workflows/test.yml

@@ -33,6 +33,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -55,6 +57,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -73,6 +77,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -98,6 +104,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}
@@ -125,6 +133,8 @@ jobs:
     needs: get-info
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
     - uses: ./.github/actions/update-version
       with:
         commit: ${{ needs.get-info.outputs.commit }}

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "Zframework"]
-	path = Zframework
-	url = git@github.com:26F-Studio/Zframework.git
+    path = Zframework
+    url = git@github.com:26F-Studio/Zframework.git

legals.md

@@ -1,4 +1,4 @@
-TECHMINO © 2019-2021 26F Studio. Some rights reserved.
+TECHMINO © 2019–2022 26F Studio. Some rights reserved.
 
 TECHMINO and "26F Studio" are trademarks of 26F Studio. The TECHMINO game and source code are under a GNU Lesser General Public License Version 3.
 
@@ -6,13 +6,13 @@ TECHMINO and "26F Studio" are trademarks of 26F Studio. The TECHMINO game and so
 "Tetris" is the registered trademark of The Tetris Holding, LLC, licensed to The Tetris Company, Inc. TECHMINO is not a fan game of Tetris. TECHMINO and 26F Studio are not affiliated with Tetris Holding, LLC or The Tetris Company, Inc. in any way.
 
 
-Powered by LÖVE, © 2006-2021 LÖVE Development Team.
+Powered by LÖVE, © 2006–2022 LÖVE Development Team.
 
-Lua is free software distributed under the terms of the MIT license. Copyright © 1994-2021 by Lua.org, PUC-Rio.
+Lua is free software distributed under the terms of the MIT license. Copyright © 1994–2022 by Lua.org, PUC-Rio.
 
 SIMPLE LOVE LIGHTS is under a MIT License. Created by Dylan Hunn.
 
-json.lua is copyrighted by rxi. © 2021 rxi.
+json.lua is copyrighted by rxi. © 2022 rxi.
 
 IBM Plex is copyrighted by the International Business Machines Corporation. IBM and IBM Plex are trademarks of IBM Corp, registered in many jurisdictions worldwide. IBM Plex is licensed under the SIL Open Font License, Version 1.1.
 
@@ -23,7 +23,7 @@ Source Han Sans is copyrighted by Adobe Inc. Source Han Sans and Adobe are regis
 JetBrains Mono is copyrighted by the JetBrains Mono Project authors. JetBrains Mono is a trademark of JetBrains s.r.o. JetBrains Mono is licensed under the SIL Open Font License, Version 1.1.
 
 
-"PlayStation", "PS", "PlayStation Family Mark", "PS logo", "DualSense" and "Play Has No Limits" are registered trademarks or trademarks of Sony Interactive Entertainment Inc. "SONY" is a registered trademark of Sony Corporation. © 2021 Sony Interactive Entertainment LLC.
+"PlayStation", "PS", "PlayStation Family Mark", "PS logo", "DualSense" and "Play Has No Limits" are registered trademarks or trademarks of Sony Interactive Entertainment Inc. "SONY" is a registered trademark of Sony Corporation. © 2022 Sony Interactive Entertainment LLC.
 
 
 "Windows", the Windows logo, "Xbox", Xbox logo, and "Microsoft" are registered trademarks of Microsoft Corporation in the United States of America and other countries or regions.
@@ -32,20 +32,20 @@ JetBrains Mono is copyrighted by the JetBrains Mono Project authors. JetBrains M
 The Apple logo, "Apple Inc.," iOS, iPadOS, macOS, iPhone, and Mac are registered trademarks of Apple Inc. in the United States of America and other countries or regions.
 
 
-"EA" and "Electronic Arts" are registered trademarks of Electronic Arts Inc. © 2021 Electronic Arts Inc.
+"EA" and "Electronic Arts" are registered trademarks of Electronic Arts Inc. © 2022 Electronic Arts Inc.
 
-SEGA and the SEGA logo are registered trademarks of Sega Corporation. © 2021 Sega Corporation.
+SEGA and the SEGA logo are registered trademarks of Sega Corporation. © 2022 Sega Corporation.
 
 Oculus Quest is a registered trademark of Facebook Technologies, LLC. © Meta Platforms, Inc.
 
-"Nintendo" is a registered trademarks of Nintendo Co., Ltd. © 2021 Nintendo Co., Ltd.
+"Nintendo" is a registered trademarks of Nintendo Co., Ltd. © 2022 Nintendo Co., Ltd.
 
-N3TWORK is a registered trademark of N3TWORK Inc. © 2021 N3TWORK Inc.
+N3TWORK is a registered trademark of N3TWORK Inc. © 2022 N3TWORK Inc.
 
 GoldWave is a registered trademark of GoldWave, Inc.
 
 Linux is a registered trademark of Linus Torvalds.
 
-Touhou Project © Team Shanghai Alice 2002-2021.
+Touhou Project © Team Shanghai Alice 2002–2022.
 
 All other trademarks, logos, and copyrights are the properties of their respective owners.

main.lua

@@ -51,8 +51,8 @@ local _LOADTIME_=TIME()
 --Load modules
 Z=require'Zframework'
 FONT.load{
-    norm='parts/fonts/proportional.ttf',
-    mono='parts/fonts/monospaced.ttf',
+    norm='parts/fonts/proportional.otf',
+    mono='parts/fonts/monospaced.otf',
 }
 FONT.setDefault('norm')
 FONT.setFallback('norm')
@@ -159,7 +159,7 @@ do--Z.setCursor
             _=BLOCK_COLORS[SETTING.skin[R]]
             gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3))
             _=DSCP[R][0]
-            gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5)
+            gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,8,8,2*_[2]+1,2*(#BLOCKS[R][0]-_[1])-1)
             gc_setColor(1,1,1)
             gc_draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8)
         end
@@ -366,7 +366,6 @@ LANG.init('zh',
     {
         zh=require'parts.language.lang_zh',
         zh_trad=require'parts.language.lang_zh_trad',
-        zh_full=require'parts.language.lang_zh_full',
         en=require'parts.language.lang_en',
         fr=require'parts.language.lang_fr',
         es=require'parts.language.lang_es',
@@ -550,6 +549,7 @@ do
     if type(SETTING.bg)~='string'then SETTING.bg='on'end
     if SETTING.skin[18]==10 then SETTING.skin[18]=4 end
     if SETTING.reTime>3 or SETTING.reTime<.5 then SETTING.reTime=2 end
+    if SETTING.locale=='zh_full' then SETTING.locale='zh' end
     if RANKS.infinite then RANKS.infinite=0 end
     if RANKS.infinite_dig then RANKS.infinite_dig=0 end
     if not RANKS.sprint_10l then RANKS.sprint_10l=0 end
@@ -683,3 +683,4 @@ if TABLE.find(arg,'--test')then
         love.event.quit(1)
     end)
 end
+WS.switchHost('101.43.110.22','10026','/tech/socket/v1')

parts/backgrounds/blockrain.lua

@@ -20,7 +20,7 @@ function back.update()
             color=BLOCK_COLORS[SETTING.skin[r]],
             x=SCR.w*rnd(),
             y=SCR.h*-.05,
-            k=SCR.rad/100,
+            k=SCR.rad/200,
             ang=rnd()*6.2832,
             vy=.5+rnd()*.4,
             vx=rnd()*.4-.2,

parts/backgrounds/blockspace.lua

@@ -47,7 +47,7 @@ function back.draw()
         local M=mino[i]
         local c=M.color
         gc_setColor(c[1],c[2],c[3],.2)
-        gc_draw(M.block,M.d*cos(M.ang),M.d*sin(M.ang),M.rotate,(18*M.d/SCR.rad)^1.6,nil,M.block:getWidth()/2,M.block:getHeight()/2)
+        gc_draw(M.block,M.d*cos(M.ang),M.d*sin(M.ang),M.rotate,(12*M.d/SCR.rad)^1.6,nil,M.block:getWidth()/2,M.block:getHeight()/2)
     end
     gc_translate(-SCR.cx,-SCR.cy)
 end

parts/backgrounds/fixColor.lua

@@ -1,11 +1,11 @@
 --Customizable grey background
 local gc=love.graphics
 local back={}
-local brightness=.26
+local r,g,b=.26,.26,.26
 function back.draw()
-    gc.clear(brightness,brightness,brightness)
+    gc.clear(r,g,b)
 end
-function back.event(b)
-    brightness=b
+function back.event(_r,_g,_b)
+    r,g,b=_r,_g,_b
 end
 return back

parts/backgrounds/lightning2.lua

@@ -6,7 +6,6 @@ local back={}
 local t
 local colorLib=BLOCK_COLORS
 local blocks=BLOCKS
-local scs=RSlist.TRS.centerPos
 function back.init()
     t=rnd()*2600
 end
@@ -21,6 +20,6 @@ function back.draw()
     end
     local _=colorLib[SETTING.skin[R]]
     gc.setColor(_[1],_[2],_[3],.12)
-    gc.draw(TEXTURE.miniBlock[R],SCR.cx,SCR.cy,t%3.1416*6,400*SCR.k,nil,scs[R][0][2]+.5,#blocks[R][0]-scs[R][0][1]-.5)
+    gc.draw(TEXTURE.miniBlock[R],SCR.cx,SCR.cy,t%3.1416*6,200*SCR.k,nil,2*DSCP[R][0][2]+1,2*(#blocks[R][0]-DSCP[R][0][1])-1)
 end
 return back

parts/bot/bot_cc.lua

@@ -58,6 +58,8 @@ function bot_cc:thread()
                 local m=rem(move,1)
                 if m<4 then
                     ins(keys,m+1)
+                elseif m==5 then
+                    ins(keys, 5)
                 elseif not self.data._20G then
                     ins(keys,13)
                 end

parts/bot/init.lua

@@ -49,7 +49,7 @@ local botMeta={__index=_undefMethod}
 
 local BOT={}
 
-local AISpeed={60,50,40,30,20,14,10,6,4,3}
+local AISpeed={60,50,42,34,27,21,16,12,9,6}
 --[[
     arg={
         next: number of nexts
@@ -83,7 +83,7 @@ end
 function BOT.new(P,data)
     local bot={P=P,data=data}
     if data.type=="CC"then
-        P:setRS('SRS')
+        P:setRS('TRS')
         bot.keys={}
         bot.bufferedNexts={}
         bot.delay=data.delay

parts/char.lua

@@ -213,91 +213,93 @@ local L={
         psOption=       0xF01A5,
     },
     mahjong={--F0200~F027F
-        wan1=           0xF0200,
-        wan2=           0xF0201,
-        wan3=           0xF0202,
-        wan4=           0xF0203,
-        wan5=           0xF0204,
-        wan6=           0xF0205,
-        wan7=           0xF0206,
-        wan8=           0xF0207,
-        wan9=           0xF0208,
-        tiao1=          0xF0209,
-        tiao2=          0xF020A,
-        tiao3=          0xF020B,
-        tiao4=          0xF020C,
-        tiao5=          0xF020D,
-        tiao6=          0xF020E,
-        tiao7=          0xF020F,
-        tiao8=          0xF0210,
-        tiao9=          0xF0211,
-        tong1=          0xF0212,
-        tong2=          0xF0213,
-        tong3=          0xF0214,
-        tong4=          0xF0215,
-        tong5=          0xF0216,
-        tong6=          0xF0217,
-        tong7=          0xF0218,
-        tong8=          0xF0219,
-        tong9=          0xF021A,
-        east=           0xF021B,
-        south=          0xF021C,
-        west=           0xF021D,
-        north=          0xF021E,
-        center=         0xF021F,
-        fortune=        0xF0220,
-        soap=           0xF0221,
-        fortuneAlt=     0xF0222,
-        soapAlt=        0xF0223,
-        spring=         0xF0224,
-        summer=         0xF0225,
-        autumn=         0xF0226,
-        winter=         0xF0227,
-        plum=           0xF0228,
-        orchid=         0xF0229,
-        chry=           0xF022A,
-        bamboo=         0xF022B,
-        wan5Red=        0xF022C,
-        tiao5Red=       0xF022D,
-        tong5Red=       0xF022E,
-        wan1Base=       0xF022F,
-        wan2Base=       0xF0230,
-        wan3Base=       0xF0231,
-        wan4Base=       0xF0232,
-        wan5Base=       0xF0233,
-        wan6Base=       0xF0234,
-        wan7Base=       0xF0235,
-        wan8Base=       0xF0236,
-        wan9Base=       0xF0237,
-        wanComb=        0xF0238,
-        tiao1Base=      0xF0239,
-        tiao1Comb=      0xF023A,
-        tiao5Base=      0xF023B,
-        tiao5Comb=      0xF023C,
-        tiao7Base=      0xF023D,
-        tiao7Comb=      0xF023E,
-        tiao9Base=      0xF023F,
-        tiao9Comb=      0xF0240,
-        tong2Base=      0xF0241,
-        tong2Comb=      0xF0242,
-        tong3Base=      0xF0243,
-        tong3Comb1=     0xF0244,
-        tong3Comb2=     0xF0245,
-        tong4Base=      0xF0246,
-        tong4Comb=      0xF0247,
-        tong5Base=      0xF0248,
-        tong5Comb1=     0xF0249,
-        tong5Comb2=     0xF024A,
-        tong6Base=      0xF024B,
-        tong6Comb=      0xF024C,
-        tong7Base=      0xF024D,
-        tong7Comb=      0xF024E,
-        tong9Base=      0xF024F,
-        tong9Comb1=     0xF0250,
-        tong9Comb2=     0xF0251,
-        frameComb=      0xF0252,
+        m1=           0xF0200,
+        m2=           0xF0201,
+        m3=           0xF0202,
+        m4=           0xF0203,
+        m5=           0xF0204,
+        m6=           0xF0205,
+        m7=           0xF0206,
+        m8=           0xF0207,
+        m9=           0xF0208,
+        s1=           0xF0209,
+        s2=           0xF020A,
+        s3=           0xF020B,
+        s4=           0xF020C,
+        s5=           0xF020D,
+        s6=           0xF020E,
+        s7=           0xF020F,
+        s8=           0xF0210,
+        s9=           0xF0211,
+        p1=           0xF0212,
+        p2=           0xF0213,
+        p3=           0xF0214,
+        p4=           0xF0215,
+        p5=           0xF0216,
+        p6=           0xF0217,
+        p7=           0xF0218,
+        p8=           0xF0219,
+        p9=           0xF021A,
+        ton=          0xF021B,
+        nan=          0xF021C,
+        sha=          0xF021D,
+        pe=           0xF021E,
+        chun=         0xF021F,
+        hatsu=        0xF0220,
+        haku=         0xF0221,
+        hatsuAlt=     0xF0222,
+        hakuAlt=      0xF0223,
+        haru=         0xF0224,
+        natsu=        0xF0225,
+        aki=          0xF0226,
+        fuyu=         0xF0227,
+        ume=          0xF0228,
+        ran=          0xF0229,
+        kiku=         0xF022A,
+        take=         0xF022B,
+        m5Red=        0xF022C,
+        s5Red=        0xF022D,
+        p5Red=        0xF022E,
+        m1Base=       0xF022F,
+        m2Base=       0xF0230,
+        m3Base=       0xF0231,
+        m4Base=       0xF0232,
+        m5Base=       0xF0233,
+        m6Base=       0xF0234,
+        m7Base=       0xF0235,
+        m8Base=       0xF0236,
+        m9Base=       0xF0237,
+        mComb=        0xF0238,
+        s1Base=       0xF0239,
+        s1Comb=       0xF023A,
+        s5Base=       0xF023B,
+        s5Comb=       0xF023C,
+        s7Base=       0xF023D,
+        s7Comb=       0xF023E,
+        s9Base=       0xF023F,
+        s9Comb=       0xF0240,
+        p2Base=       0xF0241,
+        p2Comb=       0xF0242,
+        p3Base=       0xF0243,
+        p3Comb1=      0xF0244,
+        p3Comb2=      0xF0245,
+        p4Base=       0xF0246,
+        p4Comb=       0xF0247,
+        p5Base=       0xF0248,
+        p5Comb1=      0xF0249,
+        p5Comb2=      0xF024A,
+        p6Base=       0xF024B,
+        p6Comb=       0xF024C,
+        p7Base=       0xF024D,
+        p7Comb=       0xF024E,
+        p9Base=       0xF024F,
+        p9Comb1=      0xF0250,
+        p9Comb2=      0xF0251,
+        frameComb=    0xF0252,
+        s1j=          0xF0253,
+        s1jBase=      0xF0254,
+        s1jComb=      0xF0255,
     }
-
 }
 
 for _,pack in next,L do

parts/eventsets/classic_h.lua

@@ -38,7 +38,7 @@ return{
         local D=P.modeData
         D.drought=P.lastPiece.id==7 and 0 or D.drought+1
         if P.stat.row>=D.target then
-            if D.target==110 then
+            if D.target==100 then
                 P.gameEnv.drop,P.gameEnv.lock=2,2
                 P.gameEnv.sddas,P.gameEnv.sdarr=2,2
                 SFX.play('warn_1')

parts/eventsets/classic_l.lua

@@ -0,0 +1,51 @@
+local gc_setColor=love.graphics.setColor
+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/10
+        mStr(r<11 and 19 or r<22 and r+9 or("%02x"):format(r*10-220),63,210)
+        mText(TEXTOBJ.speedLV,63,290)
+        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
+        if P.modeData.drought>7 then
+            if P.modeData.drought<=14 then
+                gc_setColor(1,1,1,P.modeData.drought/7-1)
+            else
+                local gb=P.modeData.drought<=21 and 2-P.modeData.drought/14 or .5
+                gc_setColor(1,gb,gb)
+            end
+            setFont(50)
+            mStr(P.modeData.drought,63,130)
+            mDraw(MODES.drought_l.icon,63,200,nil,.5)
+        end
+    end,
+    task=function(P)
+        P.modeData.target=10
+    end,
+    hook_drop=function(P)
+        local D=P.modeData
+        D.drought=P.lastPiece.id==7 and 0 or D.drought+1
+        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/master_g.lua

@@ -0,0 +1,316 @@
+local gc=love.graphics
+local regretDelay=-1
+local int_grade=0
+local grade_points=0
+local int_grade_boosts={0,1,2,3,4,5,5,6,6,7,7,7,8,8,8,9,9,9,10,11,12,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26}
+local coolList={false,false,false,false,false,false,false,false,false}
+local regretList={false,false,false,false,false,false,false,false,false,false}
+local gradeList={
+    "9","8","7","6","5","4","3","2","1",
+    "S1","S2","S3","S4","S5","S6","S7","S8","S9",
+    "m1","m2","m3","m4","m5","m6","m7","m8","m9",
+    "M","MK","MV","MO","MM-","MM","MM+","GM-","GM","GM+","TM-","TM","TM+"
+}
+local spd_lvl=0
+local cools=0
+local regrets=0
+local prevSectTime=0
+local isInRoll=false
+local rollGrades=0
+local cool_time={3120,3120,2940,2700,2700,2520,2520,2280,2280,0}
+local reg_time= {5400,4500,4500,4080,3600,3600,3000,3000,3000,3000}
+local prevDrop70=false --determines if previous piece has level less than __70
+local nextSpeedUp=false --determines if the next section speed should be boosted by 100
+local isInRollTrans=false
+local function getGrav(l)
+    return
+    l<30  and 64   or
+    l<35  and 43   or
+    l<40  and 32   or
+    l<50  and 26   or
+    l<60  and 21   or
+    l<70  and 16   or
+    l<80  and 8    or
+    l<90  and 6    or
+    l<120 and 4    or
+    l<160 and 3    or
+    l<200 and 2    or
+    l<220 and 64   or
+    l<230 and 8    or
+    l<233 and 4    or
+    l<236 and 3    or
+    l<243 and 2    or
+    l<300 and 1    or
+    l<360 and 0.5  or
+    l<450 and 0.25 or
+    0
+end
+local function getLock(l)
+    return
+    l<900  and 30 or
+    l<1100 and 19 or
+    15
+end
+local function getWait(l)
+    return
+    l<700  and 23 or
+    l<800  and 16 or
+    l<1000 and 12 or
+    l<1100 and 7  or
+    6
+end
+local function getFall(l)
+    return
+    l<500  and 25 or
+    l<600  and 18 or
+    l<700  and 12 or
+    l<800  and 8 or
+    4
+end
+local function getDas(l)
+    return
+    l<500  and 10 or
+    l<900  and 8 or
+    6
+end
+local function getGrade()
+    if int_grade==nil then int_grade=0 end
+    if rollGrades==nil then rollGrades=0 end
+    return gradeList[math.max(math.min(math.floor(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets),#gradeList),1)]
+end
+local function addGrade(row, cmb, lvl) -- IGS = internal grade system
+    if row<1 then return end
+    local pts=0
+    local cmb_mult=1.0
+    local lvl_mult=math.floor(lvl/250)+1
+
+    if row==1 then
+        pts=int_grade<5 and 10 or int_grade<10 and 5 or 2
+        cmb_mult=1.0
+    elseif row==2 then
+        pts=int_grade<3 and 20 or int_grade<6 and 15 or int_grade<10 and 10 or 12
+        cmb_mult=cmb==1 and 1 or cmb<4 and 1.2 or cmb<8 and 1.4 or cmb<10 and 1.5 or 2.0
+    elseif row==3 then
+        pts=int_grade==0 and 40 or int_grade<4 and 30 or int_grade<7 and 20 or int_grade<10 and 15 or 13
+        cmb_mult=cmb==1 and 1 or cmb<10 and 1+(cmb+2)*0.1 or 2
+    else
+        pts=int_grade==0 and 50 or int_grade<5 and 40 or 30
+        cmb_mult=cmb==1 and 1 or cmb==2 and 1.5 or cmb<6 and (0.2*cmb)+1.2 or cmb<10 and (0.1*cmb)+1.7 or 3
+    end
+
+    grade_points=grade_points+(pts*cmb_mult*lvl_mult)
+    if grade_points>=100 then
+        grade_points=0
+        int_grade=int_grade+1
+    end
+end
+
+return{
+    drop=64,
+    lock=30,
+    wait=23,
+    fall=25,
+    noTele=true,
+    das=16,arr=1,
+    minsdarr=1,
+    ihs=true,irs=true,ims=false,
+    mesDisp=function(P)
+        gc.setColor(1,1,1,1)
+        setFont(45)
+        mText(TEXTOBJ.grade,63,180)
+        setFont(60)
+        mStr(getGrade(),63,110)
+        if isInRoll then
+            setFont(20)
+            mStr(("%.1f"):format(rollGrades),63,208)
+            gc.setLineWidth(2)
+            gc.setColor(.98,.98,.98,.8)
+            gc.rectangle('line',0,240,126,80,4)
+            gc.setColor(.98,.98,.98,.4)
+            gc.rectangle('fill',0+2,240+2,126-4,80-4,2)
+            setFont(45)
+            local t=(P.stat.frame-prevSectTime)/60
+            local T=("%.1f"):format(60-t)
+            gc.setColor(COLOR.dH)
+            mStr(T,65,250)
+            t=t/60
+            gc.setColor(1.7*t,2.3-2*t,.3)
+            mStr(T,63,248)
+        else
+            setFont(20)
+            mStr(grade_points,63,208)
+            setFont(45)
+            if coolList[math.ceil(P.modeData.pt/100+0.01)] then
+                gc.setColor(0,1,0,1)
+            elseif P.stat.frame-prevSectTime > cool_time[math.ceil(P.modeData.pt/100+0.01)] then
+                gc.setColor(0.7,0.7,0.7,1)
+            end
+            if coolList[math.ceil(P.modeData.pt/100+0.01)] and regretList[math.ceil(P.modeData.pt/100+0.01)] then
+                gc.setColor(1,1,0,1)
+            elseif regretList[math.ceil(P.modeData.pt/100+0.01)] then
+                gc.setColor(1,0,0,1)
+            end
+            PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
+        end
+    end,
+    hook_drop=function(P)
+        local D=P.modeData
+
+        local c=#P.clearedRow
+
+        if cools>8 and isInRoll then
+            rollGrades=rollGrades+(c==4 and 1 or 0.1*c)
+            return
+        elseif isInRoll then
+            rollGrades=rollGrades+(c==4 and 0.26 or 0.04*c)
+            return
+        end
+
+        if c==0 and D.pt+1>=D.target then return end
+        local s=c<3 and c+1 or c==3 and 5 or 7
+        if P.combo>7 then s=s+2
+        elseif P.combo>3 then s=s+1
+        end
+
+        addGrade(c,P.combo,D.pt)
+
+        D.pt=D.pt+s
+        spd_lvl=spd_lvl+1
+
+        P.gameEnv.drop=getGrav(spd_lvl)
+
+        if(P.gameEnv.drop==0) then
+            P:set20G(true)
+        end
+
+        if D.pt%100>70 and not prevDrop70 then
+            if P.stat.frame-prevSectTime < cool_time[math.ceil(D.pt/100)] then
+                cools=cools+1
+                coolList[math.ceil(D.pt/100)]=true
+                P:_showText("COOL!",0,-120,80,'fly',.8)
+                nextSpeedUp=true
+            end
+            prevDrop70=true
+        end
+
+        if D.pt+1==D.target then
+            SFX.play('warn_1')
+        elseif D.pt>=D.target then--Level up!
+            spd_lvl=nextSpeedUp and spd_lvl+100 or spd_lvl
+            nextSpeedUp=false
+            prevDrop70=false
+            s=D.target/100
+            local E=P.gameEnv
+            E.lock=getLock(spd_lvl)
+            E.wait=getWait(spd_lvl)
+            E.fall=getFall(spd_lvl)
+            E.das=getDas(spd_lvl)
+
+            if P.stat.frame-prevSectTime > reg_time[math.ceil(s)] then
+                regrets=regrets+1
+                regretDelay=60
+            end
+            prevSectTime=P.stat.frame
+            if s==2 then
+                BG.set('rainbow')
+            elseif s==4 then
+                BG.set('rainbow2')
+            elseif s==5 then
+                if P.stat.frame>420*60 then
+                    D.pt=500
+                    P:win('finish')
+                    return
+                else
+                    BG.set('glow')
+                    BGM.play('secret7th remix')
+                end
+            elseif s==6 then
+                BG.set('lightning')
+            elseif s>9 then
+                if cools>8 then
+                    E.lockFX=E.lockFX>1 and 1 or E.lockFX
+                    P:setInvisible(5)
+                else
+                    P:setInvisible(300)
+                end
+                D.pt=999
+                P.waiting=240
+                BGM.stop()
+                isInRollTrans=true
+                return
+            end
+            D.target=D.target<900 and D.target+100 or 999
+            P:stageComplete(s)
+            SFX.play('reach')
+        end
+    end,
+    task=function(P)
+        regretDelay=-1
+        P.modeData.pt=0
+        P.modeData.target=100
+        int_grade=0
+        grade_points=0
+        rollGrades=0
+        spd_lvl=0
+        cools=0
+        regrets=0
+        prevSectTime=0
+        isInRoll=false
+        isInRollTrans=false
+        prevDrop70=false
+        nextSpeedUp=false
+        coolList={false,false,false,false,false,false,false,false,false}
+        regretList={false,false,false,false,false,false,false,false,false,false}
+        local decayRate={125,80,80,50,45,45,45,40,40,40,40,40,30,30,30,20,20,20,20,20,15,15,15,15,15,15,15,15,15,15,10,10,10,9,9,9,8,8,8,7,7,7,6}
+        local decayTimer=0
+        while true do
+            YIELD()
+            P.modeData.grade=getGrade()
+            P.modeData.gradePts=math.max(math.min(math.floor(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets),#gradeList),1)
+            if P.stat.frame-prevSectTime > reg_time[math.ceil(P.modeData.pt/100+0.01)] then
+                regretList[math.ceil(P.modeData.pt/100)]=true
+            end
+            if regretDelay>-1 then
+                regretDelay=regretDelay-1
+                if regretDelay==-1 then P:_showText("REGRET!!",0,-120,80,'beat',.8) end
+            end
+            if isInRollTrans then
+                if P.waiting>=220 then
+                    --Make field invisible
+                    for y=1,#P.field do for x=1,10 do
+                        P.visTime[y][x]=P.waiting-220
+                    end end
+                elseif P.waiting==190 then
+                    TABLE.cut(P.field)
+                    TABLE.cut(P.visTime)
+                elseif P.waiting==180 then
+                    playReadySFX(3,3)
+                elseif P.waiting==120 then
+                    playReadySFX(2,1)
+                elseif P.waiting==60 then
+                    playReadySFX(1,1)
+                elseif P.waiting==1 then
+                    playReadySFX(0,1)
+                    isInRollTrans=false
+                    isInRoll=true
+                    BGM.play('hope')
+                    BG.set('blockspace')
+                    prevSectTime=P.stat.frame
+                end
+            end
+            if P.waiting<=0 and grade_points>0 and not isInRoll then
+                decayTimer=decayTimer+1
+                if decayTimer>=decayRate[math.min(int_grade+1,#decayRate)] then
+                    decayTimer=0
+                    grade_points=grade_points-1
+                end
+            elseif isInRoll and P.stat.frame>=prevSectTime+3599 then
+                rollGrades=rollGrades+(cools>8 and 1.6 or 0.5)
+                P.modeData.grade=getGrade()
+                P.modeData.gradePts=math.min(math.floor(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets),#gradeList)
+                YIELD()
+                P:win('finish')
+            end
+        end
+    end,
+}

parts/eventsets/master_instinct.lua

@@ -20,7 +20,13 @@ return{
         local D=P.modeData
 
         local c=#P.clearedRow
-        if c==0 and D.pt%100==99 then return end
+        if c==0 and D.pt%100==99 then 
+            if D.pt<1000 then
+                hidetimer=0-inv_wait[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]
+                if c>0 then hidetimer=hidetimer-inv_fall[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]end
+            end
+            return
+        end
         local s=c<3 and c+1 or c==3 and 5 or 7
         if P.combo>7 then s=s+2
         elseif P.combo>3 then s=s+1
@@ -50,6 +56,8 @@ return{
             elseif s==7 then
                 E.das=6
                 BGM.play('far')
+            elseif s==8 then
+                BG.set('none')
             elseif s==10 then
                 D.pt=1000
                 P:win('finish')

parts/eventsets/pc_inf.lua

@@ -6,7 +6,7 @@ return{
         mText(TEXTOBJ.pc,63,410)
     end,
     hook_drop=function(P)
-        if P.lastPiece.pc and P.stat.row%4==0 then
+        if P.lastPiece.pc then
             P.gameEnv.heightLimit=4
             if P.stat.pc%5==0 then
                 P.gameEnv.drop=math.max(P.gameEnv.drop-1,1)

parts/eventsets/secret_grade.lua

@@ -0,0 +1,56 @@
+local gc_setColor,gc_draw=love.graphics.setColor,love.graphics.draw
+local ply_applyField=PLY.draw.applyField
+local function GetOpenHole(num)
+    return -math.abs(((num-1) % 18)-9)+10
+end
+local F={}
+local ranks={"10","9","8","7","6","5","4","3","2","1","S1","S2","S3","S4","S5","S6","S7","S8","S9","GM","GM+","TM","TM+","TM+₂","TM+₃", "TM+₄","TM+₅"}
+--     lines:  0   1   2   3   4   5   6   7   8   9   10   11   12   13   14   15   16   17   18   19   20    21   22     23     24      25     26
+return
+{
+    fkey1=function(P)P.modeData.showGuide=not P.modeData.showGuide end,
+    mesDisp=function(P)
+        mText(TEXTOBJ.grade,63,190)
+        setFont(55)
+        mStr(ranks[P.modeData.rankPts],63,125)
+        
+        ply_applyField(P)
+        local mark=TEXTURE.puzzleMark
+        gc_setColor(1,1,1)
+        if P.modeData.showGuide then
+            for y=1,P.modeData.rankPts+1 do for x=1,10 do
+                local T=F[y][x]
+                if T~=0 then
+                    gc_draw(mark[T],30*x-30,600-30*y)
+                end
+            end end
+        end
+        PLY.draw.cancelField(P)
+    end,
+    task=function(P)
+        P.modeData.rankPts=1
+        P.modeData.showGuide=true
+        for i=1,50 do
+            F[i] = {}
+            local h=GetOpenHole(i)
+            for j=1,10 do
+                F[i][j]=h==j and -1 or 21
+            end
+        end
+    end,
+    hook_drop=function(P)
+        local Pf=P.field
+        local D=P.modeData
+        D.rankPts=1
+        for i=1,#P.field do
+            local h=GetOpenHole(i)
+            for j=1,10 do
+                if P.field[i][j]>0 and h==j then return end
+                if P.field[i][j]==0 and h~=j then return end
+            end
+            if i==#P.field then return end
+            if P.field[i+1][h]==0 then return end
+            D.rankPts=D.rankPts+1
+        end
+    end
+}

parts/gameFuncs.lua

@@ -119,6 +119,18 @@ do--function applySettings()
         color={-.2,1.2},
     }
     function applySettings()
+        --Apply language
+        text=LANG.get(SETTING.locale)
+        WIDGET.setLang(text.WidgetText)
+        for k,v in next,TEXTOBJ do
+            if rawget(text,k)then
+                v:set(text[k])
+            end
+        end
+
+        --Apply cursor
+        love.mouse.setVisible(SETTING.sysCursor)
+
         --Apply fullscreen
         love.window.setFullscreen(SETTING.fullscreen)
         love.resize(gc.getWidth(),gc.getHeight())
@@ -147,26 +159,14 @@ do--function applySettings()
         SHADER.fieldSatur:send('b',m[1])
         SHADER.fieldSatur:send('k',m[2])
 
-        --Apply language
-        text=LANG.get(SETTING.locale)
-        WIDGET.setLang(text.WidgetText)
-        for k,v in next,TEXTOBJ do
-            if rawget(text,k)then
-                v:set(text[k])
-            end
-        end
-
-        --Apply cursor
-        love.mouse.setVisible(SETTING.sysCursor)
-
         --Apply BG
         if SETTING.bg=='on'then
             BG.unlock()
             BG.set()
         elseif SETTING.bg=='off'then
             BG.unlock()
-            BG.set('gray')
-            BG.send(SETTING.bgAlpha)
+            BG.set('fixColor')
+            BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)
             BG.lock()
         elseif SETTING.bg=='custom'then
             if love.filesystem.getInfo('conf/customBG')then
@@ -184,8 +184,8 @@ do--function applySettings()
             else--Switch off when custom BG not found
                 SETTING.bg='off'
                 BG.unlock()
-                BG.set('gray')
-                BG.send(SETTING.bgAlpha)
+                BG.set('fixColor')
+                BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)
                 BG.lock()
             end
         end

parts/gameTables.lua

@@ -327,7 +327,7 @@ EVENTSETS={
     'backfire_120','backfire_60','backfire_30','backfire_0',
     'checkAttack_100',
     'checkLine_10','checkLine_20','checkLine_40','checkLine_100','checkLine_200','checkLine_400','checkLine_1000',
-    'classic_e','classic_h','classic_u',
+    'classic_e','classic_h','classic_l','classic_u',
     'defender_n','defender_l',
     'dig_10l','dig_40l','dig_100l','dig_400l',
     'dig_h','dig_u',

parts/language/dict_en.lua

@@ -890,6 +890,12 @@ return{
         "term",
         "Any input device takes some time for the input to reach the game. This delay can range from a few milliseconds to a few dozen milliseconds.\nIf input delay is too long, the controls can feel uncomfortable.\nThis delay is often due to the performance of the hardware and software used, and often out of your control. Turn on performance mode (or turn off power saving mode) on your device, and turn on gaming mode on your monitor/TV (if you have one), may help reducing input delay.",
     },
+    {"Secret Grade",
+        "larger than",
+        "term",
+        "",-- "出自TGM系列的彩蛋玩法。不按照TGM的一般目标去玩，而是去拼图拼出“每行仅有一个洞的大于号”图形（不能是小于号），拼得越多获得的秘密段位越高（没特殊功能，只是好玩），最高目标是完成19行并封顶"..HDwiki,
+        HDsearch.."Secret_Grade_Techniques",
+    },
     {"Cold Clear",
         "cc coldclear ai bot",
         "term",

parts/language/dict_zh.lua

@@ -1,5 +1,5 @@
 local HDsearch="https://harddrop.com/wiki?search="
-local HDwiki="\t更多内容见Hard Drop Wiki。"
+local HDwiki="\n更多内容见Hard Drop Wiki。"
 return{
     {"新人须知",
         "读我 必读 萌新 xinren new noob readme",
@@ -115,7 +115,7 @@ return{
     {"注[1]",
         "备注 notice",
         "game",
-        "以下内容是为部分官方和较高人气同人方块游戏的简介。\n其中可能包含一些只代表个人观点的主观评价，写在方括号里面，请不要根据这些评论直接认定游戏的好坏。",
+        "以下内容是为部分官方和较高人气同人方块游戏的简介。\n其中可能包含一些只代表个人观点的主观评价写在方括号里仅供参考，顺便也请不要因为某个方面有欠缺就直接认为“这个游戏不好”。",
     },
     {"King of Stackers",
         "回合制 网页 手机 kos kingofstackers",
@@ -909,6 +909,12 @@ return{
         "term",
         "用任何设备玩任何游戏时，所有的操作（按键盘，点鼠标等）都会晚一点点（很短，几毫秒到几十毫秒）才到达游戏，如果过长就会很影响游戏手感，作用效果类似于你拿QQ远程控制打FPS游戏\nTOP、TE等游戏比较明显\n这个延迟一般由硬件性能，硬件状态影响，通常来说不可设置，开启性能模式（或者关闭节能模式）可能会好一点。",
     },
+    {"秘密段位",
+        "大于号 secret grade dayuhao",
+        "term",
+        "出自TGM系列的彩蛋玩法。不按照TGM的一般目标去玩，而是去拼图拼出“每行仅有一个洞的大于号”图形（不能是小于号），拼得越多获得的秘密段位越高（没特殊功能，只是好玩），最高目标是完成19行并封顶"..HDwiki,
+        HDsearch.."Secret_Grade_Techniques",
+    },
     {"Cold Clear",
         "机器人 电脑 cc coldclear ai bot jiqiren",
         "term",
@@ -929,31 +935,31 @@ return{
     {"DT炮",
         "dt cannon",
         "setup",
-        "Double-Triple Cannon。\n"..HDwiki,
+        "Double-Triple Cannon。"..HDwiki,
         HDsearch.."dt",
     },
     {"DTPC",
         "dtpc",
         "setup",
-        "DT炮一个能接PC的分支。\n"..HDwiki,
+        "DT炮一个能接PC的分支。"..HDwiki,
         HDsearch.."dt",
     },
     {"BT炮",
         "bt cannon",
         "setup",
-        "β炮（Beta炮）。\n"..HDwiki,
+        "β炮（Beta炮）。"..HDwiki,
         HDsearch.."bt_cannon",
     },
     {"BTPC",
         "btpc",
         "setup",
-        "BT炮一个能接PC的分支。\n"..HDwiki,
+        "BT炮一个能接PC的分支。"..HDwiki,
         HDsearch.."bt_cannon",
     },
     {"DDPC",
         "ddpc",
         "setup",
-        "开局TSD的一个能接Double-Double-PC的分支。\n"..HDwiki,
+        "开局TSD的一个能接Double-Double-PC的分支。"..HDwiki,
         HDsearch.."TKI_3_Perfect_Clear",
     },
     {"QT炮",
@@ -970,7 +976,7 @@ return{
     {"狼月炮",
         "wolfmoon",
         "setup",
-        "狼月炮。\n"..HDwiki,
+        "狼月炮。"..HDwiki,
         HDsearch.."wolfmoon_cannon",
     },
     {"ASC",
@@ -981,19 +987,19 @@ return{
     {"Sewer",
         "sewer",
         "setup",
-        "Sewer开局。\n"..HDwiki,
+        "Sewer开局。"..HDwiki,
         HDsearch.."sewer",
     },
     {"TKI",
         "tki",
         "setup",
-        "TKI开局\n有两种解释，一个是TSD开局，另一个是Cspin开局。\n"..HDwiki,
+        "TKI开局\n有两种解释，一个是TSD开局，另一个是Cspin开局。"..HDwiki,
         HDsearch.."tki",
     },
     {"God Spin",
         "god",
         "setup",
-        "God Spin\nwindkey发明的一个观赏性很强但实战没啥用的炫酷特殊T2+T3开局定式。\n"..HDwiki,
+        "God Spin\nwindkey发明的一个观赏性很强但实战没啥用的炫酷特殊T2+T3开局定式。"..HDwiki,
         HDsearch.."godspin",
     },
     {"信天翁",
@@ -1021,19 +1027,19 @@ return{
     {"Cspin",
         "cspin",
         "pattern",
-        "JL脚对脚立起来形成一个C形，缺口做适当的填充后可以打T3+T2。\n"..HDwiki,
+        "JL脚对脚立起来形成一个C形，缺口做适当的填充后可以打T3+T2。"..HDwiki,
         HDsearch.."c-spin",
     },
     {"STSD",
         "stsd",
         "pattern",
-        "Super T-spin Double\n一种能做两个T2的形状。\n如果垃圾行正好空在STSD正下方会暴毙。\n"..HDwiki,
+        "Super T-spin Double\n一种能做两个T2的形状。\n如果垃圾行正好空在STSD正下方会暴毙。"..HDwiki,
         HDsearch.."stsd",
     },
     {"STMB",
         "stmb",
         "pattern",
-        "STMB cave\n在高空3宽坑架SZ捐一个T2的形状。\n"..HDwiki,
+        "STMB cave\n在高空3宽坑架SZ捐一个T2的形状。"..HDwiki,
         HDsearch.."stmb_cave",
     },
     {"LST堆叠",
@@ -1045,13 +1051,13 @@ return{
     {"汉堡包",
         "hamburger hanbaobao",
         "pattern",
-        "一种边缘捐T不影响消四的堆叠法。\n"..HDwiki,
+        "一种边缘捐T不影响消四的堆叠法。"..HDwiki,
         HDsearch.."hamburger",
     },
     {"皇家十字",
         "皇十 imperial cross huangjiashizi huangshi",
         "pattern",
-        "在一个十字形洞口盖屋檐后可以做两个T2的形状。\n"..HDwiki,
+        "在一个十字形洞口盖屋檐后可以做两个T2的形状。"..HDwiki,
         HDsearch.."imperial_cross",
     },
     {"雨宫炮",

parts/language/lang_en.lua

@@ -116,9 +116,9 @@ return{
     noPassword="Please enter your password",
     diffPassword="Passwords don't match",
     registerRequestSent="A sign up request has been sent.",
-    registerSuccessed="Sign up successful!",
-    loginSuccessed="You are now logged in!",
-    accessSuccessed="Access granted",
+    registerOK="Sign up successful!",
+    loginOK="You are now logged in!",
+    accessOK="Access granted",
 
     wsConnecting="Websocket connecting…",
     wsFailed="WebSocket connection failed",
@@ -143,7 +143,6 @@ return{
     customBGloadFailed="Unsupport image format for custom background",
 
     errorMsg="Techmino ran into a problem and needs to restart.\nYou can send the error log to the developers.",
-    tryAnotherBuild="[Invalid UTF-8] If you are on Windows, try downloading Techmino-win32 or Techmino-win64 (different from what you are using now).",
 
     modInstruction="Choose your modifiers!\nMods allow you to change the game,\nbut they may also crash the game.\nScores will not be saved when using mods.",
     modInfo={
@@ -276,6 +275,8 @@ return{
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
         "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Performances",
         "Electric283",
@@ -763,6 +764,8 @@ return{
         ['sprint_1000l']=   {"Sprint",            "1,000L",      "Clear 1,000 lines!"},
         ['sprintPenta']=    {"Sprint",            "PENTOMINO",  "40L with 18 pentominoes"},
         ['sprintMPH']=      {"Sprint",            "MPH",        "Memoryless\nPreviewless\nHoldless"},
+        ['sprint123']=      {"Sprint",            "M123",       "40L with only monominoes, dominoes, and triminoes"},
+        ['secret_grade']=   {"Secret Grade",      "",           "Build a zig-zag hole formation, following to the guide!"},
         ['dig_10l']=        {"Dig",               "10L",        "Dig 10 garbage lines"},
         ['dig_40l']=        {"Dig",               "40L",        "Dig 40 garbage lines"},
         ['dig_100l']=       {"Dig",               "100L",       "Dig 100 garbage lines"},
@@ -787,11 +790,14 @@ return{
         ['round_h']=        {"Turn-Based",        "HARD",       "Take turns to play against the AI!"},
         ['round_l']=        {"Turn-Based",        "LUNATIC",    "Take turns to play against the AI!"},
         ['round_u']=        {"Turn-Based",        "ULTIMATE",   "Take turns to play against the AI!"},
+        ['big_n']=          {"Big",               "NORMAL",     "Play in a smaller field!"},
+        ['big_h']=          {"Big",               "HARD",       "Play in a smaller field!"},
         ['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_g']=       {"Master",            "GRADED",     "Get the highest grade you can!"},
         ['master_ex']=      {"GrandMaster",       "EXTRA",      "An eternity shorter than an instant"},
         ['master_instinct']={"Master",            "INSTINCT",   "What if the active piece turned invisible?"},
         ['strategy_e']=     {"Strategy",          "EASY",       "Fast 20G decision"},
@@ -806,8 +812,9 @@ return{
         ['blind_l']=        {"Invisible",         "SUDDEN+",    "For professionals"},
         ['blind_u']=        {"Invisible",         "?",          "Are you ready?"},
         ['blind_wtf']=      {"Invisible",         "WTF",        "You're not ready"},
-        ['classic_e']=      {"Classic",           "EASY",       "A very low-speed recreation from the 80s"},
-        ['classic_h']=      {"Classic",           "HARD",       "A medium speed recreation from the 80s"},
+        ['classic_e']=      {"Classic",           "EASY",       "A low-speed recreation from the 80s"},
+        ['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']=     {"Survival",          "EASY",       "How long can you survive?"},
         ['survivor_n']=     {"Survival",          "NORMAL",     "How long can you survive?"},

parts/language/lang_es.lua

@@ -105,9 +105,9 @@ return{
     noPassword="Por favor ingresa una contraseña",
     diffPassword="Las contraseñas no coinciden",
     registerRequestSent="Petición de registro enviada con éxito",
-    registerSuccessed="¡Registro exitoso!",
-    loginSuccessed="¡Ingreso con éxito!",
-    accessSuccessed="¡Autorizado exitoso!",
+    registerOK="¡Registro exitoso!",
+    loginOK="¡Ingreso con éxito!",
+    accessOK="¡Autorizado exitoso!",
 
     wsConnecting="Websocket Conectando",
     wsFailed="WebSocket conexión fallida",
@@ -667,8 +667,9 @@ return{
         ['blind_l']=        {"A Ciegas",                "Inmediato+",    "Para profesionales."},
         ['blind_u']=        {"A Ciegas",                 "?",            "¿Estás preparado?"},
         ['blind_wtf']=      {"A Ciegas",                "ELFUF",         "No, no lo estás."},
-        ['classic_e']=      {"Classic",                 "EASY",          "Modo clásico con alta velocidad."},
+        ['classic_e']=      {"Clásico",                 "EASY",          "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?"},

parts/language/lang_fr.lua

@@ -106,9 +106,9 @@ return{
     noPassword="Entrez votre mot de passe",
     diffPassword="Les mots de passe ne se correspondent pas",
     -- registerRequestSent="Registration request sent",
-    registerSuccessed="Enregistré avec succès !",
-    loginSuccessed="Connecté avec succès !",
-    accessSuccessed="Autorisé avec succès !",
+    registerOK="Enregistré avec succès !",
+    loginOK="Connecté avec succès !",
+    accessOK="Autorisé avec succès !",
 
     -- wsConnecting="Websocket Connecting",
     wsFailed="WebSocket connection échouée",
@@ -242,6 +242,8 @@ return{
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
         "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Performance",
         "Electric283",
@@ -766,6 +768,7 @@ return{
         ['blind_wtf']=     {"Aveugle",         "WTF",         "Vous n'êtes pas prêt."},
         ['classic_e']=     {"Classic",         "EASY",        "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 ?"},

parts/language/lang_id.lua

@@ -27,11 +27,11 @@ return{
     clear={"Single","Double","Triple","Techrash","Pentacrash","Hexacrash","Heptacrash","Octacrash","Nonacrash","Decacrash","Undecacrash","Dodecacrash","Tridecacrash","Tetradecacrash","Pentadecacrash","Hexadecacrash","Heptadecacrash","Octadecacrash","Nonadecacrash","Ultracrash","Impossicrash"},
     cleared="$1 baris",
     mini="Mini",b2b="B2B ",b3b="B2B2B ",
-    PC="PC",HPC="Hampir PC",
+    PC="PC",HPC="Setengah PC",
     replaying="[Diulang]",
     tasUsing="[TAS]",
 
-    stage="Tahap $1 selesai!",
+    stage="Bagian $1 selesai!",
     great="Bagus!",
     awesome="Luar biasa!",
     almost="Hampir!",
@@ -40,7 +40,7 @@ return{
     speedup="Percepatkan!",
     missionFailed="Salah",
 
-    speedLV="Kecepatan lvl",
+    speedLV="Kecptn lvl",
     piece="Blok",line="Baris",atk="Baris Terkirim",eff="Efisiensi",
     rpm="RPM",tsd="TSD",
     grade="Nilai",techrash="Techrash",
@@ -56,7 +56,7 @@ return{
     gameover="Tamat",
 
     pause="Terjeda",
-    pauseCount="Jeda-jeda",
+    pauseCount="Jeda",
     finesse_ap="Semua sempurna",
     finesse_fc="Kombo penuh",
 
@@ -75,7 +75,7 @@ return{
     loadError_other="'$1' eror memuat: $2",
     loadError_unknown="'$1' eror memuat: alasan tidak diketahui",
 
-    saveError_duplicate="'$1' eror menyimpan: nama file tergAnda",
+    saveError_duplicate="'$1' eror menyimpan: nama file terganda",
     saveError_encode="'$1' eror menyimpan: gagal menyandi",
     saveError_other="'$1' eror menyimpan: $2",
     saveError_unknown="'$1' eror menyimpan: alasan tidak diketahui",
@@ -85,10 +85,10 @@ return{
     exportSuccess="Ekspor berhasil",
     importSuccess="Impor berhasil",
     dataCorrupted="Data rusak",
-    pasteWrongPlace="Menempel di tempat yang salah?",
+    pasteWrongPlace="Apakah Anda menempelkannya di tempat yang salah?",
     noFile="File tidak ada",
 
-    nowPlaying="Sekarang mendengarkan:",
+    nowPlaying="Musik:",
 
     VKTchW="Berat sentuhan",
     VKOrgW="Berat asal",
@@ -117,9 +117,9 @@ return{
     noPassword="Silahkan masukki kata sandi Anda",
     diffPassword="Kata sandi tidak sama",
     registerRequestSent="Permintaan daftar telah terkirim.",
-    registerSuccessed="Pendaftaran sukses!",
-    loginSuccessed="Anda sekarang tergabung!",
-    accessSuccessed="Akses diberikan",
+    registerOK="Pendaftaran sukses!",
+    loginOK="Anda sekarang tergabung!",
+    accessOK="Akses diberikan",
 
     wsConnecting="Menghubungkan websocket…",
     wsFailed="Koneksi websocket gagal",
@@ -151,7 +151,7 @@ return{
         next="BLOK LANJUT\nMengubah jumlah blok lanjut yang ditampilkan.",
         hold="SIMPAN\nMengubah jumlah blok yang bisa disimpan.",
         hideNext="BLOK LANJUT Tersembunyi\nMenyembunyikan beberapa blok lanjut.",
-        infHold="SIMPAN SELAMANYA\nMemungkinkan Anda untuk menyimpan blok-blok selamanya.",
+        infHold="SIMPAN TAK TERBATAS\nMemungkinkan Anda untuk menyimpan blok-blok tidak terbatas.",
         hideBlock="Sembunyikan Blok Aktif\nMenyembunyikan blok yang Anda mengontrol.",
         hideGhost="Sembunyikan Blok Hantu\nMenyembunyikan blok yang menunjukkan tempat blok yang sedang dikontrol akan jatuh.",
         hidden="Sembunyikan Blok Terdarat\nMenyembunyikan blok yang sudah mendarat setelah waktu yang tertentu.",
@@ -180,7 +180,7 @@ return{
         "Diterima:",
         "Jumlah Tindakan Membuat Baris:",
         "Spins:",
-        "B2B/B3B/PC/Hampir PC:",
+        "B2B/B3B/PC/Setengah PC:",
         "Efisiensi Tombol:",
     },
     radar={"BLOK","SERANGAN","SRGN + BLOK","SRGN TERKIRIM","KECEPATAN","GALI"},
@@ -191,12 +191,12 @@ return{
         "Jumlah Waktu Bermain:",
         "Tombol/Putar/Simpan:",
         "Blok/Baris/Serangan:",
-        "Serangan Diterima/Ditolak/Muncul:", -- what is this
+        "Serangan Diterima/Ditolak/Muncul:",
         "Gali/Serangan Gali:",
         "Efisiensi/Efisiensi Gali:",
         "B2B/B2B2B:",
-        "PC/Hampir PC:",
-        "Efisiensi Tombol Tidak Maksimal/Nilai:",
+        "PC/Setengah PC:",
+        "Kesalahan Efisiensi Tombol/Nilai:",
     },
     aboutTexts={
         "Ini hanya penyusun blok *normal*. Sungguh, hanya itu saja.",
@@ -277,6 +277,8 @@ return{
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
         "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Pertunjukan",
         "Electric283",
@@ -302,8 +304,8 @@ return{
         "huaji2369",
         "Lexitik",
         "Tourahi Anime",
-        "[All other test staff]",
-        "…And You!",
+        "[Semua staf penguji lainnya]",
+        "…Dan Anda!",
     },
     used=[[
     Alat-alat yang digunakan:
@@ -345,7 +347,7 @@ return{
         pause={
             setting="Pengaturan (S)",
             replay="Ulang (P)",
-            save="Simpan Pengulangan (O)",
+            save="Simpan (O)",
             resume="Lanjut (esc)",
             restart="Coba lagi (R)",
             quit="Berhenti (Q)",
@@ -809,6 +811,7 @@ return{
         ['blind_wtf']=      {"Tak Terlihat",      "TERAKHIR",     "Anda belum siap"},
         ['classic_e']=      {"Klasik",            "MUDAH",        "Rekreasi berkecepatan rendah dari tahun 80-an"},
         ['classic_h']=      {"Klasik",            "SULIT",        "Rekreasi berkecepatan medium dari tahun 80-an"},
+        ['classic_l']=      {"Klasik",            "GILA",         "Rekreasi berkecepatan medium-tinggi dari tahun 80-an"},
         ['classic_u']=      {"Klasik",            "TERAKHIR",     "Rekreasi berkecepatan tinggi dari tahun 80-an"},
         ['survivor_e']=     {"Bertahan",          "MUDAH",        "Berapa lama Anda bisa bertahan?"},
         ['survivor_n']=     {"Bertahan",          "NORMAL",       "Berapa lama Anda bisa bertahan?"},
@@ -858,8 +861,8 @@ return{
     },
     getTip={refuseCopy=true,
         "(RUR'U')R'FR2U'R'U'(RUR'F')",
-        "\"Techmino.app\" tidak bisa dibuka karena penciptanya tidak bisa diverifikasi.",
-        "\"Techmino.app\" akan merusak komputer Anda. Anda sebaiknya memindah itu ke tempat sampah.",
+        "\"Techmino.app\" tidak bisa dibuka karena pengembang tidak bisa diverifikasi.",
+        "\"Techmino.app\" akan merusak komputer Anda. Anda harus memindahnya ke tong sampah.",
         "\"TechminOS\"",
         "\\jezevec/\\jezevec/\\jezevec/",
         "\\osk/\\osk/\\osk/",
@@ -916,8 +919,8 @@ return{
         "OHHHHHHHHHHHHHH",
         "Main dengan satu tangan!",
         "Bermain bagus membutuhkan waktu!",
-        "dipersembahkan oleh LÖVE",
-        "dipersembahkan oleh Un..LÖVE",
+        "Dipersembahkan oleh LÖVE",
+        "Dipersembahkan oleh Un..LÖVE",
         "Server kadang tidak berfungsi",
         "Beberapa persyaratan untuk mencapai peringkat X sengaja dibuat sulit bahkan untuk pemain terbaik.",
         "Segera Anda akan dapat bermain melawan teman dan musuh di seluruh dunia.",

parts/language/lang_pt.lua

@@ -104,9 +104,9 @@ return{
     noPassword="Insira sua senha ",
     diffPassword="Senhas não combinam",
     -- registerRequestSent="Registration request sent",
-    registerSuccessed="Registrado com sucesso!",
-    loginSuccessed="Logado com sucesso!",
-    accessSuccessed="Autorizado com sucesso!",
+    registerOK="Registrado com sucesso!",
+    loginOK="Logado com sucesso!",
+    accessOK="Autorizado com sucesso!",
 
     -- wsConnecting="Websocket Connecting",
     wsFailed="WebSocket falha na conexão",
@@ -264,6 +264,8 @@ return{
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
         "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Performance",
         "Electric283",
@@ -764,7 +766,7 @@ return{
         ['solo_e']=             {"Batalha",          "FÁCIL",        "Derrote a inteligência!"},
         ['solo_n']=             {"Batalha",          "NORMAL",       "Derrote a inteligência!"},
         ['solo_h']=             {"Batalha",          "DIFÍCIL",      "Derrote a inteligência!"},
-        ['solo_l']=             {"Batalha",          "LUNATICO",     "Defeat the AI!"},
+        ['solo_l']=             {"Batalha",          "LUNÁTICO",     "Defeat the AI!"},
         ['solo_u']=             {"Batalha",          "ULTIMATE",     "Defeat the AI!"},
         ['techmino49_e']=       {"Tech 49",          "FÁCIL",        "Batalha de 49 jogadores.\nO último vence"},
         ['techmino49_h']=       {"Tech 49",          "DIFÍCIL",      "Batalha de 49 jogadores.\nO último vence."},
@@ -796,7 +798,8 @@ return{
         ['blind_u']=            {"Cego",              "?",           "Are you ready?"},
         ['blind_wtf']=          {"Cego",             "WTF",          "You're not ready."},
         ['classic_e']=          {"Classic",          "EASY",         "Modo clássico rápido."},
-        ['classic_h']=          {"Classic",          "DIFÍCIL",       "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?"},

parts/language/lang_zh.lua

@@ -116,9 +116,9 @@ return{
     noPassword="请填写密码",
     diffPassword="两次密码不一致",
     registerRequestSent="注册请求已发送",
-    registerSuccessed="注册成功！",
-    loginSuccessed="登录成功",
-    accessSuccessed="身份验证成功",
+    registerOK="注册成功！",
+    loginOK="登录成功",
+    accessOK="身份验证成功",
 
     wsConnecting="正在连接",
     wsFailed="连接失败",
@@ -275,6 +275,9 @@ return{
         "ScF",
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
+        "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Performances",
         "Electric283",
@@ -759,8 +762,10 @@ return{
         ['sprint_100l']=    {"竞速",        "100L",     "消除100行"},
         ['sprint_400l']=    {"竞速",        "400L",     "消除400行"},
         ['sprint_1000l']=   {"竞速",        "1000L",    "消除1000行"},
+        ['secret_grade']=   {"秘密段位",    "",         "按照提示完成经典的“大于号”拼图"},
         ['sprintPenta']=    {"竞速",        "五连块",     "伤脑筋十八块"},
         ['sprintMPH']=      {"竞速",        "MPH",      "纯随机\n无预览\n无暂存"},
+        ['sprint123']=      {"竞速",        "M123",     "40L，但只有1~3连块"},
         ['dig_10l']=        {"挖掘",        "10L",      "挖掘10行"},
         ['dig_40l']=        {"挖掘",        "40L",      "挖掘40行"},
         ['dig_100l']=       {"挖掘",        "100L",     "挖掘100行"},
@@ -785,13 +790,16 @@ return{
         ['round_h']=        {"回合制",       "困难",      "下棋模式"},
         ['round_l']=        {"回合制",       "疯狂",      "下棋模式"},
         ['round_u']=        {"回合制",       "极限",      "下棋模式"},
+        ['big_n']=          {"大的",         "普通",     "模拟10*5场地的玩法(标准尺寸的一半)"},
+        ['big_h']=          {"大的",         "困难",     "模拟10*5场地的玩法(标准尺寸的一半)"},
         ['master_n']=       {"大师",        "普通",      "20G初心者练习"},
         ['master_h']=       {"大师",        "困难",      "上级者20G挑战"},
         ['master_m']=       {"大师",        "大师",      "大师20G"},
         ['master_final']=   {"大师",        "终点",      "究极20G:无法触及的终点"},
         ['master_ph']=      {"大师",        "虚幻",      "虚幻20G:？？？"},
+        ['master_g']=       {"大师",        "段位考试",    "20G段位考试"},
         ['master_ex']=      {"宗师",        "EX",       "成为方块大师"},
-        ['master_instinct']={"大师",        "本能",      "隐藏当前块"},
+        ['master_instinct']={"大师",        "本能",      "当前块在出现后一小会后会隐形"},
         ['strategy_e']=     {"策略堆叠",     "简单",      "20G堆叠中速决策练习"},
         ['strategy_h']=     {"策略堆叠",     "困难",      "20G堆叠快速决策练习"},
         ['strategy_u']=     {"策略堆叠",     "极限",      "20G堆叠极速决策练习"},
@@ -806,6 +814,7 @@ return{
         ['blind_wtf']=      {"隐形",        "不会吧",     "还没准备好"},
         ['classic_e']=      {"高速经典",     "简单",       "高速经典"},
         ['classic_h']=      {"高速经典",     "困难",       "飞速经典"},
+        ['classic_l']=      {"高速经典",    "疯狂",        "迅捷经典"},
         ['classic_u']=      {"高速经典",     "极限",       "极速经典"},
         ['survivor_e']=     {"生存",        "简单",      "你能存活多久？"},
         ['survivor_n']=     {"生存",        "普通",      "你能存活多久？"},

parts/language/lang_zh_full.lua

@@ -1,184 +0,0 @@
-return{
-    cmb={nil,"1连击","2连击","3连击","4连击","5连击","6连击","7连击","8连击","9连击","10连击!","11连击!","12连击!","13连击!","14连击!","15连击!","16连击!","17连击!","18连击!","19连击!","巨型连击"},
-    spin="型回旋",
-    clear={"单清","双清","三清","四清","五清","六清","七清","八清","九清","十清","十一清","十二清","十三清","十四清","十五清","十六清","十七清","十八清","十九清","二十清","超二十清"},
-    cleared="",
-    mini="迷你",b2b="满贯",b3b="大满贯",
-    PC="场地全清",HPC="场地半清",
-
-    great="不错!",
-    awesome="精彩。",
-    almost="差一点!",
-    continue="继续。",
-
-    speedLV="速度等级",
-    piece="块数",line="行数",atk="攻击",eff="效率",
-    rpm="收每分",tsd="T2",
-    grade="段位",techrash="消四",
-    wave="波数",nextWave="下一波",
-    combo="连击",maxcmb="最大连击",
-    pc="全清",ko="淘汰",
-
-    finesse_ap="完美极简",
-    finesse_fc="全连击",
-
-    cc_fixed="不能同时开启CC和固定序列",
-    cc_swap="不能同时开启CC和swap的暂存模式",
-    ai_prebag="不能同时开启电脑玩家和含有非四连块的自定义序列",
-    ai_mission="不能同时开启电脑玩家和自定义任务",
-
-    modInstruction="选择你要使用的模组!\n不同的模组会用不同的方式改变游戏规则，来开发新玩法挑战自我吧!\n提醒:开启一些模组会让成绩无效  你可以用键盘开关模组，按tab重置",
-    modInfo={
-        next="预览数量:\n强制使用预览的个数",
-        hold="暂存数量:\n强制使用暂存的个数",
-        hideNext="隐藏预览:\n隐藏前几个预览",
-        infHold="无限暂存:\n可以无限制使用暂存",
-        forceB2B="强制满贯:\n满贯点数条掉到启动线以下就会结束游戏",
-    },
-    pauseStat={
-        "时间:",
-        "按键/旋转/暂存:",
-        "落块:",
-        "消行/挖掘:",
-        "攻击/挖掘攻击:",
-        "上涨/接收/抵消:",
-        "消除:",
-        "回旋:",
-        "(大)满贯/全(半)清:",
-        "非极简操作:",
-    },
-    radar={"防","守","攻","送","速","挖"},
-    radarData={"防/分","守/分","攻/分","送/分","行/分","挖/分"},
-    WidgetText={
-        mode={
-            mod="模组(F1)",
-        },
-        mod={
-            title="模组",
-        },
-        net_newRoom={
-            ospin="O旋",
-            holdMode="暂存模式",
-            nextCount="预览个数",
-            holdCount="暂存个数",
-            infHold="无限暂存",
-            phyHold="物理暂存",
-        },
-        setting_control={
-            das="首次移动延迟",arr="移动重复延迟",
-            sddas="首次软降延迟",sdarr="软降重复延迟",
-            ihs="提前暂存",
-        },
-        customGame={
-            mod="模组(F1)",
-
-            ospin="O旋",
-            holdMode="暂存模式",
-            nextCount="预览个数",
-            holdCount="暂存个数",
-            infHold="无限暂存",
-            phyHold="物理暂存",
-        },
-    },
-    modes={
-        ['sprint_10l']=     {"竞速",        "10行",      "消除10行"},
-        ['sprint_20l']=     {"竞速",        "20行",      "消除20行"},
-        ['sprint_40l']=     {"竞速",        "40行",      "消除40行"},
-        ['sprint_100l']=    {"竞速",        "100行",     "消除100行"},
-        ['sprint_400l']=    {"竞速",        "400行",     "消除400行"},
-        ['sprint_1000l']=   {"竞速",        "1000行",    "消除1000行"},
-        ['sprintPenta']=    {"竞速",        "五连块",     "伤脑筋十八块"},
-        ['sprintMPH']=      {"竞速",        "纯净",      "纯随机\n无预览\n无暂存"},
-        ['dig_10l']=        {"挖掘",        "10L",      "挖掘10行"},
-        ['dig_40l']=        {"挖掘",        "40L",      "挖掘40行"},
-        ['dig_100l']=       {"挖掘",        "100L",     "挖掘100行"},
-        ['dig_400l']=       {"挖掘",        "400L",     "挖掘400行"},
-        ['drought_n']=      {"干旱",        "100行",     "你I没了"},
-        ['drought_l']=      {"干旱+",       "100行",     "后 妈 发 牌"},
-        ['marathon_n']=     {"马拉松",       "普通",      "200行加速马拉松"},
-        ['marathon_h']=     {"马拉松",       "困难",      "200行高速马拉松"},
-        ['solo_e']=         {"单挑",        "简单",      "打败机器人"},
-        ['solo_n']=         {"单挑",        "普通",      "打败机器人"},
-        ['solo_h']=         {"单挑",        "困难",      "打败机器人"},
-        ['solo_l']=         {"单挑",        "疯狂",      "打败机器人"},
-        ['solo_u']=         {"单挑",        "极限",      "打败机器人"},
-        ['techmino49_e']=   {"49人混战",     "简单",      "49人混战，活到最后"},
-        ['techmino49_h']=   {"49人混战",     "困难",      "49人混战，活到最后"},
-        ['techmino49_u']=   {"49人混战",     "极限",      "49人混战，活到最后"},
-        ['techmino99_e']=   {"99人混战",     "简单",      "99人混战，活到最后"},
-        ['techmino99_h']=   {"99人混战",     "困难",      "99人混战，活到最后"},
-        ['techmino99_u']=   {"99人混战",     "极限",      "99人混战，活到最后"},
-        ['round_e']=        {"回合制",       "简单",      "下棋模式"},
-        ['round_n']=        {"回合制",       "普通",      "下棋模式"},
-        ['round_h']=        {"回合制",       "困难",      "下棋模式"},
-        ['round_l']=        {"回合制",       "疯狂",      "下棋模式"},
-        ['round_u']=        {"回合制",       "极限",      "下棋模式"},
-        ['master_n']=       {"大师",        "普通",      "20G初心者练习"},
-        ['master_h']=       {"大师",        "困难",      "上级者20G挑战"},
-        ['master_m']=       {"大师",        "大师",      "大师20G"},
-        ['master_final']=   {"大师",        "终点",      "究极20G:无法触及的终点"},
-        ['master_ph']=      {"大师",        "虚幻",      "虚幻20G:???"},
-        ['master_ex']=      {"宗师",        "EX",       "成为方块大师"},
-        ['master_instinct']={"大师",        "本能",      "隐藏当前块"},
-        ['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']=        {"隐形",        "瞬隐",      "很强大脑"},
-        ['blind_l']=        {"隐形",        "瞬隐+",     "超强大脑"},
-        ['blind_u']=        {"隐形",        "啊这",      "你准备好了吗"},
-        ['blind_wtf']=      {"隐形",        "不会吧",     "还没准备好"},
-        ['classic_e']=      {"高速经典",     "简单",       "高速经典"},
-        ['classic_h']=      {"高速经典",     "困难",       "飞速经典"},
-        ['classic_u']=      {"高速经典",     "极限",       "极速经典"},
-        ['survivor_e']=     {"生存",        "简单",      "你能存活多久?"},
-        ['survivor_n']=     {"生存",        "普通",      "你能存活多久?"},
-        ['survivor_h']=     {"生存",        "困难",      "你能存活多久?"},
-        ['survivor_l']=     {"生存",        "疯狂",      "你能存活多久?"},
-        ['survivor_u']=     {"生存",        "极限",      "你能存活多久?"},
-        ['attacker_h']=     {"进攻",        "困难",      "进攻练习"},
-        ['attacker_u']=     {"进攻",        "极限",      "进攻练习"},
-        ['defender_n']=     {"防守",        "普通",      "防守练习"},
-        ['defender_l']=     {"防守",        "疯狂",      "防守练习"},
-        ['dig_h']=          {"挖掘",        "困难",      "挖掘练习"},
-        ['dig_u']=          {"挖掘",        "极限",      "挖掘练习"},
-        ['clearRush']=      {"清版竞速",      "普通",      "所有块的回旋入门\n还没做好"},
-        ['c4wtrain_n']=     {"中四宽练习",    "普通",      "无 限 连 击"},
-        ['c4wtrain_l']=     {"中四宽练习",    "疯狂",      "无 限 连 击"},
-        ['pctrain_n']=      {"全清训练",     "普通",      "简易全清题库，熟悉全清定式的组合"},
-        ['pctrain_l']=      {"全清训练",     "疯狂",      "困难全清题库，强算力者进"},
-        ['pc_n']=           {"全清挑战",     "普通",      "100行内刷全清"},
-        ['pc_h']=           {"全清挑战",     "困难",      "100行内刷全清"},
-        ['pc_l']=           {"全清挑战",     "疯狂",      "100行内刷全清"},
-        ['pc_inf']=         {"无尽全清挑战",   "",        "你能连续做多少全清?"},
-        ['tech_n']=         {"科研",        "普通",      "禁止断满贯"},
-        ['tech_n_plus']=    {"科研",        "普通+",     "仅允许回旋与全清"},
-        ['tech_h']=         {"科研",        "困难",      "禁止断满贯"},
-        ['tech_h_plus']=    {"科研",        "困难+",     "仅允许回旋与全清"},
-        ['tech_l']=         {"科研",        "疯狂",      "禁止断满贯"},
-        ['tech_l_plus']=    {"科研",        "疯狂+",     "仅允许回旋与全清"},
-        ['tech_finesse']=   {"科研",        "极简",      "强制最简操作"},
-        ['tech_finesse_f']= {"科研",        "极简+",     "禁止普通消除，强制最简操作"},
-        ['tsd_e']=          {"T2挑战",      "简单",      "你能连续做几个T旋双清?"},
-        ['tsd_h']=          {"T2挑战",      "困难",      "你能连续做几个T旋双清?"},
-        ['tsd_u']=          {"T2挑战",      "极限",      "你能连续做几个T旋双清?"},
-        ['backfire_n']=     {"自攻自防",     "普通",      "打出100攻击"},
-        ['backfire_h']=     {"自攻自防",     "困难",      "打出100攻击"},
-        ['backfire_l']=     {"自攻自防",     "疯狂",      "打出100攻击"},
-        ['backfire_u']=     {"自攻自防",     "极限",      "打出100攻击"},
-        ['sprintAtk']=      {"竞速",        "100攻击",   "打出100攻击"},
-        ['sprintEff']=      {"竞速",        "效率",      "40行内打出更高的攻击"},
-        ['zen']=            {"禅",         "200",      "不限时200行"},
-        ['ultra']=          {"限时打分",     "挑战",      "在两分钟内尽可能拿到最多的分数"},
-        ['infinite']=       {"无尽",        "",         "沙盒"},
-        ['infinite_dig']=   {"无尽:挖掘",    "",         "挖呀挖呀挖"},
-        ['marathon_inf']=   {"马拉松",      "无尽",       "无尽马拉松"},
-
-        ['custom_clear']=   {"自定义",       "普通"},
-        ['custom_puzzle']=  {"自定义",       "拼图"},
-    },
-}

parts/language/lang_zh_grass.lua

@@ -114,9 +114,9 @@ return{
     noPassword="输入您的密码",
     diffPassword="密码不匹配",
     registerRequestSent="已发送注册请求",
-    registerSuccessed="注册成功！",
-    loginSuccessed="您现在已登录！",
-    accessSuccessed="允许访问",
+    registerOK="注册成功！",
+    loginOK="您现在已登录！",
+    accessOK="允许访问",
 
     wsConnecting="双向通信连接",
     wsFailed="双向通信连接失败",
@@ -273,6 +273,9 @@ return{
         "氟化钪",
         "蛋白激酶G抑制剂",
         "不是机器人",
+        "萨库尔",
+        "爱伦",
+        "幽灵3383",
         "",
         "性能",
         "电动283",

parts/language/lang_zh_trad.lua

@@ -116,9 +116,9 @@ return{
     noPassword="請輸入密碼",
     diffPassword="密碼不匹配",
     registerRequestSent="已發送註冊請求",
-    registerSuccessed="註冊成功！",
-    loginSuccessed="登錄成功",
-    accessSuccessed="身份認證成功",
+    registerOK="註冊成功！",
+    loginOK="登錄成功",
+    accessOK="身份認證成功",
 
     wsConnecting="正在連接……",
     wsFailed="連接失敗",
@@ -276,6 +276,8 @@ return{
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
         "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Performances",
         "Electric283",

parts/language/manual_en.txt

@@ -1,7 +1,7 @@
 Gameplay:
         The system will provide you with tetrominoes (4-block pieces),
         with a total of 7 types, and the player needs to control them
-        (move left and right, rotate 90, 180 or 270 degrees).
+        (move left and right, rotate 90, 180, or 270 degrees).
         each row filled with the field will be cleared.
         If there is an opponent, an attack will be sent depending on the line clear type
         Play until the end or achieve the level's goal to win.
@@ -18,29 +18,49 @@ Spin detection:
         - The Spin is a Mini if it only has 2 points; the piece is one of S, Z, J, L, T; AND the line clear did not clear the entire piece.
 
 Attack system:
-        Normal line clears (1 to 3 lines):
-                Sends (lines cleared -0.5) attack
-        Special line clears:
-                Spin sends (lines cleared x2) attack,
-                        - B2B sends extra 1/1/2/4/8 for Spin Single/Double/Triple/Techrash/Techrash+
-                        - B2B2B sends (lines cleared x0.5), and +1 extra blocking
-                        - Minis reduces the attack to 25% (x0.25 multiplier)
-                Non-Spin Techrash/Techrash+ sends (lines cleared) attack,
-                        - B2B sends 1 additional line
-                        - B2B2B will have an attack boost of 50% and +1 extra blocking
+        Special clear:
+                A special clear refers to a situation where you perform a spin, Techrash (or clear more than four lines at a time), PC, or HPC. Special clears can elevate the B2B gauge.
+        Super clear:
+                A super clear refers to a situation where you perform a special clear when the B2B gauge is not empty.
 
-        Special line clears will the increase B2B gauge, making later special line clears have either a B2B or B2B2B bonus (see below)
+        Special clears (spins):
+                sends (lines cleared ×2) attack,
+                - B2B sends extra 1/1/2/4/8 for Spin Single/Double/Triple/Techrash/Techrash+
+                - B2B2B sends (lines cleared ×0.5), and +1 extra blocking
+                - Minis reduces the attack to 25% (×0.25 multiplier)
 
+        Special clears (Techrash/techrash+ without spins):
+                - B2B sends 1 additional line
+                - B2B2B will have an attack boost of 50% and +1 extra blocking
+        
+        Non-special clears:
+                send (attack-0.5) attack.
+
+        Combos (REN):
+                The numbers of the combos are equal to (the numbers you clear lines consecutively –1). All damage above (except attack from PC/HPC) will be given a (combo ×25%) bonus, or (combo ×15%) for Single clear (capped at 12 combo), +1 more attack for 3 Combo or more.
+        
         Hemi Perfect Clear (a P.C. "with blocks left below". If it's an I clearing 1 line, the remaining blocks must not be player-placed):
-                Attack +4, Extra Blocking +2
+                - Attack +4, Extra Blocking +2
 
-        Perfect Clear (aka All Clear):
-                Sends 8 to 16 (increments within a game by 2 for every PC) OR every other damage above, whichever is higher,
-                and +2 extra blocking.
+        Perfect Clear (All Clear):
+                - Sends 8 to 16 (increments within a game by 2 for every PC) OR every other damage above, whichever is higher, and +2 extra blocking.
 
-        Combos: All damage above will be given a (combo x25%) bonus, or (combo x15%) for Single clear (capped at 12 combo),
-        +1 more attack for 3 Combo or more.
-        After calculating all above, the damage value will be rounded down then sent
+        After calculating all the above, the damage value will be rounded down and sent.
+
+
+Back to Back (B2B) gauge:
+        The B2B gauge ranges from 0 to 1,000. Special line clears are B2B if the gauge is >=50, B2B2B if >800.
+
+        Line cleared:
+                Special clears:
+                - Spin Single/Double/Triple/Techrash/Techrash+ + 50/100/180/800/1000 (×50% if Mini)
+                - Techrash/Techrash+ + 150/200/...
+                - PC when lines cleared in this round >4, +800
+                - HPC, +100
+                - A regular line clear -250
+
+        No lines cleared:
+                - Spin (0 lines) +20. Do note that the B2B gauge cannot exceed 800 using this method.
 
 Score system:
         The better you play, the higher the score.
@@ -53,37 +73,27 @@ Attack delay:
         Minis will greatly increase the delay.
 
 Countering:
-        When you send attacks, if there is garbage in queue,
+        When you send attacks, if there is garbage in the queue,
         extra blocking will be used first, then attack, countering the earliest attack at a 1:1 ratio.
-        Any extra blocking you didn't use will be discarded, and finally the remaining attack power will be sent to your opponent.
-
-Back to Back (B2B) gauge:
-        The B2B gauge ranges from 0 to 1,000. Special line clears are B2B if the gauge is >=50, B2B2B if >800.
-        A regular line clear -250
-        Spin Single/Double/Triple/Techrash/Techrash+ + 50/100/180/800/1000 (x50% if Mini)
-        Techrash/Techrash+ + 150/200/...
-        PC when lines cleared in this round >4, +800
-        Hemi-PC, +100
-        Spin (0 lines) +20. Do note that the B2B gauge cannot exceed 800 using this method.
-        When gauge is above 800, a drop without clearing lines decreases it by 40, but cannot drop below 800
+        Any extra blocking you didn't use will be discarded, and finally, the remaining attack power will be sent to your opponent.
 
 Battle Royale modes:
         Many players play a game at the same time (against AI bots, not real players).
-        As players get eliminated, blocks fall faster, and garbage take effect faster, as well as rise faster.
+        As players get eliminated, blocks fall faster, and garbage takes effect faster, as well as rises faster.
         Eliminate other players to gain a badge and the player's badge to increase your attack power.
         Players can choose between four attack modes:
                 1. Random: Every time you attack, 10% chance to lock onto a random player.
                 2. Badges: After you attack or when your target dies, lock onto the player with the most badges.
                 3. KOs: After you attack or when your target dies, lock onto the player with the highest field. (Refreshes every second)
                 4. Attackers: attack all players locking onto yourself.
-                Your attack will be sent to all of them. If you are not targetted, you attack a random player (not locking).
+                Your attack will be sent to all of them. If you are not targeted, you attack a random player (not locking).
         When all opponents have been eliminated, the last player in the match is the winner.
 
 Custom mode:
         You can freely adjust most parameters (not including special effects of other game modes).
         You can also draw a field to clear or make a template to build.
         In build (puzzle) mode, you can toggle template display with Function key:
-                Cells with a X cannot have blocks;
+                Cells with an X cannot have blocks;
                 empty cells can be in any state;
                 regular colored cells have to be made of the corresponding block;
                 garbage-colored cells can be any block but not air.

parts/language/manual_ja.txt

@@ -0,0 +1,62 @@
+ゲームプレイ:
+        システムから与えられた全7種類のテトロミノ
+        (4ブロックで構成されたピース) をプレイヤーが操作します, 
+        (主に左右移動と90°, 180°, 270°回転で)。
+        各行がブロックで埋め尽くされるとその行列のブロックが消えます。
+        相手が居る場合, ラインの消し方等で攻撃と火力が異なります。
+        勝利する為にはそのレベルの目標達成もしくは最後までプレイする必要があります。
+
+回転システム: 
+        初期設定はTRS (Techmino Rotation System) で設定されています。
+        プレイヤーは他の一般的な回転システムも使う事ができます (基本的には変えなくても大丈夫)。
+
+スピンの検出:
+        「3コーナ」ルールを満たした時 +2点
+        「インモービル (Immobile)」 ルールを満たした時 +2点
+        - 上のどちらかを満たした時, スピンが確定します。
+
+        もし回転システムがキックテーブルから2番チェック (2nd check) を採用していなかった場合 +1点
+        - もしスピンの合計点が2点しかない場合は「ミニ」扱いになります；ミノがS, Z, J, L, Tのいずれかで, ラインクリア時にそのミノを全て消せなかった場合のみ。
+
+Attack system:
+        [TODO]
+Back to Back (B2B) gauge:
+        [TODO]
+
+スコアシステム:
+        上手くプレイすれば, スコアも上がります。
+
+攻撃遅延システム:
+        ダブル, トリプルの攻撃が一番早く効果が出ます;
+        その次にゆっくりとした攻撃を送るTechrash, スピン等, の効果が出ます;
+        高いコンボ数の攻撃が飛躍的に遅いです;
+        B2BやB2B2B等は, 送るライン数が増えれば増えるほど遅くなります; 
+        ミニ系の攻撃は攻撃自体の効果を大幅に遅らせます。
+
+カウンター:
+        攻撃を送る際, もしお邪魔ゲージにお邪魔がある場合, 
+        追加相殺がまず使われ, その次に攻撃自体とお邪魔を1対1の割合でお邪魔の相殺に当てます。
+        使わなかった追加相殺は破棄され、残った攻撃のパワーは相手に送られます。
+
+バトルロイヤルモード:
+        沢山のプレイヤーが同時にゲームをプレイします (対AIです, 本物の人ではありません)。
+        人数が減れば減るほど、ミノの落下速度は加速していき、お邪魔の効果が早く出る同時にせり上がる速度も上がります。
+        他のプレイヤーを倒してバッジを得て、そしてそのバッジであなた自身の攻撃力を上げましょう。
+        プレイヤーは4つの攻撃モードから選ぶことができます:
+                1: ランダム: 毎回攻撃を送る際, 10%の確率で他のプレイヤーに照準を合わせます。
+                2: バッジ狙い: 攻撃を送った後もしくは標的が落とされた場合, バッジの数が一番多いプレイヤーに照準を合わせます。
+                3. トドメ撃ち: 攻撃を送った後もしくは標的が落とされた場合, 各プレイヤの中からフィールドの高さが一番高いプレイヤーに照準を合わせます。
+                        (毎秒更新されます)
+                4. カウンター: あなたに照準を向けられてるプレイヤー全員に照準を同時に向けます。
+                        あなたの攻撃は照準を向けてるプレイヤー全てに送られます。照準をあなたに向けられていない場合、ランダムにプレイヤーを攻撃します (プレイヤー照準固定無し)
+        全てのプレイヤーが落とされた場合, 最後のプレイヤーが勝者となります。
+
+カスタムモード:
+        殆どの変数を自由に変えられます (他のゲームモードの特殊エフェクトを除いて)。
+        更に消す為のフィールドを描いたりまたは積み上げる為のテンプレも作れます。
+        ビルド (パズル) モードの場合, テンプレの表示をファンクションキーで操作できます:
+                X印の場所にはブロックは置けない;
+                無印の場所は何来ても構わない;
+                色付きの場所にはその色に合わせてのミノブロックを置かないいけない;
+                おじゃまミノ色の場所にはあるブロックが来てる扱いで空きスペースではない。
+        形を整えた後に, 勝ち判定となります。

parts/language/manual_zh.txt

@@ -15,21 +15,48 @@ spin判定:
         --如果分数只有2,方块是SZJLT之一,并且没有把当前方块整个消除那么就是mini
 
 攻击系统:
-        普通消除:
-                消<4行打出[消行数-0.5]攻击
-        特殊消除:
-                如果是spin,打出[2*消行数]攻击,
-                        B2B攻击+[1/1/2/4/8(spin1~5)]
-                        B3B攻击在B2B基础上+消行数*0.5,+1额外抵挡
-                        mini减至25%
-                不是spin但是单次消>=4行,打出[消行数]攻击,
-                        B2B攻击+1
-                        B3B攻击+50%,+1额外抵挡
-        特殊消除会增加B2B点数,让之后的特殊消除获得B2B(B3B)增益(详细说明见下文)
-        半全消("下方有剩余方块"的全消,如果是I消1行则必须不剩余玩家放置的方块):伤害+4,额外抵挡+2
-        全消:全消伤害为8~16(本局内递增2),和上述其他伤害取大,然后+2额外抵挡
-        连击:每次连击给予上述攻击[连击数*25%(上限12连)(如果只消一行就是15%)]的加成,>=3次时再额外加1攻击
-        根据上述规则计算后,向下取整,攻击打出
+        概念说明[高级消除]:
+                spin/消四及以上,会受到B2B(点数>=50)或B3B(点数>800)加成
+                反之称为低级消除
+        概念说明[特殊消除]:
+                spin/消四及以上/pc/hpc,可以增加B2B点数
+                反之称为普通消除
+
+        高级消除(spin):
+                打出[2*消行数]攻击,然后
+                - B2B攻击+[1/1/2/4/8/14(spin1~6)]
+                - B3B攻击在B2B基础上+消行数*0.5,+1额外抵挡
+                - mini减至25%
+        高级消除(非spin但是消四及以上):
+                打出[消行数]攻击,然后
+                - B2B攻击+1
+                - B3B攻击+50%,+1额外抵挡
+        低级消除:
+                打出[消行数-0.5]攻击
+        连击:
+                (注:连击数为连续消除次数-1)
+                把上述高级消除/低级消除的攻击直接乘以"连击倍率", 公式为 "连击倍率"=[连击数(上限12)]*[消一行以上25%,只消一行15%]
+                如果消除>=3次时再额外加1攻击
+        半全消("下方有剩余方块"的全消,如果是I消1行则必须不剩余玩家放置的方块):
+                伤害+4,额外抵挡+2
+        全消:
+                伤害为8~16(本局内递增2),和上述其他伤害取大,+2额外抵挡
+        计算完成后,向下取整,攻击打出
+
+back to back(B2B)点数说明:
+        B2B点数的范围在0~1000
+
+        落块后消行了:
+                特殊消除:
+                        spin1~5:+[50/100/180/800/1000](mini变为原来50%)
+                        消四/五/六:+[150/200/...]
+                        本局内消行数>4时全消:+800
+                        半全消:+100
+                普通消除:
+                        -250
+        落块后没消行:
+                空spin:+20
+                点数在800以上会-40(不低于800)
 
 分数系统:
         分数计算系统非常复杂,而且随时可能更改所以不写在这里,并且计算只跟消除方式等信息有关,和模式设定无关
@@ -42,16 +69,6 @@ spin判定:
         发动攻击时,若缓冲条有攻击则先用额外抵挡再用攻击力1:1抵消最先受到的攻击
         没有用上的额外抵挡会被丢弃,最后剩下的攻击力会发送给对手
 
-back to back(B2B)点数说明:
-        B2B点数的范围在0~1000,在点数>=50时进行特殊消除为B2B,>800时特殊消除为B3B
-        普通消除:-250
-        spin1~5:+[50/100/180/800/1000](mini变为原来50%)
-        消四/五/六:+[150/200/...]
-        本局内消行数>4时全消:+800
-        半全消:+100
-        空spin:+20,此法得到的点数不能超过800
-        当点数在800以上时空放一块-40(不低于800)
-
 混战模式说明:
         许多玩家同时进行一局游戏(对手都是AI,不是真人).
         随着玩家数量的减少,方块下落/垃圾生效速度/垃圾升起速度都会增加.

parts/modes.lua

@@ -1,13 +1,16 @@
 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'}},
+    {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=-200,      y=0,        size=50,shape=1,icon="sprint2",     unlock={'sprint_400l','drought_n'}},
     {name='sprint_400l',   x=-400,      y=0,        size=40,shape=1,icon="sprint3",     unlock={'sprint_1000l'}},
     {name='sprint_1000l',  x=-600,      y=0,        size=40,shape=1,icon="sprint3"},
 
-    {name='sprintPenta',   x=180,       y=-160,     size=40,shape=3,icon="sprint2"},
-    {name='sprintMPH',     x=220,       y=-340,     size=40,shape=3,icon="sprint2"},
+    {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='secret_grade',  x=-200,      y=-400,     size=40,shape=1,icon="secret_grade"},
 
     {name='drought_n',     x=-400,      y=200,      size=40,shape=1,icon="drought",     unlock={'drought_l'}},
     {name='drought_l',     x=-600,      y=200,      size=40,shape=1,icon="drought"},
@@ -17,7 +20,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','solo_e','round_e','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','clearRush','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'}},
@@ -39,42 +42,48 @@ return{
     {name='round_l',       x=-1200,     y=-800,     size=40,shape=1,icon="round",       unlock={'round_u'}},
     {name='round_u',       x=-1400,     y=-800,     size=40,shape=1,icon="round"},
 
+    {name='big_n',         x=-400,      y=-400,     size=40,shape=1,icon="big",         unlock={'big_h'}},
+    {name='big_h',         x=-600,      y=-400,     size=40,shape=1,icon="big",},
+
     {name='master_n',      x=0,         y=-1000,    size=40,shape=1,icon="master",      unlock={'master_h','strategy_h'}},
-    {name='master_h',      x=0,         y=-1200,    size=40,shape=3,icon="master",      unlock={'master_final','master_ex','master_ph','master_m','strategy_u'}},
-    {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"},
+    {name='master_h',      x=0,         y=-1200,    size=40,shape=3,icon="master",      unlock={'master_final','master_ex','master_ph','master_m','master_g','strategy_u'}},
+    {name='master_m',      x=100,       y=-1550,    size=40,shape=2,icon="master"},
+    {name='master_final',  x=-100,      y=-1550,    size=40,shape=2,icon="master"},
+    {name='master_ph',     x=-170,      y=-1450,    size=40,shape=2,icon="master"},
+    {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=-1030,    size=40,shape=3,icon="master"},
     {name='strategy_h',    x=-200,      y=-1160,    size=35,shape=3,icon="master"},
     {name='strategy_u',    x=-250,      y=-1290,    size=30,shape=2,icon="master"},
 
-    {name='blind_e',       x=150,       y=-700,     size=40,shape=1,icon="hidden",      unlock={'blind_n'}},
+    {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'}},
     {name='blind_h',       x=150,       y=-900,     size=35,shape=1,icon="hidden",      unlock={'blind_l'}},
     {name='blind_l',       x=150,       y=-1000,    size=35,shape=3,icon="hidden2",      unlock={'blind_u'}},
     {name='blind_u',       x=150,       y=-1100,    size=30,shape=3,icon="hidden2",      unlock={'blind_wtf'}},
     {name='blind_wtf',     x=150,       y=-1200,    size=25,shape=2,icon="hidden2"},
+    {name='master_instinct',x=285,      y=-835,     size=40,shape=3,icon="hidden"},
 
     {name='classic_e',     x=-200,      y=-850,     size=40,shape=1,icon="classic",     unlock={'classic_h'}},
-    {name='classic_h',     x=-300,      y=-950,    size=35,shape=2,icon="classic",     unlock={'classic_u'}},
-    {name='classic_u',     x=-400,      y=-1050,    size=30,shape=2,icon="classic"},
+    {name='classic_h',     x=-300,      y=-950,     size=40,shape=3,icon="classic",     unlock={'classic_l'}},
+    {name='classic_l',     x=-400,      y=-1050,    size=35,shape=3,icon="classic",     unlock={'classic_u'}},
+    {name='classic_u',     x=-500,      y=-1150,    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'}},
-    {name='survivor_h',    x=700,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_l'}},
-    {name='survivor_l',    x=900,       y=-600,     size=40,shape=3,icon="survivor",    unlock={'survivor_u'}},
-    {name='survivor_u',    x=1100,      y=-600,     size=40,shape=2,icon="survivor"},
+    {name='survivor_e',    x=450,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_n'}},
+    {name='survivor_n',    x=650,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_h','attacker_h','defender_n','dig_h'}},
+    {name='survivor_h',    x=850,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_l'}},
+    {name='survivor_l',    x=1050,       y=-600,     size=40,shape=3,icon="survivor",    unlock={'survivor_u'}},
+    {name='survivor_u',    x=1250,      y=-600,     size=40,shape=2,icon="survivor"},
 
-    {name='attacker_h',    x=300,       y=-800,     size=40,shape=1,icon="attack",      unlock={'attacker_u'}},
-    {name='attacker_u',    x=300,       y=-1000,    size=40,shape=1,icon="attack"},
+    {name='attacker_h',    x=450,       y=-800,     size=40,shape=1,icon="attack",      unlock={'attacker_u'}},
+    {name='attacker_u',    x=450,       y=-1000,    size=40,shape=1,icon="attack"},
 
-    {name='defender_n',    x=500,       y=-800,     size=40,shape=1,icon="defend",      unlock={'defender_l'}},
-    {name='defender_l',    x=500,       y=-1000,    size=40,shape=1,icon="defend"},
+    {name='defender_n',    x=650,       y=-800,     size=40,shape=1,icon="defend",      unlock={'defender_l'}},
+    {name='defender_l',    x=650,       y=-1000,    size=40,shape=1,icon="defend"},
 
-    {name='dig_h',         x=700,       y=-800,     size=40,shape=1,icon="dig",         unlock={'dig_u'}},
-    {name='dig_u',         x=700,       y=-1000,    size=40,shape=1,icon="dig"},
+    {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'}},

parts/modes/big_h.lua

@@ -7,16 +7,16 @@ return{
         eventSet='big_h',
         bg='cubes',bgm='push',
     },
-    score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
-    scoreDisp=function(D)return D[1].." Combo   "..STRING.time(D[2])end,
+    score=function(P)return{P.stat.row,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
         if L>=200 then
             local T=P.stat.time
             return
-            T<=160 and 5 or
-            T<=280 and 4 or
+            T<=120 and 5 or
+            T<=180 and 4 or
             3
         else
             return

parts/modes/big_n.lua

@@ -7,16 +7,16 @@ return{
         eventSet='big_n',
         bg='bg2',bgm='push',
     },
-    score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
-    scoreDisp=function(D)return D[1].." Combo   "..STRING.time(D[2])end,
+    score=function(P)return{P.stat.row,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
         if L>=200 then
             local T=P.stat.time
             return
-            T<=180 and 5 or
-            T<=300 and 4 or
+            T<=120 and 5 or
+            T<=180 and 4 or
             3
         else
             return

parts/modes/classic_l.lua

@@ -0,0 +1,23 @@
+return{
+    env={
+        center=0,ghost=0,
+        smooth=false,
+        face={0,0,2,2,2,0,0},
+        eventSet='classic_l',
+        bg='rgb',bgm='1980s',
+    },
+    slowMark=true,
+    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>=140 and 4 or
+        L>=100 and 3 or
+        L>=60 and 2 or
+        L>=30 and 1 or
+        L>=1 and 0
+    end,
+}

parts/modes/master_g.lua

@@ -0,0 +1,35 @@
+
+local gradeList={
+    "Grade 9","Grade 8","Grade 7","Grade 6","Grade 5","Grade 4","Grade 3","Grade 2","Grade 1",
+    "S1","S2","S3","S4","S5","S6","S7","S8","S9",
+    "m1","m2","m3","m4","m5","m6","m7","m8","m9",
+    "M","MK","MV","MO","MM-","MM","MM+","GM-","GM","GM+","TM-","TM","TM+"
+}
+
+return{
+    env={
+        freshLimit=15,
+        fieldH=19,
+        sequence="bagES",
+        eventSet='master_g',
+        bg='bg2',bgm='secret7th',
+    },
+    slowMark=true,
+    score=function(P) return {P.modeData.gradePts,P.stat.time} end,
+    scoreDisp=function(D) return gradeList[D[1]].."   "..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 G=P.modeData.gradePts
+        return
+            G>=39 and 5 or -- TM+
+            G>=31 and 4 or -- MM- - TM
+            G>=25 and 3 or -- m8 - MO
+            G>=18 and 2 or -- m1-m7
+            G>=9 and 1 or -- S1-S9
+            0
+
+            -- Table of grades vs values
+            -- 9 8 7 6 5 4 3 2 1 S1 S2 S3 S4 S5 S6 S7 S8 S9 m1 m2 m3 m4 m5 m6 m7 m8 m9  M MK MV MO MM- MM MM+ GM- GM GM+ TM- TM TM+
+            -- 0 1 2 3 4 5 6 7 8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31  32 33  34  35 36  37  38 39
+    end,
+}

parts/modes/secret_grade.lua

@@ -0,0 +1,23 @@
+local ranks={"Grade 10","Grade 9","Grade 8","Grade 7","Grade 6","Grade 5","Grade 4","Grade 3","Grade 2","Grade 1","S1","S2","S3","S4","S5","S6","S7","S8","S9","GM","GM+","TM","TM+","TM+₂","TM+₃", "TM+₄","TM+₅"}
+-- index:         1         2          3        4         5          6         7        8         9         10     11   12   13   14   15   16   17   18   19   20   21    22   23     24     25      26     27
+return{
+    env={
+        drop=180,lock=180,
+        hang=15,
+        eventSet='secret_grade',
+        bg='bg2',bgm='race',
+    },
+    score=function(P)return{P.modeData.rankPts,P.stat.piece}end,
+    scoreDisp=function(D)return ranks[D[1]].."   "..D[2].." Pieces"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 G=P.modeData.rankPts
+        return
+        G>=23 and 5 or
+        G>=21 and 4 or
+        G>=19 and 3 or
+        G>=15 and 2 or
+        G>=11 and 1 or
+        G>=7 and 0
+    end,
+}