版本推进

* Added draft for jp files (editing)

* Manual_JP.txt Done

.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

@@ -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
@@ -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/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/char.lua

@@ -213,89 +213,89 @@ 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,
     }
 
 }

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/master_g.lua

@@ -0,0 +1,295 @@
+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}
+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()
+    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+"
+    }
+    if int_grade==nil then int_grade=0 end
+    if rollGrades==nil then rollGrades=0 end
+    return gradeList[math.min(math.floor(int_grade_boosts[int_grade+1]+rollGrades+cools+1-regrets),#gradeList)]
+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,
+    mesDisp=function(P)
+        gc.setColor(1,1,1,1)
+        setFont(45)
+        mText(TEXTOBJ.grade,63,180)
+        setFont(62)
+        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)
+            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
+                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
+        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}
+        local decayTimer=0
+        while true do
+            YIELD()
+            P.modeData.grade=getGrade()
+            P.modeData.gradePts=math.min(math.floor(int_grade_boosts[int_grade+1]+rollGrades+cools-regrets),36)
+            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 j=1,#P.field do for i=1,10 do
+                        P.visTime[j][i]=P.visTime[j][i]-0.001
+                    end end
+                elseif P.waiting==190 then
+                    for _=#P.field,1,-1 do
+                        P.field[_],P.visTime[_]=nil
+                    end
+                elseif P.waiting==180 then
+                    playReadySFX(3,3)
+                elseif P.waiting==120 then
+                    playReadySFX(2,2)
+                elseif P.waiting==60 then
+                    playReadySFX(1,1)
+                elseif P.waiting==1 then
+                    playReadySFX(0,0)
+                    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[int_grade+1] then
+                    decayTimer=0
+                    grade_points=grade_points-1
+                end
+            elseif isInRoll and P.stat.frame>=prevSectTime+3600 then
+                rollGrades=rollGrades+(cools>8 and 1.6 or 0.5)
+                P:win('finish')
+            end
+        end
+    end,
+}

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

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

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

parts/language/lang_id.lua

@@ -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",
@@ -277,6 +277,8 @@ return{
         "C₂₉H₂₅N₃O₅",
         "NOT_A_ROBOT",
         "sakurw",
+        "Airun",
+        "幽灵3383",
         "",
         "Pertunjukan",
         "Electric283",

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

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

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

@@ -31,6 +31,9 @@ Attack system:
 
         Special line clears will the increase B2B gauge, making later special line clears have either a B2B or B2B2B bonus (see below)
 
+        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.
+
         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
 
@@ -38,8 +41,6 @@ Attack system:
                 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
 
 Score system:

parts/language/manual_ja.txt

@@ -0,0 +1,109 @@
+ゲームプレイ:
+        システムから与えられた全7種類のテトロミノ
+        (4ブロックで構成されたピース) をプレイヤーが操作します, 
+        (主に左右移動と90°, 180°, 270°回転で)。
+        各行がブロックで埋め尽くされるとその行列のブロックが消えます。
+        相手が居る場合, ラインの消し方等で攻撃と火力が異なります。
+        勝利する為にはそのレベルの目標達成もしくは最後までプレイする必要があります。
+
+回転システム: 
+        初期設定はTRS (Techmino Rotation System) で設定されています。
+        プレイヤーは他の一般的な回転システムも使う事ができます (基本的には変えなくても大丈夫)。
+
+スピンの検出:
+        「3コーナ」ルールを満たした時 +2点
+        「インモービル (Immobile)」 ルールを満たした時 +2点
+        - 上のどちらかを満たした時, スピンが確定します。
+
+        もし回転システムがキックテーブルから2番チェック (2nd check) を採用していなかった場合 +1点
+        - もしスピンの合計点が2点しかない場合は「ミニ」扱いになります；ミノがS, Z, J, L, Tのいずれかで, ラインクリア時にそのミノを全て消せなかった場合のみ。
+
+攻撃の火力システム:
+        通常のラインクリア (1から3ライン):
+                ラインを消した数から0.5引いた分 (四捨五入) を送ります
+        特殊なラインクリア:
+                スピンはラインを消した数の2倍分送ります
+                        - B2Bは消し方に応じて追加します, 以下の通り:
+                                - スピンシングル   1
+                                - スピンダブル     1
+                                - スピントリプル   2
+                                - Techrash        4
+                                - Techrash+       8
+                        - B2B2Bは (ラインクリア数×0.5) 分のラインを上乗せ、更に1ライン追加相殺します。
+                        - ミニ判定の場合, その攻撃は元の0.25倍に下がります。
+                スピン無しのTechrash/Techrash+は消した分をそのまま送ります
+                        - B2Bの場合は追加1ライン
+                        - B2B2Bの場合は50％の攻撃ブーストが掛かると更に1ライン分追加相殺します
+        
+        特殊なラインクリアはB2Bゲージを増加させます, そのゲージは後のB2BやB2B2Bにボーナスが追加されます。 (以下参照)
+        
+        コンボ (通称: 連): 
+                全てのダメージに応じて (コンボ数×25％) の上乗せ, あるいはシングルに対して (コンボ数×15%) 上乗せ (最大12コンボまで) , 
+                ３コンボ以上で+1追加攻撃。
+        
+        ヘマイパーフェクトクリア (Hemi Perfect Clear) (「ブロックが下に残ってる」状態でのパフェ。 Iミノでクリアできるラインが一つであり, 残りのミノ全てはプレイヤーが置かなかったミノ (お邪魔ミノ) である事:
+                攻撃 +4 追加相殺 +2
+
+        パーフェクトクリア (通称: オールクリア):
+                8から16ライン送る (試合内でパフェを送る度に前のライン数と2ライン分上乗せ) もしくは 上の記述からのダメージと追加, なおさら多い, 
+                更に 追加相殺 +2。
+        
+        全てを計算した後に, ダメージ数を四捨五入して送ります。
+
+スコアシステム:
+        上手くプレイすれば, スコアも上がります。
+
+攻撃遅延システム:
+        ダブル, トリプルの攻撃が一番早く効果が出ます;
+        その次にゆっくりとした攻撃を送るTechrash, スピン等, の効果が出ます;
+        高いコンボ数の攻撃が飛躍的に遅いです;
+        B2BやB2B2B等は, 送るライン数が増えれば増えるほど遅くなります; 
+        ミニ系の攻撃は攻撃自体の効果を大幅に遅らせます。
+
+カウンター:
+        攻撃を送る際, もしお邪魔ゲージにお邪魔がある場合, 
+        追加相殺がまず使われ, その次に攻撃自体とお邪魔を1対1の割合でお邪魔の相殺に当てます。
+        使わなかった追加相殺は破棄され、残った攻撃のパワーは相手に送られます。
+
+バックツーバック (B2B) ゲージ:
+        B2Bのゲージの範囲は0から1000あります。もしゲージの値が50以上なら特殊なラインクリアはB2Bと見なされ、800以上ならB2B2B (バックツーバックツーバック) 扱いとなります。
+        普通のラインクリアは -250
+        
+        スピンシングル:   +50
+        スピンダブル:     +100
+        スピントリプル:   +180
+        特殊なTechrash:  +800
+        特殊なTechrash+: +1000
+        ミニ系は (上の記述通り×50%)
+
+        普通のTechrashは+150 
+        Techrash+は+200
+        … と続きます。
+
+        このラウンド内の合計ライン数が4以上でパフェを取った場合, +800
+        ヘマイパフェ, +100
+        スピン (0ライン) は+20, 注意としてこの方法ではゲージを800以上は増やせません。
+        もしゲージが800以上ある場合, 毎回のラインクリア無しの落下で40減りますが、800未満にはなりません。
+
+バトルロイヤルモード:
+        沢山のプレイヤーが同時にゲームをプレイします (対AIです, 本物の人ではありません)。
+        人数が減れば減るほど、ミノの落下速度は加速していき、お邪魔の効果が早く出る同時にせり上がる速度も上がります。
+        他のプレイヤーを倒してバッジを得て、そしてそのバッジであなた自身の攻撃力を上げましょう。
+        プレイヤーは4つの攻撃モードから選ぶことができます:
+                1: ランダム: 毎回攻撃を送る際, 10%の確率で他のプレイヤーに照準を合わせます。
+                2: バッジ狙い: 攻撃を送った後もしくは標的が落とされた場合, バッジの数が一番多いプレイヤーに照準を合わせます。
+                3. トドメ撃ち: 攻撃を送った後もしくは標的が落とされた場合, 各プレイヤの中からフィールドの高さが一番高いプレイヤーに照準を合わせます。
+                        (毎秒更新されます)
+                4. カウンター: あなたに照準を向けられてるプレイヤー全員に照準を同時に向けます。
+                        あなたの攻撃は照準を向けてるプレイヤー全てに送られます。照準をあなたに向けられていない場合、ランダムにプレイヤーを攻撃します (プレイヤー照準固定無し)
+        全てのプレイヤーが落とされた場合, 最後のプレイヤーが勝者となります。
+
+カスタムモード:
+        殆どの変数を自由に変えられます (他のゲームモードの特殊エフェクトを除いて)。
+        更に消す為のフィールドを描いたりまたは積み上げる為のテンプレも作れます。
+        ビルド (パズル) モードの場合, テンプレの表示をファンクションキーで操作できます:
+                X印の場所にはブロックは置けない;
+                無印の場所は何来ても構わない;
+                色付きの場所にはその色に合わせてのミノブロックを置かないいけない;
+                おじゃまミノ色の場所にはあるブロックが来てる扱いで空きスペースではない。
+        形を整えた後に, 勝ち判定となります。

parts/language/manual_zh.txt

@@ -26,9 +26,9 @@ spin判定:
                         B2B攻击+1
                         B3B攻击+50%,+1额外抵挡
         特殊消除会增加B2B点数,让之后的特殊消除获得B2B(B3B)增益(详细说明见下文)
+        连击:每次连击给予上述攻击[连击数*25%(上限12连)(如果只消一行就是15%)]的加成,>=3次时再额外加1攻击
         半全消("下方有剩余方块"的全消,如果是I消1行则必须不剩余玩家放置的方块):伤害+4,额外抵挡+2
         全消:全消伤害为8~16(本局内递增2),和上述其他伤害取大,然后+2额外抵挡
-        连击:每次连击给予上述攻击[连击数*25%(上限12连)(如果只消一行就是15%)]的加成,>=3次时再额外加1攻击
         根据上述规则计算后,向下取整,攻击打出
 
 分数系统:

parts/modes/master_g.lua

@@ -0,0 +1,33 @@
+return{
+    env={
+        freshLimit=15,
+        fieldH=19,
+        sequence="bagES",
+        eventSet='master_g',
+        bg='bg2',bgm='secret7th',
+    },
+    slowMark=true,
+    score=function(P)
+        if not tonumber(P.modeData.grade) then
+            return{P.modeData.grade,P.stat.time}
+        else
+            return{"Grade "..tostring(P.modeData.grade),P.stat.time}
+        end
+    end,
+    scoreDisp=function(D) return 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/sprint123.lua

@@ -0,0 +1,22 @@
+return{
+    env={
+        drop=60,lock=60,
+        sequence='bag',seqData={26,27,28,29},
+        eventSet='checkLine_40',
+        bg='bg2',bgm='race',
+    },
+    score=function(P)return{P.stat.time,P.stat.piece}end,
+    scoreDisp=function(D)return STRING.time(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)
+        if P.stat.row<40 then return end
+        local T=P.stat.time
+        return
+        T<=42 and 5 or
+        T<=62 and 4 or
+        T<=104 and 3 or
+        T<=130 and 2 or
+        T<=160 and 1 or
+        0
+    end,
+}

parts/net.lua

@@ -467,14 +467,14 @@ function NET.updateWS_user()
                                 SCN.back()
                             end
                         end
-                        MES.new('check',text.loginSuccessed)
+                        MES.new('check',text.loginOK)
 
                         --Get self infos
                         NET.getUserInfo(USER.uid)
                         NET.unlock('wsc_user')
                     elseif res.action==0 then--Get accessToken
                         NET.accessToken=res.accessToken
-                        MES.new('check',text.accessSuccessed)
+                        MES.new('check',text.accessOK)
                         NET.wsconn_play()
                     elseif res.action==1 then--Get userInfo
                         USERS.updateUserData(res.data)

parts/patron.lua

@@ -130,4 +130,5 @@ return{
     {font=25,name="江江江江17"},
     {font=25,name="TetraCepra"},
     {font=25,name="爱抢姐姐布丁的芙兰酱(CHNO)"},
+    {font=25,name="你的忘机已上羡"},
 }

parts/player/draw.lua

@@ -782,7 +782,7 @@ function draw.norm(P,repMode)
             _drawFXs(P)
 
             --Draw current block
-            if P.alive and P.cur then
+            if P.alive and P.control and P.cur then
                 local C=P.cur
                 local curColor=C.color
 
@@ -1021,7 +1021,7 @@ function draw.demo(P)
                 local _=BLOCK_COLORS[skinSet[id]]
                 gc_setColor(_[1],_[2],_[3],.3)
                 _=blockImg[id]
-                gc_draw(_,15,40*N-10,nil,16,nil,0,_:getHeight()*.5)
+                gc_draw(_,15,40*N-10,nil,8,nil,0,_:getHeight()*.5)
                 N=N+1
             end
 
@@ -1032,7 +1032,7 @@ function draw.demo(P)
                 local _=BLOCK_COLORS[skinSet[id]]
                 gc_setColor(_[1],_[2],_[3],.3)
                 _=blockImg[id]
-                gc_draw(_,285,40*N-10,nil,16,nil,_:getWidth(),_:getHeight()*.5)
+                gc_draw(_,285,40*N-10,nil,8,nil,_:getWidth(),_:getHeight()*.5)
                 N=N+1
             end
 

parts/player/player.lua

@@ -217,6 +217,7 @@ function Player:_deepDrop()
     end
 end
 function Player:act_moveLeft(auto)
+    if not self.control then return end
     if not auto then
         self.ctrlCount=self.ctrlCount+1
     end
@@ -238,6 +239,7 @@ function Player:act_moveLeft(auto)
     end
 end
 function Player:act_moveRight(auto)
+    if not self.control then return end
     if not auto then
         self.ctrlCount=self.ctrlCount+1
     end
@@ -259,6 +261,7 @@ function Player:act_moveRight(auto)
     end
 end
 function Player:act_rotRight()
+    if not self.control then return end
     if self.cur then
         self.ctrlCount=self.ctrlCount+1
         self:spin(1)
@@ -266,6 +269,7 @@ function Player:act_rotRight()
     end
 end
 function Player:act_rotLeft()
+    if not self.control then return end
     if self.cur then
         self.ctrlCount=self.ctrlCount+1
         self:spin(3)
@@ -273,6 +277,7 @@ function Player:act_rotLeft()
     end
 end
 function Player:act_rot180()
+    if not self.control then return end
     if self.cur then
         self.ctrlCount=self.ctrlCount+2
         self:spin(2)
@@ -280,6 +285,7 @@ function Player:act_rot180()
     end
 end
 function Player:act_hardDrop()
+    if not self.control then return end
     local ENV=self.gameEnv
     if self.cur then
         if self.lastPiece.autoLock and self.frameRun-self.lastPiece.frame<ENV.dropcut then
@@ -305,6 +311,7 @@ function Player:act_hardDrop()
     end
 end
 function Player:act_softDrop()
+    if not self.control then return end
     self.downing=0
     if self.cur then
         if self.curY>self.ghoY then
@@ -325,6 +332,7 @@ function Player:act_softDrop()
     end
 end
 function Player:act_hold()
+    if not self.control then return end
     if self.cur then
         if self:hold()then
             self.keyPressing[8]=false
@@ -332,13 +340,16 @@ function Player:act_hold()
     end
 end
 function Player:act_func1()
+    if not self.control then return end
     self.gameEnv.fkey1(self)
 end
 function Player:act_func2()
+    if not self.control then return end
     self.gameEnv.fkey2(self)
 end
 
 function Player:act_insLeft(auto)
+    if not self.control then return end
     if not self.cur then
         return
     end
@@ -364,6 +375,7 @@ function Player:act_insLeft(auto)
     end
 end
 function Player:act_insRight(auto)
+    if not self.control then return end
     if not self.cur then
         return
     end
@@ -389,6 +401,7 @@ function Player:act_insRight(auto)
     end
 end
 function Player:act_insDown()
+    if not self.control then return end
     if self.cur and self.curY>self.ghoY then
         local ENV=self.gameEnv
         self:createDropFX()
@@ -403,6 +416,7 @@ function Player:act_insDown()
     end
 end
 function Player:act_down1()
+    if not self.control then return end
     if self.cur then
         if self.curY>self.ghoY then
             self:createMoveFX('down')
@@ -415,6 +429,7 @@ function Player:act_down1()
     end
 end
 function Player:act_down4()
+    if not self.control then return end
     if self.cur then
         if self.curY>self.ghoY then
             local ghoY0=self.ghoY
@@ -429,6 +444,7 @@ function Player:act_down4()
     end
 end
 function Player:act_down10()
+    if not self.control then return end
     if self.cur then
         if self.curY>self.ghoY then
             local ghoY0=self.ghoY
@@ -443,18 +459,21 @@ function Player:act_down10()
     end
 end
 function Player:act_dropLeft()
+    if not self.control then return end
     if self.cur then
         self:act_insLeft()
         self:act_hardDrop()
     end
 end
 function Player:act_dropRight()
+    if not self.control then return end
     if self.cur then
         self:act_insRight()
         self:act_hardDrop()
     end
 end
 function Player:act_zangiLeft()
+    if not self.control then return end
     if self.cur then
         self:act_insLeft()
         self:act_insDown()
@@ -463,6 +482,7 @@ function Player:act_zangiLeft()
     end
 end
 function Player:act_zangiRight()
+    if not self.control then return end
     if self.cur then
         self:act_insRight()
         self:act_insDown()
@@ -1784,6 +1804,17 @@ do
                 VOC.play(clearVoice[cc],CHN)
             end
 
+            --PC/HPC check
+            if clear and cc>=#C.bk then
+                if CY==1 then
+                    piece.pc=true
+                    piece.special=true
+                elseif cc>1 or self.field[#self.field].garbage then
+                    piece.hpc=true
+                    piece.special=true
+                end
+            end
+
             --Normal clear,reduce B2B point
             if not piece.special then
                 self.b2b=max(self.b2b-250,0)
@@ -1804,40 +1835,34 @@ do
                 cscore=cscore+min(50*cmb,500)*(2*cc-1)
             end
 
-            --PC/HPC
-            if clear and cc>=#C.bk then
-                if CY==1 then
-                    self:showText(text.PC,0,-80,50,'flicker')
-                    atk=max(atk,min(8+Stat.pc*2,16))
-                    exblock=exblock+2
-                    sendTime=sendTime+120
-                    if Stat.row+cc>4 then
-                        self.b2b=self.b2b+800
-                        cscore=cscore+300*min(6+Stat.pc,10)
-                    else
-                        cscore=cscore+626
-                    end
-                    Stat.pc=Stat.pc+1
-                    if self.sound then
-                        SFX.play('pc')
-                        VOC.play('perfect_clear',CHN)
-                    end
-                    piece.pc=true
-                    piece.special=true
-                elseif cc>1 or self.field[#self.field].garbage then
-                    self:showText(text.HPC,0,-80,50,'fly')
-                    atk=atk+4
-                    exblock=exblock+2
-                    sendTime=sendTime+60
-                    self.b2b=self.b2b+100
+            --PC/HPC effect
+            if piece.pc then
+                self:showText(text.PC,0,-80,50,'flicker')
+                atk=max(atk,min(8+Stat.pc*2,16))
+                exblock=exblock+2
+                sendTime=sendTime+120
+                if Stat.row+cc>4 then
+                    self.b2b=self.b2b+800
+                    cscore=cscore+300*min(6+Stat.pc,10)
+                else
                     cscore=cscore+626
-                    Stat.hpc=Stat.hpc+1
-                    if self.sound then
-                        SFX.play('pc')
-                        VOC.play('half_clear',CHN)
-                    end
-                    piece.hpc=true
-                    piece.special=true
+                end
+                Stat.pc=Stat.pc+1
+                if self.sound then
+                    SFX.play('pc')
+                    VOC.play('perfect_clear',CHN)
+                end
+            elseif piece.hpc then
+                self:showText(text.HPC,0,-80,50,'fly')
+                atk=atk+4
+                exblock=exblock+2
+                sendTime=sendTime+60
+                self.b2b=self.b2b+100
+                cscore=cscore+626
+                Stat.hpc=Stat.hpc+1
+                if self.sound then
+                    SFX.play('pc')
+                    VOC.play('half_clear',CHN)
                 end
             end
 
@@ -2057,6 +2082,11 @@ do
             if _cc>6 then self:showText(text.cleared:gsub("$1",_cc),0,55,30,'zoomout',.4)end
             self:_removeClearedLines()
             self:_updateFalling(self.gameEnv.fall)
+            if _cc>=4 then
+                self.b2b=min(self.b2b+_cc*50-50,1000)
+            else
+                self.b2b=max(self.b2b-250,0)
+            end
             self.stat.row=self.stat.row+_cc
             self.stat.dig=self.stat.dig+_gbcc
             self.stat.score=self.stat.score+clearSCR[_cc]

parts/scenes/app_console.lua

@@ -10,7 +10,7 @@ local function log(str)outputBox:push(str)end
 _SCLOG=log
 
 log{C.lP,"Techmino Console"}
-log{C.lC,"©2021 26F Studio   some rights reserved"}
+log{C.lC,"© Copyright 2019–2022 26F Studio. Some rights reserved."}
 log{C.dR,"WARNING: DO NOT RUN ANY CODE THAT YOU DON'T UNDERSTAND."}
 
 local history,hisPtr={"?"}
@@ -976,7 +976,7 @@ local userG={
     -- collectgarbage=collectgarbage,
 
     math={},string={},table={},bit={},coroutine={},
-    debug={"No way."},package={"No way."},io={"No way."},os={"No way."},
+    debug={},package={},io={},os={},
 }
 function userG.print(...)
     local args,L={...},{}
@@ -999,6 +999,11 @@ TABLE.complete(string,userG.string)userG.string.dump=nil
 TABLE.complete(table,userG.table)
 TABLE.complete(bit,userG.bit)
 TABLE.complete(coroutine,userG.coroutine)
+local dangerousLibMeta={__index=function()error("No way.")end}
+setmetatable(userG.debug,dangerousLibMeta)
+setmetatable(userG.package,dangerousLibMeta)
+setmetatable(userG.io,dangerousLibMeta)
+setmetatable(userG.os,dangerousLibMeta)
 
 --Puzzle box
 local first_key={}

parts/scenes/dict.lua

@@ -76,7 +76,7 @@ local function _search()
 end
 
 function scene.sceneInit()
-    dict=require("parts.language.dict_"..(SETTING.locale:find'zh'and'zh'or'en'))
+    dict=require("parts.language.dict_"..(SETTING.locale:find'zh'and'zh'or SETTING.locale:find'ja'and'ja'or'en'))
     _scanDict(dict)
 
     inputBox:clear()
@@ -207,7 +207,7 @@ function scene.draw()
         local r=TIME()*2
         local R=int(r)%7+1
         gc.setColor(1,1,1,1-abs(r%1*2-1))
-        gc.draw(TEXTURE.miniBlock[R],821,140,TIME()*10%6.2832,15,15,DSCP[R][0][2]+.5,#BLOCKS[R][0]-DSCP[R][0][1]-.5)
+        gc.draw(TEXTURE.miniBlock[R],821,140,TIME()*10%6.2832,7,7,2*DSCP[R][0][2]+1,2*(#BLOCKS[R][0]-DSCP[R][0][1])-1)
     end
 end
 

parts/scenes/load.lua

@@ -113,6 +113,7 @@ local loadingThread=coroutine.wrap(function()
     VOC.play('welcome')
     THEME.fresh()
     LOADED=true
+    saveStats()
     Z.setPowerInfo(SETTING.powerInfo)
     return'finish'
 end)

parts/scenes/pause.lua

@@ -281,7 +281,7 @@ function scene.draw()
             gc.push('transform')
                 gc.scale((3-2*timer2)*timer2)
                 gc.setColor(.97,.97,.97,timer2*(.5+.3*sin(TIME()*6.26)))
-                GC.regularPolygon('line',0,0,120,6,8)
+                GC.regRoundPolygon('line',0,0,120,6,8)
                 gc.setColor(chartColor[1],chartColor[2],chartColor[3],timer2*.626)
                 for i=1,9,2 do
                     gc.polygon('fill',0,0,val[i],val[i+1],val[i+2],val[i+3])
@@ -350,13 +350,13 @@ scene.widgetList={
     WIDGET.newKey{name='quit',     x=290,y=540,w=300,h=70,code=pressKey'q'},
     WIDGET.newKey{name='tas',      x=290,y=620,w=240,h=50,code=pressKey't',hideF=function()return not SETTING.allowTAS or GAME.tasUsed or GAME.result or GAME.replaying end},
     WIDGET.newKey{name='page_prev',x=500,y=390,w=70,code=pressKey'tab',
-        fText=GC.DO{70,70,{'setLW',2},                                              {'dRPol',33,35,32,3,6,3.142},{'dRPol',45,35,32,3,6,3.142}},
-        fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRPol',33,35,32,3,6,3.142},{'fRPol',45,35,32,3,6,3.142}}}},
+        fText=GC.DO{70,70,{'setLW',2},                                              {'dRRPol',33,35,32,3,6,3.142},{'dRRPol',45,35,32,3,6,3.142}},
+        fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRRPol',33,35,32,3,6,3.142},{'fRRPol',45,35,32,3,6,3.142}}}},
         hideF=function()return PLAYERS[1].frameRun<=180 end,
         },
     WIDGET.newKey{name='page_next',x=1230,y=390,w=70,code=pressKey'Stab',
-        fText=GC.DO{70,70,{'setLW',2},                                              {'dRPol',37,35,32,3,6},{'dRPol',25,35,32,3,6}},
-        fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRPol',37,35,32,3,6},{'fRPol',25,35,32,3,6}}}},
+        fText=GC.DO{70,70,{'setLW',2},                                              {'dRRPol',37,35,32,3,6},{'dRRPol',25,35,32,3,6}},
+        fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRRPol',37,35,32,3,6},{'fRRPol',25,35,32,3,6}}}},
         hideF=function()return PLAYERS[1].frameRun<=180 end,
         },
     WIDGET.newKey{name='replay',   x=865,y=165,w=200,h=40,font=25,code=pressKey'p',hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end},

parts/texture.lua

@@ -16,10 +16,10 @@ do
     gc.setColor(1,1,1)
     for i=1,29 do
         local b=BLOCKS[i][0]
-        TEXTURE.miniBlock[i]=NSC(#b[1],#b)
+        TEXTURE.miniBlock[i]=NSC(#b[1]*2,#b*2)
         for y=1,#b do for x=1,#b[1]do
             if b[y][x]then
-                gc.rectangle('fill',x-1,#b-y,1,1)
+                gc.rectangle('fill',2*(x-1),2*(#b-y),2,2)
             end
         end end
     end

parts/updateLog.lua

@@ -1,33 +1,28 @@
 return[=[
-未来小游戏:
-        Tetro-1010(2C2N, 重力)
-        Tetra-link(桌游)
-        坦克大战; 扫雷; 接水管
-其他未来内容:
-        模式包系统; 新模组系统; 加速下落; spike相关统计数据
-        实时统计数据可视化; 教学关脚本语言; 从录像继续
-        等级系统; 场地格边缘线; 模式数据分析; 高级自定义序列
-        成就系统; 手势操作; C2连击; 特殊控件(虚拟摇杆等)
-        组队战; 方块位移/旋转动画; 更细节的DAS选项; 拓展主题系统
-        更自由的攻击系统; 更多消除方式; 可调场地宽度;
-        task-Z(新AI); 自适应UI; 新联网游戏场景切换逻辑
+未来计划:
+        R E M A K E
 
 0.17.1: 苏醒 Wake Up
         新增:
-                全新模式选择界面(未完善,未来会增加更多便利功能)
+                新模式:master_g(NOT_A_ROBOT移植)
                 新皮肤:pixel(by C₂₉H₂₅N₃O₅)
                 新语言:Bahasa Indonesia(by NOT_A_ROBOT)
-                新语言:日本語(by sakurw)
+                新语言:日本語(by sakurw & Airun & 幽灵3383)
                 新小程序:Stopwatch, Mahjong(无和牌检测)
+                新模式:1~3连块40行(by NOT_A_ROBOT) #578
                 新BGM:lounge(暂未使用, by Hailey (cudsys) & MrZ)
+                更强的CC(会主动allspin了, by Gompyn) #579
         改动:
                 修改选择模式音效
-                优化皮肤设置页面交互效果
-                移除yygq语言
                 重做staff表
+                更新字体
+                移除yygq语言
+                优化皮肤设置页面交互效果
                 换新miya立绘,给不同立绘添加不同点击动画
                 由于一些无关紧要的小原因暂时移除一个语音包
                 略微降低master-h模式骨块出现后的难度
+                超级消除也会增加b2b点数了 #585
+                两行pc还是会重置限制线吧 #577
                 重做关于页面,微调设置菜单
                 TRS的N/H添加一个踢墙
                 词条标题必定可以被搜索
@@ -51,11 +46,15 @@ return[=[
                 经典模式h和u难度没有干旱计数器 #546
                 自定义场地16号色的方块名位置显示错误
                 联网对战结算的l'pm公式错写成lpm的
+                PC时最后一块若非特殊消除会先扣除b2b点数
                 录像界面导入导出按钮隐藏状态错误
                 登录界面读取本地账号密码数据错误
+                经典-困难模式切换速度的时机错误
+                回合制开关玩家控制的问题
                 策略堆叠模式评级标准不当
                 云存档/读档的一处小问题
                 部分场景文本重叠问题
+                说明书的一处小问题
                 deepdrop坏了
                 混战模式坏了
 

parts/users.lua

@@ -11,7 +11,7 @@ for i=1,29 do
     local img=TEXTURE.miniBlock[i]
     defaultAvatar[i]=GC.DO{128,128,
         {'clear',.1,.1,.1},
-        {'draw',img,63,63,.2,30,30,img:getWidth()/2,img:getHeight()/2},
+        {'draw',img,63,63,.2,15,15,img:getWidth()/2,img:getHeight()/2},
     }
 end
 local errorAvatar=GC.DO{128,128,

version.lua

@@ -1,7 +1,7 @@
 return{
-    ["apkCode"]=426,
+    ["apkCode"]=429,
     ["code"]=1701,
     ["string"]="V0.17.1",
-    ["room"]="ver A-3",
+    ["room"]="ver A-4",
     ["name"]="苏醒 Wake Up",
 }