From 31f4576acdeba0e6e3bbd0e348dc41e1f93bdaea Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 21 Aug 2021 03:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0SRS=5FX=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20close=20#175?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/RSlist.lua              | 41 +++++++++++++++++++++++++++++++++++
 parts/scenes/setting_game.lua |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/parts/RSlist.lua b/parts/RSlist.lua
index 504f1fd8..84b1ff61 100644
--- a/parts/RSlist.lua
+++ b/parts/RSlist.lua
@@ -532,6 +532,46 @@ do
 	for i=8,29 do SRS_plus.kickTable[i]=SRS_plus.kickTable[1]end
 end
 
+local SRS_X
+do
+	SRS_X={
+		centerTex=GC.DO{10,10,
+			{'setLW',2},
+			{'setCL',1,1,1,.4},
+			{'dCirc',5,5,4},
+			{'setLW',1},
+			{'setCL',1,1,1},
+			{'dCirc',5,5,3},
+		},
+		kickTable={
+			{
+				[01]={'+0+0','-1+0','-1+1','+0-2','-1-2'},
+				[10]={'+0+0','+1+0','+1-1','+0+2','+1+2'},
+				[03]={'+0+0','+1+0','+1+1','+0-2','+1-2'},
+				[30]={'+0+0','-1+0','-1-1','+0+2','-1+2'},
+				[12]={'+0+0','+1+0','+1-1','+0+2','+1+2'},
+				[21]={'+0+0','-1+0','-1+1','+0-2','-1-2'},
+				[32]={'+0+0','-1+0','-1-1','+0+2','-1+2'},
+				[23]={'+0+0','+1+0','+1+1','+0-2','+1-2'},
+				[02]={'+0+0','-1+0','+1+0','+0-1','+0+1'},
+				[20]={'+0+0','+1+0','-1+0','+0-1','+0+1'},
+				[13]={'+0+0','+0-1','-1+0','+1+0','+0+1'},
+				[31]={'+0+0','+0-1','-1+0','+1+0','+0+1'},
+			},--Z
+			false,--S
+			false,--J
+			false,--L
+			false,--T
+			noKickSet,--O
+			false,--I
+		}
+	}
+	for i=2,5 do SRS_X.kickTable[i]=SRS_X.kickTable[1]end
+	for i=7,29 do SRS_X.kickTable[i]=TRS.kickTable[i]end
+	SRS_X.kickTable[10]=SRS_X.kickTable[1]--P
+	SRS_X.kickTable[11]=SRS_X.kickTable[1]--Q
+end
+
 local BiRS
 do
 	local R=strToVec{'+0+0','-1+0','-1-1','+0-1','-1+1','+1-1','+1+0','+0+1','+1+1','+0+2','-1+2','+1+2','-2+0','+2+0'}
@@ -863,6 +903,7 @@ local RSlist={
 	TRS=TRS,
 	SRS=SRS,
 	SRS_plus=SRS_plus,
+	SRS_X=SRS_X,
 	BiRS=BiRS,
 	ARS_Z=ARS_Z,
 	ASC=ASC,
diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua
index be458bdf..422bf5a2 100644
--- a/parts/scenes/setting_game.lua
+++ b/parts/scenes/setting_game.lua
@@ -41,7 +41,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','SRS_plus','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'},disp=SETval("RS"),code=SETsto("RS")},
+	WIDGET.newSelector{name="RS",		x=300,	y=420,	w=300,color='S',list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'},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=320,	disp=SETval("autoPause"),	code=SETrev("autoPause")},
 	WIDGET.newSelector{name="menuPos",	x=980,	y=420,	w=300,color='O',list={'left','middle','right'},disp=SETval("menuPos"),code=SETsto("menuPos")},