From 53f949571eeaffe355a45007de058db064932e2f Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 24 Jul 2021 04:04:31 +0800
Subject: [PATCH] =?UTF-8?q?ZRS=E6=94=B9=E5=90=8DBRS(Boost=20RS)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua                      | 17 +++++------------
 parts/kickList.lua            |  6 +++---
 parts/scenes/setting_game.lua |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/main.lua b/main.lua
index 04f6b3ea..29d6f7b2 100644
--- a/main.lua
+++ b/main.lua
@@ -266,10 +266,8 @@ do
 		needSave=true
 		love.event.quit('restart')
 	end
-	if SETTING.ghostType=='greyCell'then
-		SETTING.ghostType='grayCell'
-		needSave=true
-	end
+	if SETTING.ghostType=='greyCell'then SETTING.ghostType='grayCell'needSave=true end
+	if SETTING.RS=='ZRS'then SETTING.RS='BRS'needSave=true end
 	if not SETTING.VKSkin then SETTING.VKSkin=1 end
 	if type(SETTING.skinSet)=='number'then SETTING.skinSet='crystal_scf'end
 	if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then
@@ -280,6 +278,9 @@ do
 	for _,v in next,VK_org do v.color=nil end
 	if RANKS.infinite then RANKS.infinite=0 end
 	if RANKS.infinite_dig then RANKS.infinite_dig=0 end
+	if not RANKS.sprint_10l then RANKS.sprint_10l=0 needSave=true end
+	if RANKS.master_l then RANKS.master_l=0 needSave=true end
+	if RANKS.master_u then RANKS.master_u=0 needSave=true end
 	for k in next,RANKS do
 		if type(k)=='number'then
 			RANKS[k]=nil
@@ -301,14 +302,6 @@ do
 			fs.remove(k..'.rec')
 		end
 	end
-	if not RANKS.sprint_10l then
-		RANKS.sprint_10l=0
-		needSave=true
-	end
-	if RANKS.master_l or RANKS.master_u then
-		RANKS.master_l,RANKS.master_u=0,0
-		needSave=true
-	end
 
 	if needSave then
 		FILE.save(SETTING,'conf/settings')
diff --git a/parts/kickList.lua b/parts/kickList.lua
index c88c815c..d9cfd830 100644
--- a/parts/kickList.lua
+++ b/parts/kickList.lua
@@ -443,7 +443,7 @@ do
 	for i=8,29 do SRS[i]=SRS[1]end
 end
 
-local ZRS
+local BRS
 do
 	local R=vecStrConv{'+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'}
 	local L=vecStrConv{'+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'}
@@ -487,7 +487,7 @@ do
 		list[i][01]=a;list[i][10]=b;list[i][03]=b;list[i][30]=a
 		list[i][12]=a;list[i][21]=b;list[i][32]=b;list[i][23]=a
 	end
-	ZRS=TABLE.new(function(P,d,ifpre)
+	BRS=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]
@@ -652,7 +652,7 @@ for i=1,29 do None[i]=noKickSet_180 end
 local RS={
 	TRS=TRS,
 	SRS=SRS,
-	ZRS=ZRS,
+	BRS=BRS,
 	ASC=ASC,
 	ASCplus=ASCplus,
 	C2=C2,
diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua
index 054272ab..f7d12267 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','ASC','ASCplus','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','BRS','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")},