diff --git a/parts/kickList.lua b/parts/kickList.lua index f7829256..2aa42175 100644 --- a/parts/kickList.lua +++ b/parts/kickList.lua @@ -345,9 +345,9 @@ do pushZero(TRS) end -local AIRS +local SRS do - AIRS={ + SRS={ { [01]={{-1,0},{-1, 1},{ 0,-2},{-1,-2}}, [10]={{ 1,0},{ 1,-1},{ 0, 2},{ 1, 2}}, @@ -357,6 +357,7 @@ do [21]={{-1,0},{-1, 1},{ 0,-2},{-1,-2}}, [32]={{-1,0},{-1,-1},{ 0, 2},{-1, 2}}, [23]={{ 1,0},{ 1, 1},{ 0,-2},{ 1,-2}}, + [02]={},[20]={},[13]={},[31]={}, },--Z false,--S false,--J @@ -372,14 +373,14 @@ do [32]={{-2, 0},{ 1, 0},{-2,-1},{ 1, 2}}, [30]={{ 1, 0},{-2, 0},{ 1,-2},{-2, 1}}, [03]={{-1, 0},{ 2, 0},{-1, 2},{ 2,-1}}, + [02]={},[20]={},[13]={},[31]={}, }--I } - collect(AIRS[1]) - collect(AIRS[7]) - pushZero(AIRS) - for i=2,5 do AIRS[i]=AIRS[1]end - for i=8,25 do AIRS[i]=AIRS[1]end - + collect(SRS[1]) + collect(SRS[7]) + pushZero(SRS) + for i=2,5 do SRS[i]=SRS[1]end + for i=8,25 do SRS[i]=SRS[1]end end local C2 @@ -429,7 +430,7 @@ for i=1,25 do None[i]=noKick_180 end return{ TRS=TRS, - AIRS=AIRS, + SRS=SRS, C2=C2, C2sym=C2sym, Classic=Classic, diff --git a/parts/modes/pctrain_lunatic.lua b/parts/modes/pctrain_lunatic.lua index 82aa6356..6183d458 100644 --- a/parts/modes/pctrain_lunatic.lua +++ b/parts/modes/pctrain_lunatic.lua @@ -56,6 +56,7 @@ return{ sequence="none", freshLimit=15, dropPiece=newPC, + RS="SRS", ospin=false, bg="rgb",bgm="oxygen", }, diff --git a/parts/modes/pctrain_normal.lua b/parts/modes/pctrain_normal.lua index fe343017..9d4bc6d0 100644 --- a/parts/modes/pctrain_normal.lua +++ b/parts/modes/pctrain_normal.lua @@ -48,6 +48,7 @@ return{ fall=20, sequence="none", dropPiece=newPC, + RS="SRS", ospin=false, bg="rgb",bgm="oxygen", }, diff --git a/parts/player/player.lua b/parts/player/player.lua index 0b113d8a..0fdf55f8 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1229,7 +1229,7 @@ function Player.loadAI(P,AIdata)--Load AI params P.AI_delay0=int(P.AI_delay0*.26) end if P.AI_mode=="CC"then - P:setRS("AIRS") + P:setRS("SRS") local opt,wei=CC.getConf() CC.fastWeights(wei) CC.setHold(opt,P.AIdata.hold) diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index 5241f63f..3f998a4c 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -26,7 +26,7 @@ WIDGET.init("custom_advance",{ WIDGET.newSwitch({name="noTele", x=910, y=420, font=25, disp=WIDGET.lnk_CUSval("noTele"), code=WIDGET.lnk_CUSrev("noTele")}), WIDGET.newSwitch({name="fineKill", x=910, y=490, font=20, disp=WIDGET.lnk_CUSval("fineKill"), code=WIDGET.lnk_CUSrev("fineKill")}), WIDGET.newSwitch({name="easyFresh", x=910, y=560, font=20, disp=WIDGET.lnk_CUSval("easyFresh"),code=WIDGET.lnk_CUSrev("easyFresh")}), - WIDGET.newSelector({name="RS", x=560, y=340, w=260,color="sea", list={"TRS","AIRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_CUSval("RS"),code=WIDGET.lnk_CUSsto("RS")}), + WIDGET.newSelector({name="RS", x=560, y=340, w=260,color="sea", list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_CUSval("RS"),code=WIDGET.lnk_CUSsto("RS")}), WIDGET.newSelector({name="visible", x=840, y=60, w=260,color="lBlue",list={"show","time","fast","none"}, disp=WIDGET.lnk_CUSval("visible"), code=WIDGET.lnk_CUSsto("visible")}), WIDGET.newSelector({name="target", x=840, y=160, w=260,color="green",list={10,20,40,100,200,500,1000,1e99}, disp=WIDGET.lnk_CUSval("target"), code=WIDGET.lnk_CUSsto("target")}), WIDGET.newSelector({name="freshLimit", x=840, y=260, w=260,color="purple",list={0,8,15,1e99}, disp=WIDGET.lnk_CUSval("freshLimit"),code=WIDGET.lnk_CUSsto("freshLimit")}), diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 47ae94fe..29d6cdda 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -26,7 +26,7 @@ WIDGET.init("setting_game",{ WIDGET.newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=WIDGET.lnk_goScene("setting_touch")}), WIDGET.newSlider({name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=WIDGET.lnk_SETval("reTime"), code=WIDGET.lnk_SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}), WIDGET.newSlider({name="maxNext", x=350, y=440, w=300,unit=6, font=30,disp=WIDGET.lnk_SETval("maxNext"), code=WIDGET.lnk_SETsto("maxNext")}), - WIDGET.newSelector({name="RS", x=300, y=540, w=300,color="sea",list={"TRS","AIRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}), + WIDGET.newSelector({name="RS", x=300, y=540, w=300,color="sea",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}), WIDGET.newButton({name="layout", x=580, y=540, w=200,h=70, font=35,code=WIDGET.lnk_goScene("setting_skin")}), WIDGET.newSwitch({name="autoPause", x=1080, y=320, font=20,disp=WIDGET.lnk_SETval("autoPause"),code=WIDGET.lnk_SETrev("autoPause")}), WIDGET.newSwitch({name="swap", x=1080, y=380, font=20,disp=WIDGET.lnk_SETval("swap"), code=WIDGET.lnk_SETrev("swap")}),