版本推进

* 更新LST堆叠的链接

* link fix in LST Stacking

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_1.md

@@ -1,8 +1,8 @@
 ---
 name: Bug report (bluescreen crash) Bug报告 (蓝屏报错)
-about: Create a report of problems which made the crash with a bluescreen
+about: Create a bug report which causes a bluescreen crash
 ---
 Screenshot with crash information (*Image(s) Here*):
 
 
-If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button (*Details Here*)
+If you can reproduce it, write the steps here. If you can't, try to describe what causes the game to crash, like pressing a key/button (*Details Here*)

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_2.md

@@ -1,8 +1,8 @@
 ---
 name: Bug report (unintended behaviors) Bug报告 (奇怪的现象)
-about: Create a report of unintended behaviors
+about: Create bug report that causes unintended behaviors
 ---
 Screenshot with unintended behaviors (*Image(s) Here*):
 
 
-If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button (*Details Here*):
+If you can reproduce it, write the steps here. If you can't, try to describe what causes the unintended behavior, like pressing a key/button (*Details Here*):

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_3.md

@@ -2,3 +2,7 @@
 name: Feature Request 添加新功能
 about: Suggest an idea that may improve Techmino 提一些有意思的新想法,让Techmino越来越好!
 ---
+### What feature do you want to suggest to the game?
+
+
+

Zframework/bgm.lua

@@ -1,44 +1,17 @@
 local lastLoaded={}
 local maxLoadedCount=3
+local nameList={}
 local SourceObjList={}
 local volume=1
 
 local BGM={
     default=false,
-    getList=function()error("Cannot getList before initialize!")end,
-    getCount=function()return 0 end,
-    play=NULL,
-    stop=NULL,
     onChange=NULL,
     --nowPlay=[str:playing ID]
     --playing=[src:playing SRC]
     --lastPlayed=[str:lastPlayed ID]
 }
-local function task_fadeOut(src)
-    while true do
-        coroutine.yield()
-        local v=src:getVolume()-.025*volume
-        src:setVolume(v>0 and v or 0)
-        if v<=0 then
-            src:pause()
-            return true
-        end
-    end
-end
-local function task_fadeIn(src)
-    while true do
-        coroutine.yield()
-        local v=volume
-        v=math.min(v,src:getVolume()+.025*v)
-        src:setVolume(v)
-        if v>=volume then
-            return true
-        end
-    end
-end
-local function check_curFadeOut(task,code,src)
-    return task.code==code and task.args[1]==src
-end
+
 local function _tryReleaseSources()
     local n=#lastLoaded
     while #lastLoaded>maxLoadedCount do
@@ -53,6 +26,27 @@ local function _tryReleaseSources()
         end
     end
 end
+local function _addFile(name,path)
+    if not SourceObjList[name]then
+        table.insert(nameList,name)
+        SourceObjList[name]={path=path,source=false}
+    end
+end
+
+function BGM.getList()return nameList end
+function BGM.getCount()return #nameList end
+function BGM.load(name,path)
+    if type(name)=='table'then
+        for k,v in next,name do
+            _addFile(k,v)
+        end
+    else
+        _addFile(name,path)
+    end
+    table.sort(nameList)
+    LOG(BGM.getCount().." BGM files added")
+end
+
 function BGM.setDefault(bgm)
     BGM.default=bgm
 end
@@ -75,85 +69,114 @@ function BGM.setVol(v)
         end
     end
 end
-function BGM.init(list)
-    BGM.init=nil
 
-    local simpList={}
-    for _,v in next,list do
-        table.insert(simpList,v.name)
-        SourceObjList[v.name]={path=v.path,source=false}
-    end
-    table.sort(simpList)
-    function BGM.getList()return simpList end
-    local count=#simpList
-    LOG(count.." BGM files added")
-    function BGM.getCount()return count end
-
-    local function _tryLoad(name)
-        if SourceObjList[name]then
-            if SourceObjList[name].source then
-                return true
-            elseif love.filesystem.getInfo(SourceObjList[name].path)then
-                SourceObjList[name].source=love.audio.newSource(SourceObjList[name].path,'stream')
-                SourceObjList[name].source:setLooping(true)
-                SourceObjList[name].source:setVolume(0)
-                table.insert(lastLoaded,1,name)
-                _tryReleaseSources()
-                return true
-            else
-                LOG("No BGM: "..SourceObjList[name],5)
-            end
-        elseif name then
-            LOG("No BGM: "..name,5)
+local function task_fadeOut(src)
+    while true do
+        coroutine.yield()
+        local v=src:getVolume()-volume/40
+        src:setVolume(v>0 and v or 0)
+        if v<=0 then
+            src:stop()
+            return true
         end
     end
-    function BGM.play(name)
-        name=name or BGM.default
-        if not _tryLoad(name)then return end
-        if volume==0 then
+end
+local function task_fadeIn(src)
+    while true do
+        coroutine.yield()
+        local v=volume
+        v=math.min(v,src:getVolume()+v/40)
+        src:setVolume(v)
+        if v>=volume then
+            return true
+        end
+    end
+end
+local function check_curFadeOut(task,code,src)
+    return task.code==code and task.args[1]==src
+end
+local function _tryLoad(name)
+    if SourceObjList[name]then
+        if SourceObjList[name].source then
+            return true
+        elseif love.filesystem.getInfo(SourceObjList[name].path)then
+            SourceObjList[name].source=love.audio.newSource(SourceObjList[name].path,'stream')
+            SourceObjList[name].source:setVolume(0)
+            table.insert(lastLoaded,1,name)
+            _tryReleaseSources()
+            return true
+        else
+            LOG("No BGM: "..SourceObjList[name],5)
+        end
+    elseif name then
+        LOG("No BGM: "..name,5)
+    end
+end
+function BGM.play(name,args)
+    name=name or BGM.default
+    args=args or""
+    if not _tryLoad(name)or args:sArg('-preLoad')then return end
+    if volume==0 then
+        BGM.nowPlay=name
+        BGM.playing=SourceObjList[name].source
+        return true
+    end
+    if name and SourceObjList[name].source then
+        if BGM.nowPlay~=name then
+            if BGM.nowPlay then
+                if not args:sArg('-sdout')then
+                    TASK.new(task_fadeOut,BGM.playing)
+                else
+                    BGM.playing:pause()
+                end
+            end
+            TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,SourceObjList[name].source)
+            TASK.removeTask_code(task_fadeIn)
+
             BGM.nowPlay=name
             BGM.playing=SourceObjList[name].source
-            return true
-        end
-        if name and SourceObjList[name].source then
-            if BGM.nowPlay~=name then
-                if BGM.nowPlay then
-                    TASK.new(task_fadeOut,BGM.playing)
-                end
-                TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,SourceObjList[name].source)
-                TASK.removeTask_code(task_fadeIn)
-
-                TASK.new(task_fadeIn,SourceObjList[name].source)
-                BGM.nowPlay=name
-                BGM.playing=SourceObjList[name].source
-                BGM.lastPlayed=BGM.nowPlay
-                BGM.playing:seek(0)
+            if not args:sArg('-sdin')then
+                BGM.playing:setVolume(0)
+                TASK.new(task_fadeIn,BGM.playing)
+            else
+                BGM.playing:setVolume(volume)
                 BGM.playing:play()
-                BGM.onChange(name)
             end
-            return true
-        end
-    end
-    function BGM.seek(t)
-        if BGM.playing then
-            BGM.playing:seek(t)
-        end
-    end
-    function BGM.continue()
-        if BGM.lastPlayed then
-            BGM.nowPlay,BGM.playing=BGM.lastPlayed,SourceObjList[BGM.lastPlayed].source
-            TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,SourceObjList[BGM.nowPlay].source)
-            TASK.removeTask_code(task_fadeIn)
-            TASK.new(task_fadeIn,BGM.playing)
+            SourceObjList[name].source:setLooping(not args:sArg('-noloop'))
+            BGM.lastPlayed=BGM.nowPlay
             BGM.playing:play()
+            BGM.onChange(name)
         end
+        return true
     end
-    function BGM.stop()
+end
+function BGM.seek(t)
+    if BGM.playing then
+        BGM.playing:seek(t)
+    end
+end
+function BGM.isPlaying()
+    return BGM.playing and BGM.playing:isPlaying()
+end
+function BGM.continue()
+    if BGM.lastPlayed then
+        BGM.nowPlay,BGM.playing=BGM.lastPlayed,SourceObjList[BGM.lastPlayed].source
+        TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,SourceObjList[BGM.nowPlay].source)
         TASK.removeTask_code(task_fadeIn)
+        TASK.new(task_fadeIn,BGM.playing)
+        BGM.playing:play()
+    end
+end
+function BGM.stop(args)
+    args=args or""
+    TASK.removeTask_code(task_fadeIn)
+    if not args:sArg('-s')then
         if BGM.nowPlay then
             TASK.new(task_fadeOut,BGM.playing)
         end
-        BGM.nowPlay,BGM.playing=nil
+    elseif BGM.playing then
+        BGM.playing:pause()
     end
+    BGM.nowPlay,BGM.playing=nil
 end
 return BGM

Zframework/color.lua

@@ -19,11 +19,11 @@ local COLOR={
     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)},
+    yellow=     {hsv(0.15, 0.82, 0.90)},
+    lime=       {hsv(0.20, 0.89, 0.88)},
+    jade=       {hsv(0.25, 1.00, 0.82)},
     green=      {hsv(0.33, 1.00, 0.81)},
-    aqua=       {hsv(0.48, 1.00, 0.74)},
+    aqua=       {hsv(0.47, 1.00, 0.76)},
     cyan=       {hsv(0.53, 1.00, 0.88)},
     navy=       {hsv(0.56, 1.00, 1.00)},
     sea=        {hsv(0.61, 1.00, 1.00)},
@@ -36,14 +36,14 @@ local COLOR={
     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)},
+    lYellow=    {hsv(0.14, 0.61, 0.95)},
+    lLime=      {hsv(0.20, 0.66, 0.92)},
+    lJade=      {hsv(0.26, 0.56, 0.90)},
     lGreen=     {hsv(0.34, 0.49, 0.89)},
-    lAqua=      {hsv(0.49, 0.59, 0.85)},
+    lAqua=      {hsv(0.47, 0.59, 0.86)},
     lCyan=      {hsv(0.51, 0.77, 0.88)},
     lNavy=      {hsv(0.54, 0.80, 0.95)},
-    lSea=       {hsv(0.56, 0.72, 0.97)},
+    lSea=       {hsv(0.57, 0.72, 0.97)},
     lBlue=      {hsv(0.64, 0.44, 0.96)},
     lViolet=    {hsv(0.72, 0.47, 0.95)},
     lPurple=    {hsv(0.80, 0.62, 0.89)},
@@ -53,13 +53,13 @@ local COLOR={
     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)},
+    dYellow=    {hsv(0.12, 0.80, 0.37)},
+    dLime=      {hsv(0.20, 0.80, 0.26)},
+    dJade=      {hsv(0.29, 0.80, 0.27)},
     dGreen=     {hsv(0.33, 0.80, 0.26)},
-    dAqua=      {hsv(0.47, 0.80, 0.23)},
+    dAqua=      {hsv(0.46, 0.80, 0.24)},
     dCyan=      {hsv(0.50, 0.80, 0.30)},
-    dNavy=      {hsv(0.59, 0.80, 0.42)},
+    dNavy=      {hsv(0.58, 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)},

Zframework/file.lua

@@ -6,22 +6,38 @@ function FILE.load(name,args)
         local F=fs.newFile(name)
         assert(F:open'r','open error')
         local s=F:read()F:close()
-        if args:sArg'-luaon'or args==''and s:sub(1,6)=='return{'then
-            local func=loadstring(s)
+        local mode=
+            STRING.sArg(args,'-luaon')and'luaon'or
+            STRING.sArg(args,'-lua')and'lua'or
+            STRING.sArg(args,'-json')and'json'or
+            STRING.sArg(args,'-string')and'string'or
+            s:sub(1,6)=='return{'and'luaon'or
+            (s:sub(1,1)=='['and s:sub(-1)==']'or s:sub(1,1)=='{'and s:sub(-1)=='}')and'json'or
+            'string'
+        if mode=='luaon'then
+            local func,err_mes=loadstring(s)
             if func then
                 setfenv(func,{})
                 local res=func()
                 return assert(res,'decode error')
             else
-                error('decode error')
+                error('decode error: '..err_mes)
             end
-        elseif args:sArg'-json'or args==''and s:sub(1,1)=='['and s:sub(-1)==']'or s:sub(1,1)=='{'and s:sub(-1)=='}'then
+        elseif mode=='lua'then
+            local func,err_mes=loadstring(s)
+            if func then
+                local res=func()
+                return assert(res,'run error')
+            else
+                error('compile error: '..err_mes)
+            end
+        elseif mode=='json'then
             local res=JSON.decode(s)
             if res then
                 return res
             end
             error('decode error')
-        elseif args:sArg'-string'or args==''then
+        elseif mode=='string'then
             return s
         else
             error('unknown mode')
@@ -32,12 +48,12 @@ function FILE.load(name,args)
 end
 function FILE.save(data,name,args)
     if not args then args=''end
-    if args:sArg'-d'and fs.getInfo(name)then
+    if STRING.sArg(args,'-d')and fs.getInfo(name)then
         error('duplicate')
     end
 
     if type(data)=='table'then
-        if args:sArg'-luaon'then
+        if STRING.sArg(args,'-luaon')then
             data=TABLE.dump(data)
             if not data then
                 error('encode error')

Zframework/font.lua

@@ -18,7 +18,7 @@ function FONT.rawset(s)
 end
 function FONT.load(fonts)
     for name,path in next,fonts do
-        assert(love.filesystem.getInfo(path),("Font file $1($2) not exist!"):repD(name,path))
+        assert(love.filesystem.getInfo(path),STRING.repD("Font file $1($2) not exist!",name,path))
         fontFiles[name]=love.filesystem.newFile(path)
         fontCache[name]={}
     end

Zframework/image.lua

@@ -2,7 +2,6 @@ local IMG={}
 function IMG.init(list)
     IMG.init=nil
 
-    local null=love.graphics.newCanvas(1,1)
     setmetatable(IMG,{__index=function(self,name)
         if type(list[name])=='table'then
             self[name]={}
@@ -13,7 +12,7 @@ function IMG.init(list)
             self[name]=love.graphics.newImage(list[name])
         else
             LOG("No IMG: "..name)
-            self[name]=null
+            self[name]=PAPER
         end
         return self[name]
     end})

Zframework/init.lua

@@ -1,4 +1,4 @@
-NONE={}function NULL()end
+NONE={}function NULL()end PAPER=love.graphics.newCanvas(1,1)
 EDITING=""
 LOADED=false
 
@@ -70,15 +70,26 @@ local gc_draw,gc_line,gc_circle,gc_print=gc.draw,gc.line,gc.circle,gc.print
 
 local WIDGET,SCR,SCN=WIDGET,SCR,SCN
 local xOy=SCR.xOy
-
 local ITP=xOy.inverseTransformPoint
+
 local max,min=math.max,math.min
 
+local devMode
 local mx,my,mouseShow,cursorSpd=640,360,false,0
 local jsState={}--map, joystickID->axisStates: {axisName->axisVal}
 local errData={}--list, each error create {mes={errMes strings},scene=sceneNameStr}
 
-local devMode
+local function drawCursor(_,x,y)
+    gc_setColor(1,1,1)
+    gc_setLineWidth(2)
+    gc_circle(ms.isDown(1)and'fill'or'line',x,y,6)
+end
+local showPowerInfo=true
+local showClickFX=true
+local discardCanvas=false
+local frameMul=100
+local sleepInterval=1/60
+local onQuit=NULL
 
 local batteryImg=GC.DO{31,20,
     {'fRect',1,0,26,2},
@@ -96,17 +107,16 @@ local function updatePowerInfo()
     gc_clear(0,0,0,.25)
     if state~='unknown'then
         gc_setLineWidth(4)
-        local charging=state=='charging'
         if state=='nobattery'then
             gc_setColor(1,1,1)
             gc_setLineWidth(2)
-            gc_line(74,SCR.safeX+5,100,22)
+            gc_line(74,5,100,22)
         elseif pow then
-            if charging then    gc_setColor(0,1,0)
-            elseif pow>50 then  gc_setColor(1,1,1)
-            elseif pow>26 then  gc_setColor(1,1,0)
-            elseif pow==26 then gc_setColor(.5,0,1)
-            else                gc_setColor(1,0,0)
+            if state=='charging'then gc_setColor(0,1,0)
+            elseif pow>50 then       gc_setColor(1,1,1)
+            elseif pow>26 then       gc_setColor(1,1,0)
+            elseif pow==26 then      gc_setColor(.5,0,1)
+            else                     gc_setColor(1,0,0)
             end
             gc.rectangle('fill',76,6,pow*.22,14)
             if pow<100 then
@@ -152,7 +162,7 @@ local function _triggerMouseDown(x,y,k)
     if SCN.mouseDown then SCN.mouseDown(x,y,k)end
     WIDGET.press(x,y,k)
     lastX,lastY=x,y
-    if SETTING.clickFX then SYSFX.newTap(3,x,y)end
+    if showClickFX then SYSFX.newTap(3,x,y)end
 end
 local function mouse_update(dt)
     if not KBisDown('lctrl','rctrl')and KBisDown('up','down','left','right')then
@@ -238,13 +248,13 @@ function love.touchpressed(id,x,y)
     x,y=ITP(xOy,x,y)
     lastX,lastY=x,y
     WIDGET.cursorMove(x,y)
-    if SCN.touchDown then SCN.touchDown(x,y)end
+    if SCN.touchDown then SCN.touchDown(x,y,id)end
     if kb.hasTextInput()then kb.setTextInput(false)end
 end
-function love.touchmoved(_,x,y,dx,dy)
+function love.touchmoved(id,x,y,dx,dy)
     if SCN.swapping then return end
     x,y=ITP(xOy,x,y)
-    if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k)end
+    if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k,id)end
     WIDGET.drag(x,y,dx/SCR.k,dy/SCR.k)
 end
 function love.touchreleased(id,x,y)
@@ -257,10 +267,10 @@ function love.touchreleased(id,x,y)
         WIDGET.unFocus()
         SCN.mainTouchID=false
     end
-    if SCN.touchUp then SCN.touchUp(x,y)end
+    if SCN.touchUp then SCN.touchUp(x,y,id)end
     if(x-lastX)^2+(y-lastY)^2<62 then
         if SCN.touchClick then SCN.touchClick(x,y)end
-        if SETTING.clickFX then SYSFX.newTap(3,x,y)end
+        if showClickFX then SYSFX.newTap(3,x,y)end
     end
 end
 
@@ -309,7 +319,7 @@ function love.keypressed(key,_,isRep)
         MES.new('info',"DEBUG ON",.2)
     elseif key=='f11'then
         SETTING.fullscreen=not SETTING.fullscreen
-        applyFullscreen()
+        applySettings()
         saveSettings()
     elseif not SCN.swapping then
         if EDITING==""and(not SCN.keyDown or SCN.keyDown(key,isRep))then
@@ -324,7 +334,7 @@ function love.keypressed(key,_,isRep)
             elseif key=='space'or key=='return'then
                 mouseShow=true
                 if not isRep then
-                    if SETTING.clickFX then SYSFX.newTap(3,mx,my)end
+                    if showClickFX then SYSFX.newTap(3,mx,my)end
                     _triggerMouseDown(mx,my,1)
                 end
             else
@@ -397,7 +407,7 @@ function love.joystickremoved(JS)
     end
 end
 function love.gamepadaxis(JS,axis,val)
-    if JS==jsState[1]._jsObj then
+    if jsState[1]and JS==jsState[1]._jsObj then
         local js=jsState[1]
         if axis=='leftx'or axis=='lefty'or axis=='rightx'or axis=='righty'then
             local newVal=--range: [0,1]
@@ -452,7 +462,7 @@ function love.gamepadpressed(_,key)
                 if W and W.arrowKey then W:arrowKey(key)end
             elseif key=='return'then
                 mouseShow=true
-                if SETTING.clickFX then SYSFX.newTap(3,mx,my)end
+                if showClickFX then SYSFX.newTap(3,mx,my)end
                 _triggerMouseDown(mx,my,1)
             else
                 if W and W.keypress then
@@ -481,14 +491,16 @@ function love.lowmemory()
         MES.new('check',"[auto GC] low MEM 设备内存过低")
     end
 end
+
+local onResize=NULL
 function love.resize(w,h)
+    if SCR.w==w and SCR.h==h then return end
     SCR.resize(w,h)
     if BG.resize then BG.resize(w,h)end
     if SCN.resize then SCN.resize(w,h)end
     WIDGET.resize(w,h)
     FONT.reset()
-
-    SHADER.warning:send('w',w*SCR.dpi)
+    onResize(w,h)
 end
 
 local onFocus=NULL
@@ -627,14 +639,9 @@ local wsImg={}do
     }
 end
 
-local function drawCursor(_,x,y)
-    gc_setColor(1,1,1)
-    gc_setLineWidth(2)
-    gc_circle(ms.isDown(1)and'fill'or'line',x,y,6)
-end
-local function showPowerInfo()return true end
-local onQuit=NULL
-
+local debugInfos={
+    {"Cache",gcinfo},
+}
 function love.run()
     local love=love
 
@@ -649,7 +656,7 @@ function love.run()
     local FPS,MINI=love.timer.getFPS,love.window.isMinimized
     local PUMP,POLL=love.event.pump,love.event.poll
 
-    local timer,SETTING,VERSION=love.timer.getTime,SETTING,VERSION
+    local timer,VERSION=love.timer.getTime,VERSION
 
     local frameTimeList={}
     local lastFrame=timer()
@@ -698,11 +705,10 @@ function love.run()
 
         --DRAW
         if not MINI()then
-            FCT=FCT+SETTING.frameMul
+            FCT=FCT+frameMul
             if FCT>=100 then
                 FCT=FCT-100
 
-                local safeX=SCR.safeX
                 gc_replaceTransform(SCR.origin)
                     gc_setColor(1,1,1)
                     BG.draw()
@@ -713,16 +719,14 @@ function love.run()
                     TEXT_draw()
 
                     --Draw cursor
-                    if mouseShow then
-                        drawCursor(time,mx,my)
-                    end
+                    if mouseShow then drawCursor(time,mx,my)end
                 gc_replaceTransform(SCR.xOy_ul)
                     MES_draw()
                 gc_replaceTransform(SCR.origin)
                     --Draw power info.
-                    if showPowerInfo()then
+                    if showPowerInfo then
                         gc_setColor(1,1,1)
-                        gc_draw(infoCanvas,safeX,0,0,SCR.k)
+                        gc_draw(infoCanvas,SCR.safeX,0,0,SCR.k)
                     end
 
                     --Draw scene swapping animation
@@ -737,6 +741,8 @@ function love.run()
                     FONT.set(20)
                     mStr(VERSION.string,0,-30)
                 gc_replaceTransform(SCR.xOy_dl)
+                    local safeX=SCR.safeX/SCR.k
+
                     --Draw FPS
                     FONT.set(15)
                     gc_setColor(1,1,1)
@@ -744,11 +750,14 @@ function love.run()
 
                     --Debug info.
                     if devMode then
-                        --Left-down infos
+                        --Debug infos at left-down
                         gc_setColor(devColor[devMode])
-                        gc_print("MEM     "..gcinfo(),safeX+5,-40)
-                        gc_print("Tasks   "..TASK.getCount(),safeX+5,-60)
-                        gc_print("Voices  "..VOC.getQueueCount(),safeX+5,-80)
+
+                        --Text infos
+                        for i=1,#debugInfos do
+                            gc_print(debugInfos[i][1],safeX+5,-20-20*i)
+                            gc_print(debugInfos[i][2](),safeX+62.6,-20-20*i)
+                        end
 
                         --Update & draw frame time
                         table.insert(frameTimeList,1,dt)table.remove(frameTimeList,126)
@@ -794,13 +803,13 @@ function love.run()
                 gc_present()
 
                 --SPEED UPUPUP!
-                if SETTING.cleanCanvas then gc_discard()end
+                if discardCanvas then gc_discard()end
             end
         end
 
         --Fresh power info.
         if time-lastFreshPow>2.6 then
-            if showPowerInfo()then
+            if showPowerInfo then
                 updatePowerInfo()
                 lastFreshPow=time
             end
@@ -818,31 +827,59 @@ function love.run()
             end
         end
 
-        --Keep 60fps
         _=timer()-lastFrame
-        if _<.0162 then WAIT(.0162-_)end
-        while timer()-lastFrame<1/60 do end
+        if _<sleepInterval*.9626 then WAIT(sleepInterval*.9626-_)end
+        while timer()-lastFrame<sleepInterval do end
     end
 end
 
 local Z={}
 
-Z.js=jsState
-Z.errData=errData
+function Z.getJsState()return jsState end
+function Z.getErr(i)
+    if i=='#'then
+        return errData[#errData]
+    elseif i then
+        return errData[i]
+    else
+        return errData
+    end
+end
 
-function Z.setIfPowerInfo(func)showPowerInfo=func end
+function Z.setPowerInfo(bool)showPowerInfo=bool end
+function Z.setCleanCanvas(bool)discardCanvas=bool end
+function Z.setFrameMul(n)frameMul=n end
+function Z.setMaxFPS(fps)sleepInterval=1/fps end
+function Z.setClickFX(bool)showClickFX=bool end
 
 --[Warning] Color and line width is uncertain value, set it in the function.
 function Z.setCursor(func)drawCursor=func end
 
 --Change F1~F7 events of devmode (F8 mode)
 function Z.setOnFnKeys(list)
-    assert(type(list)=='table')
-    for i=1,7 do fnKey[i]=type(list[i])=='function'and list[i]or NULL end
+    assert(type(list)=='table',"Z.setOnFnKeys(list): list must be a table")
+    for i=1,7 do fnKey[i]=assert(type(list[i])=='function'and list[i])end
 end
 
-function Z.setOnFocus(func)onFocus=type(func)=='function'and func or NULL end
+function Z.setDebugInfo(list)
+    assert(type(list)=='table',"Z.setDebugInfo(list): list must be a table")
+    for i=1,#list do
+        assert(type(list[i][1])=='string',"Z.setDebugInfo(list): list[i][1] must be a string")
+        assert(type(list[i][2])=='function',"Z.setDebugInfo(list): list[i][2] must be a function")
+    end
+    debugInfos=list
+end
 
-function Z.setOnQuit(func)onQuit=type(func)=='function'and func or NULL end
+function Z.setOnFocus(func)
+    onFocus=assert(type(func)=='function'and func,"Z.setOnFocus(func): func must be a function")
+end
+
+function Z.setOnResize(func)
+    onResize=assert(type(func)=='function'and func,"Z.setOnResize(func): func must be a function")
+end
+
+function Z.setOnQuit(func)
+    onQuit=assert(type(func)=='function'and func,"Z.setOnQuit(func): func must be a function")
+end
 
 return Z

Zframework/mathExtend.lua

@@ -20,4 +20,18 @@ function MATH.coin(a,b)
     end
 end
 
+function MATH.interval(v,low,high)
+    if v<=low then
+        return low
+    elseif v>=high then
+        return high
+    else
+        return v
+    end
+end
+
+function MATH.expApproach(a,b,k)
+    return b+(a-b)*2.718281828459045^-k
+end
+
 return MATH

Zframework/profile.lua

@@ -140,11 +140,11 @@ function profile.switch()
     switch=not switch
     if not switch then
         profile.stop()
-        love.system.setClipboardText(PROFILE.report())
-        PROFILE.reset()
+        love.system.setClipboardText(profile.report())
+        profile.reset()
         return false
     else
-        PROFILE.start()
+        profile.start()
         return true
     end
 end

Zframework/scene.lua

@@ -15,6 +15,8 @@ local SCN={
         draw=false,      --Swap draw  func
     },
     stack={},--Scene stack
+    prev=false,
+    args={},--Arguments from previous scene
 
     scenes=scenes,
 
@@ -52,14 +54,15 @@ function SCN.swapUpdate(dt)
     S.time=S.time-dt
     if S.time<S.changeTime and S.time+dt>=S.changeTime then
         --Scene swapped this frame
-        SCN.init(S.tar,SCN.cur)
+        SCN.prev=SCN.cur
+        SCN.init(S.tar)
         SCN.mainTouchID=nil
     end
     if S.time<0 then
         SCN.swapping=false
     end
 end
-function SCN.init(s,org)
+function SCN.init(s)
     love.keyboard.setTextInput(false)
 
     local S=scenes[s]
@@ -89,7 +92,7 @@ function SCN.init(s,org)
     SCN.update=S.update
     SCN.draw=S.draw
     if S.sceneInit then
-        S.sceneInit(org)
+        S.sceneInit()
     end
 end
 function SCN.push(tar,style)
@@ -165,11 +168,12 @@ local swap={
         end
     },
 }--Scene swapping animations
-function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back
+function SCN.swapTo(tar,style,...)--Parallel scene swapping, cannot back
     if scenes[tar]then
         if not SCN.swapping and tar~=SCN.cur then
             style=style or'fade'
             SCN.swapping=true
+            SCN.args={...}
             local S=SCN.stat
             S.tar,S.style=tar,style
             S.time=swap[style].duration
@@ -180,15 +184,15 @@ function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back
         MES.new('warn',"No Scene: "..tar)
     end
 end
-function SCN.go(tar,style)--Normal scene swapping, can back
+function SCN.go(tar,style,...)--Normal scene swapping, can back
     if scenes[tar]then
         SCN.push()
-        SCN.swapTo(tar,style)
+        SCN.swapTo(tar,style,...)
     else
         MES.new('warn',"No Scene: "..tar)
     end
 end
-function SCN.back()
+function SCN.back(...)
     if SCN.swapping then return end
 
     --Leave scene
@@ -199,7 +203,7 @@ function SCN.back()
     --Poll&Back to previous Scene
     local m=#SCN.stack
     if m>0 then
-        SCN.swapTo(SCN.stack[m-1],SCN.stack[m])
+        SCN.swapTo(SCN.stack[m-1],SCN.stack[m],...)
         SCN.stack[m],SCN.stack[m-1]=nil
     end
 end

Zframework/sfx.lua

@@ -1,5 +1,6 @@
 local type,rem=type,table.remove
 local int,rnd=math.floor,math.random
+local interval=MATH.interval
 
 local sfxList={}
 local packSetting={}
@@ -140,7 +141,7 @@ local function _play(name,vol,pos,pitch)
     S=S[n]--AU_SRC
     if S:getChannelCount()==1 then
         if pos then
-            pos=pos*stereo
+            pos=interval(pos,-1,1)*stereo
             S:setPosition(pos,1-pos^2,0)
         else
             S:setPosition(0,0,0)

Zframework/stringExtend.lua

@@ -6,7 +6,7 @@ local find,sub,gsub,upper=string.find,string.sub,string.gsub,string.upper
 local char,byte=string.char,string.byte
 
 --"Replace dollars", replace all $n with ...
-function string.repD(str,...)
+function STRING.repD(str,...)
     local l={...}
     for i=#l,1,-1 do
         str=gsub(str,'$'..i,l[i])
@@ -15,7 +15,7 @@ function string.repD(str,...)
 end
 
 --"Scan arg", scan if str has the arg (format of str is like "-json -q", arg is like "-q")
-function string.sArg(str,switch)
+function STRING.sArg(str,switch)
     if find(str.." ",switch.." ")then
         return true
     end
@@ -77,11 +77,11 @@ end
 
 function STRING.time(t)
     if t<60 then
-        return format("%.3f\"",t)
+        return format("%.3f″",t)
     elseif t<3600 then
-        return format("%d'%05.2f\"",int(t/60),int(t%60*100)/100)
+        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),int(t%60*100)/100)
+        return format("%d:%.2d′%05.2f″",int(t/3600),int(t/60%60),int(t%60*100)/100)
     end
 end
 
@@ -169,6 +169,25 @@ function STRING.vcsDecrypt(text,key)
     end
     return result..buffer
 end
+function STRING.digezt(text)--Not powerful hash, just protect the original text
+    local out={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
+    local seed=26
+    for i=1,#text do
+        local c=byte(text,i)
+        seed=(seed+c)%26
+        c=c+seed
+        local pos=c*i%16
+        local step=(c+i)%4+1
+        local times=2+(c%6)
+        for _=1,times do
+            out[pos+1]=(out[pos+1]+c)%256
+            pos=(pos+step)%16
+        end
+    end
+    local result=""
+    for i=1,16 do result=result..char(out[i])end
+    return result
+end
 
 function STRING.readLine(str)
     local p=str:find("\n")
@@ -178,6 +197,9 @@ function STRING.readLine(str)
         return str,""
     end
 end
+function STRING.readChars(str,n)
+    return sub(str,1,n),sub(str,n+1)
+end
 
 function STRING.packBin(s)
     return data.encode('string','base64',data.compress('string','zlib',s))

Zframework/tableExtend.lua

@@ -1,3 +1,4 @@
+local rnd=math.random
 local find=string.find
 local rem=table.remove
 local next,type=next,type
@@ -58,7 +59,6 @@ function TABLE.coverR(new,old)
     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
@@ -84,6 +84,19 @@ function TABLE.complete(new,old)
     end
 end
 
+--------------------------
+
+--Pop & return random [1~#] of table
+function TABLE.popRandom(t)
+    local l=#t
+    if l>0 then
+        local r=rnd(l)
+        r,t[r]=t[r],t[l]
+        t[l]=nil
+        return r
+    end
+end
+
 --Remove [1~#] of table
 function TABLE.cut(G)
     for i=1,#G do
@@ -98,6 +111,8 @@ function TABLE.clear(G)
     end
 end
 
+--------------------------
+
 --Remove duplicated value of [1~#]
 function TABLE.trimDuplicate(org)
     local cache={}
@@ -122,6 +137,7 @@ function TABLE.remDuplicate(org)
     end
 end
 
+--------------------------
 
 --Reverse [1~#]
 function TABLE.reverse(org)

Zframework/widget.lua

@@ -19,6 +19,7 @@ local sub,ins,rem=string.sub,table.insert,table.remove
 local xOy=SCR.xOy
 local FONT=FONT
 local mStr=GC.mStr
+local approach=MATH.expApproach
 
 local downArrowIcon=GC.DO{40,25,{'fPoly',0,0,20,25,40,0}}
 local upArrowIcon=GC.DO{40,25,{'fPoly',0,25,20,0,40,25}}
@@ -45,7 +46,12 @@ local function _rectangleStencil()
     gc.rectangle('fill',1,1,STW-2,STH-2)
 end
 
+local onChange=NULL
+
 local WIDGET={}
+
+function WIDGET.setOnChange(func)onChange=assert(type(func)=='function'and func,"WIDGET.setOnChange(func): func must be a function")end
+
 local widgetMetatable={
     __tostring=function(self)
         return self:getInfo()
@@ -72,20 +78,23 @@ function text:draw()
     if self.alpha>0 then
         local c=self.color
         gc_setColor(c[1],c[2],c[3],self.alpha)
+        local w=self.obj:getWidth()
+        local k=min(self.lim/self.obj:getWidth(),1)
         if self.align=='M'then
-            gc_draw(self.obj,self.x-self.obj:getWidth()*.5,self.y)
+            gc_draw(self.obj,self.x,self.y,nil,k,1,w*.5,0)
         elseif self.align=='L'then
-            gc_draw(self.obj,self.x,self.y)
+            gc_draw(self.obj,self.x,self.y,nil,k,1)
         elseif self.align=='R'then
-            gc_draw(self.obj,self.x-self.obj:getWidth(),self.y)
+            gc_draw(self.obj,self.x,self.y,nil,k,1,w,0)
         end
     end
 end
-function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,fType][,align='M'][,hideF][,hide]
+function WIDGET.newText(D)--name,x,y[,lim][,fText][,color][,font=30][,fType][,align='M'][,hideF][,hide]
     local _={
         name= D.name or"_",
         x=    D.x,
         y=    D.y,
+        lim=  D.lim or 1e99,
 
         fText=D.fText,
         color=D.color and(COLOR[D.color]or D.color)or COLOR.Z,
@@ -226,10 +235,10 @@ function button:press(_,_,k)
         self.h
     )
     if self.sound then
-        SFX.play('button')
+        SFX.play(self.sound)
     end
 end
-function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,fType][,sound=true][,align='M'][,edge=0][,code][,hideF][,hide]
+function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,fType][,sound][,align='M'][,edge=0][,code][,hideF][,hide]
     if not D.h then D.h=D.w end
     local _={
         name= D.name or"_",
@@ -253,11 +262,18 @@ function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,fType][,
         fType=D.fType,
         align=D.align or'M',
         edge= D.edge or 0,
-        sound=D.sound~=false,
         code= D.code or NULL,
         hideF=D.hideF,
         hide= D.hide,
     }
+    if D.sound==false then
+        _.sound=false
+    elseif type(D.sound)=='string'then
+        _.sound=D.sound
+    else
+        _.sound='button'
+    end
+
     for k,v in next,button do _[k]=v end
     setmetatable(_,widgetMetatable)
     return _
@@ -347,10 +363,10 @@ end
 function key:press(_,_,k)
     self.code(k)
     if self.sound then
-        SFX.play('key')
+        SFX.play(self.sound)
     end
 end
-function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,color][,font=30][,fType][,sound=true][,align='M'][,edge=0][,code][,hideF][,hide]
+function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,color][,font=30][,fType][,sound][,align='M'][,edge=0][,code][,hideF][,hide]
     if not D.h then D.h=D.w end
     local _={
         name=   D.name or"_",
@@ -373,13 +389,19 @@ function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,color][,font=30][,fT
         color=  D.color and(COLOR[D.color]or D.color)or COLOR.Z,
         font=   D.font or 30,
         fType=  D.fType,
-        sound=  D.sound~=false,
         align=  D.align or'M',
         edge=   D.edge or 0,
         code=   D.code or NULL,
         hideF=  D.hideF,
         hide=   D.hide,
     }
+    if D.sound==false then
+        _.sound=false
+    elseif type(D.sound)=='string'then
+        _.sound=D.sound
+    else
+        _.sound='key'
+    end
     for k,v in next,key do _[k]=v end
     setmetatable(_,widgetMetatable)
     return _
@@ -507,7 +529,7 @@ function slider:isAbove(x,y)
     return x>self.x-10 and x<self.x+self.w+10 and y>self.y-25 and y<self.y+25
 end
 function slider:getCenter()
-    return self.x+self.w*(self.pos/self.unit),self.y
+    return self.x+self.w*((self.pos-self.rangeL)/(self.rangeR-self.rangeL)),self.y
 end
 function slider:update(dt)
     local ATV=self.ATV
@@ -521,7 +543,7 @@ function slider:update(dt)
         if ATV>0 then self.ATV=max(ATV-dt*30,0)end
     end
     if not self.hide then
-        self.pos=self.pos*.7+self.disp()*.3
+        self.pos=approach(self.pos,self.disp(),dt*26)
     end
 end
 function slider:draw()
@@ -534,8 +556,8 @@ function slider:draw()
     --Units
     if not self.smooth then
         gc_setLineWidth(2)
-        for p=0,self.unit do
-            local X=x+(x2-x)*p/self.unit
+        for p=self.rangeL,self.rangeR,self.unit do
+            local X=x+(x2-x)*(p-self.rangeL)/(self.rangeR-self.rangeL)
             gc_line(X,y+7,X,y-7)
         end
     end
@@ -545,7 +567,7 @@ function slider:draw()
     gc_line(x,y,x2,y)
 
     --Block
-    local cx=x+(x2-x)*self.pos/self.unit
+    local cx=x+(x2-x)*(self.pos-self.rangeL)/(self.rangeR-self.rangeL)
     local bx,by,bw,bh=cx-10-ATV*.5,y-16-ATV,20+ATV,32+2*ATV
     gc_setColor(.8,.8,.8)
     gc_rectangle('fill',bx,by,bw,bh,3)
@@ -580,13 +602,16 @@ end
 function slider:drag(x)
     if not x then return end
     x=x-self.x
-    local p=self.disp()
-    local P=x<0 and 0 or x>self.w and self.unit or x/self.w*self.unit
-    if not self.smooth then
-        P=int(P+.5)
+    local newPos=MATH.interval(x/self.w,0,1)
+    local newVal
+    if not self.unit then
+        newVal=(1-newPos)*self.rangeL+newPos*self.rangeR
+    else
+        newVal=newPos*(self.rangeR-self.rangeL)
+        newVal=self.rangeL+newVal-newVal%self.unit
     end
-    if p~=P then
-        self.code(P)
+    if newVal~=self.disp()then
+        self.code(newVal)
     end
     if self.change and timer()-self.lastTime>.5 then
         self.lastTime=timer()
@@ -599,8 +624,8 @@ function slider:release(x)
 end
 function slider:scroll(n)
     local p=self.disp()
-    local u=self.smooth and .01 or 1
-    local P=n==-1 and max(p-u,0)or min(p+u,self.unit)
+    local u=self.unit or .01
+    local P=MATH.interval(p+u*n,self.rangeL,self.rangeR)
     if p==P or not P then return end
     self.code(P)
     if self.change and timer()-self.lastTime>.18 then
@@ -611,7 +636,13 @@ end
 function slider:arrowKey(k)
     self:scroll((k=='left'or k=='up')and -1 or 1)
 end
-function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,unit][,smooth][,font=30][,fType][,change],disp[,show][,code],hide
+function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,axis][,smooth][,font=30][,fType][,change],disp[,show][,code],hide
+    if not D.axis then
+        D.axis={0,1,false}
+        D.smooth=true
+    elseif not D.axis[3]then
+        D.smooth=true
+    end
     local _={
         name=  D.name or"_",
 
@@ -630,8 +661,10 @@ function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,unit][,smooth][,
 
         fText= D.fText,
         color= D.color and(COLOR[D.color]or D.color)or COLOR.Z,
-        unit=  D.unit or 1,
-        smooth=false,
+        rangeL=D.axis[1],
+        rangeR=D.axis[2],
+        unit=  D.axis[3],
+        smooth=D.smooth,
         font=  D.font or 30,
         fType= D.fType,
         change=D.change,
@@ -641,22 +674,17 @@ function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,unit][,smooth][,
         hide=  D.hide,
         show=  false,
     }
-    if D.smooth~=nil then
-        _.smooth=D.smooth
-    else
-        _.smooth=_.unit<=1
-    end
     if D.show then
         if type(D.show)=='function'then
             _.show=D.show
         else
             _.show=sliderShowFunc[D.show]
         end
-    elseif D.show~=false then
-        if _.unit<=1 then
-            _.show=sliderShowFunc.percent
-        else
+    elseif D.show~=false then--Use default if nil
+        if _.unit and _.unit%1==0 then
             _.show=sliderShowFunc.int
+        else
+            _.show=sliderShowFunc.percent
         end
     end
     for k,v in next,slider do _[k]=v end
@@ -1205,6 +1233,14 @@ function listBox:arrowKey(dir)
         end
     end
 end
+function listBox:select(i)
+    self.selected=i
+    if self.selected<int(self.scrollPos/self.lineH)+2 then
+        self:drag(nil,nil,nil,1e99)
+    elseif self.selected>int(self.scrollPos/self.lineH)+self.capacity-1 then
+        self:drag(nil,nil,nil,-1e99)
+    end
+end
 function listBox:draw()
     local x,y,w,h=self.x,self.y,self.w,self.h
     local list=self.list
@@ -1247,7 +1283,7 @@ end
 function listBox:getInfo()
     return("x=%d,y=%d,w=%d,h=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h)
 end
-function WIDGET.newListBox(D)--name,x,y,w,h,lineH[,hideF][,hide][,drawF]
+function WIDGET.newListBox(D)--name,x,y,w,h,lineH,drawF[,hideF][,hide]
     local _={
         name=    D.name or"_",
 
@@ -1304,16 +1340,7 @@ function WIDGET.setWidgetList(list)
         for i=1,#list do
             list[i]:reset()
         end
-        if SCN.cur~='custom_field'then
-            local colorList=THEME.getThemeColor()
-            if not colorList then return end
-            local rnd=math.random
-            for _,W in next,list do
-                if W.color and not W.fText then
-                    W.color=colorList[rnd(#colorList)]
-                end
-            end
-        end
+        onChange()
     end
 end
 function WIDGET.setScrollHeight(height)

main.lua

@@ -24,13 +24,13 @@ VERSION=require"version"
 TIME=love.timer.getTime
 YIELD=coroutine.yield
 SYSTEM=love.system.getOS()if SYSTEM=='OS X'then SYSTEM='macOS'end
-FNSF=SYSTEM:find'\79\83'--What does FNSF stand for? IDK so don't ask me lol
+FNNS=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()
 
 --Global Vars & Settings
 SFXPACKS={'chiptune'}
-VOCPACKS={'miya','mono','xiaoya','miku'}
+VOCPACKS={'miya',--[['mono',]]'xiaoya','miku'}
 FIRSTLAUNCH=false
 DAILYLAUNCH=false
 
@@ -62,6 +62,19 @@ BGM.setMaxSources(5)
 BGM.setChange(function(name)MES.new('music',text.nowPlaying..name,5)end)
 VOC.setDiversion(.62)
 
+WIDGET.setOnChange(function()
+    if SCN.cur~='custom_field'then
+        local colorList=THEME.getThemeColor()
+        if not colorList then return end
+        local rnd=math.random
+        for _,W in next,SCN.scenes[SCN.cur].widgetList do
+            if W.color then
+                W.color=colorList[rnd(#colorList)]
+            end
+        end
+    end
+end)
+
 table.insert(_LOADTIMELIST_,("Load Zframework: %.3fs"):format(TIME()-_LOADTIME_))
 
 --Create shortcuts
@@ -71,6 +84,9 @@ mStr=GC.mStr
 mText=GC.simpX
 mDraw=GC.draw
 Snd=SFX.playSample
+string.repD=STRING.repD
+string.sArg=STRING.sArg
+string.split=STRING.split
 
 --Delete all naked files (from too old version)
 FILE.clear('')
@@ -116,16 +132,13 @@ MODES=      require'parts.modes'
 
 setmetatable(TEXTURE,{__index=function(self,k)
     MES.new('warn',"No texture called: "..k)
-    self[k]=love.graphics.newCanvas(1,1)
+    self[k]=PAPER
     return self[k]
 end})
 
 table.insert(_LOADTIMELIST_,("Load Parts: %.3fs"):format(TIME()-_LOADTIME_))
 
 --Init Zframework
-Z.setIfPowerInfo(function()
-    return SETTING.powerInfo and LOADED
-end)
 do--Z.setCursor
     local normImg=GC.DO{16,16,
         {'fCirc',8,8,4},
@@ -171,6 +184,15 @@ Z.setOnFnKeys({
     function()for k,v in next,_G do print(k,v)end end,
     function()if love['_openConsole']then love['_openConsole']()end end,
 })
+Z.setDebugInfo{
+    {"Cache",gcinfo},
+    {"Tasks",TASK.getCount},
+    {"Voices",VOC.getQueueCount},
+    {"Audios",love.audio.getSourceCount},
+}
+Z.setOnResize(function(w,_)
+    SHADER.warning:send('w',w*SCR.dpi)
+end)
 do--Z.setOnFocus
     local function task_autoSoundOff()
         while true do
@@ -256,13 +278,15 @@ IMG.init{
     pay1='media/image/mess/pay1.png',
     pay2='media/image/mess/pay2.png',
 
-    miyaCH='media/image/characters/miya.png',
-    miyaF1='media/image/characters/miya_f1.png',
-    miyaF2='media/image/characters/miya_f2.png',
-    miyaF3='media/image/characters/miya_f3.png',
-    miyaF4='media/image/characters/miya_f4.png',
+    miyaCH1='media/image/characters/miya1.png',
+    miyaCH2='media/image/characters/miya2.png',
+    miyaCH3='media/image/characters/miya3.png',
+    miyaCH4='media/image/characters/miya4.png',
+    miyaHeart='media/image/characters/miya_heart.png',
+    miyaGlow='media/image/characters/miya_glow.png',
     monoCH='media/image/characters/mono.png',
     xiaoyaCH='media/image/characters/xiaoya.png',
+    xiaoyaOmino='media/image/characters/xiaoya_Omino.png',
     mikuCH='media/image/characters/miku.png',
     electric='media/image/characters/electric.png',
     hbm='media/image/characters/hbm.png',
@@ -279,7 +303,7 @@ IMG.init{
 SKIN.load{
     {name="crystal_scf",path='media/image/skin/crystal_scf.png'},
     {name="matte_mrz",path='media/image/skin/matte_mrz.png'},
-    {name="shiny_cho",path='media/image/skin/shiny_cho.png'},
+    {name="shiny_chno",path='media/image/skin/shiny_chno.png'},
     {name="contrast_mrz",path='media/image/skin/contrast_mrz.png'},
     {name="polkadots_scf",path='media/image/skin/polkadots_scf.png'},
     {name="toy_scf",path='media/image/skin/toy_scf.png'},
@@ -302,6 +326,7 @@ SKIN.load{
     {name="classic",path='media/image/skin/classic_unknown.png'},
     {name="ball_shaw",path='media/image/skin/ball_shaw.png'},
     {name="retro_notypey",path='media/image/skin/retro_notypey.png'},
+    {name="pixel_chno",path='media/image/skin/pixel_chno.png'},
     {name="textbone_mrz",path='media/image/skin/textbone_mrz.png'},
     {name="coloredbone_mrz",path='media/image/skin/coloredbone_mrz.png'},
     {name="wtf",path='media/image/skin/wtf_mrz.png'},
@@ -317,11 +342,11 @@ SFX.init((function()--[Warning] Not loading files here, just get the list of sou
     end
     return L
 end)())
-BGM.init((function()
+BGM.load((function()
     local L={}
     for _,v in next,fs.getDirectoryItems('media/music')do
         if isSafeFile('media/music/'..v,"Dangerous file : %SAVE%/media/music/"..v)then
-            table.insert(L,{name=v:sub(1,-5),path='media/music/'..v})
+            L[v:sub(1,-5)]='media/music/'..v
         end
     end
     return L
@@ -346,8 +371,9 @@ LANG.init('zh',
         fr=require'parts.language.lang_fr',
         es=require'parts.language.lang_es',
         pt=require'parts.language.lang_pt',
+        id=require'parts.language.lang_id',
+        ja=require'parts.language.lang_ja',
         zh_grass=require'parts.language.lang_zh_grass',
-        zh_yygq=require'parts.language.lang_yygq',
         symbol=require'parts.language.lang_symbol',
         --1. Add language file to LANG folder;
         --2. Require it;
@@ -463,6 +489,9 @@ do
         SETTING.dascut=SETTING.dascut+1
         needSave=true
     end
+    if SETTING.vocPack=='mono'then
+        SETTING.vocPack='miya'
+    end
     if RANKS.stack_e then
         RANKS.stack_e=nil
         RANKS.stack_h=nil
@@ -519,6 +548,8 @@ do
     if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then SETTING.frameMul=100 end
     if SETTING.cv then SETTING.vocPack,SETTING.cv=SETTING.cv end
     if type(SETTING.bg)~='string'then SETTING.bg='on'end
+    if SETTING.skin[18]==10 then SETTING.skin[18]=4 end
+    if SETTING.reTime>3 or SETTING.reTime<.5 then SETTING.reTime=2 end
     if RANKS.infinite then RANKS.infinite=0 end
     if RANKS.infinite_dig then RANKS.infinite_dig=0 end
     if not RANKS.sprint_10l then RANKS.sprint_10l=0 end
@@ -567,7 +598,7 @@ if FIRSTLAUNCH and MOBILE then
 end
 
 --Apply system setting
-applyAllSettings()
+applySettings()
 
 --Load replays
 for _,fileName in next,fs.getDirectoryItems('replay')do
@@ -645,9 +676,9 @@ if TABLE.find(arg,'--test')then
     TASK.new(function()
         while true do
             YIELD()
-            if Z.errData[1]then break end
+            if Z.getErr(1)then break end
         end
-        LOG("\27[91m\27[1mAutomatic Test Failed :(\27[0m\nThe error message is:\n"..table.concat(Z.errData[1].mes,"\n").."\27[91m\nAborting\27[0m")
+        LOG("\27[91m\27[1mAutomatic Test Failed :(\27[0m\nThe error message is:\n"..table.concat(Z.getErr(1).mes,"\n").."\27[91m\nAborting\27[0m")
         TEST.yieldN(60)
         love.event.quit(1)
     end)

parts/RSlist.lua

@@ -376,8 +376,8 @@ do
             },--R
             false,--Y
             {
-                [01]={'+0+0','-1+0','-1+1','+0+1','+1+0','-1+2','-2+0','+0-2'},
-                [10]={'+0+0','+1+0','-1+0','+0-1','+1-1','+1-2','+2+0','+0+2'},
+                [01]={'+0+0','-1+0','-1+1','+0+1','+1+0','+1+1','-1+2','-2+0','+0-2'},
+                [10]={'+0+0','+1+0','-1+0','+0-1','-1-1','+1-1','+1-2','+2+0','+0+2'},
                 [03]={'+0+0','-1+0','+1-1','+0-2','+0-3','+1+0','+1-2','+1-3','+0+1','-1+1'},
                 [30]={'+0+0','-1+0','+1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'},
                 [12]={'+0+0','-1+0','+1-1','-1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'},

parts/backgrounds/space.lua

@@ -22,12 +22,12 @@ function back.resize(w,h)
         S[i+4]=(rnd()-.5)*.01*s--Vy
     end
 end
-function back.update()
+function back.update(dt)
     local S=stars
     --Star moving
     for i=1,1260,5 do
-        S[i+1]=(S[i+1]+S[i+3])%W
-        S[i+2]=(S[i+2]+S[i+4])%H
+        S[i+1]=(S[i+1]+S[i+3]*dt*60)%W
+        S[i+2]=(S[i+2]+S[i+4]*dt*60)%H
     end
 end
 function back.draw()

parts/eventsets/big_h.lua

@@ -9,7 +9,7 @@ return
         PLY.draw.drawTargetLine(P,200-P.stat.row)
     end,
     task=function(P)
-	    local F=P.field
+        local F=P.field
         for i=1,24 do
             F[i]=LINE.new(20)
             P.visTime[i]=LINE.new(20)
@@ -31,7 +31,7 @@ return
                 P:set20G(true)
                 P.modeData.target=200
                 SFX.play('reach')
-			else
+            else
                 P:win('finish')
             end
         end

parts/eventsets/big_n.lua

@@ -11,7 +11,7 @@ return
         PLY.draw.drawTargetLine(P,200-P.stat.row)
     end,
     task=function(P)
-		local F=P.field
+        local F=P.field
         for i=1,24 do
             F[i]=LINE.new(20)
             P.visTime[i]=LINE.new(20)

parts/eventsets/classic_h.lua

@@ -36,6 +36,7 @@ return{
     end,
     hook_drop=function(P)
         local D=P.modeData
+        D.drought=P.lastPiece.id==7 and 0 or D.drought+1
         if P.stat.row>=D.target then
             if D.target==110 then
                 P.gameEnv.drop,P.gameEnv.lock=2,2

parts/eventsets/classic_u.lua

@@ -36,6 +36,7 @@ return{
     end,
     hook_drop=function(P)
         local D=P.modeData
+        D.drought=P.lastPiece.id==7 and 0 or D.drought+1
         if P.stat.row>=D.target then
             if D.target==100 then
                 P:win('finish')

parts/eventsets/master_h.lua

@@ -1,6 +1,6 @@
-local death_lock={12,11,10,9,8, 7,7,7,7,6}
-local death_wait={10,9, 8, 7,6, 6,6,5,5,4}
-local death_fall={10,9, 8, 7,6, 6,5,5,4,4}
+local death_lock={12,11,10,9,8, 8,8,7,7,6}
+local death_wait={10,9, 8, 7,6, 7,6,6,5,5}
+local death_fall={10,9, 8, 7,6, 7,6,5,5,5}
 
 return{
     drop=0,

parts/eventsets/master_instinct.lua

@@ -0,0 +1,80 @@
+local inv_lock={60,50,45,40,37, 34,32,30,28,26}
+local inv_wait={12,11,11,10,10, 10,10, 9, 9, 9}
+local inv_fall={18,16,14,13,12, 12,11,11,10,10}
+local inv_hide={20,17,14,11, 8,  5, 3, 2, 1, 0}
+local hidetimer=0
+local held=false
+
+return{
+    drop=0,
+    lock=inv_lock[1],
+    wait=inv_wait[1],
+    fall=inv_fall[1],
+    ghost=false,
+    noTele=true,
+    das=10,arr=1,
+    mesDisp=function(P)
+        PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
+    end,
+    hook_drop=function(P)
+        local D=P.modeData
+
+        local c=#P.clearedRow
+        if c==0 and D.pt%100==99 then return end
+        local s=c<3 and c+1 or c==3 and 5 or 7
+        if P.combo>7 then s=s+2
+        elseif P.combo>3 then s=s+1
+        end
+        D.pt=D.pt+s
+        held=false
+        if D.pt<1000 then
+            hidetimer=0-inv_wait[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]
+            if c>0 then hidetimer=hidetimer-inv_fall[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]end
+        end
+
+        if D.pt%100==99 then
+            SFX.play('warn_1')
+        elseif D.pt>=D.target then--Level up!
+            s=D.target/100
+            local E=P.gameEnv
+            E.lock=inv_lock[s]
+            E.wait=inv_wait[s]
+            E.fall=inv_fall[s]
+
+            if s==2 then
+                E.das=8
+            elseif s==4 then
+                BG.set('rgb')
+            elseif s==5 then
+                E.das=7
+            elseif s==7 then
+                E.das=6
+                BGM.play('far')
+            elseif s==10 then
+                D.pt=1000
+                P:win('finish')
+                return
+            end
+            D.target=D.target+100
+            P:stageComplete(s)
+            SFX.play('reach')
+        end
+    end,
+    task=function(P)
+        P.modeData.pt=0
+        P.modeData.target=100
+        while true do
+            YIELD()
+            if P.holdTime==0 and P.waiting<=0 and not held then
+                hidetimer=0
+                held=true
+            end
+            hidetimer=hidetimer+1
+            if hidetimer>inv_hide[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]then
+                P.gameEnv.block=false
+            else
+                P.gameEnv.block=true
+            end
+        end
+    end,
+}

parts/eventsets/royale.lua

@@ -5,15 +5,22 @@ local setFont=setFont
 local PLAYERS,PLY_ALIVE=PLAYERS,PLY_ALIVE
 
 return{
+    layout='royale',
+    fkey1=function(P)
+        P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode)
+        P.swappingAtkMode=45
+    end,
     mesDisp=function(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)

parts/eventsets/strategy_e_plus.lua

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

parts/eventsets/strategy_h_plus.lua

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

parts/eventsets/strategy_u_plus.lua

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

parts/gameFuncs.lua

@@ -7,6 +7,7 @@ local gc_draw,gc_rectangle,gc_line,gc_printf=gc.draw,gc.rectangle,gc.line,gc.pri
 
 local ins,rem=table.insert,table.remove
 local int,rnd=math.floor,math.random
+local approach=MATH.expApproach
 
 local SETTING,GAME,SCR=SETTING,GAME,SCR
 local PLAYERS=PLAYERS
@@ -79,7 +80,7 @@ do--function loadFile(name,args), function saveFile(data,name,args)
         local text=text or t
         local res,mes=pcall(FILE.save,data,name,args)
         if res then
-            return mes
+            return true
         else
             MES.new('error',
                 mes:find'duplicate'and
@@ -109,23 +110,7 @@ end
 function saveSettings()
     return saveFile(SETTING,'conf/settings')
 end
-function applyLanguage()
-    text=LANG.get(SETTING.locale)
-    WIDGET.setLang(text.WidgetText)
-    for k,v in next,TEXTOBJ do
-        if rawget(text,k)then
-            v:set(text[k])
-        end
-    end
-end
-function applyCursor()
-    love.mouse.setVisible(SETTING.sysCursor)
-end
-function applyFullscreen()
-    love.window.setFullscreen(SETTING.fullscreen)
-    love.resize(gc.getWidth(),gc.getHeight())
-end
-do--function applyBlockSatur,applyFieldSatur(mode)
+do--function applySettings()
     local saturateValues={
         normal={0,1},
         soft={.2,.7},
@@ -133,58 +118,79 @@ do--function applyBlockSatur,applyFieldSatur(mode)
         light={.2,.8},
         color={-.2,1.2},
     }
-    function applyBlockSatur(mode)
-        local m=saturateValues[mode]or saturateValues.normal
+    function applySettings()
+        --Apply fullscreen
+        love.window.setFullscreen(SETTING.fullscreen)
+        love.resize(gc.getWidth(),gc.getHeight())
+
+        --Apply Zframework setting
+        Z.setClickFX(SETTING.clickFX)
+        Z.setFrameMul(SETTING.frameMul)
+        Z.setPowerInfo(SETTING.powerInfo)
+        Z.setCleanCanvas(SETTING.cleanCanvas)
+
+        --Apply VK shape
+        VK.setShape(SETTING.VKSkin)
+
+        --Apply sound
+        love.audio.setVolume(SETTING.mainVol)
+        BGM.setVol(SETTING.bgm)
+        SFX.setVol(SETTING.sfx)
+        VOC.setVol(SETTING.voc)
+
+        --Apply saturs
+        local m
+        m=saturateValues[SETTING.blockSatur]or saturateValues.normal
         SHADER.blockSatur:send('b',m[1])
         SHADER.blockSatur:send('k',m[2])
-    end
-    function applyFieldSatur(mode)
-        local m=saturateValues[mode]or saturateValues.normal
+        m=saturateValues[SETTING.fieldSatur]or saturateValues.normal
         SHADER.fieldSatur:send('b',m[1])
         SHADER.fieldSatur:send('k',m[2])
-    end
-end
-function applyBG()
-    if SETTING.bg=='on'then
-        BG.unlock()
-        BG.set()
-    elseif SETTING.bg=='off'then
-        BG.unlock()
-        BG.set('gray')
-        BG.send(SETTING.bgAlpha)
-        BG.lock()
-    elseif SETTING.bg=='custom'then
-        if love.filesystem.getInfo('conf/customBG')then
-            local res,image=pcall(gc.newImage,love.filesystem.newFile('conf/customBG'))
-            if res then
-                BG.unlock()
-                BG.set('custom')
-                gc.setDefaultFilter('linear','linear')
-                BG.send(SETTING.bgAlpha,image)
-                gc.setDefaultFilter('nearest','nearest')
-                BG.lock()
-            else
-                MES.new('error',text.customBGloadFailed)
+
+        --Apply language
+        text=LANG.get(SETTING.locale)
+        WIDGET.setLang(text.WidgetText)
+        for k,v in next,TEXTOBJ do
+            if rawget(text,k)then
+                v:set(text[k])
+            end
+        end
+
+        --Apply cursor
+        love.mouse.setVisible(SETTING.sysCursor)
+
+        --Apply BG
+        if SETTING.bg=='on'then
+            BG.unlock()
+            BG.set()
+        elseif SETTING.bg=='off'then
+            BG.unlock()
+            BG.set('gray')
+            BG.send(SETTING.bgAlpha)
+            BG.lock()
+        elseif SETTING.bg=='custom'then
+            if love.filesystem.getInfo('conf/customBG')then
+                local res,image=pcall(gc.newImage,love.filesystem.newFile('conf/customBG'))
+                if res then
+                    BG.unlock()
+                    BG.set('custom')
+                    gc.setDefaultFilter('linear','linear')
+                    BG.send(SETTING.bgAlpha,image)
+                    gc.setDefaultFilter('nearest','nearest')
+                    BG.lock()
+                else
+                    MES.new('error',text.customBGloadFailed)
+                end
+            else--Switch off when custom BG not found
+                SETTING.bg='off'
+                BG.unlock()
+                BG.set('gray')
+                BG.send(SETTING.bgAlpha)
+                BG.lock()
             end
-        else
-            SETTING.bg='off'
-            applyBG()
         end
     end
 end
-function applyAllSettings()
-    applyFullscreen()
-    love.audio.setVolume(SETTING.mainVol)
-    VK.setShape(SETTING.VKSkin)
-    BGM.setVol(SETTING.bgm)
-    SFX.setVol(SETTING.sfx)
-    VOC.setVol(SETTING.voc)
-    applyBlockSatur(SETTING.blockSatur)
-    applyFieldSatur(SETTING.fieldSatur)
-    applyLanguage()
-    applyCursor()
-    applyBG()
-end
 
 --Royale mode
 function randomTarget(P)--Return a random opponent for P
@@ -742,7 +748,7 @@ do--function resetGameData(args)
             GAME.recording=false
             GAME.replaying=true
         else
-            GAME.frameStart=args:find'n'and 0 or 150-SETTING.reTime*15
+            GAME.frameStart=args:find'n'and 0 or 180-SETTING.reTime*60
             GAME.seed=seed or math.random(1046101471,2662622626)
             GAME.pauseTime=0
             GAME.pauseCount=0
@@ -771,7 +777,7 @@ do--function resetGameData(args)
         BGM.play(type(bgm)=='string'and bgm or type(bgm)=='table'and bgm[math.random(#bgm)])
 
         TEXT.clear()
-        if GAME.modeEnv.royaleMode then
+        if GAME.modeEnv.eventSet=='royale'then
             for i=1,#PLAYERS do
                 PLAYERS[i]:changeAtk(randomTarget(PLAYERS[i]))
             end
@@ -792,7 +798,7 @@ do--function resetGameData(args)
 end
 do--function checkWarning()
     local max=math.max
-    function checkWarning()
+    function checkWarning(dt)
         local P1=PLAYERS[1]
         if P1.alive then
             if P1.frameRun%26==0 then
@@ -812,7 +818,7 @@ do--function checkWarning()
             end
             local _=GAME.warnLVL
             if _<GAME.warnLVL0 then
-                _=_*.95+GAME.warnLVL0*.05
+                _=approach(_,GAME.warnLVL0,dt*6)
             elseif _>0 then
                 _=max(_-.026,0)
             end

parts/gameTables.lua

@@ -594,7 +594,7 @@ do--Userdata tables
         FTLock=true,
 
         --System
-        reTime=4,
+        reTime=2,
         allowTAS=false,
         autoPause=true,
         menuPos='middle',
@@ -603,11 +603,13 @@ do--Userdata tables
         autoLogin=true,
         simpMode=false,
         sysCursor=true,
+        maxFPS=60,
+        frameMul=100,
         locale='zh',
         skinSet='crystal_scf',
         skin={
             1,7,11,3,14,4,9,
-            1,7,2,6,10,2,13,5,9,15,10,11,3,12,2,16,8,4,
+            1,7,2,6,10,2,13,5,9,15,4,11,3,12,2,16,8,4,
             10,13,2,8
         },
         face={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -625,7 +627,6 @@ do--Userdata tables
         splashFX=2,
         shakeFX=2,
         atkFX=2,
-        frameMul=100,
         cleanCanvas=false,
         blockSatur='normal',
         fieldSatur='normal',

parts/language/dict_en.lua

@@ -1,20 +1,20 @@
 local HDsearch="https://harddrop.com/wiki?search="
-local HDwiki="\nVisit HD Wiki for more information"
+local HDwiki="\nVisit Hard Drop Wiki for more information."
 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 C₂₉H₂₅N₃O₅ (Discord: C29H25N3O5#1606).\n\nTo view the list of contributors or make contributions, feel free to visit the GitHub page.",
+        "This translation of the TetroDictionary is maly provided by User670 (Discord: User670#9501).\n\nThe translation may not completely reflect the contents of the original Chinese text.\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",
-        "official website homepage",
+        "homepage mainpage",
         "help",
         "The official website of Techmino!\nYou can modify your profile on it",
         "http://home.techmino.org",
     },
     {"To New Players",
-        "guide newbie noob",
+        "guide newbie noob readme",
         "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\nHere is a article written by a well-known player in Chinese Tetris community talking about advices to new players. Click the globe to read the translated article by User670.",
         "https://github.com/user670/temp/blob/master/tips_to_those_new_to_top.md",
@@ -39,7 +39,7 @@ return{
     {"Four.lol",
         "four wiki",
         "help",
-        "An website containing collections of various openings with simple UI and very detailed consecutive PC analyses (Not recommended for new players as you may have to memorize many techniques).",
+        "An website containing collections of various openings with simple UI and very detailed consecutive PC analyses (Not recommended for new players, as you may have to memorize many techniques).",
         "https://four.lol",
     },
     {"Tetris Wiki Fandom",
@@ -59,7 +59,7 @@ return{
     {"Github Repository",
         "githubrepository sourcecode",
         "org",
-        "Techmino's Github repository. Stars are appreciated.",
+        "Techmino's official Github repository. Stars are appreciated.",
         "https://github.com/26F-Studio/Techmino",
     },
     {"Communities",
@@ -69,7 +69,7 @@ return{
         "https://discord.gg/harddrop"
     },
     {"Mew",
-        "mew tieba forum",
+        "tieba forum reddit",
         "org",
         "The Mew forum owned by Chinese Tetris Research Community, and was founded in the second half of 2021. Mew is a Chinese social media that can be thought of a combination of Discord and Reddit, with many channels in a big community. Users can chat in the channels or submit posts to the channel. Mew also has a function called \"Library\" which allows storing documentations systematically. The Tetris Mew forum is currently under construction and not too much contents are available (2/Nov/2021).",
         "https://mew.fun/n/tetris",
@@ -80,217 +80,244 @@ return{
         "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\101\111\110",
-        "p\97\116\114\101\111\110 support",
+    {"Support 1",
+        "support wechat vx alipay zfb",
         "org",
-        "Techmino's P\97\116\114\101\111\110 Page",
-        FNSF and"https://www.youtube.com/watch?v=DVl0IiUKX_g"or"https://www.p\97\116\114\101\111\110.com/techmino",
+        FNNS and "This feature is restricted due to platform policy restrictions. You may discuss about this feature in our Discord server." or "To donate to Techmino via WeChat Pay or Alipay, type \"support\" in console.",
     },
+    {"Support 2",
+        "support afdian",
+        "org",
+        FNNS and "This feature is restricted due to platform policy restrictions. You may discuss about this feature in our Discord server. The URL in this entry is a rickroll, by the way." or "To donate to Techmino via Aifadian, use the globe icon on the bottom right to open URL. Aifadian charges 6% transaction fee off your purchase.",
+        FNNS and"https://youtu.be/dQw4w9WgXcQ"or"https://afdian.net/@MrZ_26",
+    },
+    {"Support 3",
+        "support p\97\116\114\101\111\110",
+        "org",
+        FNNS and "This feature is restricted due to platform policy restrictions. You may discuss about this feature in our Discord server. The URL in this entry is a rickroll, by the way." or "To donate to Techmino via P\97\116\114\101\111\110, use the globe icon on the bottom right to open URL. P\97\116\114\101\111\110 charges 7.9% + 0.30 USD transaction fee off your purchase that is greater than 3 USD.",
+        FNNS and"https://youtu.be/dQw4w9WgXcQ"or"https://www.p\97\116\114\101\111\110.com/techmino",
+    },
+
     --Games
     {"TTT",
-        "ttt tetris trainer tres bien",
+        "tetris trainer tres bien",
         "game",
-        "*Web-based, no mobile support | Single-player*\nTetris Trainer Tres-Bien. A hands-on tutorial of advanced techniques in modern Tetris.\nRecommended for players that can complete a 40-line Sprint with all Tetris line clears and no hold.\nCovered topics include T-Spin, finesse, SRS, and some battle setups.\nLink translated to Simplified Chinese; originally in Japanese.",
-        "http://teatube.ltd/ttt",
+        "Tetris Trainer Très-Bien. A hands-on tutorial of advanced techniques in modern Tetris.\nRecommended for players that can complete a 40-line Sprint with all Tetris line clears and no hold.\nCovered topics include T-Spin, finesse, SRS, and some battle setups.\nLink in Japanese.",
+        "http://taninkona.web.fc2.com/ttt/",
     },
     {"TTPC",
-        "ttpc tetris perfect clear challenge",
+        "tetris perfect clear challenge",
         "game",
-        "*Web-based, no mobile support | Single-player*\nTetris Perfect Clear Challenge. The PC opener tutorial for SRS+7 Bag.\nRecommended for players that have completed TTT. You need to know SRS to play this.\nIncludes only the basic PC opener.\nLink translated to Simplified Chinese; originally in Japanese.",
+        "Tetris Perfect Clear Challenge. The PC opener tutorial for SRS and 7-Bag.\nRecommended for players that have completed TTT. You need to know SRS to play this.\nIncludes only the basic PC opener.\nLink translated to Simplified Chinese; originally in Japanese.",
         "http://teatube.ltd/ttpc",
     },
     {"NAZO",
         "nazo",
         "game",
-        "*Web-based, no mobile support | Single-player*\nAll sorts of SRS puzzles. Recommended for players that have completed TTT.\nHas T-Spin and all spin puzzles of all difficulties.\nLink translated to Simplified Chinese; originally in Japanese.",
+        "All sorts of SRS puzzles. Recommended for players that have completed TTT.\nHas T-Spin and all spin puzzles of all difficulties.\nLink translated to Simplified Chinese; originally in Japanese.",
         "http://teatube.ltd/nazo",
     },
 
+    {"Side Note 1",
+        "note nb NB DM notice",
+        "game",
+        "The following contents are some brief introductions about some official and fan-made Tetris games with high popularity. We make absolutely no guarantees that they would cover every Tetris game. Also, the author of this game has made some comments on some of these games. Notice that they are just personal opinions and cannot be used to judge the qualities of these games. To better differentiate between the facts and opinions, all the commentary contents are enclosed with square brackets and are separated from the main contents.",
+    },
     {"King of Stackers",
         "kos kingofstackers",
         "game",
-        "*Web-based | Multiplayer*\nTurn-based battle Tetris game.",
+        "Browser Game | Multiplayer | Mobile Support\nKoS for short. A turn-based battle Tetris game. In this game, the players can place seven tetrominoes in his or her turn, and garbage lines can enter the field only if the player places a block that does not clear a line. This game requires careful thinking and there are multiple modes with different attack mechanics.",
         "https://kingofstackers.com/games.php",
     },
     {"Tetr.js",
         "tetrjs tetr.js",
         "game",
-        "*Web-based | Single-player*\nHas newbie-friendly custom modes (most common features). Only a few on-screen control schemes are available to mobile.\nLink to Farter's Dig Mod, which itself is a mod of another version. Also has another mod called Tetr.js Enhanced.",
+        "Browser Game | Singleplayer | Mobile Support\nA browser-based Tetris game. It has many professional tunings and many modes, but the visuals are simple and there are barely any animations; besides that, only a few on-screen control schemes are available to mobile.\nLink to Farter's Dig Mod, which itself is a mod of another version. Also has another mod called Tetr.js Enhanced (You can find the link on Tetris Wiki).",
         "http://farter.cn/t",
     },
     {"Tetra Legends",
         "tl tetralegends",
         "game",
-        "*Web-based, no mobile support | Single-player*\nFeature-rich game with fancy visuals, also visualized some data that are otherwise hidden in other games, although controls aren't exactly the most comfortable. Has a rhythm mode.\nIt can be slow to load the game for the first time.",
+        "Browser Game | Singleplayer | No Mobile Support\nOr TL for short. It has many single-player modes, two hidden rhythm modes, and visualizes many hidden mechanics with rich animations. The development of this game was halted for multiple reasons in December 2020.",
         "https://tetralegends.app",
     },
     {"Ascension",
-        "asc ascension",
+        "asc ASC",
         "game",
-        "Or ASC for short. A cross-platform web-based Tetris game using its own rotation system called ASC. It may take a very long time when first loading this game. It also has many single-player modes (The \"Stack\" mode in Techmino was inspired by Ascension). Battle mode is currently in the testing phase (08/20/2021).",
+        "Browser Game | Singleplayer/Multiplayer\nOr ASC for short. It uses its own rotation system (also called ASC) and has many single-player modes. Battle modes are currently under beta testing (15/Dec/2021). The Stack mode in this game was also inspired by Ascension. ",
         "https://asc.winternebs.com",
     },
     {"Jstris",
         "js jstris",
         "game",
-        "*Web-based | Single-player and multiplayer*\nBasic web-based battle Tetris game.",
+        "Browser Game | Singleplayer/Multiplayer | Mobile Support\nOr JS for short. It has some single-player modes with multiple customizable parameters, Adjustable virtual keys layouts for mobile, but it doesn't have any animation. ",
         "https://jstris.jezevec10.com",
     },
     {"TETR.IO",
         "io tetrio tetr.io",
         "game",
-        "*Web-based, no mobile support | Single-player and multiplayer*\nFancy online battling Tetris game.",
+        "Browser Game | Singleplayer/Multiplayer\nOr IO for short. It has a ranking system and custom game with many adjustable parameters. Also, it provides desktop clients for improved performances and no ads.\n[It seems that Safari cannot open this game.]",
         "https://tetr.io",
     },
     {"Nuketris",
         "nuketris",
         "game",
-        "*Web-based | Single-player and multiplayer*\nA block stacker game with 1-vs-1 ranked mode and a few single-player modes. A PC is recommended for playing this game.",
+        "*Browser Game | Singleplayer/Multiplayer\nA block stacker game with 1V1 ranked matches and basic single-player modes.",
         "https://nuketris.herokuapp.com",
     },
-    {"WWC",
+    {"Worldwide Combos",
         "wwc worldwidecombos",
         "game",
-        "*Web-based | Multiplayer*\nWorldwide Combos, a web-based worldwide 1-vs-1 battle Tetris game.",
+        "Browser Game | Singleplayer/Multiplayer\nOr WWC for short. It has worldwide 1V1 ranked matches, recorded battles (which means that your opponent doesn't have to be a real person), many different rulesets, and bomb-handicapped garbage lines.",
         "https://worldwidecombos.com",
     },
     {"Tetris Friends",
         "tf tetrisfriends notrisfoes",
         "game",
-        "*Web-based, no mobile support | Single-player and multiplayer*\nA now-defunct web-based Tetris game; used to be a decent battle game. An unofficial private server known as Notris Foes exists.\nBuilt using Flash, which might require workarounds to play or cannot run at all on your devices.",
+        "Browser Game | Singleplayer/Multiplayer\n or TF for short, a now-defunct official Tetris game. Used to be a popular game but now nobody plays it because the website was shut down. However an unofficial private server known as \"Notris Foes\" still exists and you will need to download desktop client for full experiences.",
     },
     {"tetris.com",
         "tetris online official",
         "game",
-        "The Tetris game on tetris.com. It only has one mode – marathon, and you can control the game with your mouse.",
+        "Browser Game | Singleplayer\nThe Tetris game on tetris.com. It only has one mode — marathon, and you can control the game with your mouse.",
     },
     {"Tetris Gems",
         "tetris online official gem",
         "game",
-        "Another Tetris game from tetris.com. It has the gravity mechanism, and each game lasts for 1 minute. There are three kinds of gem blocks with different abilities.",
+        "Browser Game | Singleplayer\nAnother Tetris game from tetris.com. It has the gravity mechanism, and each game lasts for 1 minute. There are three kinds of gem blocks with different abilities.",
     },
     {"Tetris Mind Bender",
         "tetris online official gem",
         "game",
-        "Another Tetris game from tetris.com. It introduced \"Mind Bender\" minoes on the basis of marathon mode. Clearing a line with a Mind Bender mino will give you either a good or bad effect.",
+        "Browser Game | Singleplayer\nAnother Tetris game from tetris.com. It introduced \"Mind Bender\" minoes on the basis of marathon mode. Clearing a line with a Mind Bender mino will give you either a good or bad effect.",
     },
 
-    {"TGM",
-        "tgm tetrisgrandmaster tetristhegrandmaster",
+    {"Techmino",
+        "techmino",
         "game",
-        "*Arcade | Single-player*\nTetris The Grand Master, an arcade Tetris series that can run on Microsoft Windows. Titles like S13 or GM come from this series.\n\nTGM3 is the most well-known game in this series.",
+        "Cross-Platform | Singleplayer/Multiplayer\nOr Tech for short. A block stacker game developed using LÖVE. It has many single-player modes and many customizable parameters, and online multiplayer modes are gradually being developed.",
     },
-    {"DTET",
-        "dtet",
+    {"Falling Lightblocks",
+        "fl fallinglightblocks",
         "game",
-        "*Windows | Single-player*\nA game based on TGM's Classic rule with 20G and a powerful rotation system. Decent controls, but has no customization other than control mappings. The game is a bit hard to find now and you might need to manually install required DLLs.",
-    },
-    {"Heboris",
-        "hb heboris",
-        "game",
-        "*Windows*\nA game with Arcade-ish play style, simulates some modes of many Tetris games.",
-    },
-    {"Texmaster",
-        "txm texmaster",
-        "game",
-        "*Windows | Single-player*\nA game with all modes from TGM which you can use to practice. Has better controls than actual TGM. The world rule is slightly different, however (eg, instant-lock soft drops, and slightly different kick tables)",
+        "Browser Game/iOS/Android | Singleplayer/Multiplayer\n A cross-platform Tetris game that can be played in portrait and landscape modes. It has fixed DAS and line clear ARE. Has some customizable controls on mobile. Most of the game modes are designed based on NES classic Tetris, but there are some modern-ish modes. Battles are half turn-based, half real-time, and garbage cannot be buffered or canceled.",
+        "https://golfgl.de/lightblocks/",
     },
     {"Cambridge",
         "cambridge",
         "game",
-        "*Windows, macOS, Linux | Single-player*\nA Lua-based game engine dedicated to creating a robust, easily customizable platform for creating new, custom game modes. It was originally made by Joe Zeng, and starting with version 0.1.5 on October 8, 2020, Milla took over development of the game.\n--Tetris Wiki",
-    },
-
-    {"Tetris99",
-        "t99 tetris99",
-        "game",
-        "*Nintendo Switch | Multiplayer*\nA game famous for its 99-player battle royale mode and has many interesting strategies not present on traditional battle Tetris games. Also has limited single-player modes like Marathon and bot matches available as DLC.",
-    },
-    {"Puyo Puyo Tetris",
-        "ppt puyopuyotetris",
-        "game",
-        "*Multiple platforms | Single-player and multiplayer*\nA game that combines two games, Tetris and Puyo Puyo, and can battle between those two games. Has many modes for both single-player and online. The PC/Steam version has worse controls and horrible online experience, so it is not recommended.",
-    },
-    {"Tetris Online",
-        "top tetrisonline",
-        "game",
-        "*Windows | Single-player and multiplayer*\nA now-defunct Japanese Tetris game with both online and single-player modes. Allows custom DAS/ARR but neither can be set to 0. Minor input delay. Private servers exist and is decent for new players to get started.",
-    },
-    {"Tetris Effect",
-        "te tetriseffect",
-        "game",
-        "*PS4, Windows, Xbox | Single-player*\nFancy graphics and soundtrack that react to your actions. Not-so-good controls. You can have a go if you are into the visuals, but not exactly worth it if you are just trying to play some Tetris.",
-    },
-    {"Techmino",
-        "techmino",
-        "game",
-        "*Windows, macOS, Android, Linux, iOS/iPadOS | Single-player and multiplayer*\nA game with many modes and loads of customization. Low input delay, decent controls.",
-    },
-    {"Cultris II",
-        "c2 cultris2 cultrisii",
-        "game",
-        "*Windows, macOS, Linux | Single-player and multiplayer*\nA game focusing on speed. Has no hold and limited lockdown timer (like old school Tetris), but has customizable DAS/ARR. The main gimmick is its timer-based combos and emphasizes on speed, combo setups and digging.",
-    },
-    {"Nullpomino",
-        "np nullpomino",
-        "game",
-        "*Windows | Single-player and multiplayer*\nProfessional Tetris game with extreme room for customization. You can customize almost every aspect of the game. However, this is not a beginner-friendly game (you can get lost in the menus quite easily).",
-    },
-    {"Touhoumino",
-        "touhoumino",
-        "game",
-        "*Windows | Single-player*\nA Nullpomino mod with elements from Touhou Project. It is fun to play but difficult. Recommended for players with at least half-decent skills otherwise you don't even know how you die",
+        "Cross-Platform | Singleplayer\n A Tetris game developed using LÖVE and is dedicated to creating a robust, easily customizable platform for creating new, custom game modes. Originally made by Joe Zeng, but Milla took over the development on 08/Oct/2020 starting from V0.1.5.\n — Tetris Wiki",
     },
     {"Nanamino",
         "nanamino",
         "game",
-        "*Windows, Android | Single-player*\nDeveloping game, has a interesting rotation system",
+        "Windows/Android | Singleplayer\nA developing fan game which has a interesting original rotation system.",
+    },
+
+    {"TGM",
+        "tetrisgrandmaster tetristhegrandmaster",
+        "game",
+        "Arcade | Singleplayer/Local Multiplayer\nTetris The Grand Master, an arcade Tetris series. Titles like S13 and GM come from this series.\n\nTGM3 is the most well-known game in this series.",
+    },
+    {"DTET",
+        "dtet",
+        "game",
+        "Windows | Singleplayer\nA game based on TGM's Classic rule with 20G and a powerful rotation system. Decent controls, but has no customization other than control mappings. The game is a bit hard to find now and you may need to manually install required DLLs.",
+    },
+    {"Heboris",
+        "hb heboris",
+        "game",
+        "Windows | Singleplayer\nA game with Arcade-ish play style, capable of simulating many modes of other Tetris games.",
+    },
+    {"Texmaster",
+        "txm texmaster",
+        "game",
+        "Windows | Singleplayer\nA game with all modes from TGM which you can use to practice. The world rule is slightly different, however (e.g. instant-lock soft drops and slightly different kick tables).",
+    },
+
+    {"Tetris Effect",
+        "tec tetriseffectconnected",
+        "game",
+        "PS/Oculus Quest/Xbox/NS/Windows | Singleplayer/Multiplayer\nOr TE(C) for short. An official Tetris game with fancy graphics and soundtracks that react to your input. The basic version (without the word \"Connected\") only has singleplayer modes. The extended version, Tetris Effect Connected, features four online battle modes, Connected (VS), Zone Battle, Score Attack, and Classic Score Attack.",
+    },
+    {"Tetris 99",
+        "t99 tetris99",
+        "game",
+        "Nintendo Switch | Singleplayer/Multiplayer\nA game famous for its 99-player battle royale mode and has many interesting strategies not present on traditional battle Tetris games. Also has limited single-player modes like Marathon and bot matches available as DLC.",
+    },
+    {"Puyo Puyo Tetris",
+        "ppt puyopuyotetris",
+        "game",
+        "PS/NS/Xbox/Windows | Singleplayer/multiplayer\nA game that combines two games, Tetris and Puyo Puyo, and can battle between those two games. Has many modes for both single-player and online\n\n[The Steam PC version has worse controls and horrible online experience.]",
+    },
+    {"Tetris Online",
+        "top tetrisonline",
+        "game",
+        "Windows | Singleplayer/Multiplayer*\nA now-defunct Japanese Tetris game with both online and single-player modes. Allows custom DAS/ARR but neither can be set to 0. Minor input delay. Private servers do exist and is decent for new players to get started.",
+    },
+    {"Tetra Online",
+        "TO tetraonline",
+        "game",
+        "Windows/macOS/Linux | Singleplayer/Multiplayer\nTO for short. A Tetris game developed by Dr Ocelot and Mine. The delays are AREs are intentionally set to high values, and players who get used to Tetris games with no delays may not get used to this game.\nThe game was removed from Steam on 09/Dec/2020 due to a DMCA notice filed by TTC.\nHowever, an offline build can still be downloaded on GitHub.",
+        "https://github.com/Juan-Cartes/Tetra-Offline/releases/tag/1.0",
+    },
+
+    {"Cultris II",
+        "c2 cultris2 cultrisii",
+        "game",
+        "Windows/OS X | Singleplayer/Multiplayer\nC2 for short. Designed based on classic Tetris, Cultris II supports customizable DAS and ARR. The battle mode is focused on time-based combos, which challenges players’ speed, n-wide setups, and downstacking skills.\n[The Mac version was not being maintained for a long time. Any macOS build newer than macOS Catalina cannot run this game at all.]",
+    },
+    {"Nullpomino",
+        "np nullpomino",
+        "game",
+        "Windows/macOS/Linux | Singleplayer/Multiplayer\nOr NP for short. A high-customizable professional Tetris game. Nearly every parameter in the game can be adjusted.\n[But the UI was outdated, and this game requires full-keyboard controls. New players may have some problems getting used to it. Also, it seems that macOS Monterey cannot run this game.]",
     },
     {"Misamino",
         "misamino",
         "game",
-        "*Windows | Single-player?*\nLocal 1-vs-1 game, mainly plays turn-based mode. You can write your own bot for it (though you need to learn its API if you do).\nMisamino is also the name of its built-in bot. Said bot is also the core for the Puyo Puyo Tetris bot, Zetris.",
+        "Windows | Single-player\nLocal 1V1 game, mainly plays turn-based mode. You can write your own bot for it (though you need to learn its API if you do).\nMisamino is also the name of its built-in bot.",
     },
-    {"Tetris Journey",
-        "huanyouji tetrisjourney mobile phone",
+    {"Touhoumino",
+        "touhoumino",
         "game",
-        "An official mobile Tetris game developed by Tencent (available only in China). It has level modes, battle modes, and some single-player modes. You can customize the sizes and positions of the virtual keys but you cannot adjust DAS or ARR.\n The battle mode lasts for 2 minutes and if both player did not top out, the one who sent more attacks wins."
+        "Windows | Singleplayer\nA fan-made Tetris game, basically Nullpomino with elements from Touhou Project. The \"Spellcards\" from Touhou was introduced in the game, and you can only get bonus scores if you can reach the target score within the given period of time.\n[Recommended for players with at least half-decent skills otherwise you don't even know how you die.]",
     },
+
     {"Tetris Blitz",
         "blitz ea mobile phone",
         "game",
-        "A mobile Tetris game by Electronic Arts (EA). It has the gravity mechanism, and each game lasts for 2 minutes. A bunch of minoes fall down to the field at the beginning of the game, and you can enter the \"Frenzy\" mode by performing  line clears continuously. There are many different power-ups available. Also, this game has no top-out mechanism. When an incoming block overlaps with existing blocks in the field, the top lines will be cleared automatically. \n\nThis game is no longer available since April 2020.",
+        "iOS/Android | Singleplayer\nA mobile Tetris game by Electronic Arts (EA). It has the gravity mechanism, and each game lasts for 2 minutes. A bunch of minoes fall down to the field at the beginning of the game, and you can enter the \"Frenzy\" mode by performing  line clears continuously. There are many different power-ups available. Also, this game has no top-out mechanism. When an incoming block overlaps with existing blocks in the field, the top lines will be cleared automatically. \n\nThis game is no longer available since April 2020.",
     },
     {"Tetris (EA)",
         "tetris ea galaxy universe cosmos mobile phone",
         "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."
+        "iOS/Android | Singleplayer/Multiplayer?\nAnother 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 mobile phone",
         "game",
-        "The latest mobile Tetris from N3TWORK Inc. It has a 3-minute ultra mode, a marathon mode and a 100-player Royale mode. The UI is great but its controls are not so good.",
+        "iOS/Android | Singleplayer\nThe mobile Tetris game from N3TWORK Inc. It has a 3-minute ultra mode, a marathon mode and a 100-player Royale mode.\n[The UI is great but its controls are not so good.]",
     },
     {"Tetris Beat",
-        "tetris beat n3twork rhythm",
+        "n3twork rhythm",
         "game",
-        "A mobile Tetris game from N3TWORK. It has a \"Beat\" mode besides the Marathon mode, but in this game you only have drop the blocks in rhythm with the BGM. The effects are very heavy and the controls are not so good."
+        "iOS | Singleplayer\nA mobile Tetris game from N3TWORK. It has a \"Beat\" mode besides the Marathon mode, but in this game you only have drop the blocks in rhythm with the BGM.\n[The effects are very heavy and the controls are not so good.]"
+    },
+    {"Tetris Journey",
+        "tetrisjourney mobile phone huanyouji",
+        "game",
+        "iOS/Android | Singleplayer\nAn official mobile Tetris game developed by Tencent (available  exclusively in China). It has level modes, battle modes, and some single-player modes. You can customize the sizes and positions of the virtual keys but you cannot adjust DAS or ARR.\n The battle mode lasts for 2 minutes and if both player did not top out, the one who sent more attacks wins."
     },
     {"JJ Tetris",
         "jjtetris",
         "game",
-        "*Android | Multiplayer*\n(JJ块)\nA casual game on JJ Card Games (JJ棋牌). Portrait screen, low input delay, smooth controls. Customizable DAS/ARR and toggle-able 20G soft drop, limited control scheme customization. No hold nor B2B, no garbage buffer nor cancelling. Every attack sends at most 4 lines, combos are more powerful, otherwise similar to modern Tetris.",
-    },
-    {"Falling lightblock",
-        "fl fallinglightblock",
-        "game",
-        "*Android, iOS, Web | Single-player and multiplayer*\nA game that supports many platforms. Has delays that cannot be adjusted. Can, to some extent, customize controls on mobile. Most of the modes are similar to classic Tetris, but modern-ish modes also exist. Battles are half-turn-based-half-real-time, and garbage cannot be buffered or cancelled.",
-        "https://golfgl.de/lightblocks/",
+        "Android | Multiplayer\n(JJ块)\nA casual game on JJ Card Games (JJ棋牌). Portrait screen, low input delay, smooth controls. Customizable DAS/ARR and toggle-able 20G soft drop, limited control scheme customization. No hold nor B2B, no garbage buffer nor cancelling. Every attack sends at most 4 lines, combos are more powerful, otherwise similar to modern Tetris.",
     },
+
     {"Huopin Tetris",
         "huopin qq",
         "game",
-        "*Windows | Multiplayer*\n(火拼俄罗斯)\n\nThe Tetris game on Tencent Game Center, 12-wide board, DAS/ARR the same as your typing, 1 next, no hold. Can only send garbage through Tetris (sends 3 lines) and Triple (sends 2 lines). Garbage is checker-board-shaped and is very difficult to dig through.",
+        "Windows | Multiplayer\n(火拼俄罗斯)\n\nThe Tetris game on Tencent Game Center, 12-wide board, DAS/ARR the same as your typing, 1 next, no hold. Can only send garbage through Tetris (sends 3 lines) and Triple (sends 2 lines). Garbage is checker-board-shaped and is nearly impossible to dig through.",
     },
 
     --Terms
@@ -300,57 +327,57 @@ return{
         "Translator's note on those per-minute and per-second values\n\nNot all of them are commonly used in the communities, and not all terms mean the same thing across all contexts. They mostly apply to Techmino."
     },
     {"LPM",
-        "lpm linesperminute speed",
+        "linesperminute speed",
         "term",
         "Lines per minute\n\tReflects playing speed of a player.\nDifferent games calculate LPM differently. For example, Tetris Online calculates its LPM using PPS (see below), where 1PPS=24LPM. This basically ignores clearing garbage lines and makes it different from its literal meaning. In Techmino, this converted LPM value is marked \"L'PM\".",
     },
     {"PPS",
-        "pps piecespersecond speed",
+        "piecespersecond speed",
         "term",
         "Pieces per second\n\tReflects playing speed of a player.",
     },
     {"BPM",
-        "bpm blocksperminute piecesperminute speed",
+        "blocksperminute piecesperminute speed",
         "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",
+        "keysperminute keypressesperminute",
         "term",
         "Keypresses per minute\n\tReflects how fast the player presses keys or buttons.",
     },
     {"KPP",
-        "kpp keysperpiece keypressesperpiece",
+        "keysperpiece keypressesperpiece",
         "term",
         "Keypresses per piece\n\tReflects how efficient the player is with the controls. Reduce this number by learning to finesse.",
     },
     {"APM",
-        "apm attackperminute",
+        "attackperminute",
         "term",
         "Attack per minute\n\tReflects offensive power of a player.\nIn Techmino, the concept of \"attack\" sometimes includes the fractional lines of an attack. Since sending garbage rounds down before sending, this value can be higher than your actual attack power.",
     },
     {"SPM",
-        "spm linessentperminute",
+        "linessentperminute",
         "term",
         "[lines] Sent per minute\n\tReflects *actual* offensive power of a player. (does not count lines used for cancelling garbage in buffer.)",
     },
     {"RPM",
-        "rpm receive jieshou",
+        "receive jieshou",
         "term",
         "[lines] Receive per Minute\n\tReflects pressure applied to a player.",
     },
     {"DPM",
-        "dpm digperminute defendperminute",
+        "digperminute defendperminute",
         "term",
         "Dig/Defend per minute\n\tSometimes can reflect how well a player can survive garbage.",
     },
     {"ADPM",
-        "adpm attackdigperminute vs",
+        "attackdigperminute vs",
         "term",
         "Attack&Dig per minute\n\tUsed to compare skill differences between the two players within one match; slightly more accurate than APM.\n\"vs\" in TETR.IO is Atk+Dig per 100s",
     },
     {"APL",
-        "apl attackperline efficiency",
+        "attackperline efficiency",
         "term",
         "Attack per line (cleared)\n\tAlso known as \"efficiency\"; reflects the per-line efficiency of attacks. For example, Tetrises and T-spins have higher efficiency than doubles and triples.",
     },
@@ -386,7 +413,7 @@ return{
         "Formerly known as Perfect Clear (PC). That is also still the term preferred by the communities and used in Techmino.\nClear all minoes on the field.",
     },
     {"HPC",
-        "hpc hc clear halfperfectclear",
+        "hc clear halfperfectclear",
         "term",
         "*Techmino-exclusive*\nHalf Perfect Clear\nExtension of an All Clear. Should a line clear resemble an All Clear when ignoring lines below the clear, the clear is a Half Perfect Clear, and sends a small extra amount of attack.",
     },
@@ -412,27 +439,27 @@ return{
         "A spin performed using the T Tetromino.\nIn modern official games, T-Spins are detected using the 3-corner rule, i.e. if at least three of the four cells diagonal to the rotation center is occupied by minoes, it is considered as a T-Spin. Some games have extra rules to determine a T-Spin as a Mini T-Spin instead, which has reduced attacks/scores.",
     },
     {"TSS",
-        "tss t1 tspinsingle",
+        "t1 tspinsingle",
         "term",
         "T-Spin Single\nClear 1 line with a T-Spin.",
     },
     {"TSD",
-        "tsd t2 tspindouble",
+        "t2 tspindouble",
         "term",
         "T-Spin Double\nClear 2 lines with a T-Spin.",
     },
     {"TST",
-        "tst t3 tspintriple",
+        "t3 tspintriple",
         "term",
         "T-Spin Triple\nClear 3 lines with a T-Spin.",
     },
     {"MTSS",
-        "mtss minitspinsingle tsms tspinminisingle",
+        "minitspinsingle tsms tspinminisingle",
         "term",
         "Mini T-Spin Single\nFormerly known as T-Spin Mini Single (TSMS).\nClear 1 line with a Mini T-Spin.\nDifferent games have different ways to determine whether a T-Spin is a Mini.",
     },
     {"MTSD",
-        "mtsd minitspindouble tsmd tspinminidouble",
+        "minitspindouble tsmd tspinminidouble",
         "term",
         "Mini T-Spin Double\nFormerly known as T-Spin Mini Double (TSMD).\nClear 2 lines with a Mini T-Spin.\nDifferent games have different ways to determine whether a T-Spin is a Mini.\nIn addition, different games have different behaviors when clearing a Mini T-Spin Double: some games credit this move correctly, and some games use a different displayed text because they never programmed this in.",
     },
@@ -447,12 +474,12 @@ return{
         "Systems that determine how the pieces rotate.\n\nIn modern Tetris games, tetrominoes can rotate on a specfic rotation center (but this may be absent in some games). If the minoes overlap with the walls or the field, the system would attempt to perform some offsets (a process known as \"wall-kicking\"). Wall kicks allow minoes to move into  in specific-shaped holes.",
     },
     {"Orientation",
-        "orientation direction 0r2l 02 20 rl lr",
+        "direction 0r2l 02 20 rl lr",
         "term",
         "In SRS and SRS-like rotation systems, there are standard notations describing the orientations of the minoes:\n 0 for Original orientation; R for right, or 90° clockwise; L for left, or 90° counterclockwise; 2 for spin twice (180°). For example, 0→L means rotating counterclockwise from original orientation (0) to L; 0→R means rotating clockwise from original orientation (0) to R; 2→R means rotating counterclockwise from 2 (180°) to R.",
     },
     {"ARS",
-        "ars arikrotationsystem atarirotationsystem",
+        "arikrotationsystem atarirotationsystem",
         "term",
         "It can refer to two things:\nArika Rotation System, which is used in Tetris: The Grand Master games.\nAtari Rotation System, which aligns pieces to the top-left when rotating.",
     },
@@ -462,12 +489,12 @@ return{
         "Rotation system used in the Tetris clone Ascension. All pieces use the same two kick tables (one for CW, one for CCW), and the kick range is approximately ± 2 blocks on both axis.\n\nIn Techmino, ASC+ is a modified version of Ascension's rotation system, adding kicks for 180° spins.",
     },
     {"BRS",
-        "brs bulletproofsoftware",
+        "bulletproofsoftware",
         "term",
         "BPS rotation system, the rotation system used in Tetris games by Bullet-Proof Software.",
     },
     {"BiRS",
-        "birs biasrs biasrotationsystem",
+        "biasrs biasrotationsystem",
         "term",
         "*Techmino exclusive*\n\nBias Rotation System, Techmino's original rotation system based on XRS and SRS.\nIt sets an offset to the rotation if you hold left/right/soft drop when you rotate.\nIf rotation fails when downwards offset is applied, it tries again without the downwards offset.\nThen it tries without left/right offset.\nIf it fails, then the rotation will not occur.\n\nCompared to XRS, BiRS only uses a single kick table, making it easier to memorize; also keeps the climb-over-terrain feature of SRS.\n\nThe final kick offset's euclidean distance can't be larger than √5; if there is a horizontal offset, the final kick offset can't be in the opposite direction.",
     },
@@ -477,22 +504,22 @@ return{
         "Cultris II rotation system, a rotation system used in the Tetris clone Cultris II.\nAll rotations and all pieces share the same kick table (left, right, down, down-left, down-right, left 2, right 2), with left priortizing over right.\n\nIn Techmino, C2sym is a modification to this rotation system that chooses whether to check left or right first depending on the piece and rotation.",
     },
     {"DRS",
-        "drs dtetrotationsystem",
+        "dtetrotationsystem",
         "term",
         "DTET Rotation System\nThe rotation system used in DTET.",
     },
     {"NRS",
-        "nrs nintendorotationsystem",
+        "nintendorotationsystem",
         "term",
         "Nintendo Rotation System\nThe rotation system used in the Tetris games on the NES and Game Boy.\nIt has two mirrored versions; the left-handed version is used on Game Boy, and the right-handed version on the NES.",
     },
     {"SRS",
-        "srs superrotationsystem",
+        "superrotationsystem",
         "term",
         "Super Rotation System, the most widely used rotation system by modern Tetris games, and is the foundation of many self-made rotation systems. There are four orientations for each tetromino, and they can rotate clockwise or counterclockwise (But without 180° rotations). Should a Tetromino overlap with the wall, floor or other minoes on the field after rotation, a few offset positions will be checked, allowing pieces to kick off walls and floors. You can look up the details of the wall kick table on Tetris Wiki.",
     },
     {"TRS",
-        "trs techminorotationsystem",
+        "techminorotationsystem",
         "term",
         "*Techmino-exclusive*\nTechmino Rotation System\nThe rotation system used in Techmino, based on SRS.\nIt includes fixes on common cases where S/Z are locked from rotating and some extra useful kicks. Each pentomino also has a kick table roughly based on SRS logic.",
     },
@@ -508,7 +535,7 @@ return{
         "Clearing 2 or more technical line clears (Spins and Tetrises) in a row (without introducing ordinary line clears) gives extra attack power.\nUnlike combos, placing pieces that do not clear lines does not affect Back to Back.",
     },
     {"B2B2B",
-        "b2b2b b3b",
+        "b3b",
         "term",
         "*Techmino-exclusive*\nClearing many Back to Backs to fill the Back to Back gauge, and eventually you will be able to perform a Back to Back to Back, giving more bonus attack. A.k.a. B3B.",
     },
@@ -533,17 +560,17 @@ return{
         "Many modern Tetris games use the same color scheme for the tetrominoes. The colors are:\nZ–red, S–green, J–blue, L–orange, T–purple, O–yellow, and I–cyan.\n\nTechmino also uses this \"standard\" coloring for the tetrominoes.",
     },
     {"IRS",
-        "irs initialrotationsystem",
+        "initialrotationsystem",
         "term",
         "Initial Rotation System\nHolding a rotation key during spawn delay to spawn the piece pre-rotated. Sometimes prevents death.",
     },
     {"IHS",
-        "ihs initialholdsystem",
+        "initialholdsystem",
         "term",
         "Initial Hold System\nHolding the hold key during spawn delay to spawn the held piece (or Next piece in the Next queue if there is no held piece) instead of the current piece, and put the current piece in hold as if the player has performed the held before spawning. Sometimes prevents death.",
     },
     {"IMS",
-        "ims initialmovesystem",
+        "initialmovesystem",
         "term",
         "*Techmino-exclusive*\nInitial Movement System\nHolding a sideways movement key during spawn delay to spawn the piece one block off to the side. Sometimes prevents death.\nNote that DAS need to be full charged when new piece appear",
     },
@@ -558,12 +585,12 @@ return{
         "Save your current piece for later use, and take out a previously held piece (or next piece in the next queue, if no piece was held) to place instead. You can only perform this once per piece in most cases.\n\nTechmino Exclusive: Techmino has a \"In-place hold\" feature. When enabled, pieces that spawn from the Hold queue will spawn at where your currently-controlling piece is, instead of at the top of the matrix.",
     },
     {"Swap",
-        "swap hold",
+        "hold",
         "term",
         "Like *hold*, swap your current piece and the first piece of next queue. You can also only perform this once per piece in most cases.",
     },
     {"Deepdrop",
-        "deepdrop shenjiang",
+        "shenjiang",
         "term",
         "*Techmino exclusive*\n\nA special function that allows minoes to teleport through the wall to enter a hole. When the mino hits the bottom, pressing the soft drop button again will enable the deep drop. if there is a hole that fits the shape of the mino, it will teleport into this hole immediately/nThis mechanism is especially useful for AI because it allows AI to disregard the differences between different rotation systems.",
     },
@@ -583,7 +610,7 @@ return{
         "A sub-(number) time means the time is below a certain milestone. The unit of the time is often left out and inferred, for example, a \"sub-30\" time for a 40-line Sprint means below 30 seconds, and a \"sub-15\" time for a 1000-line Sprint means below 15 minutes.",
     },
     {"Donation",
-        "donation donate",
+        "donate",
         "term",
         "A method of \"plugging\" up the Tetris hole to send a T-Spin. After the T-Spin, the Tetris hole is opened up once again to allow the continuation of Tetris or downstacking.\n--Harddrop wiki",
     },
@@ -653,7 +680,7 @@ return{
         "The stacking method where you leave a 4-block-wide well in the middle.\nThe infamous combo setup that not only makes a lot of combos but also abuses the death conditions and won't die even if you receive some garbage. This technique is often disliked by players due to how unbalanced it is.",
     },
     {"Residual",
-        "residual c4w s4w",
+        "c4w s4w",
         "term",
         "Refers to how many blocks to leave in the well of a 4-wide combo setup. The most common are 3-residual and 6-residual.\n3-residual has fewer variations and is easier to learn, with a pretty good chance of success, and it's pretty useful in combat.\n6-residual has more variables and is harder, but can be more consistent if you do it well. It can also be used for special challenges like getting 100 combos in an infinite 4-wide challenge.",
     },
@@ -663,7 +690,7 @@ return{
         "A way of stacking where you have a 6-block-wide stack on the left, and a 3-block-wide stack on the right.\nFor a skilled player, this method of stacking might reduce the keypresses needed for stacking, and is a popular Sprint stacking method. The reason why it works has to do with the fact that pieces spawn with a bias to the left.",
     },
     {"Freestyle",
-        "freestyle ziyou",
+        "ziyou",
         "term",
         "This term is usually used in 20TSDs. Freestyle means finishing 20 TSDs without using static stacking modes. Freestyle 20TSDs is more difficult than static tsacking modes such as LST, and the performance can represent the T-spin skills a player has in battles.",
     },
@@ -673,12 +700,12 @@ return{
         "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",
+        "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",
+        "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",
@@ -689,7 +716,7 @@ return{
         "Falling speed is often described in terms of \"G\", i.e. how many lines the blocks fall in one frame (usually assuming 60 fps).\nG is a relatively large unit. The speed of Lv 1 in a regular Marathon (one second per line) is 1/60 G, and 1G is about Lv 13 speed. The highest speed of modern Tetris is 20G because the field height is 20 lines. In fact, the real meaning of 20G is \"Infinite falling speed\", and even when the field height is more than 20 lines, 20G modes force all the blocks to fall down to the bottom instantly. You can learn more about 20G at the \"20G\" entry.",
     },
     {"20G",
-        "20g gravity instant",
+        "gravity instant",
         "term",
         "The fastest falling speed of modern Tetris. In 20G modes, pieces appear instantly on the bottom of the field without the actual process of \"falling down\". This sometimes also limits a piece's sideways movements, as it is not always possible to make a piece climb over a bump or out of a well in 20G. You can learn more at the unit \"G\" at the \"falling speed\" entry. ",
     },
@@ -699,17 +726,17 @@ return{
         "The delay between block touching the ground and locking down (i.e. can no longer be controlled, and the next piece spawns).\nModern Tetris games often have forgiving lockdown delay mechanics where you can reset this delay by moving or rotating (up to 15 times), and you can sometimes stall for time by doing this. Classic Tetris games often have a far less forgiving lockdown delay.",
     },
     {"ARE",
-        "are spawn appearance delay",
+        "spawn appearance delay",
         "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 appearance delay",
+        "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",
+        "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_ROBOT",
     },
@@ -754,7 +781,7 @@ return{
         "Techmino exclusive: this feature is designed to prevent mis-harddropping from pressing hard drop key shortly after the previous piece is naturally locked down.\nHard drop key can be disabled for a few frames (depending on the settings) after a natural lockdown.\n\nOther games may have a similar feature but may function differently.",
     },
     {"SDF",
-        "sdf softdropfactor",
+        "softdropfactor",
         "term",
         "Soft Drop Factor\n\nA way to define soft drop speed as a multiple of natural falling speed. In guideline games, the soft drop is usually 20x the speed of natural falling, i.e. it has an SDF of 20. Techmino does not use SDF to define soft drop speed.",
     },
@@ -788,8 +815,13 @@ return{
         "term",
         "Vibrate your finger on the controller to achieve faster sideways movement speed than holding it.\nIt is most commonly used on classic Tetris where DAS is rather slow. In most cases, you do not need to hypertap in modern Tetris games, because their DAS is often fast enough.",
     },
+    {"Rolling",
+        "rolling",
+        "term",
+        "Another method of fast-tapping in high-gravity (around 1G) modes (with slow DAS/ARR setting).\nWhen you perform rolling, you fix the position of one hand and the controller, and then tap the back of the controller with fingers on your other hand repeatedly. This method allows even faster moving speeds than hypertapping (see \"Hypertapping\" for more)and requires much less effort.\nThis method was first discovered by Cheez-fish and he has once achieved a tapping speed of more than 20 Hz.",
+    },
     {"Passthrough",
-        "passthrough pingthrough",
+        "pingthrough",
         "term",
         "",--TODO
     },
@@ -859,12 +891,12 @@ return{
         "Any input device takes some time for the input to reach the game. This delay can range from a few milliseconds to a few dozen milliseconds.\nIf input delay is too long, the controls can feel uncomfortable.\nThis delay is often due to the performance of the hardware and software used, and often out of your control. Turn on performance mode (or turn off power saving mode) on your device, and turn on gaming mode on your monitor/TV (if you have one), may help reducing input delay.",
     },
     {"Cold Clear",
-        "cc coldclear",
+        "cc coldclear ai bot",
         "term",
         "A Tetris bot. Originally built for Puyo Puyo Tetris, thus can be less powerful on Techmino.",
     },
     {"ZZZbot",
-        "zzzbot",
+        "ai bot",
         "term",
         "A Tetris bot. Built by the Chinese Tetris player 奏之章 (Zou Zhi Zhang) and has decent performance in many games",
     },
@@ -882,7 +914,7 @@ return{
         HDsearch.."dt",
     },
     {"DTPC",
-        "dtpc dtcannon doubletriplecannon",
+        "dtcannon doubletriplecannon",
         "setup",
         "A follow-up of the DT Cannon that ends with an All Clear"..HDwiki,
         HDsearch.."dt",
@@ -894,7 +926,7 @@ return{
         HDsearch.."bt_cannon",
     },
     {"BTPC",
-        "btpc btcannon betacannon",
+        "btcannon betacannon",
         "setup",
         "A follow-up of the BT Cannon that ends with an All Clear."..HDwiki,
         HDsearch.."bt_cannon",
@@ -988,8 +1020,8 @@ return{
     {"LST stacking",
         "lst",
         "pattern",
-        "An infinite T-Spin Double setup"..HDwiki,
-        HDsearch.."st_stacking",
+        "An infinite T-Spin Double setup",
+        "https://four.lol/stacking/lst",
     },
     {"Hamburger",
         "hamburger",
@@ -1026,9 +1058,9 @@ return{
 
     --Savedata managing
     {"Console",
-        "console cmd commamd minglinghang kongzhitai",
+        "cmd commamd minglinghang kongzhitai terminal",
         "command",
-        "Techmino has a console that enables debugging/advanced features.\nTo access the console, repeatedly tap the Techmino logo or press the C key on the keyboard on the main menu.\n\nCareless actions in the console may result in corrupting or losing saved data. Proceed at your own risk.",
+        "Techmino has a console that enables debugging/advanced features.\nTo access the console, repeatedly tap (or click) the Techmino logo or press the C key on the keyboard on the main menu.\n\nCareless actions in the console may result in corrupting or losing saved data. Proceed at your own risk.",
     },
     {"Reset setting",
         "reset setting",
@@ -1068,12 +1100,12 @@ return{
 
     --English
     {"SFX",
-        "sfx soundeffects",
+        "soundeffects",
         "english",
         "Acronym for \"Sound Effects\".",
     },
     {"BGM",
-        "bgm backgroundmusic",
+        "backgroundmusic",
         "english",
         "Acronym for \"Background Music\".",
     },
@@ -1090,7 +1122,7 @@ return{
 
     --Famous
     {"Hebomai",
-        "hebomai hbm",
+        "hbm",
         "name",
         "One of the top players.\nOnce Beat Wu Songhao (a Chinese player) on TV.",
     },
@@ -1100,52 +1132,52 @@ return{
         "(あめみや　たいよう)\n\nOne of the top players.\nWon champion on a game in Puyo Puyo Tetris's Swap mode.",
     },
     {"Ajanba",
-        "ajanba ajb",
+        "ajb",
         "name",
         "One of the top players.\nWon champion of JsCup.",
     },
     {"Blink",
-        "blink",
+        "",
         "name",
         "One of the top players.\nRuns the Tetris community, Hard Drop.",
     },
     {"Doremy",
-        "doremy 123",
+        "123",
         "name",
         "One of the top players.\nAmemiya once said he was the second-best player in the world.",
     },
     {"Firestorm",
-        "firestorm fst",
+        "fst",
         "name",
         "One of the top players.\nWon champion of JsCup.",
     },
     {"Furea",
-        "furea fuleiya jk",
+        "flare fuleiya jk",
         "name",
         "(ふれあ)\n\nOne of the top players.\nWorld record holder of Puyo Puyo Tetris's Ultra mode.",
     },
     {"Iljain",
-        "iljain yijianlian",
+        "yijianlian",
         "name",
         "One of the top players.\nAchieved Rank 1 in Cultris II.",
     },
     {"Jonas",
-        "jonas",
+        "",
         "name",
-        "One of the top players in Classic Tetris.\nFour-times-in-a-row champion of CTWC.\n\n(1981-2021)",
+        "(1981-2021) One of the top players in Classic Tetris.\nFour-times-in-a-row champion of CTWC.",
     },
     {"Joseph",
-        "joseph",
+        "",
         "name",
         "One of the top players in Classic Tetris.\nTwice-in-a-row champion of CTWC. Also holds many world records of Tetris (NES, Nintendo).",
     },
     {"Kazu",
-        "kazu mdking",
+        "mdking",
         "name",
         "One of the top players.\nFamous for how he can turn misdrops into donation setups.\nA.k.a. \"GAMEOVER\", \"GAMAOVER\", \"GAME_OVER_RETRY\"",
     },
     {"Microblizz",
-        "microblizz",
+        "",
         "name",
         "One of the top players.\nFormer world record holder for Sprint.",
     },
@@ -1160,7 +1192,7 @@ return{
         "One of the top players.\nFamously fond of using Center 4-Wide setups, thus having a bad reputation. However, he is undeniably skilled in other techniques as well.",
     },
     {"Yakine",
-        "yakine heshui",
+        "",
         "name",
         "One of the top players.\nFamous for fancy T-Spins. When in combat but not in danger, he could often pull off some fancy donations very high on the field. Third place on the speed leaderboards of Jstris's 20TSD mode, and didn't use setups (the first and second place both used LST setup).",
     },
@@ -1170,37 +1202,37 @@ return{
         "Starting from here, all but one term are China-specific (the not-China term is Diao) and are less relevant for the global community.\n\"Virtual content creator\" refers to people who produce content online under a fictional persona, and appear as a motion-controlled animated character on screens. Basically \"Virtual YouTuber\" but not platform-specific."
     },
     {"TetroDictionary",
-        "zictionary tetrodictionary littlez",
+        "zictionary littlez",
         "name",
-        "(or Zictionary for short) The name of this dictionary!\nIt includes brief introductions on many common terms in Tetris.\nIt used to be a chatbot in our QQ group, which was used to answer new player's FAQs. The entries in the Tetrodictionary were also inherited from the database in the chatbot.",
+        "(or Zictionary for short) The name of this dictionary!\nIt includes brief introductions on many common terms in Tetris.\nIt used to be a chatbot in our QQ group, which was used to answer new player's FAQs. The entries in the Tetrodictionary were also inherited from the database in the chatbot.\nThe contents in the TetroDictionary was adapted from a variety of sources such as Tetris Wiki and Hard Drop Wiki.",
     },
     {"MrZ",
-        "mrz_26",
+        "mrz_26 t026 t626",
         "name",
         "Tetris Research community member, the author of Techmino.\nPersonal bests: Sprint 25.95 seconds, MPH Sprint 57 seconds, #8 on Jstris leaderboards, X rank on TETR.IO, cleared TGM3 (World rule, Shirase gold 1300).",
         "https://space.bilibili.com/225238922",
     },
 
     {"Circu1ation",
-        "circu1ation",
+        "",
         "name",
-        "One of the top players. First one to achieve sub-20 Sprint in China, X rank on TETR.IO.",
+        "One of the top players. First one to achieve sub-20 40L Sprint in China, X rank on TETR.IO.",
         "https://space.bilibili.com/557547205",
     },
     {"Farter",
-        "farteryhr",
+        "",
         "name",
         "Tetris Research community member.\nPersonal bests: Sprint 26.193 seconds\nOne of the prestigious players in the Chinese Tetris community. Author of T-ex and Tetr.js Farter's Dig Mod.",
         "https://space.bilibili.com/132966",
     },
     {"Teatube",
-        "teatube ttb chaguan chanaiye sifangchaye 022",
+        "ttb chaguan chanaiye sifangchaye 022",
         "name",
         "Administrator of the Tetris Research community, Operator of the Tetris Online Study private server, chief editor of the Huiji wiki.\nPersonal bests: Sprint 33 seconds.",
         "https://space.bilibili.com/834903",
     },
     {"Sniraite",
-        "sniraite",
+        "",
         "name",
         "Tetris Research community member.\nPersonal bests: Sprint 23 seconds\nOne of the top players in China. Should be the fastest player in Mainland China.",
         "https://space.bilibili.com/561589",
@@ -1211,7 +1243,7 @@ return{
         "Tetris Research community member.\nMain organizer for competitions in the community.",
     },
     {"Flyz",
-        "flyz fxg",
+        "fxg",
         "name",
         "Tetris Research community member.\nA technical player.",
         "https://space.bilibili.com/787096",
@@ -1228,12 +1260,12 @@ return{
         "(Yùn Kōng Zhī Líng)Tetris Research community member.\nPersonal bests: Sprint 33 seconds.\nDecent efficiency. Can't eat spicy food. Often uses TKI 3, Albatross and PC opener.",
         "https://space.bilibili.com/9964553",
     },
-    {"Mono",
-        "mono dongxi",
-        "name",
-        "Tetris Research community member.\nWe seem to have lost some information about this individual, but you should still be able to find her in one of the voice packs in Techmino.",
-        "https://space.bilibili.com/1048531896",
-    },
+    -- {"Mono",
+    --     "dongxi",
+    --     "name",
+    --     "Tetris Research community member.\nWe seem to have lost some information about this individual, but you should still be able to find her in one of the voice packs in Techmino.",
+    --     "https://space.bilibili.com/1048531896",
+    -- },
     {"奏之章",
         "zzz zouzhizhang",
         "name",
@@ -1259,43 +1291,43 @@ return{
         "https://space.bilibili.com/1471400",
     },
     {"Mifu",
-        "mifu swl nanmaomao",
+        "swl",
         "name",
         "Originally known as swl.\nPersonal bests: Sprint 28.445 seconds, Tetris Research community member.\nMiya's Tetris coach. Miya made an animated character art for him called Mifu, meaning \"Miya's Shifu\".",
         "https://space.bilibili.com/109356367",
     },
     {"ZXC",
-        "zxc thtsod",
+        "thtsod flag ctf",
         "name",
         "Also known as ThTsOd.\nTetris Research community member.\nA technical player.",
         "https://space.bilibili.com/4610502",
     },
     {"Tinko",
-        "tinko",
+        "",
         "name",
         "Tetris Research community member.\nA technical player.",
         "https://tinko.moe",
     },
-    {"T722",
-        "722",
+    {"T0722",
+        "",
         "name",
-        "Tetris Research community member.\nMusician.",
+        "Tetris Research community member.\nMusic Composer.",
         "https://space.bilibili.com/30452985",
     },
     {"Diao",
-        "diao",
+        "",
         "name",
         "Tetris Research community member.\nOne of the top battle players. Won second place in JsCup, champion in TTT, champion in HDO XII.\nHas many former nicknames including nmdtql, diao, nanami.",
         "https://space.bilibili.com/471341780",
     },
     {"思竣",
-        "sijun",
+        "sijun acm oi",
         "name",
         "(Sī Jùn)\n\nTetris Research community member.\nLots of mental computation power.",
         "https://space.bilibili.com/403250559",
     },
     {"Particle_G",
-        "particleg pg",
+        "pg",
         "name",
         "Tetris Research community member.\nSprint 59.4 seconds\nThe developer of Techmino backend",
         "https://space.bilibili.com/3306106",
@@ -1307,13 +1339,13 @@ return{
         "https://space.bilibili.com/263909369",
     },
     {"子心Koishi",
-        "koishi",
+        "",
         "name",
         "(Zǐ Xīn Koishi)\n\nTetris Research community member, Virtual content creator.\nA top Tetris 99 players known for his strategies.",
         "https://space.bilibili.com/147529",
     },
     {"ditoly",
-        "ditoly icrem kuimei jk",
+        "icrem kuimei jk",
         "name",
         "Tetris Research community member. The developer of Nanamino.",
         "https://space.bilibili.com/13014410",
@@ -1324,7 +1356,7 @@ return{
         "(Lán Lǜ)\n\nTetris Research community member.\nParticipant of $1",--Techmino backend
     },
     {"喵田弥夜Miya",
-        "miya miaotianmiye",
+        "miaotianmiye",
         "name",
         "(Miāo Tián Mí Yè Miya)\n\nTetris Research community member, Virtual content creator.\nPractically the mascot of the community. Voice actress of Techmino.",
         "https://space.bilibili.com/846180",