Not really rewrite mod system

Zframework/tableExtend.lua

@@ -15,6 +15,29 @@ function TABLE.new(val,count)
     return L
 end
 
+-- Get a new empty table with __lock() and __unlock() to protect changes
+function TABLE.newWithLockMetamethod()
+    local t
+    do
+        local lockedKey={}
+        local realTable={}
+        t=setmetatable( -- This is the fake table, act like a wrapper of realTable
+            {
+                __lock  =function(k) if k then lockedKey[k]=true end end,
+                __unlock=function(k)
+                    if k then lockedKey[k]=false else TABLE.cut(lockedKey) end
+                end,
+            },{
+                __index   =realTable,
+                __newindex=function(_,k,v) if not lockedKey[k] then realTable[k]=v end end,
+                __len     =function(_,_,_) return #realTable end,
+                __tostring=function(_,_,_) return tostring(realTable) end,
+            }
+        )
+    end
+    return t
+end
+
 -- Get a copy of [1~#] elements
 function TABLE.shift(org,depth)
     if not depth then depth=1e99 end

Zframework/widget.lua

@@ -803,7 +803,7 @@ function selector:press(x)
             end
         end
         if self.select~=s then
-            self.code(self.list[s])
+            self.code(self.list[s],s)
             self.select=s
             self.selText=self.list[s]
             if self.sound then

parts/char.lua

@@ -73,8 +73,8 @@ local L={
         hollowLogo=     0xF008C,
         toUp=           0xF008D,
         toDown=         0xF008E,
-        toLeft=         0xF008F,
-        toRight=        0xF0090,
+        toLeft=         0xF0090,
+        toRight=        0xF008F,
         checkMark=      0xF0091,
         crossMark=      0xF0092,
         musicMark=      0xF0093,

parts/data.lua

@@ -334,6 +334,7 @@ do-- function DATA.saveReplay()
                 seed=GAME.seed,
                 setting=GAME.setting,
                 mod=_getModList(),
+                modApplyAt=GAME.modApplyAt,
                 tasUsed=GAME.tasUsed,
             }
             if GAME.curMode.savePrivate then
@@ -393,6 +394,7 @@ function DATA.parseReplayData(fileName,fileData,ifFull)
         seed=metaData.seed,
         setting=metaData.setting,
         mod=metaData.mod,
+        modApplyAt=metaData.modApplyAt,
         tasUsed=metaData.tasUsed,
     }
     if ifFull then rep.data=fileData end

parts/gameFuncs.lua

@@ -506,10 +506,8 @@ function mergeStat(stat,delta)-- Merge delta stat. to global stat.
     end
 end
 function scoreValid()-- Check if any unranked mods are activated
-    for number,sel in next,GAME.mod do
-        if sel>0 and MODOPT[number].unranked then
-            return false
-        end
+    for _,sel in next,GAME.mod do
+        if sel>0 then return false end
     end
     if GAME.playing and GAME.tasUsed then
         return false
@@ -999,20 +997,25 @@ do-- function resetGameData(args)
     local function task_showMods() -- TODO
         coroutine.yield()
         local counter=0
-        for number,sel in next,GAME.mod do
-            if sel>0 then
-                if counter==0 then
-                    coroutine.yield()
-                else
+
+        if usingMod() then
+            SFX.play('collect',.2)
+            TEXT.show(GAME.modApplyAt,640,26,45,'spin')
+            for _=1,90 do coroutine.yield() end
+
+            for number,sel in next,GAME.mod do
+                if sel>0 then
                     for _=1,20 do
                         coroutine.yield()
                     end
+                    local M=MODOPT[number]
+                    SFX.play('collect',.2)
+                    TEXT.show(M.id,640+(counter%5-2)*80,26,45,'spin')
+                    counter=counter+1
                 end
-                local M=MODOPT[number]
-                SFX.play('collect',.2)
-                TEXT.show(M.id,640+(counter%5-2)*80,26,45,'spin')
-                counter=counter+1
             end
+            for _=1,(counter%5)*20+90 do coroutine.yield() end
+            if GAME.playing then PLAYERS[1].showUsername=true end
         end
     end
     local gameSetting={

parts/gameTables.lua

@@ -354,144 +354,174 @@ do-- Mod data
     local function _disableKey(P,key)
         table.insert(P.gameEnv.keyCancel,key)
     end
+    local _invisibleTime={
+        ['easy']  =300,
+        ['slow']  =100,
+        ['medium']=60,
+        ['fast']  =20,
+        ['none']  =0,
+    }
+    local function _lockVfunc(k) do
+        local K=k
+        return function(P,O)
+            P.gameEnv[K]=O or true
+            P.gameEnv.__lock(K)
+        end
+    end end
     MODOPT={-- Mod options
         {no=0,id="NX",name="next",
             key="q",x=80,y=230,color='lO',
             list={0,1,2,3,4,5,6},
-            func=function(P,O) P.gameEnv.nextCount=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.nextCount=O end,
+            funcOnce  =_lockVfunc('nextCount'),
         },
         {no=1,id="HL",name="hold",
             key="w",x=200,y=230,color='lO',
             list={0,1,2,3,4,5,6},
-            func=function(P,O) P.gameEnv.holdCount=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.holdCount=O end,
+            funcOnce  =_lockVfunc('holdCount'),
         },
         {no=2,id="FL",name="hideNext",
             key="e",x=320,y=230,color='lA',
             list={1,2,3,4,5},
-            func=function(P,O) P.gameEnv.nextStartPos=O+1 end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.nextStartPos=O+1 end,
+            funcOnce  =_lockVfunc('nextStartPos'),
         },
         {no=3,id="IH",name="infHold",
             key="r",x=440,y=230,color='lA',
-            func=function(P) P.gameEnv.infHold=true end,
-            unranked=true,
+            funcInit  =function(P) P.gameEnv.infHold=true end,
+            funcOnce  =_lockVfunc('infHold'),
         },
         {no=4,id="HB",name="hideBlock",
             key="y",x=680,y=230,color='lV',
-            func=function(P) P.gameEnv.block=false end,
-            unranked=true,
+            funcInit  =function(P) P.gameEnv.block=false end,
+            funcOnce  =_lockVfunc('block'),
         },
         {no=5,id="HG",name="hideGhost",
             key="u",x=800,y=230,color='lV',
-            func=function(P) P.gameEnv.ghost=false end,
-            unranked=true,
+            funcInit  =function(P) P.gameEnv.ghost=false end,
+            funcOnce  =function(P) P.gameEnv.ghost=false; P.gameEnv.__lock('ghost') end,
         },
         {no=6,id="HD",name="hidden",
             key="i",x=920,y=230,color='lP',
             list={'easy','slow','medium','fast','none'},
-            func=function(P,O) P.gameEnv.visible=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.visible=O end,
+            funcRepeat=function(P,O)
+                if P.showTime~=_invisibleTime[O] then
+                    P:setInvisible(_invisibleTime[O])
+                end
+            end,
         },
         {no=7,id="HB",name="hideBoard",
             key="o",x=1040,y=230,color='lP',
             list={'down','up','all'},
-            func=function(P,O) P.gameEnv.hideBoard=O  end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.hideBoard=O  end,
         },
         {no=8,id="FB",name="flipBoard",
             key="p",x=1160,y=230,color='lJ',
             list={'U-D','L-R','180'},
-            func=function(P,O) P.gameEnv.flipBoard=O  end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.flipBoard=O  end,
+            funcOnce  =_lockVfunc('flipBoard'),
         },
 
         {no=9,id="DT",name="dropDelay",
             key="a",x=140,y=350,color='lR',
             list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
-            func=function(P,O) P.gameEnv.drop=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.drop=O end,
+            funcRepeat=function(P,O)
+                if P.dropDelay~=O then
+                    P.gameEnv.drop=O
+                    P:set20G(O==0)
+                end
+            end,
         },
         {no=10,id="LT",name="lockDelay",
             key="s",x=260,y=350,color='lR',
             list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
-            func=function(P,O) P.gameEnv.lock=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.lock=O end,
+            funcRepeat=function(P,O) P.dropDelay=O end,
         },
         {no=11,id="ST",name="waitDelay",
             key="d",x=380,y=350,color='lR',
             list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
-            func=function(P,O) P.gameEnv.wait=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.wait=O end,
+            funcOnce  =_lockVfunc('waitDelay'),
         },
         {no=12,id="CT",name="fallDelay",
             key="f",x=500,y=350,color='lR',
             list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
-            func=function(P,O) P.gameEnv.fall=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.fall=O end,
+            funcOnce  =_lockVfunc('fallDelay'),
         },
         {no=13,id="LF",name="life",
             key="j",x=860,y=350,color='lY',
             list={0,1,2,3,5,10,15,26,42,87,500},
-            func=function(P,O) P.gameEnv.life=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.life=O end,
+            funcOnce  =_lockVfunc('life'),
         },
         {no=14,id="FB",name="forceB2B",
             key="k",x=980,y=350,color='lY',
-            func=function(P) P.gameEnv.b2bKill=true end,
-            unranked=true,
+            funcInit  =function(P) P.gameEnv.b2bKill=true end,
+            funcOnce  =_lockVfunc('b2bKill'),
         },
         {no=15,id="PF",name="forceFinesse",
             key="l",x=1100,y=350,color='lY',
-            func=function(P) P.gameEnv.fineKill=true end,
-            unranked=true,
+            funcInit  =function(P) P.gameEnv.fineKill=true end,
+            funcOnce  =_lockVfunc('fineKill'),
         },
 
         {no=16,id="TL",name="tele",
             key="z",x=200,y=470,color='lH',
-            func=function(P)
+            funcInit  =function(P)
                 P.gameEnv.das,P.gameEnv.arr=0,0
                 P.gameEnv.sddas,P.gameEnv.sdarr=0,0
             end,
-            unranked=true,
+            funcOnce  =function(P)
+                for _,k in pairs{'das','arr','sddas','sdarr'} do
+                    P.gameEnv[k]=0
+                    P.gameEnv.__lock(k)
+                end
+            end
         },
         {no=17,id="FX",name="noRotation",
             key="x",x=320,y=470,color='lH',
-            func=function(P)
+            funcInit  =function(P)
                 _disableKey(P,3)
                 _disableKey(P,4)
                 _disableKey(P,5)
             end,
-            unranked=true,
         },
         {no=18,id="GL",name="noMove",
             key="c",x=440,y=470,color='lH',
-            func=function(P)
-                _disableKey(P,1)_disableKey(P,2)
+            funcInit  =function(P)
+                _disableKey(P,1) _disableKey(P,2)
                 _disableKey(P,11)_disableKey(P,12)
                 _disableKey(P,17)_disableKey(P,18)
                 _disableKey(P,19)_disableKey(P,20)
             end,
-            unranked=true,
         },
         {no=19,id="CS",name="customSeq",
             key="b",x=680,y=470,color='lB',
             list={'bag','bagES','his','hisPool','c2','bagP1inf','rnd','mess','reverb'},
-            func=function(P,O) P.gameEnv.sequence=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.sequence=O end,
+            funcOnce  =_lockVfunc('sequence'),
         },
         {no=20,id="PS",name="pushSpeed",
             key="n",x=800,y=470,color='lB',
             list={.5,1,2,3,5,15,1e99},
-            func=function(P,O) P.gameEnv.pushSpeed=O end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.pushSpeed=O end,
+            funcOnce  =_lockVfunc('pushSpeed'),
         },
         {no=21,id="BN",name="boneBlock",
             key="m",x=920,y=470,color='lB',
             list={'on','off'},
-            func=function(P,O) P.gameEnv.bone=O=='on' end,
-            unranked=true,
+            funcInit  =function(P,O) P.gameEnv.bone=O end,
+            funcRepeat=function(P,O)
+                P.gameEnv.bone=O
+                if O=='on' then
+                    for _,bk in pairs(P.nextQueue) do bk.color=17 end
+                end
+            end,
         },
     }
     for i=1,#MODOPT do
@@ -521,7 +551,9 @@ do-- Game data tables
         seed=1046101471,         -- Game seed
         curMode=false,           -- Current gamemode object
         initPlayerCount=0,       -- Player count when init game
+        modUsed=false,
         mod=TABLE.new(0,#MODOPT),-- List of loaded mods
+        modApplyAt='postInit',   -- Apply mod when? (preInit, postInit, always)
         modeEnv=false,           -- Current gamemode environment
         setting={},              -- Game settings
         rep={},                  -- Recording list, key,time,key,time...

parts/language/lang_en.lua

@@ -209,6 +209,7 @@ return {
     tryAnotherBuild="UTF-8 decoding error. If you are using Microsoft Windows, please try to download the build with the different architecture. If you are using the x86 version of Techmino, try downloading the x64 version and vice versa.",
 
     modInstruction="Choose your modifiers here!\nMods allow you to change the rules in various ways, but they can also crash the game. Feel free to play the game your way!\nNote that scores are not saved when using mods. You can also toggle mods using your keyboard keys (hold Shift to reverse).",
+    modApplyAtInstruction="Choose when you want the modifier to be applied.\npreInit: Before loading the modes. The default option in V0.17.15 and earlier, but may cause problems with certain mods.\npostInit: After loading the game. This can fix some bugs in preInit, but some mods can still be disabled by modes in some situations.\nalways: Throughout the entire game. Keeps the effects of the mods in all situations.",
     modInfo={
         next="NEXT\nOverrides the number of Next pieces displayed.",
         hold="HOLD\nOverrides the number of Hold pieces displayed.",
@@ -449,6 +450,7 @@ C. Gamepad
         },
         mod={
             title="Mods",
+            applyAt="Apply during",
             reset="Reset (tab)",
             unranked="Unranked",
         },

parts/language/lang_es.lua

@@ -208,6 +208,7 @@ return {
     tryAnotherBuild="[UTF-8 Inválido] Si estás usando Windows, intenta descargar Techmino-win32 o Techmino-win64 (el que no estés usando ahora).",
 
     modInstruction="¡Elige tus mods!\nLos mods permiten modificar el juego,\npero también es posible que lo crasheen.\nLos scores no se guardan durante el uso de mods.",
+    -- modApplyAtInstruction="Choose when you want the modifier to be applied.\npreInit: Before loading the modes. The default option in V0.17.15 and earlier, but may cause problems with certain mods.\npostInit: After loading the game. This can fix some bugs in preInit, but some mods can still be disabled by modes in some situations.\nalways: Throughout the entire game. Keeps the effects of the mods in all situations. ",
     modInfo={
         next="NEXT\nSobreescribe el nro. de piezas siguientes a mostrar.",
         hold="HOLD\nSobreescribe el nro. de piezas en reserva disponibles.",
@@ -411,6 +412,7 @@ return {
         mod={
             title="Mods",
             reset="Reinic. (tab)",
+            -- applyAt="Apply during",
             unranked="Sin rango",
         },
         pause={

parts/language/lang_fr.lua

@@ -210,6 +210,7 @@ return {
     -- tryAnotherBuild="[Invalid UTF-8] If you are on Windows, try downloading Techmino-win32 or Techmino-win64 (different from what you are using now).",
 
     modInstruction="",
+    -- modApplyAtInstruction="Choose when you want the modifier to be applied.\npreInit: Before loading the modes. The default option in V0.17.15 and earlier, but may cause problems with certain mods.\npostInit: After loading the game. This can fix some bugs in preInit, but some mods can still be disabled by modes in some situations.\nalways: Throughout the entire game. Keeps the effects of the mods in all situations. ",
     modInfo={},-- See lang_en.lua
     pauseStat={
         "Temps :",
@@ -386,6 +387,7 @@ return {
         mod={
             title="Mods",
             reset="Réinitialiser (tab)",
+            -- applyAt="Apply during",
             unranked="Unranked",
         },
         pause={