From 68f4fec538451ba9e20b9df08470e09155edac6f Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Sun, 5 May 2024 17:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=B0=94=E6=B3=A1=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=B0=8F=E9=97=AE=E9=A2=98=20=E6=96=B9?=
 =?UTF-8?q?=E5=9D=97=E5=92=8C=E6=B0=94=E6=B3=A1=E6=B7=BB=E5=8A=A0voidDelay?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=A4=87=E7=94=A8=20=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/game/minoPlayer.lua |  1 +
 assets/game/puyoPlayer.lua | 43 +++++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/assets/game/minoPlayer.lua b/assets/game/minoPlayer.lua
index a38446aa..2729db9e 100644
--- a/assets/game/minoPlayer.lua
+++ b/assets/game/minoPlayer.lua
@@ -1891,6 +1891,7 @@ local baseEnv={
     lockoutH=1e99,
     deathH=1e99,
     voidH=1260,
+    voidDelay=260,
 
     -- Clear
     clearRule='line',
diff --git a/assets/game/puyoPlayer.lua b/assets/game/puyoPlayer.lua
index c399892e..55004f6f 100644
--- a/assets/game/puyoPlayer.lua
+++ b/assets/game/puyoPlayer.lua
@@ -445,7 +445,7 @@ function PP:getPuyo(mat)
 
     local puyo={
         id=self.pieceCount,
-        size=max(#mat,#mat[1]),
+        size=min(#mat,#mat[1]),
         direction=0,
         matrix=mat,
     }
@@ -509,24 +509,24 @@ end
 local PRS={
     [1]={
         [0]={
-            R={target=1,{0,0},{0,1},{-1,0},{-1,1}},
-            L={target=3,{-1,0},{-1,1},{0,0},{0,1}},
-            F={target=2,{0,-1},{0,0}},
+            R={target=1,base={0,0},{0,0},{0,1},{-1,0},{-1,1}},
+            L={target=3,base={-1,0},{0,0},{0,1},{1,0},{1,1}},
+            F={target=2,base={0,-1},{0,0},{0,1}},
         },
         [1]={
-            R={target=2,{0,-1},{0,0},{1,-1},{1,0}},
-            L={target=0,{0,0},{1,0},{0,-1},{1,-1}},
-            F={target=3,{-1,0},{0,0}},
+            R={target=2,base={0,-1},{0,0},{0,1},{1,0},{1,1}},
+            L={target=0,base={0,0},{0,0},{1,0},{0,-1},{1,-1}},
+            F={target=3,base={-1,0},{0,0},{1,0}},
         },
         [2]={
-            R={target=3,{-1,1},{0,1},{-1,0},{0,0}},
-            L={target=1,{0,1},{-1,1},{0,0},{-1,0}},
-            F={target=0,{0,1},{0,0}},
+            R={target=3,base={-1,1},{0,0},{1,0},{0,-1},{1,-1}},
+            L={target=1,base={0,1},{0,0},{-1,0},{0,-1},{-1,-1}},
+            F={target=0,base={0,1},{0,0},{0,-1}},
         },
         [3]={
-            R={target=0,{1,0},{0,0},{1,-1},{0,-1}},
-            L={target=2,{1,-1},{1,0},{0,-1},{0,0}},
-            F={target=1,{1,0},{0,0}},
+            R={target=0,base={1,0},{0,0},{-1,0},{0,-1},{-1,-1}},
+            L={target=2,base={1,-1},{0,0},{0,1},{-1,0},{-1,1}},
+            F={target=1,base={1,0},{0,0},{-1,0}},
         },
     },
     [2]={
@@ -536,6 +536,20 @@ local PRS={
         [3]={R={target=0,{0,0}},L={target=2,{0,0}},F={target=1,{0,0}}},
     },
 }
+for size=1,2 do
+    for _,sizeData in next,PRS[size] do
+        for _,rotData in next,sizeData do
+            if rotData.base then
+                for i=1,#rotData do
+                    local kick=rotData[i]
+                    kick[1]=kick[1]+rotData.base[1]
+                    kick[2]=kick[2]+rotData.base[2]
+                end
+                rotData.base=nil
+            end
+        end
+    end
+end
 function PP:rotate(dir,ifInit)
     if self.settings.stopMoveWhenRotate then
         self.moveDir=false
@@ -1226,7 +1240,7 @@ local baseEnv={
     spawnH=11,
     lockoutH=1e99,
     deathH=1e99,
-    voidH=620,
+    voidH=16,
     connH=4, -- Default to 12
 
     -- Clear
@@ -1246,6 +1260,7 @@ local baseEnv={
     fallDelay=100,
     clearDelay=200,
     deathDelay=260,
+    voidDelay=6200,
 
     -- Fresh
     freshCondition='fall',