From 47fc75bae84c985ca859d844ef484ddbfd936e72 Mon Sep 17 00:00:00 2001
From: SweetSea-ButImNotSweet
 <106439598+SweetSea-ButImNotSweet@users.noreply.github.com>
Date: Thu, 4 Jan 2024 14:45:19 +0700
Subject: [PATCH] Modify some mods' behavior

---
 parts/gameTables.lua  | 22 ++++++++++++----------
 parts/player/init.lua | 17 ++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/parts/gameTables.lua b/parts/gameTables.lua
index 69757bb3..906b7730 100644
--- a/parts/gameTables.lua
+++ b/parts/gameTables.lua
@@ -388,17 +388,19 @@ do-- Mod data
         {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,
+            func=function(P,O) P.gameEnv.visible=O end, -- TODO
         },
         {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,
+            onlyOnce=true,
         },
         {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,
+            onlyOnce=true,
         },
 
         {no=9,id="DT",name="dropDelay",
@@ -429,14 +431,17 @@ do-- Mod data
             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,
+            onlyOnce=true,
         },
         {no=14,id="FB",name="forceB2B",
             key="k",x=980,y=350,color='lY',
             func=function(P) P.gameEnv.b2bKill=true end,
+            onlyOnce=true,
         },
         {no=15,id="PF",name="forceFinesse",
             key="l",x=1100,y=350,color='lY',
             func=function(P) P.gameEnv.fineKill=true end,
+            onlyOnce=true,
         },
 
         {no=16,id="TL",name="tele",
@@ -453,6 +458,7 @@ do-- Mod data
                 _disableKey(P,4)
                 _disableKey(P,5)
             end,
+            onlyOnce=true,
         },
         {no=18,id="GL",name="noMove",
             key="c",x=440,y=470,color='lH',
@@ -462,16 +468,13 @@ do-- Mod data
                 _disableKey(P,17)_disableKey(P,18)
                 _disableKey(P,19)_disableKey(P,20)
             end,
+            onlyOnce=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)
-                if P.gameEnv.sequence==O then return end
-                P.gameEnv.sequence=O
-                if F then P:resetNext() end
-            end,
-            executeOnce=false,
+            func=function(P,O) P.gameEnv.sequence=O end,
+            onlyOnce=true,
         },
         {no=20,id="PS",name="pushSpeed",
             key="n",x=800,y=470,color='lB',
@@ -485,11 +488,10 @@ do-- Mod data
                 if P.gameEnv.bone==O then return end
                 P.gameEnv.bone=O
                 if F and O=='on' then
-                    for _,bk in pairs(P.nextQueue) do
-                        bk.color=17 --Bone block
-                    end
+                    for _,bk in pairs(P.nextQueue) do bk.color=17 end
                 end
             end,
+            executeFirst=true
         },
     }
     for i=1,#MODOPT do
diff --git a/parts/player/init.lua b/parts/player/init.lua
index 5cacddae..4c05ba91 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -224,10 +224,10 @@ local function _loadGameEnv(P)-- Load gameEnv
         for i=1,#GAME.mod do
             if GAME.mod[i]>0 then
                 local M=MODOPT[i]
-                if not GAME.modPatch or M.executeOnce then
-                    M.func(P,M.list and M.listpGAME.mod[i],false)
-                else
-                    table.insert(GAME.modCodeList[P.id], function() M.func(P,M.list and M.list[GAME.mod[i]],true) end)
+                if not GAME.modPatch or M.executeFirst or M.onlyOnce then
+                    M.func(P,M.list and M.list[GAME.mod[i]])
+                elseif GAME.modPatch and not M.onlyOnce then
+                    table.insert(GAME.modCodeList[P.id],function() M.func(P,M.list and M.list[GAME.mod[i]],true) end)
                 end
             end
         end
@@ -396,14 +396,9 @@ local function _applyGameEnv(P)-- Finish gameEnv processing
             P:newNext()
         end
     end
-    function P:resetNext()
-        seqGen=coroutine.create(getSeqGen(ENV.sequence))
-        seqCalled=false
-        initSZOcount=0
-        bagLineCounter=0
-        for _=1,ENV.trueNextCount do self:newNext() end
+    for _=1,ENV.trueNextCount do
+        P:newNext() end
     end
-    P:resetNext()
 
     if P.miniMode then
         ENV.lockFX=false