From c742e9fd31623e3150c475f346fff99b65bbd318 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 17 Jul 2021 00:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EASC=E5=92=8CASCplus(=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0180=E5=BA=A6=E8=B8=A2=E5=A2=99=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E9=AA=8C=E6=80=A7)=E6=97=8B=E8=BD=AC=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/kickList.lua            | 33 +++++++++++++++++++++++++++++++++
 parts/scenes/setting_game.lua |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/parts/kickList.lua b/parts/kickList.lua
index 6676c0d1..3415c152 100644
--- a/parts/kickList.lua
+++ b/parts/kickList.lua
@@ -551,6 +551,37 @@ do
 	end,29)
 end
 
+local ASC
+do
+	local L={"+1+0","+0-1","+1-1","+0-2","+1-2","+2+0","+2-1","+2-2","-1+0","-1-1","+0+1","+1+1","+2+1","-1-2","-2+0","+0+2","+1+2","+2+2","-2-1","-2-2"}
+	local R=flipList(L)
+	vecStrConv(L)vecStrConv(R)
+	ASC={
+		{
+			[01]=R,[10]=L,[03]=L,[30]=R,
+			[12]=R,[21]=L,[32]=L,[23]=R,
+			[02]=noKickSet_180,[20]=noKickSet_180,[13]=noKickSet_180,[31]=noKickSet_180,
+		}
+	}
+	for i=2,29 do ASC[i]=ASC[1]end
+end
+
+local ASCplus
+do
+	local L={"+1+0","+0-1","+1-1","+0-2","+1-2","+2+0","+2-1","+2-2","-1+0","-1-1","+0+1","+1+1","+2+1","-1-2","-2+0","+0+2","+1+2","+2+2","-2-1","-2-2"}
+	local R=flipList(L)
+	local F={"-1+0","+1+0","+0-1","-1-1","+1-1","+0-2","-1-2","+1-2","-2+0","+2+0","-2-1","+2-1","-2+1","+2+1","+0+2","-1+2","+1+2"}
+	vecStrConv(L)vecStrConv(R)vecStrConv(F)
+	ASCplus={
+		{
+			[01]=R,[12]=R,[23]=R,[30]=R,
+			[10]=L,[21]=L,[32]=L,[03]=L,
+			[02]=F,[20]=F,[13]=F,[31]=F,
+		}
+	}
+	for i=2,29 do ASCplus[i]=ASCplus[1]end
+end
+
 local C2
 do
 	local L=vecStrConv{'+0+0','-1+0','+1+0','+0-1','-1-1','+1-1','-2+0','+2+0'}
@@ -610,6 +641,8 @@ return{
 	TRS=TRS,
 	SRS=SRS,
 	ZRS=ZRS,
+	ASC=ASC,
+	ASCplus=ASCplus,
 	C2=C2,
 	C2sym=C2sym,
 	Classic=Classic,
diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua
index 90ac9314..64055bf6 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','ZRS','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','ASC','ASCplus','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")},