From f478184342b0ccfd6ca8fb0bd59aa7d1d1bcc425 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 15 Nov 2020 12:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=97=8B?=
 =?UTF-8?q?=E8=BD=AC=E7=B3=BB=E7=BB=9F=E6=97=8B=E8=BD=ACO=E5=90=8E?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=B0=B1=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/kickList.lua      | 37 ++++++++++++++++++-------------------
 parts/player/player.lua | 17 +++++++++++------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/parts/kickList.lua b/parts/kickList.lua
index 0937cd1e..f7829256 100644
--- a/parts/kickList.lua
+++ b/parts/kickList.lua
@@ -1,8 +1,8 @@
 local zero={0,0}
-local ZERO,ZERO_180 do
+local noKick,noKick_180 do
 	local Zero={zero}
-	ZERO={[01]=Zero,[10]=Zero,[03]=Zero,[30]=Zero,[12]=Zero,[21]=Zero,[32]=Zero,[23]=Zero}
-	ZERO_180={[01]=Zero,[10]=Zero,[03]=Zero,[30]=Zero,[12]=Zero,[21]=Zero,[32]=Zero,[23]=Zero,[02]=Zero,[20]=Zero,[13]=Zero,[31]=Zero}
+	noKick={[01]=Zero,[10]=Zero,[03]=Zero,[30]=Zero,[12]=Zero,[21]=Zero,[32]=Zero,[23]=Zero}
+	noKick_180={[01]=Zero,[10]=Zero,[03]=Zero,[30]=Zero,[12]=Zero,[21]=Zero,[32]=Zero,[23]=Zero,[02]=Zero,[20]=Zero,[13]=Zero,[31]=Zero}
 end
 
 local map={}
@@ -338,12 +338,11 @@ do
 	TRS[20]=reflect(TRS[19])--L5J5
 	TRS[22]=reflect(TRS[21])--RY
 	TRS[24]=reflect(TRS[23])--HN
-	pushZero(TRS)
-
 	C_sym(TRS[8])
 	C_sym(TRS[9])
 	C_sym(TRS[25])
 	for i=1,25 do collect(TRS[i])end
+	pushZero(TRS)
 end
 
 local AIRS
@@ -358,12 +357,12 @@ do
 			[21]={{-1,0},{-1, 1},{ 0,-2},{-1,-2}},
 			[32]={{-1,0},{-1,-1},{ 0, 2},{-1, 2}},
 			[23]={{ 1,0},{ 1, 1},{ 0,-2},{ 1,-2}},
-		},
-		false,
-		false,
-		false,
-		false,
-		function()end,
+		},--Z
+		false,--S
+		false,--J
+		false,--L
+		false,--T
+		noKick,--O
 		{
 			[01]={{-2, 0},{ 1, 0},{-2,-1},{ 1, 2}},
 			[10]={{ 2, 0},{-1, 0},{ 2, 1},{-1,-2}},
@@ -373,7 +372,7 @@ do
 			[32]={{-2, 0},{ 1, 0},{-2,-1},{ 1, 2}},
 			[30]={{ 1, 0},{-2, 0},{ 1,-2},{-2, 1}},
 			[03]={{-1, 0},{ 2, 0},{-1, 2},{ 2,-1}},
-		}
+		}--I
 	}
 	collect(AIRS[1])
 	collect(AIRS[7])
@@ -409,30 +408,30 @@ do
 		Z,S,--Z,S
 		Z,S,--JL
 		Z,--T
-		ZERO,--O
+		noKick,--O
 		Z,--I
 		Z,S,--Z5,S5
 		Z,S,--P,Q
 		Z,S,--F,E
 		Z,Z,Z,Z,--T5,U,V,W
-		ZERO,--X
+		noKick,--X
 		Z,S,--J5,L5
 		Z,S,--R,Y
 		Z,S,--N,H
 	}
 end
 
-local None={}
-for i=1,25 do None[i]=ZERO_180 end
-
 local Classic={}
-for i=1,25 do Classic[i]=ZERO end
+for i=1,25 do Classic[i]=noKick end
+
+local None={}
+for i=1,25 do None[i]=noKick_180 end
 
 return{
 	TRS=TRS,
 	AIRS=AIRS,
 	C2=C2,
 	C2sym=C2sym,
-	None=None,
 	Classic=Classic,
+	None=None,
 }
\ No newline at end of file
diff --git a/parts/player/player.lua b/parts/player/player.lua
index 04176e11..3320cc3f 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -505,7 +505,7 @@ function Player.spin(P,d,ifpre)
 				return
 			end
 		end
-	else
+	elseif iki then
 		iki(P,d)
 	end
 end
@@ -668,27 +668,32 @@ do--player:drop()--Place piece
 	local clearSFX={"clear_1","clear_2","clear_3"}
 	local renSFX={}for i=1,11 do renSFX[i]="ren_"..i end
 	local finesseList={
-		[1]={
+		{
 			{1,2,1,0,1,2,2,1},
 			{2,2,2,1,1,2,3,2,2},
 		},--Z
-		[3]={
+		false,--S
+		{
 			{1,2,1,0,1,2,2,1},
 			{2,2,3,2,1,2,3,3,2},
 			{3,4,3,2,3,4,4,3},
 			{2,3,2,1,2,3,3,2,2},
-		},--L
-		[6]={
+		},--J
+		false,--L
+		false,--T
+		{
 			{1,2,2,1,0,1,2,2,1},
 		},--O
-		[7]={
+		{
 			{1,2,1,0,1,2,1},
 			{2,2,2,2,1,1,2,2,2,2},
 		},--I
 	}
 	finesseList[1][3],finesseList[1][4],finesseList[7][3],finesseList[7][4]=finesseList[1][1],finesseList[1][2],finesseList[7][1],finesseList[7][2]--"2-phase" SZI
+	for i=2,4 do finesseList[6][i]=finesseList[6][1]end
 	finesseList[2]=finesseList[1]--S=Z
 	finesseList[4],finesseList[5]=finesseList[3],finesseList[3]--J=L=T
+
 	function Player.drop(P)
 		local _
 		local CHN=VOC.getFreeChannel()