再次修复安全漏洞（嗯

词典添加patreon词条

.github/actions/upload-artifact/action.yml

@@ -1,51 +0,0 @@
-name: "upload artifact"
-description: "upload file with webdav"
-inputs:
-  WEBDAV_USERNAME:
-    required: true
-    description: "webdav username"
-  WEBDAV_PASSWORD:
-    required: true
-    description: "webdav password"
-  ARTIFACT_TYPE:
-    required: true
-    description: "file build type"
-  ARTIFACT_PLATFORM:
-    required: true
-    description: "file platform"
-  ARTIFACT_NAME:
-    required: true
-    description: "file name"
-runs:
-  using: "composite"
-  steps:
-    - name: Install Webdav 4
-      shell: bash
-      run: |
-        pip install webdav4
-    - name: Update release
-      shell: python
-      run: |
-        import re
-        from webdav4.client import Client
-
-        client = Client(
-          "http://mc.yuhao7370.top:5212/dav", 
-          auth=("${{ inputs.WEBDAV_USERNAME }}", "${{ inputs.WEBDAV_PASSWORD }}"),
-          timeout=None,
-        )
-        if '${{ inputs.ARTIFACT_TYPE }}' == 'release'
-          print('Removing previous ${{ inputs.ARTIFACT_PLATFORM }} release file...')
-          for file in client.ls('Techmino distribution'):
-            if re.search(r'(Techmino_a[0-9]+\.[0-9]+\.[0-9]_${{ inputs.ARTIFACT_PLATFORM }}.*)', file['name']):
-              client.remove(file['name'])
-          print('Uploading new ${{ inputs.ARTIFACT_PLATFORM }} release file...')
-          client.upload_file("${{ inputs.ARTIFACT_NAME }}", 'Techmino distribution/${{ inputs.ARTIFACT_NAME }}')
-
-        if '${{ inputs.ARTIFACT_TYPE }}' == 'test':
-          print('Removing previous ${{ inputs.ARTIFACT_PLATFORM }} test file...')
-          for file in client.ls('Techmino Snapshot'):
-            if re.search(r'(Techmino_pre[0-9]+\.[0-9]+\.[0-9]_[0-9a-z]{7}_${{ inputs.ARTIFACT_PLATFORM }}.*)', file['name']):
-              client.remove(file['name'])
-          print('Uploading new ${{ inputs.ARTIFACT_PLATFORM }} test file...')
-          client.upload_file("${{ inputs.ARTIFACT_NAME }}", 'Techmino Snapshot/${{ inputs.ARTIFACT_NAME }}')

.github/workflows/release.yml

@@ -56,14 +56,6 @@ jobs:
         with:
           name: ${{ needs.get-info.outputs.updateTitle }}
           files: Techmino_a${{ needs.get-info.outputs.release }}_Win64.zip
-      - name: Upload artifact to server
-        uses: ./.github/actions/upload-artifact
-        with:
-          WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-          WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-          ARTIFACT_TYPE: release
-          ARTIFACT_PLATFORM: Win64
-          ARTIFACT_NAME: Techmino_a${{ needs.get-info.outputs.release }}_Win64.zip
 
   build-windows-x86:
     runs-on: windows-latest
@@ -85,14 +77,6 @@ jobs:
         with:
           name: ${{ needs.get-info.outputs.updateTitle }}
           files: Techmino_a${{ needs.get-info.outputs.release }}_Win32.zip
-      - name: Upload artifact to server
-        uses: ./.github/actions/upload-artifact
-        with:
-          WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-          WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-          ARTIFACT_TYPE: release
-          ARTIFACT_PLATFORM: Win32
-          ARTIFACT_NAME: Techmino_a${{ needs.get-info.outputs.release }}_Win32.zip
 
   build-linux:
     runs-on: ubuntu-20.04
@@ -109,14 +93,6 @@ jobs:
         with:
           name: ${{ needs.get-info.outputs.updateTitle }}
           files: Techmino_a${{ needs.get-info.outputs.release }}_Linux.AppImage
-      - name: Upload artifact to server
-        uses: ./.github/actions/upload-artifact
-        with:
-          WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-          WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-          ARTIFACT_TYPE: release
-          ARTIFACT_PLATFORM: Linux
-          ARTIFACT_NAME: Techmino_a${{ needs.get-info.outputs.release }}_Linux.AppImage
 
   build-android:
     runs-on: ubuntu-20.04
@@ -139,14 +115,6 @@ jobs:
         with:
           name: ${{ needs.get-info.outputs.updateTitle }}
           files: Techmino_a${{ needs.get-info.outputs.release }}_Android.apk
-      - name: Upload artifact to server
-        uses: ./.github/actions/upload-artifact
-        with:
-          WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-          WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-          ARTIFACT_TYPE: release
-          ARTIFACT_PLATFORM: Android
-          ARTIFACT_NAME: Techmino_a${{ needs.get-info.outputs.release }}_Android.apk
 
   build-macOS:
     runs-on: macos-10.15
@@ -174,14 +142,6 @@ jobs:
         with:
           name: ${{ needs.get-info.outputs.updateTitle }}
           files: Techmino_a${{ needs.get-info.outputs.release }}_MacOS.dmg
-      - name: Upload artifact to server
-        uses: ./.github/actions/upload-artifact
-        with:
-          WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-          WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-          ARTIFACT_TYPE: release
-          ARTIFACT_PLATFORM: MacOS
-          ARTIFACT_NAME: Techmino_a${{ needs.get-info.outputs.release }}_MacOS.dmg
 
   build-iOS:
     runs-on: macos-latest
@@ -216,14 +176,6 @@ jobs:
         with:
           name: ${{ needs.get-info.outputs.updateTitle }}
           files: Techmino_a${{ needs.get-info.outputs.release }}_iOS.ipa
-      - name: Upload artifact to server
-        uses: ./.github/actions/upload-artifact
-        with:
-          WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-          WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-          ARTIFACT_TYPE: release
-          ARTIFACT_PLATFORM: iOS
-          ARTIFACT_NAME: Techmino_a${{ needs.get-info.outputs.release }}_iOS.ipa
 
   Add-Release-note:
     runs-on: ubuntu-20.04

.github/workflows/test.yml

@@ -49,20 +49,7 @@ jobs:
       with:
         name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Windows
         path: love
-    - name: Pack Techmino
-      run: 7z a -tzip .\Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Windows.zip .\love
-    - name: Upload artifact to server
-      uses: ./.github/actions/upload-artifact
-      with:
-        WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-        WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-        ARTIFACT_TYPE: test
-        ARTIFACT_PLATFORM: Windows
-        ARTIFACT_NAME: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Windows.zip
-    # - name: Upload artifact to server
-    #   run: |
-    #     curl --user "${{ secrets.WEBDAV_USERNAME }}:${{ secrets.WEBDAV_PASSWORD }}" -T Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Windows.zip http://mc.yuhao7370.top:5212/dav/Techmino%20Snapshots/ -v
-
+    
   build-linux:
     runs-on: ubuntu-20.04
     needs: get-info
@@ -80,16 +67,6 @@ jobs:
       with:
         name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Linux
         path: Techmino.AppImage
-    - name: Pack Techmino
-      run: mv Techmino.AppImage Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Linux.AppImage
-    - name: Upload artifact to server
-      uses: ./.github/actions/upload-artifact
-      with:
-        WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-        WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-        ARTIFACT_TYPE: test
-        ARTIFACT_PLATFORM: Linux
-        ARTIFACT_NAME: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Linux.AppImage
 
   build-android:
     runs-on: ubuntu-20.04
@@ -115,16 +92,6 @@ jobs:
       with:
         name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Android
         path: Techmino_Snapshot.apk
-    - name: Pack Techmino
-      run: mv Techmino_Snapshot.apk Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Android.apk
-    - name: Upload artifact to server
-      uses: ./.github/actions/upload-artifact
-      with:
-        WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-        WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-        ARTIFACT_TYPE: test
-        ARTIFACT_PLATFORM: Android
-        ARTIFACT_NAME: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Android.apk
 
   build-macOS:
     runs-on: macos-10.15
@@ -152,16 +119,6 @@ jobs:
       with:
         name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_MacOS
         path: Techmino.dmg
-    - name: Pack Techmino
-      run: mv Techmino.dmg Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_MacOS.dmg
-    - name: Upload artifact to server
-      uses: ./.github/actions/upload-artifact
-      with:
-        WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-        WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-        ARTIFACT_TYPE: test
-        ARTIFACT_PLATFORM: MacOS
-        ARTIFACT_NAME: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_MacOS.dmg
 
   build-iOS:
     runs-on: macos-latest
@@ -195,13 +152,3 @@ jobs:
       with:
         name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_iOS
         path: Techmino.ipa
-    - name: Pack Techmino
-      run: mv Techmino.ipa Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_iOS.ipa
-    - name: Upload artifact to server
-      uses: ./.github/actions/upload-artifacts
-      with:
-        WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
-        WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
-        ARTIFACT_TYPE: test
-        ARTIFACT_PLATFORM: iOS
-        ARTIFACT_NAME: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_iOS.ipa

Zframework/color.lua

@@ -1,6 +1,6 @@
 local abs=math.abs
 local function hsv(h,s,v,a)
-    if s<=0 then return v,v,v end
+    if s<=0 then return v,v,v,a end
     h=h*6
     local c=v*s
     local x=abs((h-1)%2-1)*c
@@ -16,62 +16,62 @@ end
 local COLOR={
     hsv=hsv,
 
-    red=     {hsv(0,     .85,.85)},
-    fire=    {hsv(0.0625,.85,.85)},
-    orange=  {hsv(0.125, .85,.85)},
-    yellow=  {hsv(0.1875,.85,.85)},
-    lime=    {hsv(0.25,  .85,.85)},
-    jade=    {hsv(0.3125,.85,.85)},
-    green=   {hsv(0.375, .85,.85)},
-    aqua=    {hsv(0.4375,.85,.85)},
-    cyan=    {hsv(0.5,   .85,.85)},
-    navy=    {hsv(0.5625,.85,.85)},
-    sea=     {hsv(0.625, .85,.85)},
-    blue=    {hsv(0.6875,.85,.85)},
-    violet=  {hsv(0.75,  .85,.85)},
-    purple=  {hsv(0.8125,.85,.85)},
-    magenta= {hsv(0.875, .85,.85)},
-    wine=    {hsv(0.9375,.85,.85)},
+    red=        {hsv(0.00, 0.89, 0.91)},
+    fire=       {hsv(0.04, 0.93, 0.94)},
+    orange=     {hsv(0.09, 0.99, 0.96)},
+    yellow=     {hsv(0.16, 0.82, 0.90)},
+    lime=       {hsv(0.18, 0.89, 0.88)},
+    jade=       {hsv(0.23, 1.00, 0.82)},
+    green=      {hsv(0.33, 1.00, 0.81)},
+    aqua=       {hsv(0.48, 1.00, 0.74)},
+    cyan=       {hsv(0.53, 1.00, 0.88)},
+    navy=       {hsv(0.56, 1.00, 1.00)},
+    sea=        {hsv(0.61, 1.00, 1.00)},
+    blue=       {hsv(0.64, 1.00, 0.95)},
+    violet=     {hsv(0.73, 1.00, 0.91)},
+    purple=     {hsv(0.80, 1.00, 0.81)},
+    magenta=    {hsv(0.86, 1.00, 0.78)},
+    wine=       {hsv(0.94, 0.96, 0.91)},
 
-    lRed=    {hsv(0,     .5,.95)},
-    lFire=   {hsv(0.0625,.5,.95)},
-    lOrange= {hsv(0.125, .5,.95)},
-    lYellow= {hsv(0.1875,.5,.95)},
-    lLime=   {hsv(0.25,  .5,.95)},
-    lJade=   {hsv(0.3125,.5,.95)},
-    lGreen=  {hsv(0.375, .5,.95)},
-    lAqua=   {hsv(0.4375,.5,.95)},
-    lCyan=   {hsv(0.5,   .5,.95)},
-    lNavy=   {hsv(0.5625,.5,.95)},
-    lSea=    {hsv(0.625, .5,.95)},
-    lBlue=   {hsv(0.6875,.5,.95)},
-    lViolet= {hsv(0.75,  .5,.95)},
-    lPurple= {hsv(0.8125,.5,.95)},
-    lMagenta={hsv(0.875, .5,.95)},
-    lWine=   {hsv(0.9375,.5,.95)},
+    lRed=       {hsv(0.00, 0.38, 0.93)},
+    lFire=      {hsv(0.04, 0.45, 0.91)},
+    lOrange=    {hsv(0.10, 0.53, 0.92)},
+    lYellow=    {hsv(0.15, 0.61, 0.95)},
+    lLime=      {hsv(0.19, 0.66, 0.92)},
+    lJade=      {hsv(0.24, 0.56, 0.90)},
+    lGreen=     {hsv(0.34, 0.49, 0.89)},
+    lAqua=      {hsv(0.49, 0.59, 0.85)},
+    lCyan=      {hsv(0.51, 0.77, 0.88)},
+    lNavy=      {hsv(0.54, 0.80, 0.95)},
+    lSea=       {hsv(0.56, 0.72, 0.97)},
+    lBlue=      {hsv(0.64, 0.44, 0.96)},
+    lViolet=    {hsv(0.73, 0.47, 0.95)},
+    lPurple=    {hsv(0.80, 0.62, 0.89)},
+    lMagenta=   {hsv(0.86, 0.61, 0.89)},
+    lWine=      {hsv(0.93, 0.57, 0.92)},
 
-    dRed=    {hsv(0,     .9,.5)},
-    dFire=   {hsv(0.0625,.9,.5)},
-    dOrange= {hsv(0.125, .9,.5)},
-    dYellow= {hsv(0.1875,.9,.5)},
-    dLime=   {hsv(0.25,  .9,.5)},
-    dJade=   {hsv(0.3125,.9,.5)},
-    dGreen=  {hsv(0.375, .9,.5)},
-    dAqua=   {hsv(0.4375,.9,.5)},
-    dCyan=   {hsv(0.5,   .9,.5)},
-    dNavy=   {hsv(0.5625,.9,.5)},
-    dSea=    {hsv(0.625, .9,.5)},
-    dBlue=   {hsv(0.6875,.9,.5)},
-    dViolet= {hsv(0.75,  .9,.5)},
-    dPurple= {hsv(0.8125,.9,.5)},
-    dMagenta={hsv(0.875, .9,.5)},
-    dWine=   {hsv(0.9375,.9,.5)},
+    dRed=       {hsv(0.00, 0.80, 0.48)},
+    dFire=      {hsv(0.04, 0.80, 0.34)},
+    dOrange=    {hsv(0.07, 0.80, 0.39)},
+    dYellow=    {hsv(0.11, 0.80, 0.37)},
+    dLime=      {hsv(0.17, 0.80, 0.26)},
+    dJade=      {hsv(0.31, 0.80, 0.27)},
+    dGreen=     {hsv(0.33, 0.80, 0.26)},
+    dAqua=      {hsv(0.47, 0.80, 0.23)},
+    dCyan=      {hsv(0.50, 0.80, 0.30)},
+    dNavy=      {hsv(0.59, 0.80, 0.42)},
+    dSea=       {hsv(0.64, 0.80, 0.40)},
+    dBlue=      {hsv(0.67, 0.80, 0.34)},
+    dViolet=    {hsv(0.71, 0.80, 0.35)},
+    dPurple=    {hsv(0.76, 0.80, 0.32)},
+    dMagenta=   {hsv(0.87, 0.80, 0.28)},
+    dWine=      {hsv(0.92, 0.80, 0.28)},
 
-    black=   {hsv(0,0,.05)},
-    dGray=   {hsv(0,0,0.3)},
-    gray=    {hsv(0,0,0.6)},
-    lGray=   {hsv(0,0,0.8)},
-    white=   {hsv(0,0,.97)},
+    black=      {hsv(0.04, 0.04, 0.14)},
+    dGray=      {hsv(0.02, 0.05, 0.44)},
+    gray=       {hsv(0.02, 0.05, 0.65)},
+    lGray=      {hsv(0.02, 0.06, 0.86)},
+    white=      {hsv(0.01, 0.02, 0.99)},
 }
 for k,v in next,{
     R='red', F='fire', O='orange', Y='yellow', L='lime', J='jade', G='green', A='aqua', C='cyan', N='navy', S='sea', B='blue', V='violet', P='purple', M='magenta', W='wine',

Zframework/init.lua

@@ -4,6 +4,7 @@ LOADED=false
 ERRDATA={}
 
 --Pure lua modules (basic)
+MATH=       require'Zframework.mathExtend'
 COLOR=      require'Zframework.color'
 TABLE=      require'Zframework.tableExtend'
 STRING=     require'Zframework.stringExtend'
@@ -622,9 +623,8 @@ function love.run()
                         --Left-down infos
                         gc_setColor(devColor[devMode])
                         gc_print("MEM     "..gcinfo(),safeX+5,-40)
-                        gc_print("Lines    "..FREEROW.getCount(),safeX+5,-60)
-                        gc_print("Tasks   "..TASK.getCount(),safeX+5,-80)
-                        gc_print("Voices  "..VOC.getQueueCount(),safeX+5,-100)
+                        gc_print("Tasks   "..TASK.getCount(),safeX+5,-60)
+                        gc_print("Voices  "..VOC.getQueueCount(),safeX+5,-80)
 
                         --Update & draw frame time
                         table.insert(frameTimeList,1,dt)table.remove(frameTimeList,126)

Zframework/mathExtend.lua

@@ -0,0 +1,23 @@
+local MATH={}for k,v in next,math do MATH[k]=v end
+
+local rnd=math.random
+
+MATH.tau=2*math.pi
+
+function MATH.sign(a)
+    return a>0 and 1 or a<0 and -1 or 0
+end
+
+function MATH.roll(chance)
+    return rnd()<(chance or .5)
+end
+
+function MATH.coin(a,b)
+    if rnd()<.5 then
+        return a
+    else
+        return b
+    end
+end
+
+return MATH

Zframework/sfx.lua

@@ -1,4 +1,5 @@
 local type,rem=type,table.remove
+local int,rnd=math.floor,math.random
 
 local sfxList={}
 local packSetting={}
@@ -6,7 +7,7 @@ local Sources={}
 local volume=1
 local stereo=1
 
-local noteName={
+local noteVal={
     C=1,c=1,
     D=3,d=3,
     E=5,e=5,
@@ -15,10 +16,11 @@ local noteName={
     A=10,a=10,
     B=12,b=12,
 }
+local noteName={'C','C#','D','D#','E','F','F#','G','G#','A','A#','B'}
 local function _getTuneHeight(tune)
     local octave=tonumber(tune:sub(-1,-1))
     if octave then
-        local tuneHeight=noteName[tune:sub(1,1)]
+        local tuneHeight=noteVal[tune:sub(1,1)]
         if tuneHeight then
             tuneHeight=tuneHeight+(octave-1)*12
             local s=tune:sub(2,2)
@@ -55,14 +57,14 @@ function SFX.loadSample(pack)
     assert(type(pack)=='table',"Usage: SFX.loadsample([table])")
     assert(pack.name,"No field: name")
     assert(pack.path,"No field: path")
-    packSetting[pack.name]={
-        base=(_getTuneHeight(pack.base)or 37)-1,
-    }
     local num=1
     while love.filesystem.getInfo(pack.path..'/'..num..'.ogg')do
         Sources[pack.name..num]={love.audio.newSource(pack.path..'/'..num..'.ogg','static')}
         num=num+1
     end
+    local base=(_getTuneHeight(pack.base)or 37)-1
+    local top=base+num-1
+    packSetting[pack.name]={base=base,top=top}
     LOG((num-1).." "..pack.name.." samples loaded")
 end
 
@@ -78,23 +80,39 @@ function SFX.setStereo(v)
     stereo=v
 end
 
-function SFX.playSample(pack,...)--vol-2, sampSet1, vol-3, sampSet2, vol-1
+function SFX.getNoteName(note)
+    if note<1 then
+        return'---'
+    else
+        note=note-1
+        local octave=int(note/12)+1
+        return noteName[note%12+1]..octave
+    end
+end
+function SFX.playSample(pack,...)--vol-1, sampSet1, vol-2, sampSet2
     if ... then
         local arg={...}
         local vol
-        if type(arg[#arg])=='number'then vol=rem(arg)end
         for i=1,#arg do
-            if type(arg[i])=='number'then
-                vol=arg[i]
+            local a=arg[i]
+            if type(a)=='number'and a<=1 then
+                vol=a
             else
-                local tune=arg[i]
-                tune=_getTuneHeight(tune)-packSetting[pack].base
-                SFX.play(pack..tune,vol)
+                local base=packSetting[pack].base
+                local top=packSetting[pack].top
+                local tune=type(a)=='string'and _getTuneHeight(a)or a--Absolute tune in number
+                local playTune=tune+rnd(-2,2)
+                if playTune<=base then--Too low notes
+                    playTune=base+1
+                elseif playTune>top then--Too high notes
+                    playTune=top
+                end
+                SFX.play(pack..playTune-base,vol,nil,tune-playTune)
             end
         end
     end
 end
-function SFX.play(name,vol,pos)
+function SFX.play(name,vol,pos,pitch)
     if volume==0 or vol==0 then return end
     local S=Sources[name]--Source list
     if not S then return end
@@ -117,6 +135,7 @@ function SFX.play(name,vol,pos)
         end
     end
     S:setVolume(((vol or 1)*volume)^1.626)
+    S:setPitch(pitch and 1.0594630943592953^pitch or 1)
     S:play()
 end
 function SFX.fplay(name,vol,pos)

Zframework/stringExtend.lua

@@ -63,9 +63,9 @@ function STRING.time(t)
     if t<60 then
         return format("%.3f\"",t)
     elseif t<3600 then
-        return format("%d'%05.2f\"",int(t/60),t%60)
+        return format("%d'%05.2f\"",int(t/60),int(t%60*100)/100)
     else
-        return format("%d:%.2d'%05.2f\"",int(t/3600),int(t/60%60),t%60)
+        return format("%d:%.2d'%05.2f\"",int(t/3600),int(t/60%60),int(t%60*100)/100)
     end
 end
 

Zframework/tableExtend.lua

@@ -46,6 +46,18 @@ function TABLE.cover(new,old)
     end
 end
 
+--For all things in new, push to old
+function TABLE.coverR(new,old)
+    for k,v in next,new do
+        if type(v)=='table'and type(old[k])=='table'then
+            TABLE.coverR(v,old[k])
+        else
+            old[k]=v
+        end
+    end
+end
+
+
 --For all things in new if same type in old, push to old
 function TABLE.update(new,old)
     for k,v in next,new do
@@ -90,6 +102,11 @@ function TABLE.find(t,val)
     for i=1,#t do if t[i]==val then return i end end
 end
 
+--Retuen next value of [1~#]
+function TABLE.next(t,val)
+    for i=1,#t do if t[i]==val then return t[i%#t+1]end end
+end
+
 --Find value in whole table
 function TABLE.search(t,val)
     for k,v in next,t do if v==val then return k end end

legals.md

@@ -2,11 +2,7 @@
 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.
 
-
-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.
-
-
-"Tetris" is the registered trademark of The Tetris Holding, LLC, licensed to The Tetris Company, Inc.
+"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.
@@ -21,7 +17,7 @@ The Apple logo, "Apple Inc.," iOS, iPadOS, macOS, iPhone, and Mac are registered
 "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.
 
 
-Alibaba Sans is copyrighted by Alibaba Group Holding Limited. Alibaba is a trademark of Alibaba Group Holding Limited in the People’s Republic of China and other countries or regions.
+Source Han Sans is copyrighted by Adobe Inc. Source Han Sans and Adobe are registered trademarks of Adobe Inc. in United States and other countries or regions. Source Han Sans is licensed under the SIL Open Font License.
 
 
 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.
@@ -50,5 +46,5 @@ Linux is a registered trademark of Linus Torvalds.
 
 Touhou Project © Team Shanghai Alice 2002-2021.
 
-
 All other trademarks are the properties of their respective owners.
+

main.lua

@@ -24,6 +24,7 @@ VERSION=require"version"
 TIME=love.timer.getTime
 YIELD=coroutine.yield
 SYSTEM=love.system.getOS()
+FNSF=SYSTEM:find'\79\83'--What does FNSF stand for? IDK so don't ask me lol
 MOBILE=SYSTEM=='Android'or SYSTEM=='iOS'
 SAVEDIR=fs.getSaveDirectory()
 
@@ -90,7 +91,7 @@ for _,v in next,fs.getDirectoryItems('parts/shaders')do
     end
 end
 
-FREEROW=    require'parts.freeRow'
+LINE=       require'parts.line'
 DATA=       require'parts.data'
 
 TEXTURE=    require'parts.texture'
@@ -104,6 +105,12 @@ PLY=        require'parts.player'
 NETPLY=     require'parts.netPlayer'
 MODES=      require'parts.modes'
 
+setmetatable(TEXTURE,{__index=function(self,k)
+    MES.new('warn',"No texture called: "..k)
+    self[k]=love.graphics.newCanvas(1,1)
+    return self[k]
+end})
+
 table.insert(_LOADTIMELIST_,("Load Parts: %.3fs"):format(TIME()-_LOADTIME_))
 
 --Init Zframework
@@ -199,7 +206,7 @@ Z.setOnQuit(destroyPlayers)
 TABLE.cover (FILE.load('conf/user')or{},USER)
 TABLE.cover (FILE.load('conf/unlock')or{},RANKS)
 TABLE.update(FILE.load('conf/settings')or{},SETTING)
-TABLE.update(FILE.load('conf/data')or{},STAT)
+TABLE.coverR(FILE.load('conf/data')or{},STAT)
 TABLE.cover (FILE.load('conf/key')or{},KEY_MAP)
 TABLE.cover (FILE.load('conf/virtualkey')or{},VK_ORG)
 
@@ -444,7 +451,7 @@ do
         fs.remove('record/round_l.rec')
         fs.remove('record/round_u.rec')
     end
-    if STAT.version<1604 then
+    if RANKS.stack_e then
         RANKS.stack_e=nil
         RANKS.stack_h=nil
         RANKS.stack_u=nil
@@ -460,6 +467,14 @@ do
         fs.remove('record/stack_40l.rec')
         fs.remove('record/stack_100l.rec')
     end
+    if RANKS.rhythm_e then
+        RANKS.rhythm_e=nil
+        RANKS.rhythm_h=nil
+        RANKS.rhythm_u=nil
+        fs.remove('record/rhythm_e.rec')
+        fs.remove('record/rhythm_h.rec')
+        fs.remove('record/rhythm_u.rec')
+    end
     if STAT.version~=VERSION.code then
         for k,v in next,MODE_UPDATE_MAP do
             if RANKS[k]then

parts/RSlist.lua

@@ -353,8 +353,8 @@ do
                 [21]={'+0+0','-1+0','-1+1','+0+1','-1+2','+0+2','-1-1','+1+0','+0-2','-1-2'},
                 [32]={'+0+0','-1+0','-1+1','-1-1','+1+0','+0+2','-1+2','+0-2'},
                 [23]={'+0+0','+1+0','+1-1','+1+1','-1+0','+0-2','+1-2','+0+2'},
-                [02]={'+0+0','+0-1','+1-1','-1+0','+2-1'},
-                [20]={'+0+0','+0+1','-1+1','+1+0','-2+1'},
+                [02]={'+0+0','+0-1','-1-1','+1-1','-1+0','+2-1'},
+                [20]={'+0+0','+0+1','+1+1','-1+1','+1+0','-2+1'},
                 [13]={'+0+0','-1+0','-1-1','+0+1','-1-2'},
                 [31]={'+0+0','+1+0','+1+1','+0-1','+1+2'},
             },--J5
@@ -686,13 +686,7 @@ do
                                 sfx='prerotate'
                             elseif P:ifoverlap(icb,x,y+1)and P:ifoverlap(icb,x-1,y)and P:ifoverlap(icb,x+1,y)then
                                 sfx='rotatekick'
-                                if P.gameEnv.shakeFX then
-                                    if d==1 or d==3 then
-                                        P.fieldOff.va=P.fieldOff.va+(2-d)*6e-3
-                                    else
-                                        P.fieldOff.va=P.fieldOff.va+P:getCenterX()*3e-3
-                                    end
-                                end
+                                P:_rotateField(d)
                             else
                                 sfx='rotate'
                             end

parts/backgrounds/fan.lua

@@ -12,10 +12,9 @@ local ins,rem=table.insert,table.remove
 local back={}
 
 local t
-local fan,petal
+local petal
 function back.init()
     t=0
-    fan=SVG_TITLE_FAN
     petal={}
 end
 function back.update()
@@ -62,7 +61,7 @@ function back.draw()
 
     gc_setLineWidth(6)
     gc_setColor(.8,.9,1,.3)
-    for i=1,8 do gc_polygon('line',fan[i])end
+    for i=1,8 do gc_polygon('line',SVG_TITLE_FAN[i])end
 
     gc_setLineWidth(2)
     gc_setColor(1,.5,.7,.3)

parts/bot/bot_9s.lua

@@ -44,8 +44,7 @@ local function _ifoverlapAI(f,bk,x,y)
         end
     end end
 end
-local discardRow=FREEROW.discard
-local getRow=FREEROW.get
+local getRow,discardRow=LINE.new,LINE.discard
 local function _resetField(f0,f,start)
     for _=#f,start,-1 do
         discardRow(f[_])

parts/customEnv0.lua

@@ -13,6 +13,7 @@ return{
     holdCount=1,
     infHold=true,
     phyHold=false,
+    hang=0,
 
     --Visual
     bone=false,

parts/eventsets/attacker_h.lua

@@ -33,6 +33,7 @@ return{
                             P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                         end
                     end
+                    P:shakeField(9)
                     D.wave=D.wave+1
                 end
             end

parts/eventsets/attacker_u.lua

@@ -42,6 +42,7 @@ return{
                             P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                         end
                     end
+                    P:shakeField(10)
                     D.wave=D.wave+1
                 end
             end

parts/eventsets/backfire_0.lua

@@ -1,5 +1,5 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.atk>0 then
             P:receive(nil,P.lastPiece.atk,0,generateLine(P.holeRND:random(10)))
         end

parts/eventsets/backfire_120.lua

@@ -1,5 +1,5 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.atk>0 then
             P:receive(nil,P.lastPiece.atk,120,generateLine(P.holeRND:random(10)))
         end

parts/eventsets/backfire_30.lua

@@ -1,5 +1,5 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.atk>0 then
             P:receive(nil,P.lastPiece.atk,30,generateLine(P.holeRND:random(10)))
         end

parts/eventsets/backfire_60.lua

@@ -1,5 +1,5 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.atk>0 then
             P:receive(nil,P.lastPiece.atk,60,generateLine(P.holeRND:random(10)))
         end

parts/eventsets/c4wBase.lua

@@ -11,8 +11,8 @@ return{
     task=function(P)
         local F=P.field
         for i=1,24 do
-            F[i]=FREEROW.get(20)
-            P.visTime[i]=FREEROW.get(20)
+            F[i]=LINE.new(20)
+            P.visTime[i]=LINE.new(20)
             for x=4,7 do F[i][x]=0 end
         end
         if P.holeRND:random()<.6 then

parts/eventsets/c4wCheck_easy.lua

@@ -1,10 +1,10 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.row>0 then
             for _=1,#P.clearedRow do
                 local h=#P.field
-                P.field[h+1]=FREEROW.get(20)
-                P.visTime[h+1]=FREEROW.get(20)
+                P.field[h+1]=LINE.new(20)
+                P.visTime[h+1]=LINE.new(20)
                 for i=4,7 do P.field[h+1][i]=0 end
             end
             if P.combo>P.modeData.maxCombo then

parts/eventsets/c4wCheck_hard.lua

@@ -1,12 +1,12 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.row==0 then
             P:lose()
         else
             for _=1,P.lastPiece.row do
                 local h=#P.field
-                P.field[h+1]=FREEROW.get(20)
-                P.visTime[h+1]=FREEROW.get(20)
+                P.field[h+1]=LINE.new(20)
+                P.visTime[h+1]=LINE.new(20)
                 for i=4,7 do P.field[h+1][i]=0 end
             end
             if P.combo>P.modeData.maxCombo then

parts/eventsets/checkAttack_100.lua

@@ -6,7 +6,7 @@ return{
         mText(TEXTOBJ.atk,63,243)
         mText(TEXTOBJ.eff,63,363)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.atk>=100 then
             P:win('finish')
         end

parts/eventsets/checkClearBoard.lua

@@ -1,13 +1,11 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.garbageBeneath==0 then
             local D=P.modeData
             D.finished=D.finished+1
             if FIELD[D.finished+1]then
                 P.waiting=26
                 for i=#P.field,1,-1 do
-                    FREEROW.discard(P.field[i])
-                    FREEROW.discard(P.visTime[i])
                     P.field[i],P.visTime[i]=nil
                 end
                 setField(P,D.finished+1)

parts/eventsets/checkLine_10.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=10 then
             P:win('finish')
         end

parts/eventsets/checkLine_100.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=100 then
             P:win('finish')
         end

parts/eventsets/checkLine_1000.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=1000 then
             P:win('finish')
         end

parts/eventsets/checkLine_20.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=20 then
             P:win('finish')
         end

parts/eventsets/checkLine_200.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=200 then
             P:win('finish')
         end

parts/eventsets/checkLine_40.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=40 then
             P:win('finish')
         end

parts/eventsets/checkLine_400.lua

@@ -6,7 +6,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=400 then
             P:win('finish')
         end

parts/eventsets/checkTurn_1.lua

@@ -1,5 +1,5 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if #PLY_ALIVE>1 then
             P.control=false
             local id1=P.sid

parts/eventsets/checkTurn_7.lua

@@ -1,5 +1,5 @@
 return{
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.piece%7==0 and #PLY_ALIVE>1 then
             P.control=false
             local id1=P.sid

parts/eventsets/classic_e.lua

@@ -1,3 +1,4 @@
+local gc_setColor=love.graphics.setColor
 return{
     das=16,arr=6,
     sddas=6,sdarr=6,
@@ -18,12 +19,24 @@ return{
         mStr(r<10 and 9 or r<30 and r or("%02x"):format(r*10-300),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,
-    dropPiece=function(P)
+    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
             if D.target==110 then
                 P.gameEnv.drop,P.gameEnv.lock=5,5

parts/eventsets/classic_h.lua

@@ -1,3 +1,4 @@
+local gc_setColor=love.graphics.setColor
 return{
     das=16,arr=6,
     sddas=3,sdarr=3,
@@ -15,14 +16,25 @@ return{
     mesDisp=function(P)
         setFont(75)
         local r=P.modeData.target/10
-        mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210)
+        mStr(r<10 and 9 or r<30 and r or("%02x"):format(r*10-300),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,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local D=P.modeData
         if P.stat.row>=D.target then
             if D.target==110 then

parts/eventsets/classic_u.lua

@@ -1,3 +1,4 @@
+local gc_setColor=love.graphics.setColor
 return{
     das=16,arr=6,
     sddas=1,sdarr=1,
@@ -15,14 +16,25 @@ return{
     mesDisp=function(P)
         setFont(75)
         local r=P.modeData.target/10
-        mStr(r==1 and 29 or("%02x"):format(r*10-20),63,210)
+        mStr(r<10 and 9 or r<30 and r or("%02x"):format(r*10-300),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,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local D=P.modeData
         if P.stat.row>=D.target then
             if D.target==100 then

parts/eventsets/defender_l.lua

@@ -40,6 +40,7 @@ return{
                         P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                         P.dropDelay,P.gameEnv.drop=2,2
                     end
+                    P:shakeField(3)
                 end
             end
         end

parts/eventsets/defender_n.lua

@@ -40,6 +40,7 @@ return{
                         P.dropDelay,P.gameEnv.drop=5,5
                         P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                     end
+                    P:shakeField(3)
                 end
             end
         end

parts/eventsets/dig_100l.lua

@@ -3,7 +3,7 @@ return{
         setFont(55)
         mStr(100-P.stat.dig,63,265)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         for _=1,math.min(10,100-P.stat.dig)-P.garbageBeneath do
             P:garbageRise(21,1,P:getHolePos())
         end

parts/eventsets/dig_10l.lua

@@ -3,7 +3,7 @@ return{
         setFont(55)
         mStr(10-P.stat.dig,63,265)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.dig==10 then
             P:win('finish')
         end

parts/eventsets/dig_400l.lua

@@ -3,7 +3,7 @@ return{
         setFont(55)
         mStr(400-P.stat.dig,63,265)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         for _=1,math.min(10,400-P.stat.dig)-P.garbageBeneath do
             P:garbageRise(21,1,P:getHolePos())
         end

parts/eventsets/dig_40l.lua

@@ -3,7 +3,7 @@ return{
         setFont(55)
         mStr(40-P.stat.dig,63,265)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         for _=1,math.min(10,40-P.stat.dig)-P.garbageBeneath do
             P:garbageRise(21,1,P:getHolePos())
         end

parts/eventsets/marathon_bfmax.lua

@@ -11,7 +11,7 @@ return{
     task=function(P)
         P.modeData.target=10
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local flag
         local l=P.lastPiece
         if P.combo>1 then flag=true;P:showText("2x",0,-220,40,'flicker',.3)end

parts/eventsets/marathon_h.lua

@@ -10,7 +10,7 @@ return
     task=function(P)
         P.modeData.target=50
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=P.modeData.target then
             if P.modeData.target==50 then
                 P.gameEnv.drop=.25

parts/eventsets/marathon_inf.lua

@@ -30,7 +30,7 @@ return
     task=function(P)
         P.modeData.target=10
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=P.modeData.target then
             if P.modeData.target%300==0 then
                 P.gameEnv.wait=P.gameEnv.wait-1

parts/eventsets/marathon_n.lua

@@ -12,7 +12,7 @@ return
     task=function(P)
         P.modeData.target=10
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=P.modeData.target then
             if P.modeData.target==200 then
                 P:win('finish')

parts/eventsets/master_ex.lua

@@ -30,7 +30,7 @@ return{
         mStr(P.stat.row,63,230)
         mStr(P.stat.clears[4],63,340)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.modeData.rankPoint<140-passPoint then--If Less then X
             local R=#P.clearedRow
             if R>0 then

parts/eventsets/master_final.lua

@@ -8,7 +8,7 @@ return{
     mesDisp=function(P)
         PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local D=P.modeData
 
         local c=#P.clearedRow

parts/eventsets/master_h.lua

@@ -12,7 +12,7 @@ return{
     mesDisp=function(P)
         PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local D=P.modeData
 
         local c=#P.clearedRow

parts/eventsets/master_m.lua

@@ -14,7 +14,7 @@ return
     task=function(P)
         P.modeData.target=10
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=P.modeData.target then
             if P.modeData.target==200 then
                 P:win('finish')

parts/eventsets/master_n.lua

@@ -12,7 +12,7 @@ return{
     mesDisp=function(P)
         PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local D=P.modeData
 
         local c=#P.clearedRow

parts/eventsets/master_ph.lua

@@ -13,7 +13,7 @@ return
     mesDisp=function(P)
         PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local p=P.modeData.pt+P.lastPiece.row
         if p>=P.modeData.target then
             local ENV=P.gameEnv
@@ -55,8 +55,8 @@ return
                             P.field[i][P.holeRND:random(10)]=0
                         end
                     else
-                        P.field[i]=FREEROW.get(0)
-                        P.visTime[i]=FREEROW.get(30)
+                        P.field[i]=LINE.new(0)
+                        P.visTime[i]=LINE.new(30)
                         for j=1,10 do
                             if P.holeRND:random()>.9 then
                                 P.field[i][j]=P.holeRND:random(16)
@@ -89,6 +89,7 @@ return
                     ENV.bone=true
 
                     P.modeData.target=62
+                    SFX.play('reach')
                 else
                     p=41
                 end
@@ -112,6 +113,7 @@ return
                 ENV.fall=4
 
                 P.modeData.target=162
+                SFX.play('reach')
             elseif T==162 then--Stage 7: speed up+++
                 P:stageComplete(7)
                 P.life=P.life+1
@@ -146,6 +148,7 @@ return
                 P.modeData.target=260
                 p=260
                 SFX.play('blip_2')
+                SFX.play('reach')
             else
                 p=260
             end

parts/eventsets/pc_inf.lua

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

parts/eventsets/pctrain_l.lua

@@ -46,6 +46,6 @@ return{
         mStr(P.stat.pc,63,340)
         mText(TEXTOBJ.pc,63,410)
     end,
-    dropPiece=check,
+    hook_drop=check,
     task=check,
 }

parts/eventsets/pctrain_n.lua

@@ -37,6 +37,6 @@ return{
         mStr(P.stat.pc,63,340)
         mText(TEXTOBJ.pc,63,410)
     end,
-    dropPiece=check,
+    hook_drop=check,
     task=check,
 }

parts/eventsets/rhythm_e.lua

@@ -1,53 +0,0 @@
-local gc=love.graphics
-local dropSpeed={[0]=40,33,27,20,16,12,11,10,9,8,7,6,5,4,3,3,2,2,1,1}
-
-return{
-    drop=40,
-    lock=1e99,
-    wait=20,
-    fall=90,
-    mesDisp=function(P)
-        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
-
-        setFont(30)
-        mStr(P.modeData.bpm,63,178)
-
-        gc.setLineWidth(4)
-        gc.circle('line',63,200,30)
-
-        local beat=P.modeData.counter/P.modeData.beatFrame
-        gc.setColor(1,1,1,1-beat)
-        gc.setLineWidth(3)
-        gc.circle('line',63,200,30+45*beat)
-    end,
-    dropPiece=function(P)
-        if P.stat.row>=P.modeData.target then
-            if P.modeData.target==200 then
-                P:win('finish')
-            else
-                P.modeData.bpm=40+2*P.modeData.target/10
-                P.modeData.beatFrame=math.floor(3600/P.modeData.bpm)
-                P.gameEnv.fall=P.modeData.beatFrame
-                P.gameEnv.wait=math.max(P.gameEnv.wait-2,0)
-                P.gameEnv.drop=dropSpeed[P.modeData.target/10]
-                P.modeData.target=P.modeData.target+10
-                SFX.play('reach')
-            end
-        end
-    end,
-    task=function(P)
-        P.modeData.target=10
-        P.modeData.bpm=40
-        P.modeData.beatFrame=90
-        P.modeData.counter=90
-        while true do
-            YIELD()
-            P.modeData.counter=P.modeData.counter-1
-            if P.modeData.counter==0 then
-                P.modeData.counter=P.modeData.beatFrame
-                SFX.play('click',.3)
-                P:act_hardDrop()
-            end
-        end
-    end,
-}

parts/eventsets/rhythm_h.lua

@@ -1,53 +0,0 @@
-local gc=love.graphics
-local dropSpeed={[0]=30,26,23,20,17,14,12,10,8,6,5,4,3,2,1,1,.5,.5,.25,.25}
-
-return{
-    drop=30,
-    lock=1e99,
-    wait=10,
-    fall=60,
-    mesDisp=function(P)
-        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
-
-        setFont(30)
-        mStr(P.modeData.bpm,63,178)
-
-        gc.setLineWidth(4)
-        gc.circle('line',63,200,30)
-
-        local beat=P.modeData.counter/P.modeData.beatFrame
-        gc.setColor(1,1,1,1-beat)
-        gc.setLineWidth(3)
-        gc.circle('line',63,200,30+45*beat)
-    end,
-    dropPiece=function(P)
-        if P.stat.row>=P.modeData.target then
-            if P.modeData.target==200 then
-                P:win('finish')
-            else
-                P.modeData.bpm=60+3*P.modeData.target/10
-                P.modeData.beatFrame=math.floor(3600/P.modeData.bpm)
-                P.gameEnv.fall=P.modeData.beatFrame
-                P.gameEnv.wait=math.max(P.gameEnv.wait-1,0)
-                P.gameEnv.drop=dropSpeed[P.modeData.target/10]
-                P.modeData.target=P.modeData.target+10
-                SFX.play('reach')
-            end
-        end
-    end,
-    task=function(P)
-        P.modeData.target=10
-        P.modeData.bpm=60
-        P.modeData.beatFrame=60
-        P.modeData.counter=60
-        while true do
-            YIELD()
-            P.modeData.counter=P.modeData.counter-1
-            if P.modeData.counter==0 then
-                P.modeData.counter=P.modeData.beatFrame
-                SFX.play('click',.3)
-                P:act_hardDrop()
-            end
-        end
-    end,
-}

parts/eventsets/rhythm_u.lua

@@ -1,58 +0,0 @@
-local gc=love.graphics
-
-return{
-    drop=.5,
-    lock=1e99,
-    wait=5,
-    fall=30,
-    mesDisp=function(P)
-        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
-
-        setFont(30)
-        mStr(P.modeData.bpm,63,178)
-
-        gc.setLineWidth(4)
-        gc.circle('line',63,200,30)
-
-        local beat=P.modeData.counter/P.modeData.beatFrame
-        gc.setColor(1,1,1,1-beat)
-        gc.setLineWidth(3)
-        gc.circle('line',63,200,30+45*beat)
-    end,
-    dropPiece=function(P)
-        if P.stat.row>=P.modeData.target then
-            if P.modeData.target==200 then
-                P:win('finish')
-            else
-                P.modeData.bpm=120+2*P.modeData.target/10
-                P.modeData.beatFrame=math.floor(3600/P.modeData.bpm)
-                P.gameEnv.fall=P.modeData.beatFrame
-                P.gameEnv.wait=math.max(P.gameEnv.wait-1,0)
-                if P.modeData.target==50 then
-                    P.gameEnv.das=5
-                    P.gameEnv.drop=.25
-                elseif P.modeData.target==100 then
-                    P.gameEnv.das=4
-                    P:set20G(true)
-                end
-                P.modeData.target=P.modeData.target+10
-                SFX.play('reach')
-            end
-        end
-    end,
-    task=function(P)
-        P.modeData.target=10
-        P.modeData.bpm=120
-        P.modeData.beatFrame=30
-        P.modeData.counter=30
-        while true do
-            YIELD()
-            P.modeData.counter=P.modeData.counter-1
-            if P.modeData.counter==0 then
-                P.modeData.counter=P.modeData.beatFrame
-                SFX.play('click',.3)
-                P:act_hardDrop()
-            end
-        end
-    end,
-}

parts/eventsets/royale.lua

@@ -1,5 +1,24 @@
+local gc=love.graphics
+local gc_draw,gc_print,gc_setColor=gc.draw,gc.print,gc.setColor
+local setFont=setFont
+
+local PLAYERS,PLY_ALIVE=PLAYERS,PLY_ALIVE
+
 return{
     mesDisp=function(P)
-        PLY.draw.drawRoyaleInfo(P)
+        setFont(35)
+        mStr(#PLY_ALIVE.."/"..#PLAYERS,63,175)
+        mStr(P.modeData.ko,80,215)
+        gc_draw(TEXTOBJ.ko,60-TEXTOBJ.ko:getWidth(),222)
+        setFont(20)
+        gc_setColor(1,.5,0,.6)
+        gc_print(P.badge,103,227)
+        gc_setColor(.97,.97,.97)
+        setFont(25)
+        mStr(text.powerUp[P.strength],63,290)
+        gc_setColor(1,1,1)
+        for i=1,P.strength do
+            gc_draw(IMG.badgeIcon,16*i+6,260)
+        end
     end,
 }

parts/eventsets/sprintEff_40.lua

@@ -0,0 +1,19 @@
+return{
+    mesDisp=function(P)
+        setFont(55)
+        local r=40-P.stat.row
+        if r<0 then r=0 end
+        mStr(r,63,170)
+        PLY.draw.drawTargetLine(P,r)
+        setFont(45)
+        mStr(("%.1f"):format(P.stat.atk),63,270)
+        mText(TEXTOBJ.atk,63,323)
+        mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,370)
+        mText(TEXTOBJ.eff,63,423)
+    end,
+    hook_drop=function(P)
+        if P.stat.row>=40 then
+            P:win('finish')
+        end
+    end
+}

parts/eventsets/sprintMD.lua

@@ -36,7 +36,7 @@ return{
             end
         end
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.stat.row>=40 then
             P:win('finish')
         end

parts/eventsets/sprintSym.lua

@@ -14,7 +14,7 @@ return{
         mStr(r,63,265)
         PLY.draw.drawTargetLine(P,r)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local F=P.field
         for y=1,#F do
             local l=F[y]

parts/eventsets/stack_e.lua

@@ -7,9 +7,9 @@ return{
         mText(TEXTOBJ.line,63,350)
         PLY.draw.drawMarkLine(P,20,.3,1,1,TIME()%.42<.21 and .95 or .6)
     end,
-    dropPiece=function(P)
-        if #P.field>20 then
-            local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath)
+    hook_die=function(P)
+        local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath)
+        if cc>0 then
             local h=20-cc-P.garbageBeneath
             if h>0 then
                 P:garbageRise(21,h,2e10-1)

parts/eventsets/stack_h.lua

@@ -1,22 +0,0 @@
-return{
-    fieldH=21,
-    fillClear=false,
-    mesDisp=function(P)
-        setFont(60)
-        mStr(P.stat.row,63,280)
-        mText(TEXTOBJ.line,63,350)
-        PLY.draw.drawMarkLine(P,18,.3,1,1,TIME()%.42<.21 and .95 or .6)
-    end,
-    dropPiece=function(P)
-        if #P.field>20 then
-            local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath)
-            local h=20-cc-P.garbageBeneath-2
-            if h>0 then
-                P:garbageRise(21,h,2e10-1)
-                if P.garbageBeneath>=20 then
-                    P:lose()
-                end
-            end
-        end
-    end,
-}

parts/eventsets/stack_u.lua

@@ -7,9 +7,9 @@ return{
         mText(TEXTOBJ.line,63,350)
         PLY.draw.drawMarkLine(P,17,.3,1,1,TIME()%.42<.21 and .95 or .6)
     end,
-    dropPiece=function(P)
-        if #P.field>20 then
-            local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath)
+    hook_die=function(P)
+        local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath)
+        if cc>0 then
             local h=20-cc-P.garbageBeneath-3
             if h>0 then
                 P:garbageRise(21,h,2e10-1)

parts/eventsets/survivor_l.lua

@@ -21,6 +21,7 @@ return{
                         if D.wave==60 then
                             P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                         end
+                        P:shakeField(3)
                         D.timer=0
                         D.wave=D.wave+1
                     end

parts/eventsets/survivor_u.lua

@@ -24,6 +24,7 @@ return{
                         if D.wave==30 then
                             P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                         end
+                        P:shakeField(9)
                         D.timer=0
                         D.wave=D.wave+1
                     end

parts/eventsets/techrash_n.lua

@@ -4,7 +4,7 @@ return{
         mStr(P.stat.clear[7][4],63,250)
         mText(TEXTOBJ.techrash,63,315)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         if P.lastPiece.row>0 and P.lastPiece.row<4 then
             P:lose()
         end

parts/eventsets/techrash_u.lua

@@ -8,12 +8,12 @@ return{
         PLY.draw.applyField(P)
         local L=P.modeData.history
         for i=1,#L do
-            gc.setColor(1,.3,.3,.45-i*.04)
+            gc.setColor(1,.3,.3,.5-i*.04)
             gc.rectangle('fill',30*L[i]-30,0,30,600)
         end
         PLY.draw.cancelField(P)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local C=P.lastPiece
         if C.row>0 then
             if C.row==4 then

parts/eventsets/tsd_e.lua

@@ -4,7 +4,7 @@ return{
         mStr(P.modeData.tsd,63,250)
         mText(TEXTOBJ.tsd,63,315)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local C=P.lastPiece
         if C.row>0 then
             if C.id==5 and C.row==2 and C.spin then

parts/eventsets/tsd_h.lua

@@ -13,7 +13,7 @@ return{
             PLY.draw.cancelField(P)
         end
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local C=P.lastPiece
         if C.row>0 then
             if C.id==5 and C.row==2 and C.spin then

parts/eventsets/tsd_u.lua

@@ -8,12 +8,12 @@ return{
         PLY.draw.applyField(P)
         local L=P.modeData.history
         for i=1,#L do
-            gc.setColor(1,.3,.3,.3-i*.05)
+            gc.setColor(1,.3,.3,.4-i*.05)
             gc.rectangle('fill',30*L[i]-30,0,30,600)
         end
         PLY.draw.cancelField(P)
     end,
-    dropPiece=function(P)
+    hook_drop=function(P)
         local C=P.lastPiece
         if C.row>0 then
             if C.id==5 and C.row==2 and C.spin then

parts/eventsets/ultra.lua

@@ -16,9 +16,9 @@ return{
             if P.stat.frame/60>=warnTime[P.modeData.stage]then
                 if P.modeData.stage<9 then
                     P.modeData.stage=P.modeData.stage+1
-                    SFX.play('ready',.7+P.modeData.stage*.03)
+                    playReadySFX(3,.7+P.modeData.stage*.03)
                 else
-                    SFX.play('start')
+                    playReadySFX(0,.7+P.modeData.stage*.03)
                     P:win('finish')
                     return
                 end

parts/freeRow.lua

@@ -1,37 +0,0 @@
-local FREEROW={}
-local L={}--Storage
-local len=0--Length
-function FREEROW.reset(num)
-    if num<len then
-        for i=len,num+1,-1 do
-            L[i]=nil
-        end
-    elseif num>len then
-        for i=len+1,num do
-            L[i]={0,0,0,0,0,0,0,0,0,0,garbage=false}
-        end
-    end
-    len=num
-end
-function FREEROW.get(val,ifGarbage)
-    if len==0 then
-        for i=1,10 do
-            L[i]={0,0,0,0,0,0,0,0,0,0,garbage=false}
-        end
-        len=len+10
-    end
-    local t=L[len]
-    for i=1,10 do t[i]=val end
-    t.garbage=ifGarbage==true
-    L[len]=nil
-    len=len-1
-    return t
-end
-function FREEROW.discard(t)
-    len=len+1
-    L[len]=t
-end
-function FREEROW.getCount()
-    return len
-end
-return FREEROW

parts/gameFuncs.lua

@@ -206,34 +206,30 @@ function playClearSFX(cc)
         end
     end
 end
-function playReadySFX(i)
+function playReadySFX(i,vol)
     if i==3 then
-        Snd('bass','A3')
-        Snd('lead','A4')
+        Snd('bass','A3',vol)
+        Snd('lead','A4',vol)
     elseif i==2 then
-        Snd('bass','F3')
-        Snd('lead','A4')
-        Snd('lead','D5')
+        Snd('bass','F3',vol)
+        Snd('lead','A4',vol)
+        Snd('lead','D5',vol)
     elseif i==1 then
-        Snd('bass','G3')
-        Snd('lead','B4')
-        Snd('lead','E5')
+        Snd('bass','G3',vol)
+        Snd('lead','B4',vol)
+        Snd('lead','E5',vol)
     elseif i==0 then
-        Snd('bass','A3')
-        Snd('lead','A4')
-        Snd('lead','E5')
-        Snd('lead','A5')
+        Snd('bass','A3',vol)
+        Snd('lead','A4',vol)
+        Snd('lead','E5',vol)
+        Snd('lead','A5',vol)
     end
 end
 
 
 --Game
-function coin(a,b)
-    if rnd()<.5 then
-        return a
-    else
-        return b
-    end
+function getItem(itemName,amount)
+    STAT.item[itemName]=STAT.item[itemName]+(amount or 1)
 end
 function generateLine(hole)
     return 1023-2^(hole-1)
@@ -257,8 +253,8 @@ function setField(P,page)
     local t=P.showTime*3
     for y=1,height do
         local notEmpty=notEmptyLine(F[y])
-        P.field[y]=FREEROW.get(0,notEmpty)
-        P.visTime[y]=FREEROW.get(t)
+        P.field[y]=LINE.new(0,notEmpty)
+        P.visTime[y]=LINE.new(t)
         if notEmpty then
             for x=1,10 do
                 P.field[y][x]=F[y][x]
@@ -275,9 +271,11 @@ function freshDate(mode)
     if STAT.date~=date then
         STAT.date=date
         STAT.todayTime=0
+        getItem('zTicket',1)
         if not mode:find'q'then
             MES.new('info',text.newDay)
         end
+        saveStats()
         return true
     end
 end
@@ -331,8 +329,8 @@ function destroyPlayers()--Destroy all player objects, restore freerows and free
             P.canvas:release()
         end
         while P.field[1]do
-            FREEROW.discard(rem(P.field))
-            FREEROW.discard(rem(P.visTime))
+            rem(P.field)
+            rem(P.visTime)
         end
     end
     TABLE.cut(PLAYERS)
@@ -668,7 +666,6 @@ do--function resetGameData(args)
             GAME.secDangerous=false
             GAME.stage=1
         end
-        FREEROW.reset(30*#PLAYERS)
         TASK.removeTask_code(task_showMods)
         if GAME.setting.allowMod then
             TASK.new(task_showMods)

parts/gameTables.lua

@@ -345,7 +345,6 @@ EVENTSETS={
     'marathon_n','marathon_h',
     'master_n','master_h','master_final','master_m','master_ex','master_ph',
     'pctrain_n','pctrain_l','pc_inf',
-    'rhythm_e','rhythm_h','rhythm_u',
     'survivor_e','survivor_n','survivor_h','survivor_l','survivor_u',
     'tsd_e','tsd_h','tsd_u',
     'ultra',
@@ -727,6 +726,10 @@ do--Userdata tables
         spin=(function()local L={}for i=1,29 do L[i]={0,0,0,0,0,0,0}end return L end)(),
         pc=0,hpc=0,b2b=0,b3b=0,score=0,
         lastPlay='sprint_10l',--Last played mode ID
+        item=setmetatable({},{__index=function(self,k)
+            self[k]=0
+            return 0
+        end}),
         date=false,
         todayTime=0,
     }

parts/language/dict_en.lua

@@ -4,7 +4,7 @@ return{
     {"Translator Note 1",
         "",
         "help",
-        "This translation of the TetroDictionary is provided by me, User670 (Discord: User670#9501).\n\nThe translation may not completely reflect the contents of the original Chinese text.\n\nCorrected by C29H25N3O5.\n\nTo view the list of contributors or make contributions, feel free to visit the GitHub page.",
+        "This translation of the TetroDictionary is provided by me, User670 (Discord: User670#9501).\n\nThe translation may not completely reflect the contents of the original Chinese text.\n\nCorrected by C₂₉H₂₅N₃O₅ (Discord: C29H25N3O5#1606).\n\nTo view the list of contributors or make contributions, feel free to visit the GitHub page.",
         "https://github.com/26F-Studio/Techmino/blob/main/parts/language/dict_en.lua",
     },
     {"Official Website",
@@ -16,7 +16,7 @@ return{
     {"To New Players",
         "guide newbie noob",
         "help",
-        "To new players that want to get better at the game:\n\tTwo principles:\n\t1. find a version with good controls (e.g. Techmino, Tetr.io, Tetris Online, Jstris, Tetr.js). Do not use those version used for programming practice.\n\t2. Build foundations in your skills (stable Techrashes using next queue to aid decisions), don't go for fancy T-Spins from the start.\n\n\tTwo main techniques:\n\t1. familiarize yourself with spawn locations of pieces, and the controls to move the piece into each location\n\t2. Plan ahead of where to put the pieces\nWe recommend that you read this article titled \"Words to newbies from a Tetris Pro\" (Click \"Open URL\". In Simplified Chinese)",
+        "To new players that want to get better at the game:\n\tTwo principles:\n\t1. find a version with good controls (e.g. Techmino, Tetr.io, Tetris Online, Jstris, Tetr.js). Do not use those version used for programming practice.\n\t2. Build foundations in your skills (stable Techrashes using next queue to aid decisions), don't go for fancy T-Spins from the start.\n\n\tTwo main techniques:\n\t1. familiarize yourself with spawn locations of pieces, and the controls to move the piece into each location\n\t2. Plan ahead of where to put the pieces\nHere is a article written by a well-known player in Chinese Tetris community talking about advices to new players. Click the globe if you can read simplified Chinese.",
         "https://bilibili.com/read/cv2352939",
     },
     {"Learning T-spins",
@@ -55,7 +55,7 @@ return{
         "https://tetris.huijiwiki.com",
     },
 
-    --Organizations
+    --Webpages / Organizations
     {"Github Repository",
         "githubrepository sourcecode",
         "org",
@@ -65,7 +65,7 @@ return{
     {"Communities",
         "community communities",
         "org",
-        "Join Tetris communities and talk with other players!\n\nChina: [QQ] Tetris Research: 112897780\nGlobal: [Discord] Hard Drop: discord.gg/harddrop (click \"Open URL\").",
+        "Join Tetris communities and talk with other players!\n\nChina: [QQ] Tetris Research: 112897780\nGlobal: [Discord] Hard Drop: discord.gg/harddrop (click the globe icon to open).",
         "https://discord.gg/harddrop"
     },
     {"Mew",
@@ -77,10 +77,15 @@ return{
     {"Tetris OL Servers",
         "tetrisonline servers",
         "org",
-        "Google \"Tetris Online Poland\" for the Poland server.\nClick \"Open URL\" for information about the Tetris Online Study server.",
+        "Google \"Tetris Online Poland\" for the Poland server.\nClick on the globe icon for information about the Tetris Online Study server.",
         "http://teatube.ltd/tos",
     },
-
+    {"P\97\116\114\111\110",
+        "p\97\116\114\111\110 support",
+        "org",
+        "Techmino's P\97\116\114\111\110 Page",
+        FNSF and"https://www.youtube.com/watch?v=DVl0IiUKX_g"or"https://www.p\97\116\114\111\110.com/techmino",
+    },
     --Games
     {"TTT",
         "ttt tetris trainer tres bien",
@@ -256,7 +261,7 @@ return{
         "game",
         "Another mobile Tetris game by EA. It has two control modes – Swipe and One-Touch. It also has a Galaxy Mode besides the Marathon Mode (with gravity mechanism), and the goal of this mode is to clear all Galaxy minoes before the sequence runs out.\n\nThis game is no longer available since April 2020."
     },
-    {"Tetris（N3TWORK）",
+    {"Tetris (N3TWORK)",
         "tetris n3twork mobile phone",
         "game",
         "The latest mobile Tetris from N3TWORK Inc. It has a 3-minute ultra mode, a marathon mode and a Royale mode. The UI is great but its controls are not so good.",
@@ -302,7 +307,7 @@ return{
     {"BPM",
         "bpm blocksperminute piecesperminute speed",
         "term",
-        "Blocks per minute\n\tReflects playing speed of a player.\nAlso MrZ forgot that it can be called PPM to avoid confusing with the music term.",
+        "Blocks per minute\n\tReflects playing speed of a player.\nAlso called PPM (to avoid confusing with the musical term).",
     },
     {"KPM",
         "kpm keysperminute keypressesperminute",
@@ -582,7 +587,7 @@ return{
         "term",
         "A terminology used in the Chinese Tetris community. A \"debt\" refers to a situation where one must first finish constructing a specific setup before he or she can perform one or more T-spins with real attacks. When constructing a setup where one or multiple debts are created, it is important to observe the opponent carefully to ensure your safety; otherwise, there is a high probability of topping out before the construction is finished.\n\nThis term is frequently used to describe setups such as TST tower. No real attacks can be made before the setup is constructed completely.",
     },
-    {"Attacking & Defending",
+    {"Attack & Defend",
         "attacking defending",
         "term",
         "Attacking: send garbage lines to your opponent by clearing lines.\nDefending: after your opponent send you lines, you offset this garbage by clearing lines.\nCounter attack: Send attack back at your opponent after offsetting incoming garbage, or taking the hit then attack back.\nIn most games, garbage offsetting is 1:1, i.e. one attack offsets one incoming garbage.",
@@ -660,7 +665,18 @@ return{
     {"Topping out",
         "die death topout toppingout",
         "term",
-        "Modern Tetris games have three different conditions in which the player tops out:\n1. Block out: when a piece spawned overlaps with the existing blocks in the field;\n2. Lock out: when a piece locks entirely above the skyline;\n3. Garbage out: when the stack exceeds 40 lines in height (often due to incoming garbage).\nTechmino does not check for locking out and garbage out.",
+        "Modern Tetris games have three different conditions in which the player tops out:\n1. Block out: when a piece spawned overlaps with the existing blocks in the field;\n2. Lock out: when a piece locks entirely above the skyline;\n3. Top out: when the stack exceeds 40 lines in height (often due to incoming garbage).\nTechmino does not check for locking out and topping out.",
+    },
+    {"Buffer zone",
+        "buffer zone above super invisible disappear",
+        "term",
+        "Refers to 21st-40th lines above the visible field. Because the blocks in the field could go over the visible field (this usually happens when multiple garbage lines come in) so the buffer zone was created so those blocks could go back to the field when garbage lines are cleared. Also, the buffer zone is usually located at 21st-40th lines because this is sufficient for most cases. Refer to \"Vanish Zone\" to learn more.",
+    },
+    {"Vanish zone",
+        "vanish zone disappear gone cut die",
+        "term",
+        "Refers to the area located above the 40th line. This is usually realised by combining c4w and multiple garbage lines. In many games, when any block reaches the vanish zone, the game is terminated immediately.\nHowever, this area can have different behaviours in different games. Some games are flawed because the game could crash when the blocks enter the vanish zone (e.g. Tetris Online). Wierd behaviours could also happen when the blocks enter the vanish zone (you can refer to this video, click on the globe icon to open the link).\n\nFurthermore, the vanish zone in Jstris is located above the 22nd line, and any blocks locked above the 21st line will disappear. ",
+        "https://youtu.be/z4WtWISkrdU",
     },
     {"Falling speed",
         "fallingspeed",
@@ -677,11 +693,16 @@ return{
         "term",
         "Sometimes called the Entry Delay. ARE refers to the delay between the lockdown of one piece and the spawn of another piece.",
     },
-    {"line ARE",
+    {"Line ARE",
         "line are appearance delay",
         "term",
         "The delay between the start of a line clear animation to the spawn of the next piece.",
     },
+    {"Death ARE",
+        "death are die delay",
+        "term",
+        "(Techmino exclusive) When the spawn location of the next piece is blocked by an existing block in the field, a delay will be added in addition to the spawn ARE, and this delay is referred to as the death ARE. This mechanism can be used along with IHS and IRS to prevent death. \nOriginal idea by Not-A-Normal-Bot",
+    },
     {"Finesse",
         "finesse",
         "term",

parts/language/dict_zh.lua

@@ -4,7 +4,7 @@ return{
     {"新人须知",
         "新人须知 xinren new noob readme",
         "help",
-        "致想深入玩下去的新人：\n\n\t两大根本原则：\n\t\t1. 选手感好的版本（Tech/Tetr.io/Jstris/TOP/Tetr.js），别用编程练习渣版本\n\t\t2. 踏实打好基础（预判next稳定消四等），别总想着炫酷T旋，对未来发展没好处。\n\t两大主要技巧：\n\t\t1. 熟悉初始位置以及到各个位置的初始操作；\n\t\t2. 提前计算好下一块能放哪。\n\n推荐阅读专栏《给TOP新人的几点建议》\n\n[点击右下角按钮打开链接]",
+        "致想深入玩下去的新人：\n\n\t两大根本原则：\n\t\t1. 选手感好的版本（Tech/Tetr.io/Jstris/TOP/Tetr.js），别用编程练习渣版本\n\t\t2. 踏实打好基础（预判next稳定消四等），别总想着炫酷T旋，对未来发展没好处。\n\t两大主要技巧：\n\t\t1. 熟悉初始位置以及到各个位置的初始操作；\n\t\t2. 提前计算好下一块能放哪。\n\n推荐阅读专栏《给TOP新人的几点建议》\n\n[点击右下角地球按钮打开链接]",
         "https://bilibili.com/read/cv2352939",
     },
     {"关于T-spin学习",
@@ -15,7 +15,7 @@ return{
     {"游戏官网",
         "official website homepage guanwang",
         "help",
-        "Techmino的官网！\n可以在上面修改头像和个人信息。",
+        "Techmino的官网！\n可以在上面下载游戏本体，或者修改头像以及个人信息。\n\n游戏作者的一些话：强烈不建议在任何公开场合提及甚至宣传本游戏，更不要随便就对外公布我们的官网链接！请务必只在私下里向有基础或真的很有兴趣入坑认真玩的玩家推荐，不然很容易拉低社群质量破坏交流氛围，非常难处理，甚至有可能影响游戏的未来发展。为了保证游戏未来会变得越来越好玩，千万慎重考虑您对游戏的推广方式！感谢您对Techmino的支持！！感谢配合！！！",
         "http://home.techmino.org",
     },
     {"灰机Wiki",
@@ -49,7 +49,7 @@ return{
         "https://four.lol",
     },
 
-    --相关组织
+    --相关网页/组织
     {"GitHub仓库",
         "源代码 github git sourcecode yuandaima",
         "org",
@@ -73,6 +73,12 @@ return{
         "TO-S的添加方法、说明等关于茶服的一切",
         "http://teatube.ltd/tos",
     },
+    {"P\97\116\114\111\110",
+        "赞助 p\97\116\114\111\110 support zanzhu daqian",
+        "org",
+        "Techmino的P\97\116\114\111\110",
+        FNSF and"https://www.youtube.com/watch?v=DVl0IiUKX_g"or"https://www.p\97\116\114\111\110.com/techmino",
+    },
 
     --游戏（题库）
     {"TTT",
@@ -217,7 +223,7 @@ return{
     {"Tetris Effect",
         "效应 tec tetriseffectconnect",
         "game",
-        "简称TE(C)，一个Windows/PS/Xbox/Oculus Quest 平台方块， 特效方块游戏，只有单机模式，手感不算太好，想看特效的可以一试， 只是去玩方块的不是很建议。\n\n有一个拓展版本 Tetris Effect: Connected 增加了联网对战， 包含普通对战， Zone 对战，经典对战和Boss战四个模式。",
+        "简称TE（C），一个Windows/PS/Xbox/Oculus Quest 平台方块， 特效方块游戏，只有单机模式，手感不算太好，想看特效的可以一试， 只是去玩方块的不是很建议。\n\n有一个拓展版本 Tetris Effect: Connected 增加了联网对战， 包含普通对战， Zone 对战，经典对战和Boss战四个模式。",
     },
     {"Cultris II",
         "文艺方块 c2 cultris2 cultrisii",
@@ -289,57 +295,57 @@ return{
     {"LPM",
         "lpm sudu",
         "term",
-        "Line per Minute\n行每分，体现玩家下块速度。\n\n注：不同游戏中显示的LPM算法可能不一样，例如TO中的LPM是用PPS换算的，每1PPS=24LPM，忽略掉了垃圾行的影响，不再是字面意思，本游戏中使用L'PM代表这种换算后LPM",
+        "Line Per Minute\n行每分，体现玩家下块速度。\n\n注：不同游戏中显示的LPM算法可能不一样，例如TO中的LPM是用PPS换算的，每1PPS=24LPM，忽略掉了垃圾行的影响，不再是字面意思，本游戏中使用L'PM代表这种换算后LPM",
     },
     {"PPS",
         "pps sudu",
         "term",
-        "Piece per Second\n块每秒，体现玩家下块速度。",
+        "Piece Per Second\n块每秒，体现玩家下块速度。",
     },
     {"BPM",
         "bpm sudu",
         "term",
-        "Block per Minute\n块每分，体现玩家下块速度\n别问为什么不是PPM，问就是不知道（",
+        "Block Per Minute\n块每分，体现玩家下块速度\n又称PPM（Piece Per Minute）",
     },
     {"KPM",
         "kpm sudu",
         "term",
-        "Key per Minute\n按键每分，体现玩家按键速度。",
+        "Key Per Minute\n按键每分，体现玩家按键速度。",
     },
     {"KPP",
         "kpp anjian",
         "term",
-        "Key per Piece\n按键每块，体现玩家操作是否繁琐。\n学会极简提升操作效率以减少此数字。",
+        "Key Per Piece\n按键每块，体现玩家操作是否繁琐。\n学会极简提升操作效率以减少此数字。",
     },
     {"APM",
         "apm attack gongji",
         "term",
-        "Attack per Minute\n攻击每分，即玩家每分钟能打出的垃圾行数。\n一定程度体现玩家攻击力。",
+        "Attack Per Minute\n攻击每分，即玩家每分钟能打出的垃圾行数。\n一定程度体现玩家攻击力。",
     },
     {"SPM",
         "spm send gongji",
         "term",
-        "Send per Minute\n送出每分，即玩家每分钟实际打出去给对手的垃圾行数。\n一定程度体现玩家给对手实际造成的攻击力。",
+        "Send Per Minute\n送出每分，即玩家每分钟实际打出去给对手的垃圾行数。\n一定程度体现玩家给对手实际造成的攻击力。",
     },
     {"DPM",
         "dpm dig defend",
         "term",
-        "Dig/Defend per Minute\n挖掘每分，即玩家每分钟向下挖掘的垃圾行数。\n某些时候可以体现玩家生存能力。\n\n或：防御（抵消+挖掘）每分。",
+        "Dig/Defend Per Minute\n挖掘每分，即玩家每分钟向下挖掘的垃圾行数。\n某些时候可以体现玩家生存能力。\n\n或：防御（抵消+挖掘）每分。",
     },
     {"RPM",
         "rpm receive jieshou",
         "term",
-        "Receive per Minute\n接收每分，即玩家每分钟收到来自对手的垃圾行数。\n一定程度体现玩家被对手施加的压力。",
+        "Receive Per Minute\n接收每分，即玩家每分钟收到来自对手的垃圾行数。\n一定程度体现玩家被对手施加的压力。",
     },
     {"ADPM",
         "adpm attack defend vs",
         "term",
-        "Atk+Dig per Minute\n攻击+挖掘每分，用于在同一局游戏内对比玩家间水平差距，比APM更准确一些。在TETR.IO中叫VS的数据就是ADPM（调整过比例，具体是Atk + Dig per 100s）",
+        "Atk+Dig Per Minute\n攻击+挖掘每分，用于在同一局游戏内对比玩家间水平差距，比APM更准确一些。在TETR.IO中叫VS的数据就是ADPM（调整过比例，具体是Atk + Dig per 100s）",
     },
     {"APL",
         "apl xiaolv",
         "term",
-        "Attack per Line\n攻击每行，也叫效率，体现玩家攻击的行利用率。",
+        "Attack Per Line\n攻击每行，也叫效率，体现玩家攻击的行利用率。",
     },
 
     --术语（消除名）
@@ -438,7 +444,7 @@ return{
     {"方块朝向",
         "旋转 朝向 xuanzhuan chaoxiang orientation direction 0r2l 02 20 rl lr",
         "term",
-        "在SRS或者类SRS的旋转系统中需要说明方块朝向的时候，“朝下”“竖着”等词描述太模糊。\nSRS中每种方块的初始状态固定，所以我们使用0(原位)、R（右，即顺时针转一次）、2（转两下，即180°）、L（左，即逆时针转一次）四个字符表示方块的四种状态，从原位（0）开始顺时针转一圈四个状态是0R2L。\n最早见于SRS踢墙表的行首，0→L表示原位逆时针转一次到L状态，0→R表示原位顺时针转一次到R状态，2→R代表从180°状态逆时针转一次到R状态。",
+        "在SRS或者类SRS的旋转系统中需要说明方块朝向的时候，“朝下”“竖着”等词描述太模糊。\nSRS中每种方块的初始状态固定，所以我们使用0（原位）、R（右，即顺时针转一次）、2（转两下，即180°）、L（左，即逆时针转一次）四个字符表示方块的四种状态，从原位（0）开始顺时针转一圈四个状态是0R2L。\n最早见于SRS踢墙表的行首，0→L表示原位逆时针转一次到L状态，0→R表示原位顺时针转一次到R状态，2→R代表从180°状态逆时针转一次到R状态。",
     },
     {"ARS",
         "旋转系统 ars rotate",
@@ -600,7 +606,7 @@ return{
     {"欠债",
         "欠债 qianzhai",
         "term",
-        "欠债\n指必须完全堆好才能开始转下T旋打出攻击，堆完之前T下不去的形状。对战实战中如果要做此类(中局)定式时一定要观察对手情况确保自己安全，不然可能被半途打死\n\n一般只用来描述类似双T3/T3塔的大型组合炮，堆完之前完全不能打出攻击。",
+        "欠债\n指必须完全堆好才能开始转下T旋打出攻击，堆完之前T下不去的形状。对战实战中如果要做此类（中局）定式时一定要观察对手情况确保自己安全，不然可能被半途打死\n\n一般只用来描述类似双T3/T3塔的大型组合炮，堆完之前完全不能打出攻击。",
     },
     {"攻守",
         "攻守 gong shou",
@@ -685,7 +691,18 @@ return{
     {"死亡判定",
         "死亡判定 die death siwang",
         "term",
-        "现代方块普遍使用的死亡判定：\n1. 新出现的方块和场地方块有重叠（窒息，Top Out）（c4w比s4w强的原因，因为被打进18行都不会窒息）；\n2. 方块锁定时完全在场地的外面（Block Out）；\n3. 场地内现存方块总高度大于40。部分游戏可能没有这条判定，而是会自动“切除”场地内所有高度大于40的部分（Vanish Zone）。\n\n注：本游戏使用的死亡判定不包含上述的第二条和第三条。",
+        "现代方块普遍使用的死亡判定：\n1. 新出现的方块和场地方块有重叠（窒息，Block Out）（c4w比s4w强的原因，因为被打进18行都不会窒息）；\n2. 方块锁定时完全在场地的外面（Lock Out）；\n3. 场地内现存方块总高度大于40。（超高，Top Out）\n\n注：本游戏使用的死亡判定不包含上述的第二条和第三条。",
+    },
+    {"缓冲区",
+        "缓冲区 buffer zone huanchongqu",
+        "term",
+        "（不是所有游戏都有这个概念）指10×20可见场地之上的21~40行。因为垃圾行顶起后两边堆高的方块可能会超出屏幕，消行后这些方块要重新回到场地内所以需要保存下来，由于程序上要求场地尺寸有限（部分游戏可以无限），故设定为40，一般都够用。\n\n另见“消失区”词条。",
+    },
+    {"消失区",
+        "消失区 vanish zone xiaoshiqu",
+        "term",
+        "在缓冲区的基础上，指比40行缓冲区还高的区域。\n标准的死亡判定涉及了这个概念，在垃圾行升起后如果场地上有任何方块超出了40高的缓冲区（也就是达到了消失区）时游戏直接结束。\n但事实上这块区域在不同游戏中表现不同，甚至有设计者考虑不周导致方块挪到40行以上，但是程序没考虑导致方块接触消失区直接报错闪退的游戏。通常出现在玩家堆了c4w然后被打入大量垃圾行时才会考虑这个概念。其他游戏中方块进入消失区可能直接导致游戏结束，也有可能会出现一些奇怪的bug（附带链接是ppt的复制40行无限ren视频）。\n\n另，Jstris中22行及以上可以理解为消失区，锁定在21行之外的格子会消失。",
+        "https://www.bilibili.com/video/BV1ZE411Y7GD",
     },
     {"下落速度",
         "下落速度 重力 drop speed zhongli gravity",
@@ -707,6 +724,11 @@ return{
         "term",
         "方块<锁定完成能消行时的消行动画>占据的时间，英文是line ARE。",
     },
+    {"窒息延迟",
+        "窒息延迟 choke are delay zhixiyanchi",
+        "term",
+        "当前方块锁定后如果下一块的生成位置被阻挡，那么下一块的出块延迟会被再额外加上这个延迟的值，方便使用提前系统来避免死亡\n想法来自Not-A-Normal-Bot",
+    },
     {"Finesse",
         "极简操作 最简操作 finesse jijiancaozuo zuijiancaozuo",
         "term",
@@ -720,7 +742,7 @@ return{
     {"手感",
         "手感 feel shougan",
         "term",
-        "决定手感的几个主要因素：\n(1) 输入延迟受设备配置或者设备状况影响。可以重启/换设备解决\n(2) 程序运行稳定性程序设计（或者实现）得不好，时不时会卡一下。把设置画面效果拉低可能可以缓解\n(3) 游戏设计故意的。自己适应\n(4) 参数设置设置不当。去改设置\n(5) 游玩姿势姿势不当。不便用力，换个姿势\n(6) 换键位或者换设备后不适应，操作不习惯。多习惯习惯，改改设置\n(7) 肌肉疲劳反应和协调能力下降。睡一觉或者做点体育运动，过段时间（也可能要几天）再来玩",
+        "决定手感的几个主要因素：\n（1） 输入延迟受设备配置或者设备状况影响。可以重启/换设备解决\n（2） 程序运行稳定性程序设计（或者实现）得不好，时不时会卡一下。把设置画面效果拉低可能可以缓解\n（3） 游戏设计故意的。自己适应\n（4） 参数设置设置不当。去改设置\n（5） 游玩姿势姿势不当。不便用力，换个姿势\n（6） 换键位或者换设备后不适应，操作不习惯。多习惯习惯，改改设置\n（7） 肌肉疲劳反应和协调能力下降。睡一觉或者做点体育运动，过段时间（也可能要几天）再来玩",
     },
     {"DAS通俗",
         "das arr simple",
@@ -760,7 +782,7 @@ return{
     {"His出块",
         "his出块 history",
         "term",
-        "一种的出块方式，例如His4 Roll6 (h4r6)就是在随机生成新的 Next 的时候，随机一个跟最后4次生成的Next中有一样的，就重新随机，直到已经尝试6次或和那4个都不一样。\n本游戏的His序列模式中最大Roll次数为序列长度的一半（向上取整）\n\n是纯随机出块的一大改进，大大减小了连续出几个SZ（洪水）的概率。",
+        "一种的出块方式，例如His4 Roll6 （h4r6）就是在随机生成新的 Next 的时候，随机一个跟最后4次生成的Next中有一样的，就重新随机，直到已经尝试6次或和那4个都不一样。\n本游戏的His序列模式中最大Roll次数为序列长度的一半（向上取整）\n\n是纯随机出块的一大改进，大大减小了连续出几个SZ（洪水）的概率。",
     },
     {"HisPool出块",
         "hisPool出块 history pool",
@@ -1121,7 +1143,7 @@ return{
     {"Jonas",
         "jonas",
         "name",
-        "经典块一流玩家，曾经的经典块第一，CTWC4连冠\n(1981-2021)",
+        "经典块一流玩家，曾经的经典块第一，CTWC4连冠\n（1981-2021）",
     },
     {"Joseph",
         "joseph",
@@ -1131,7 +1153,7 @@ return{
     {"Kazu",
         "kazu mdking",
         "name",
-        "(也叫“GAMEOVER” “GAMAOVER” “GAME_OVER_RETRY”)\n一流玩家，以熟练md转捐赠闻名（雾）。",
+        "（也叫“GAMEOVER” “GAMAOVER” “GAME_OVER_RETRY”）\n一流玩家，以熟练md转捐赠闻名（雾）。",
     },
     {"Microblizz",
         "microblizz",

parts/language/lang_en.lua

@@ -194,7 +194,9 @@ return{
         "Make sure to get the game only from official sources,",
         "as we can't make sure you're safe if you got it elsewhere.",
         "The author is not responsible for any modifications.",
-        "While the game is free, donations are appreciated."
+        FNSF and"/"or"While the game is free, donations are appreciated.",
+        FNSF and"/"or"If you are unable to use both WeChat Pay and AliPay,",
+        FNSF and"/"or"you can go to our P\97\116\114\111\110 page (Link in Zictionary) to support us!",
     },
     staff={
         "Author: MrZ  Email: 1046101471@qq.com",
@@ -224,7 +226,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="Support the author",
-    group="Join our Discord: discord.gg/f9pUvkh",
     WidgetText={
         main={
             offline="Single Player",
@@ -316,7 +317,7 @@ return{
         net_game={
             ready="Ready",
             spectate="Spectate",
-            cancel="Cancel",
+            cancel="Cancel ready",
         },
         setting_game={
             title="Game Settings",
@@ -476,6 +477,7 @@ return{
             lock="Lock Delay",
             wait="Entry Delay",
             fall="Line Delay",
+            hang="Death Delay",
 
             bg="Background",
             bgm="Music",
@@ -677,9 +679,6 @@ return{
         ['dig_400l']=      {"Dig",               "400L",       "Dig 400 garbage lines"},
         ['drought_n']=     {"Drought",           "100L",       "No I-pieces available"},
         ['drought_l']=     {"Drought+",          "100L",       "W T F"},
-        ['stack_e']=       {"Stack",             "EASY",       "Pack them!"},
-        ['stack_h']=       {"Stack",             "HARD",       "Pack them!"},
-        ['stack_u']=       {"Stack",             "ULTIMATE",   "Pack them!"},
         ['marathon_n']=    {"Marathon",          "NORMAL",     "200-line marathon with increasing speed"},
         ['marathon_h']=    {"Marathon",          "HARD",       "200-line high-speed marathon"},
         ['solo_e']=        {"Battle",            "EASY",       "Defeat the AI!"},
@@ -704,9 +703,6 @@ return{
         ['master_final']=  {"Master",            "FINAL",      "20G and beyond"},
         ['master_ph']=     {"Master",            "PHANTASM",    "???"},
         ['master_ex']=     {"GrandMaster",       "EXTRA",      "An eternity shorter than an instant"},
-        ['rhythm_e']=      {"Rhythm",            "EASY",       "200-line low-BPM rhythm marathon"},
-        ['rhythm_h']=      {"Rhythm",            "HARD",       "200-line medium BPM rhythm marathon"},
-        ['rhythm_u']=      {"Rhythm",            "ULTIMATE",   "200-line high-BPM rhythm marathon"},
         ['blind_e']=       {"Invisible",         "HALF",       "For novices"},
         ['blind_n']=       {"Invisible",         "ALL",        "For intermediates"},
         ['blind_h']=       {"Invisible",         "SUDDEN",     "For the experienced"},
@@ -755,7 +751,7 @@ return{
         ['sprintEff']=     {"Sprint",            "Efficiency", "Send more attack in 40lines!"},
         ['zen']=           {'Zen',               "200",        "A 200-line run without a time limit"},
         ['ultra']=         {'Ultra',             "EXTRA",      "A 2-minute score attack"},
-        ['infinite']=      {'infinite',           "",          "Just a sandbox"},
+        ['infinite']=      {"Infinite",           "",          "Just a sandbox"},
         ['infinite_dig']=  {"Infinite: Dig",      "",          "Dig-diggin'-dug"},
         ['marathon_inf']=  {"Marathon",           "INFINITE",  "Infinite marathon."},
 
@@ -837,7 +833,7 @@ return{
         "Powered by Un..LÖVE",
         "pps-0.01",
         "Server down randomly",
-        "Some requirements to achieve rank S are intentionally set to be difficult for even the best players.",
+        "Some requirements to achieve rank X are intentionally set to be difficult for even the best players.",
         "Soon you'll be able to play against friends and foes all over the world.",
         "Split clear coming soon!",
         "sudo rm -rf /*",
@@ -868,6 +864,7 @@ return{
         "You can set the spawning orientation for each tetromino.",
         "ZS JL T O I",
         {C.C,"Also try 15puzzle!"},
+        {C.C,"Also try Ballance!"},
         {C.C,"Also try Minecraft!"},
         {C.C,"Also try Minesweeper!"},
         {C.C,"Also try Orzmic!"},
@@ -878,6 +875,8 @@ return{
         {C.C,"Also try Terraria!"},
         {C.C,"Also try Touhou Project!"},
         {C.C,"Also try VVVVVV!"},
+        {C.C,"Also try World of goo!"},
+        {C.C,"Also try Zuma!"},
         {C.H,"REGRET!!"},
         {C.lP,"Secret number: 626"},
         {C.lR,"Z ",C.lG,"S ",C.lS,"J ",C.lO,"L ",C.lP,"T ",C.lY,"O ",C.lC,"I"},

parts/language/lang_es.lua

@@ -160,7 +160,9 @@ return{
         "Descarga disponible únicamente vía el grupo de testeo y discord.gg/f9pUvkh",
         "Descargas desde otros sitios pueden contener malware/viruses, y en smartphones sólo requiere permisos de internet y vibración.",
         "El autor no se responabiliza por daños ocasionados debido a modificaciones del juego.",
-        "Por favor descarga las últimas versiones desde los sitios oficiales. El juego es gratuito",
+        FNSF and"/"or"Por favor descarga las últimas versiones desde los sitios oficiales. El juego es gratuito",
+        FNSF and"/"or"Si no puede usar WeChat Pay y AliPay,",
+        FNSF and"/"or"puede ir a nuestra página de P\97\116\114\111\110 para apoyarnos.",
     },
     staff={
         "Autor:MrZ  Email: 1046101471@qq.com",
@@ -190,7 +192,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="Apoyen al Autor",
-    group="Grupo Oficial de QQ (si no lo hackean) : 913154753",
     WidgetText={
         main={
             offline="1 Jugador",
@@ -283,7 +284,7 @@ return{
         net_game={
             ready="Estoy Listo",
             spectate="Espectear",
-            cancel="Cancelar",
+            -- cancel="Cancel ready",
         },
         setting_game={
             title="Ajustes del Juego",
@@ -442,6 +443,7 @@ return{
             lock="Retraso de Bloqueo",
             wait="Retraso de Spawneo",
             fall="Retraso de Línea",
+            -- hang="Death Delay",
 
             bg="Fondo",
             bgm="Música",
@@ -636,9 +638,6 @@ return{
         ['dig_400l']=       {"Queso",                   "400L",          "Limpia 400 líneas de queso."},
         ['drought_n']=      {"Sequía",                  "100L",          "¡Sin piezas I!"},
         ['drought_l']=      {"Sequía+",                 "100L",          "Guat de foc..."},
-        ['stack_e']=        {"Stack",                   "Fácil",         "¡Sin dejar huecos!"},
-        ['stack_h']=        {"Stack",                   "Difícil",       "¡Sin dejar huecos!"},
-        ['stack_u']=        {"Stack",                   "Supremo",       "¡Sin dejar huecos!"},
         ['marathon_n']=     {"Maratón",                 "Normal",        "Maratón de 200 líneas con velocidad en aumento."},
         ['marathon_h']=     {"Maratón",                 "Difícil",       "Maratón de 200 líneas a velocidad máxima."},
         ['solo_e']=         {"VS.",                     "Fácil",         "¡Derrota a la CPU!"},
@@ -662,9 +661,6 @@ return{
         -- ['master_m']=       {"Master",                  "M21",           "For 20G Masters."},
         ['master_final']=   {"Master",                  "FINAL",         "El verdadero 20G Supremo: el final es inalcanzable."},
         ['master_ex']=      {"GrandMaster",             "EXTRA",         "Para ser un gran maestro, acepta este desafío"},
-        ['rhythm_e']=       {"Al Ritmo",                "Fácil",         "Maratón rítmica de 200 líneas con bajo bpm."},
-        ['rhythm_h']=       {"Al Ritmo",                "Difícil",       "Maratón rítmica de 200 líneas con bpm moderado."},
-        ['rhythm_u']=       {"Al Ritmo",                "Supremo",       "Maratón rítmica de 200 líneas con bpm elevado."},
         ['blind_e']=        {"A Ciegas",                "Parcial",       "Para novatos."},
         ['blind_n']=        {"A Ciegas",                "Total",         "Para jugadores intermedios."},
         ['blind_h']=        {"A Ciegas",                "Inmediato",     "Para jugadores experimentados"},

parts/language/lang_fr.lua

@@ -160,7 +160,9 @@ return{
         "Ce jeu est gratuit et est uniquement disponible via discord.gg/f9pUvkh",
         "Ne téléchargez pas ce jeu depuis une autre source au risque d'avoir des virus,",
         "et vous n'avez besoin que des permissions de vibration et de communication réseau pour les versions mobiles !",
-        "Le créateur n'est pas responsable pour n'importe quel type de perte de données suite à une modification du jeu.",
+        FNSF and"/"or"Le créateur n'est pas responsable pour n'importe quel type de perte de données suite à une modification du jeu.",
+        FNSF and"/"or"Si vous ne parvenez pas à utiliser à la fois WeChat Pay et AliPay,",
+        FNSF and"/"or"vous pouvez vous rendre sur notre page P\97\116\114\111\110 pour nous soutenir !",
     },
     staff={
         "Author: MrZ  E-mail: 1046101471@qq.com",
@@ -190,7 +192,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="Aider le créateur",
-    group="Groupe QQ officiel : 913154753",
     WidgetText={
         main={
             -- offline="Solo",
@@ -279,7 +280,7 @@ return{
         net_game={
             -- ready="Ready",
             -- spectate="Spectate",
-            -- cancel="Cancel",
+            -- cancel="Cancel ready",
         },
         setting_game={
             title="Paramètres du jeu",
@@ -443,6 +444,7 @@ return{
             lock="Délai de verrouillage",
             wait="Délai d'apparition",
             fall="Délai de ligne",
+            -- hang="Death Delay",
 
             bg="Arrière-plan",
             bgm="Musique",
@@ -638,7 +640,6 @@ return{
         ['drought_n']=     {"Drought",         "100L",        "Pas de pièce I !"},
         ['drought_l']=     {"Drought+",        "100L",        "WTF ??!!"},
         -- ['stack_e']=       {"Stack",           "FACILE",      "Pack them!"},
-        -- ['stack_h']=       {"Stack",           "DIFFICILE",   "Pack them!"},
         -- ['stack_u']=       {"Stack",           "ULTIME",      "Pack them!"},
         ['marathon_n']=    {"Marathon",        "NORMAL",      "Marathon de 200 lignes."},
         ['marathon_h']=    {"Marathon",        "DIFFICILE",   "Marathon de 200 lignes à très haute vitesse"},
@@ -664,9 +665,6 @@ return{
         ['master_final']=  {"Master",          "FINAL",       "20G : Un point final impossible à atteindre !"},
         -- ['master_ph']=  {"Mester",          "FANTASMA",       "20G: ???"},
         ['master_ex']=     {"GrandMaster",     "EXTRA",       "Tentez de devenir un Grandmaster."},
-        -- ['rhythm_e']=      {"Rhythm",          "EASY",        "200-line low-bpm rhythm marathon."},
-        -- ['rhythm_h']=      {"Rhythm",          "HARD",        "200-line medium-bpm rhythm marathon"},
-        -- ['rhythm_u']=      {"Rhythm",          "ULTIMATE",    "200-line high-bpm rhythm marathon."},
         ['blind_e']=       {"Aveugle",         "MOITIE",      "Pour les novices."},
         ['blind_n']=       {"Aveugle",         "TOUT",        "Pour les joueurs intermédiaires."},
         ['blind_h']=       {"Aveugle",         "SOUDAIN",     "Pour les bons jooeurs."},

parts/language/lang_pt.lua

@@ -177,12 +177,14 @@ return{
         "Isso é apenas um jogo de blocos, nada de especial.",
         "Joga como C2/IO/JS/WWC/KOS e outros.",
         "",
-        "Feito na Love 2D Engine",
+        "Feito na LÖVE 2D Engine",
         "Por favor mande bugs ou sugestões para o autor.",
         "certifique-se de pegar o jogo de fontes oficiais;",
         "binários obtidos em outros lugares pode conter malware.",
         "O autor não é responsável por qualquer binários modificados",
-        "O jogo é gratis, mas doações são apreciadas."
+        FNSF and"/"or"O jogo é gratis, mas doações são apreciadas.",
+        FNSF and"/"or"Se você não conseguir usar o WeChat Pay e o AliPay,",
+        FNSF and"/"or"pode acessar a página do P\97\116\114\111\110 para nos ajudar!",
     },
     staff={
         "Author: MrZ E-mail: 1046101471@qq.com",
@@ -212,7 +214,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="Support author",
-    group="Junte-se ao nosso Discord: discord.gg/f9pUvkh",
     WidgetText={
         main={
             offline="Solo",
@@ -305,7 +306,7 @@ return{
         net_game={
             -- ready="Ready",
             -- spectate="Spectate",
-            -- cancel="Cancel",
+            -- cancel="Cancel ready",
         },
         setting_game={
             title="Config. de jogo",
@@ -465,6 +466,7 @@ return{
             lock="Delay Trava",
             wait="Delay Entrada",
             fall="Delay Linha",
+            -- hang="Death Delay",
 
             bg="Fundo",
             bgm="Música",
@@ -668,7 +670,6 @@ return{
         ['drought_n']=          {"Drought",          "100L",         "Sem peça I !"},
         ['drought_l']=          {"Drought+",         "100L",         "WTF"},
         -- ['stack_e']=            {"Stack",            "FÁCIL",        "Pack them!"},
-        -- ['stack_h']=            {"Stack",            "DIFÍCIL",      "Pack them!"},
         -- ['stack_u']=            {"Stack",            "ULTIMATE",     "Pack them!"},
         ['marathon_n']=         {"Maratona",         "NORMAL",       "200-line Maratona com velocidade aumentando."},
         ['marathon_h']=         {"Maratona",         "DIFÍCIL",      "200-line Maratona com velocidade alta."},
@@ -694,9 +695,6 @@ return{
         ['master_final']=       {"Mestre",           "FINAL",        "20G: Final inalcançável!"},
         ['master_ph']=          {"Mestre",           "FANTASMA",     "20G: ???"},
         ['master_ex']=          {"GrandMaster",      "EXTRA",        "Para ser um Grand Master, aceite \nesse desafio."},
-        -- ['rhythm_e']=           {"Rhythm",           "EASY",         "200-line low-bpm rhythm marathon."},
-        -- ['rhythm_h']=           {"Rhythm",           "HARD",         "200-line medium-bpm rhythm marathon"},
-        -- ['rhythm_u']=           {"Rhythm",           "ULTIMATE",     "200-line high-bpm rhythm marathon."},
         ['blind_e']=            {"Cego",             "METADE",       "Para novatos."},
         ['blind_n']=            {"Cego",             "TUDO",         "Para intermediários."},
         ['blind_h']=            {"Cego",             "DE REPENTE",   "Para experientes."},
@@ -833,13 +831,16 @@ return{
         "Você pode escolher uma orientação pra cada blococan.",
         "ZS JL T O I",
         {C.C,"Tente também 15puzzle"},
+        {C.C,"Tente também Ballance!"},
+        {C.C,"Tente também Cubo de Rubik"},
         {C.C,"Tente também Minecraft"},
         {C.C,"Tente também Minesweeper"},
         {C.C,"Tente também osu!"},
         {C.C,"Tente também Phigros"},
-        {C.C,"Tente também Cubo de Rubik"},
         {C.C,"Tente também Terraria"},
         {C.C,"Tente também VVVVVV"},
+        {C.C,"Tente também World of goo!"},
+        {C.C,"Tente também Zuma!"},
         {C.F,"Tente também Cultris II"},
         {C.F,"Tente também Jstris"},
         {C.F,"Tente também Nullpomino"},

parts/language/lang_symbol.lua

@@ -1,6 +1,23 @@
 return{
     fallback='en',
 
+    loadText={
+        loadSFX="#!#",
+        loadSample="#~#",
+        loadVoice="#<()==)#",
+        loadFont="#Aa#",
+        loadModeIcon="#[ ]#",
+        loadMode="#[…]#",
+        loadOther="#…#",
+        finish="&",
+    },
+
+    sureQuit="X?",
+    sureReset="R?",
+    newDay="→→!→→",
+    playedLong="→→→→!, XX□XX!",
+    playedTooMuch="→→→→→→→→→→→!, XX□XX!!!!!!!",
+
     atkModeName={"?","(  )","!","←→"},
     royale_remain="$1 ~",
     cmb={nil,"!","!!","!!!","!!!!","!!!!!","!!!!!!","!!!!!!!","!!!!!!!!","!!!!!!!!!","!!!!!!!!!!","!!!!!!!!!!!","!!!!!!!!!!!!","!!!!!!!!!!!!!","!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!!!!",},
@@ -97,12 +114,15 @@ return{
         "□!!~~~,□□□□X",
         "□!!==*/*/*/*/*~",
         "",
-        "Powered by LÖVE",
-        "Any suggestions or bug reports are appreciated!",
-        "Make sure to only obtain the game from official sources;",
-        "We can't make sure you're safe if you got it elsewhere.",
-        "The author is not responsible for any modified binaries.",
-        "While the game is free, donations are appreciated."
+        "\\LÖVE/",
+        "(≡≡≡)/(XXX↑↑) : )",
+        "↓↓[=]↓↓ OK!",
+        "↓↓……↓↓(!!!)",
+        "MrZ XXX A→B",
+        "",
+        "□$X, ↑$↑ XD!",
+        "C0, 支 XXX,",
+        "|^O : )",
     },
     WidgetText={
         main={
@@ -351,6 +371,7 @@ return{
             lock="↓_",
             wait="→=",
             fall="↓=",
+            hang=":(=",
 
             bg="{~}",
             bgm="(~)",

parts/language/lang_yygq.lua

@@ -206,9 +206,6 @@ return{fallback='zh',
         ['dig_400l']=       {"挖掘",         "400L",     "挖400行"},
         ['drought_n']=      {"干旱",         "100L",     "放轻松,简单得很"},
         ['drought_l']=      {"干旱+",        "100L",     "有趣的要来了"},
-        ['stack_e']=        {"堆叠",         "简单",      "智力启蒙玩具(确信"},
-        ['stack_h']=        {"堆叠",         "困难",      "智力启蒙玩具(确信"},
-        ['stack_u']=        {"堆叠",         "极限",      "智力启蒙玩具(确信"},
         ['marathon_n']=     {"马拉松",       "普通",      "休闲模式"},
         ['marathon_h']=     {"马拉松",       "困难",      "休闲模式"},
         ['solo_e']=         {"单挑",         "简单",      "鲨AI"},
@@ -233,9 +230,6 @@ return{fallback='zh',
         ['master_final']=   {"大师",         "终点",      "真正的20G"},
         ['master_ph']=      {"大师",         "虚幻",      "好玩的20G"},
         ['master_ex']=      {"宗师",         "EX",      "考试20G"},
-        ['rhythm_e']=       {"节奏",         "简单",      "很无聊的"},
-        ['rhythm_h']=       {"节奏",         "困难",      "好玩么?"},
-        ['rhythm_u']=       {"节奏",         "极限",      "真男人不玩低难度"},
         ['blind_e']=        {"隐形",         "半隐",      "谁都能玩"},
         ['blind_n']=        {"隐形",         "全隐",      "稍加练习即可"},
         ['blind_h']=        {"隐形",         "瞬隐",      "和上一个一样"},

parts/language/lang_zh.lua

@@ -191,10 +191,12 @@ return{
         "",
         "使用LÖVE引擎",
         "错误或者建议请附带截图发送到内测群或者作者邮箱~",
-        "仅通过内测qq群/discord群进行免费下载/更新",
+        "仅通过官网 home.techmino.org 免费下载/更新",
         "其他渠道获得游戏皆有被修改/加广告/植入病毒的风险，程序只申请了振动&联网权限！",
-        "若由于被修改的本游戏产生的各种损失作者不负责(我怎么负责啊跟我有啥关系)",
-        "请从正规途径获得最新版，游戏现为免费，不过有打赏当然感谢啦~记得备注id，方便记录！",
+        "若由于被修改的本游戏产生的各种损失作者不负责(怎么负责啊我又没法管)",
+        FNSF and"/"or"请从正规途径获得最新版，游戏现为免费，不过有打赏当然感谢啦~",
+        FNSF and"/"or"记得备注id备注id备注id，不然可能会没法记录到赞助列表！",
+        FNSF and"/"or"你也可以去我们的P\97\116\114\111\110页面(链接见小Z词典)来支持我们！",
     },
     staff={
         "作者:MrZ  邮箱:1046101471@qq.com",
@@ -224,7 +226,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="支持作者",
-    group="官方QQ群:913154753",
     WidgetText={
         main={
             offline="单机游戏",
@@ -317,7 +318,7 @@ return{
         net_game={
             ready="准备",
             spectate="观战",
-            cancel="取消",
+            cancel="取消准备",
         },
         setting_game={
             title="游戏设置",
@@ -476,6 +477,7 @@ return{
             lock="锁定延迟",
             wait="出块等待",
             fall="消行延迟",
+            hang="窒息延迟",
 
             bg="背景",
             bgm="音乐",
@@ -681,9 +683,6 @@ return{
         ['dig_400l']=       {"挖掘",        "400L",     "挖掘400行"},
         ['drought_n']=      {"干旱",        "100L",     "你I没了"},
         ['drought_l']=      {"干旱+",       "100L",     "后 妈 发 牌"},
-        ['stack_e']=        {"堆积",        "简单",      "搭积木"},
-        ['stack_h']=        {"堆积",        "困难",      "搭积木"},
-        ['stack_u']=        {"堆积",        "极限",      "搭积木"},
         ['marathon_n']=     {"马拉松",       "普通",      "200行加速马拉松"},
         ['marathon_h']=     {"马拉松",       "困难",      "200行高速马拉松"},
         ['solo_e']=         {"单挑",        "简单",      "打败AI"},
@@ -708,9 +707,6 @@ return{
         ['master_final']=   {"大师",        "终点",      "究极20G:无法触及的终点"},
         ['master_ph']=      {"大师",        "虚幻",      "虚幻20G:？？？"},
         ['master_ex']=      {"宗师",        "EX",       "成为方块大师"},
-        ['rhythm_e']=       {"节奏",        "简单",      "200行低速节奏马拉松"},
-        ['rhythm_h']=       {"节奏",        "困难",      "200行中速节奏马拉松"},
-        ['rhythm_u']=       {"节奏",        "极限",      "200行高速节奏马拉松"},
         ['blind_e']=        {"隐形",        "半隐",      "不强大脑"},
         ['blind_n']=        {"隐形",        "全隐",      "挺强大脑"},
         ['blind_h']=        {"隐形",        "瞬隐",      "很强大脑"},
@@ -936,7 +932,7 @@ return{
         "请勿大力敲打设备！敲坏了就没有Techmino玩了",
         "请勿使用三只手游玩",
         "去玩别的方块的时候记得没有Ospin！",
-        "全球应该没人能全S评价(大爆炸不算)",
+        "全球目前应该没人能全X评价(大爆炸不算)",
         "群友翻译的中文方块百科全书！ tetris.huijiwiki.com",
         "让他三尺又何妨",
         "如何O-spin: 一秒转626圈(误",
@@ -1092,10 +1088,11 @@ return{
         "Z块等身抱枕来一个(x",
         {C.C,"<PURE ",C.P,"MEMORY>"},
         {C.C,"15puzzle好玩！"},
-        {C.C,"东方Project，好玩！"},
+        {C.C,"东方Project好玩！"},
         {C.C,"魔方好玩！"},
         {C.C,"噗哟噗哟好玩！"},
         {C.C,"扫雷好玩！"},
+        {C.C,"Ballance好玩！"},
         {C.C,"Celeste好玩！"},
         {C.C,"Minecraft好玩！"},
         {C.C,"Orzmic好玩！"},
@@ -1103,6 +1100,8 @@ return{
         {C.C,"Phigros好玩！"},
         {C.C,"Terraria好玩！"},
         {C.C,"VVVVVV好玩！"},
+        {C.C,"World of goo好玩！"},
+        {C.C,"Zuma好玩！"},
         {C.H,"暂定段位:9"},
         {C.H,"REGRET!!"},
         {C.lC,"Xspin",C.Z,"是啥"},

parts/language/lang_zh_full.lua

@@ -95,9 +95,6 @@ return{
         ['dig_400l']=       {"挖掘",        "400L",     "挖掘400行"},
         ['drought_n']=      {"干旱",        "100行",     "你I没了"},
         ['drought_l']=      {"干旱+",       "100行",     "后 妈 发 牌"},
-        ['stack_e']=        {"堆积",        "简单",      "搭积木"},
-        ['stack_h']=        {"堆积",        "困难",      "搭积木"},
-        ['stack_u']=        {"堆积",        "极限",      "搭积木"},
         ['marathon_n']=     {"马拉松",       "普通",      "200行加速马拉松"},
         ['marathon_h']=     {"马拉松",       "困难",      "200行高速马拉松"},
         ['solo_e']=         {"单挑",        "简单",      "打败机器人"},
@@ -122,9 +119,6 @@ return{
         ['master_final']=   {"大师",        "终点",      "究极20G:无法触及的终点"},
         ['master_ph']=      {"大师",        "虚幻",      "虚幻20G:???"},
         ['master_ex']=      {"宗师",        "EX",       "成为方块大师"},
-        ['rhythm_e']=       {"节奏",        "简单",      "200行低速节奏马拉松"},
-        ['rhythm_h']=       {"节奏",        "困难",      "200行中速节奏马拉松"},
-        ['rhythm_u']=       {"节奏",        "极限",      "200行高速节奏马拉松"},
         ['blind_e']=        {"隐形",        "半隐",      "不强大脑"},
         ['blind_n']=        {"隐形",        "全隐",      "挺强大脑"},
         ['blind_h']=        {"隐形",        "瞬隐",      "很强大脑"},

parts/language/lang_zh_grass.lua

@@ -1,4 +1,3 @@
-local C=COLOR
 return{
     fallback='zh',
     loadText={
@@ -194,6 +193,7 @@ return{
         "因为如果你在别处找到它，我们无法确保你的安全",
         "作者不对任何修改负责",
         "虽然游戏是免费的，但我们会感谢捐赠.",
+        "如果您无法同时使用我们的聊天支付和阿里支付，你可以去我们的P\97\116\114\111\110页面（连接到四联词典）支持我们！",
     },
     staff={
         "作者:Z先生  邮箱:1046101471@qq.com",
@@ -223,7 +223,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="供养作者！",
-    group="加入我们的不谐和:不谐和.gg/f9pUvkh",
     WidgetText={
         main={
             offline="单人",
@@ -316,7 +315,7 @@ return{
         net_game={
             ready="准备好的",
             spectate="凝视",
-            cancel="取消",
+            cancel="取消准备",
         },
         setting_game={
             title="游戏设置",
@@ -476,6 +475,7 @@ return{
             lock="锁定延迟",
             wait="进入延迟",
             fall="线路延迟",
+            hang="毁灭延迟",
 
             bg="背景",
             bgm="音乐",
@@ -678,9 +678,6 @@ return{
         ['dig_400l']=      {"挖掘",            "400升",       "挖400条垃圾线"},
         ['drought_n']=     {"干旱",            "100升",       "没有工装"},
         ['drought_l']=     {"干旱+",           "100升",       "搞什么呀"},
-        ['stack_e']=       {"堆栈",            "容易",         "打包！"},
-        ['stack_h']=       {"堆栈",            "硬的",         "打包！"},
-        ['stack_u']=       {"堆栈",            "终极",         "打包！"},
         ['marathon_n']=    {"马拉松赛跑",        "正常",         "200线加速马拉松"},
         ['marathon_h']=    {"马拉松赛跑",        "硬的",         "200线高速马拉松"},
         ['solo_e']=        {"战争",            "容易",         "打败AI！"},
@@ -705,9 +702,6 @@ return{
         ['master_final']=  {"主人",            "最终",         "20G及以上"},
         ['master_ph']=     {"主人",            "幻觉",         "？？？"},
         ['master_ex']=     {"大师",            "额外的",        "比瞬间还短的永恒"},
-        ['rhythm_e']=      {"节奏",            "容易",         "200线低节奏马拉松"},
-        ['rhythm_h']=      {"节奏",            "硬的",         "200线中等节奏马拉松"},
-        ['rhythm_u']=      {"节奏",            "终极",         "200线高节奏马拉松"},
         ['blind_e']=       {"看不见的",         "一半",         "对于新手来说"},
         ['blind_n']=       {"看不见的",         "全部",         "对于中间产品"},
         ['blind_h']=       {"看不见的",         "突然",         "对于有经验的人"},

parts/language/lang_zh_trad.lua

@@ -194,7 +194,8 @@ return{
         "僅透過內測QQ群/discord伺服器進行免費下載/更新",
         "從其他渠道獲得遊戲皆有被修改/加入廣告/植入病毒的風險，程序只申請了振動&網路權限！",
         "若由於被修改的本遊戲產生的各種損失作者概不負責（我怎麼負責啊跟我有什麼關係）",
-        "請從正規途徑獲得最新版，遊戲現為免費，不過有讚賞當然感謝啦~ 記得備註用戶名，方便記錄！",
+        FNSF and"/"or"請從正規途徑獲得最新版，遊戲現為免費，不過有讚賞當然感謝啦~ 記得備註用戶名，方便記錄！",
+        FNSF and"/"or"如果你不使用微信或支付寶，你可以前往我們的P\97\116\114\111\110頁面來贊助我們！"
     },
     staff={
         "作者:MrZ  電郵:1046101471@qq.com",
@@ -224,7 +225,6 @@ return{
         simple-love-lights [dylhunn]
     ]],
     support="支持作者",
-    group="官方QQ群:913154753",
     WidgetText={
         main={
             offline="單人遊戲",
@@ -317,7 +317,7 @@ return{
         net_game={
             ready="準備",
             spectate="觀賽",
-            cancel="取消",
+            cancel="取消準備",
         },
         setting_game={
             title="遊戲設置",
@@ -476,6 +476,7 @@ return{
             lock="鎖定延遲",
             wait="方塊生成等待",
             fall="行清除延遲",
+            hang="死亡延遲",
 
             bg="背景",
             bgm="音樂",
@@ -681,9 +682,6 @@ return{
         ['dig_400l']=       {"挖掘",        "400L",     "挖掘400行"},
         ['drought_n']=      {"乾旱",        "100L",     "你I沒了"},
         ['drought_l']=      {"乾旱+",       "100L",     "後 媽 發 牌"},
-        ['stack_e']=        {"堆疊",        "簡單",      "搭積木"},
-        ['stack_h']=        {"堆疊",        "困難",      "搭積木"},
-        ['stack_u']=        {"堆疊",        "極限",      "搭積木"},
         ['marathon_n']=     {"馬拉松",       "普通",      "200行加速馬拉松"},
         ['marathon_h']=     {"馬拉松",       "困難",      "200行高速馬拉松"},
         ['solo_e']=         {"單挑",        "簡單",      "打敗AI"},
@@ -708,9 +706,6 @@ return{
         ['master_final']=   {"大師",        "究極",      "究極20G:無法觸及的終點"},
         ['master_ph']=      {"大師",        "虛幻",      "虛幻20G:？？？"},
         ['master_ex']=      {"宗師",        "EX",       "成為方塊大師"},
-        ['rhythm_e']=       {"節奏",        "簡單",      "200行低速節奏馬拉松"},
-        ['rhythm_h']=       {"節奏",        "困難",      "200行中速節奏馬拉松"},
-        ['rhythm_u']=       {"節奏",        "極限",      "200行高速節奏馬拉松"},
         ['blind_e']=        {"隱形",        "半隱",      "不強大腦"},
         ['blind_n']=        {"隱形",        "全隱",      "挺強大腦"},
         ['blind_h']=        {"隱形",        "瞬隱",      "很強大腦"},

parts/line.lua

@@ -0,0 +1,22 @@
+local LINE={}
+local L={}--Storage
+local len=0--Length
+function LINE.new(val,isGarbage)
+    if len==0 then
+        for i=1,10 do
+            L[i]={0,0,0,0,0,0,0,0,0,0,garbage=false}
+        end
+        len=len+10
+    end
+    local t=L[len]
+    for i=1,10 do t[i]=val end
+    t.garbage=isGarbage==true
+    L[len]=nil
+    len=len-1
+    return t
+end
+function LINE.discard(t)
+    len=len+1
+    L[len]=t
+end
+return LINE

parts/modes.lua

@@ -1,7 +1,7 @@
 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','stack_e'}},
+    {name='sprint_40l',    x=0,         y=-300,     size=40,shape=1,icon="sprint2",     unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH'}},
     {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"},
@@ -12,16 +12,12 @@ return{
     {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"},
 
-    {name='stack_e',       x=-200,      y=-400,     size=40,shape=1,icon="mess",        unlock={'stack_h'}},
-    {name='stack_h',       x=-400,      y=-400,     size=40,shape=1,icon="mess",        unlock={'stack_u'}},
-    {name='stack_u',       x=-600,      y=-400,     size=40,shape=1,icon="mess"},
-
     {name='dig_10l',       x=-200,      y=-200,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_40l'}},
     {name='dig_40l',       x=-400,      y=-200,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_100l'}},
     {name='dig_100l',      x=-600,      y=-200,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_400l'}},
     {name='dig_400l',      x=-800,      y=-200,     size=40,shape=1,icon="dig_sprint"},
 
-    {name='marathon_n',    x=0,         y=-600,     size=60,shape=1,icon="marathon",    unlock={'marathon_h','rhythm_e','solo_e','round_e','blind_e','classic_e','survivor_e','bigbang','zen'}},
+    {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','bigbang','zen'}},
     {name='marathon_h',    x=0,         y=-800,     size=50,shape=1,icon="marathon",    unlock={'master_n'}},
 
     {name='solo_e',        x=-600,      y=-1000,    size=40,shape=1,icon="solo",        unlock={'solo_n'}},
@@ -50,10 +46,6 @@ return{
     {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='rhythm_e',      x=-350,      y=-1000,    size=40,shape=1,icon="rhythm",      unlock={'rhythm_h'}},
-    {name='rhythm_h',      x=-350,      y=-1200,    size=40,shape=3,icon="rhythm",      unlock={'rhythm_u'}},
-    {name='rhythm_u',      x=-350,      y=-1400,    size=40,shape=2,icon="rhythm"},
-
     {name='blind_e',       x=150,       y=-700,     size=40,shape=1,icon="hidden",      unlock={'blind_n'}},
     {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'}},
@@ -61,9 +53,9 @@ return{
     {name='blind_u',       x=150,       y=-1100,    size=30,shape=3,icon="hidden",      unlock={'blind_wtf'}},
     {name='blind_wtf',     x=150,       y=-1200,    size=25,shape=2,icon="hidden"},
 
-    {name='classic_e',     x=-150,      y=-850,     size=40,shape=1,icon="classic",     unlock={'classic_h'}},
-    {name='classic_h',     x=-150,      y=-970,     size=35,shape=2,icon="classic",     unlock={'classic_u'}},
-    {name='classic_u',     x=-150,      y=-1090,    size=30,shape=2,icon="classic"},
+    {name='classic_e',     x=-170,      y=-850,     size=40,shape=1,icon="classic",     unlock={'classic_h'}},
+    {name='classic_h',     x=-180,      y=-1000,     size=35,shape=2,icon="classic",     unlock={'classic_u'}},
+    {name='classic_u',     x=-190,      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'}},

parts/modes/attacker_h.lua

@@ -1,5 +1,4 @@
 return{
-    color=COLOR.magenta,
     env={
         drop=30,lock=60,
         fall=12,

parts/modes/attacker_u.lua

@@ -1,5 +1,4 @@
 return{
-    color=COLOR.lYellow,
     env={
         drop=5,lock=60,
         fall=8,

parts/modes/backfire_h.lua

@@ -1,11 +1,10 @@
 return{
-    color=COLOR.magenta,
     env={
         drop=10,lock=60,
         freshLimit=15,
-        dropPiece={
-            require'parts.eventsets.backfire_60'.dropPiece,
-            require'parts.eventsets.checkAttack_100'.dropPiece,
+        hook_drop={
+            require'parts.eventsets.backfire_60'.hook_drop,
+            require'parts.eventsets.checkAttack_100'.hook_drop,
         },
         mesDisp=function(P)
             setFont(60)

parts/modes/backfire_l.lua

@@ -1,11 +1,10 @@
 return{
-    color=COLOR.red,
     env={
         drop=5,lock=45,
         freshLimit=15,
-        dropPiece={
-            require'parts.eventsets.backfire_30'.dropPiece,
-            require'parts.eventsets.checkAttack_100'.dropPiece,
+        hook_drop={
+            require'parts.eventsets.backfire_30'.hook_drop,
+            require'parts.eventsets.checkAttack_100'.hook_drop,
         },
         mesDisp=function(P)
             setFont(60)