diff --git a/parts/RSlist.lua b/parts/RSlist.lua index eafc3646..b97f2bd5 100644 --- a/parts/RSlist.lua +++ b/parts/RSlist.lua @@ -479,6 +479,59 @@ do for i=8,29 do SRS.kickTable[i]=SRS.kickTable[1]end end +local SRS_plus +do + SRS_plus={ + centerTex=GC.DO{10,10, + {'setCL',1,1,1,.4}, + {'fCirc',5,5,5}, + {'setCL',1,1,1,.6}, + {'fCirc',5,5,4}, + {'setCL',1,1,1,.9}, + {'fCirc',5,5,3}, + {'setCL',1,1,1}, + {'fCirc',5,5,2}, + }, + 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 + { + [01]={'+0+0','-2+0','+1+0','-2-1','+1+2'}, + [10]={'+0+0','+2+0','-1+0','+2+1','-1-2'}, + [12]={'+0+0','-1+0','+2+0','-1+2','+2-1'}, + [21]={'+0+0','+1+0','-2+0','+1-2','-2+1'}, + [23]={'+0+0','+2+0','-1+0','+2+1','-1-2'}, + [32]={'+0+0','-2+0','+1+0','-2-1','+1+2'}, + [30]={'+0+0','+1+0','-2+0','+1-2','-2+1'}, + [03]={'+0+0','-1+0','+2+0','-1+2','+2-1'}, + [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'}, + }--I + } + } + for i=2,5 do SRS_plus.kickTable[i]=SRS_plus.kickTable[1]end + for i=8,29 do SRS_plus.kickTable[i]=SRS_plus.kickTable[1]end +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'} @@ -766,6 +819,7 @@ local None_plus={ local RSlist={ TRS=TRS, SRS=SRS, + SRS_plus=SRS_plus, BiRS=BiRS, ASC=ASC, ASC_plus=ASC_plus, diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 7ac957f8..2dee85de 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','BiRS','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','BiRS','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")},