From 1c8844c3c44e57068cd2d96302afad676c376614 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 13 Jul 2021 23:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=B3=BB=E7=BB=9F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EZRS(=E5=AE=9E=E9=AA=8C=E6=80=A7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/kickList.lua            | 114 +++++++++++++++++++++++++++++++++-
 parts/player/player.lua       |   3 +-
 parts/scenes/setting_game.lua |   2 +-
 3 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/parts/kickList.lua b/parts/kickList.lua
index 89574f4d..f8f01b01 100644
--- a/parts/kickList.lua
+++ b/parts/kickList.lua
@@ -22,6 +22,7 @@ local function vecStrConv(list)
 	for k,vecStr in next,list do
 		list[k]=map[tonumber(vecStr:sub(1,2))][tonumber(vecStr:sub(3,4))]
 	end
+	return list
 end
 
 --Make all vec point to the same vec
@@ -439,10 +440,118 @@ do
 	for i=8,29 do SRS[i]=SRS[1]end
 end
 
+local ZRS
+do
+	local R=vecStrConv{'+0+0','-1+0','+0-1','-1-1','+1-1','-1+1','+1+0','+0+1','+1+1','+0+2'}
+	local L=vecStrConv{'+0+0','+1+0','+0-1','+1-1','-1-1','+1+1','-1+0','+0+1','-1+1','+0+2'}
+	local F=vecStrConv{'+0+0','+0-1','+0+1','+0+2'}
+	local list={
+		{[02]=L,[20]=R,[13]=R,[31]=L},--Z
+		{[02]=R,[20]=L,[13]=L,[31]=R},--S
+		{[02]=L,[20]=R,[13]=R,[31]=L},--J
+		{[02]=R,[20]=L,[13]=L,[31]=R},--L
+		{[02]=F,[20]=F,[13]=L,[31]=R},--T
+		{[02]=R,[20]=L,[13]=L,[31]=R},--O
+		{[02]=F,[20]=F,[13]=R,[31]=L},--I
+
+		{[02]=L,[20]=R,[13]=R,[31]=L},--Z5
+		{[02]=R,[20]=L,[13]=L,[31]=R},--S5
+		{[02]=L,[20]=R,[13]=L,[31]=R},--P
+		{[02]=R,[20]=L,[13]=R,[31]=L},--Q
+		{[02]=R,[20]=L,[13]=L,[31]=R},--F
+		{[02]=L,[20]=R,[13]=R,[31]=L},--E
+		{[02]=F,[20]=F,[13]=L,[31]=R},--T5
+		{[02]=F,[20]=F,[13]=L,[31]=R},--U
+		{[02]=R,[20]=L,[13]=L,[31]=R},--V
+		{[02]=R,[20]=L,[13]=L,[31]=R},--W
+		{[02]=F,[20]=F,[13]=F,[31]=F},--X
+		{[02]=L,[20]=R,[13]=R,[31]=L},--J5
+		{[02]=R,[20]=L,[13]=L,[31]=R},--L5
+		{[02]=L,[20]=R,[13]=R,[31]=L},--R
+		{[02]=R,[20]=L,[13]=L,[31]=R},--Y
+		{[02]=L,[20]=R,[13]=R,[31]=L},--N
+		{[02]=R,[20]=L,[13]=L,[31]=R},--H
+		{[02]=F,[20]=F,[13]=F,[31]=F},--I5
+
+		{[02]=F,[20]=F,[13]=F,[31]=F},--I3
+		{[02]=R,[20]=L,[13]=L,[31]=R},--C
+		{[02]=F,[20]=F,[13]=R,[31]=L},--I2
+		{[02]=F,[20]=F,[13]=F,[31]=F},--O1
+	}
+	for i=1,29 do
+		list[i][01]=R;list[i][10]=L;list[i][03]=L;list[i][30]=R
+		list[i][12]=R;list[i][21]=L;list[i][32]=L;list[i][23]=R
+	end
+	ZRS=TABLE.new(function(P,d,ifpre)
+		local cur=P.cur
+		local idir=(cur.dir+d)%4
+		local kickList=list[cur.id][cur.dir*10+idir]
+		local icb=BLOCKS[cur.id][idir]
+		local isc=SCS[cur.id][idir]
+		local ix,iy=P.curX+cur.sc[2]-isc[2],P.curY+cur.sc[1]-isc[1]
+		local dx,dy=0,0 do
+			local pressing=P.keyPressing
+			if pressing[1]then dx=dx-1 end
+			if pressing[2]then dx=dx+1 end
+			if pressing[7]then dy=-1 end
+		end
+		while true do
+			for test=1,#kickList do
+				local x,y=ix+kickList[test][1]+dx,iy+kickList[test][2]+dy
+				if (dx==0 or kickList[test][2]<0)and(P.freshTime>0 or kickList[test][2]+dy<=0)and not P:ifoverlap(icb,x,y)then
+					if P.gameEnv.moveFX and P.gameEnv.block then
+						P:createMoveFX()
+					end
+					P.curX,P.curY,cur.dir=x,y,idir
+					cur.sc,cur.bk=isc,icb
+					P.spinLast=test==2 and 0 or 1
+
+					local t=P.freshTime
+					if not ifpre then
+						P:freshBlock('move')
+					end
+					if kickList[test][2]+dy>0 and P.freshTime==t and P.curY~=P.imgY then
+						P.freshTime=P.freshTime-1
+					end
+
+					if P.sound then
+						local sfx
+						if ifpre then
+							sfx='prerotate'
+						elseif P:ifoverlap(icb,x,y+1)and P:ifoverlap(icb,x-1,y)and P:ifoverlap(icb,x+1,y)then
+							sfx='rotatekick'
+							if P.gameEnv.shakeFX then
+								if d==1 or d==3 then
+									P.fieldOff.va=P.fieldOff.va+(2-d)*P.gameEnv.shakeFX*6e-3
+								else
+									P.fieldOff.va=P.fieldOff.va+P:getCenterX()*P.gameEnv.shakeFX*3e-3
+								end
+							end
+						else
+							sfx='rotate'
+						end
+						SFX.play(sfx,nil,P:getCenterX()*.15)
+					end
+					P.stat.rotate=P.stat.rotate+1
+					return
+				end
+			end
+
+			--Try release left/right, then softdrop, failed to rotate otherwise
+			if dx~=0 then
+				dx=0
+			elseif dy~=0 then
+				dy=0
+			else
+				return
+			end
+		end
+	end,29)
+end
+
 local C2
 do
-	local L={'+0+0','-1+0','+1+0','+0-1','-1-1','+1-1','-2+0','+2+0'}
-	vecStrConv(L)
+	local L=vecStrConv{'+0+0','-1+0','+1+0','+0-1','-1-1','+1-1','-2+0','+2+0'}
 	C2={
 		{
 			[01]=L,[10]=L,[12]=L,[21]=L,
@@ -498,6 +607,7 @@ for i=1,29 do None[i]=noKickSet_180 end
 return{
 	TRS=TRS,
 	SRS=SRS,
+	ZRS=ZRS,
 	C2=C2,
 	C2sym=C2sym,
 	Classic=Classic,
diff --git a/parts/player/player.lua b/parts/player/player.lua
index f8dd15e5..a8646d27 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -185,7 +185,6 @@ function Player:switchKey(id,on)
 end
 function Player:set20G(if20g)
 	self._20G=if20g
-	self:switchKey(7,not if20g)
 	self:switchKey(13,not if20g)
 	self:switchKey(14,not if20g)
 	self:switchKey(15,not if20g)
@@ -599,7 +598,7 @@ function Player:spin(d,ifpre)
 		local ix,iy=self.curX+cur.sc[2]-isc[2],self.curY+cur.sc[1]-isc[1]
 		for test=1,#kickData do
 			local x,y=ix+kickData[test][1],iy+kickData[test][2]
-			if not self:ifoverlap(icb,x,y)and(self.freshTime>0 or kickData[test][2]<=0)then
+			if (self.freshTime>0 or kickData[test][2]<=0)and not self:ifoverlap(icb,x,y)then
 				ix,iy=x,y
 				if self.gameEnv.moveFX and self.gameEnv.block then
 					self:createMoveFX()
diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua
index 05e1b3eb..90ac9314 100644
--- a/parts/scenes/setting_game.lua
+++ b/parts/scenes/setting_game.lua
@@ -29,7 +29,7 @@ scene.widgetList={
 	WIDGET.newButton{name="key",		x=640,	y=220,	w=320,h=80,	color='lG',font=35,code=goScene'setting_key'},
 	WIDGET.newButton{name="touch",		x=990,	y=220,	w=320,h=80,	color='lB',font=35,code=goScene'setting_touch'},
 	WIDGET.newSlider{name="reTime",		x=330,	y=320,	w=300,unit=10,disp=SETval("reTime"),code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end},
-	WIDGET.newSelector{name="RS",		x=300,	y=420,	w=300,color='S',list={'TRS','SRS','C2','C2sym','Classic','None'},disp=SETval("RS"),code=SETsto("RS")},
+	WIDGET.newSelector{name="RS",		x=300,	y=420,	w=300,color='S',list={'TRS','SRS','ZRS','C2','C2sym','Classic','None'},disp=SETval("RS"),code=SETsto("RS")},
 	WIDGET.newButton{name="layout",		x=250,	y=540,	w=200,h=70,font=35,			code=goScene'setting_skin'},
 	WIDGET.newSwitch{name="autoPause",	x=1060,	y=350,	disp=SETval("autoPause"),	code=SETrev("autoPause")},
 	WIDGET.newSwitch{name="swap",		x=1060,	y=460,	disp=SETval("swap"),		code=SETrev("swap")},