Merge branch 'main' into test-new-mode-system

2021-12-16 02:32:51 +08:00
parent 462720881a 2b80f72c6b
commit b642f2b5c4
21 changed files with 281 additions and 230 deletions
--- a/parts/eventsets/classic_h.lua
+++ b/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
--- a/parts/eventsets/classic_u.lua
+++ b/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')