From e7b9a4ba874226f666dc3994295c4ad76c9fb08e Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 27 Nov 2021 05:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0DRS=5Fweak=E6=97=8B=E8=BD=AC?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20close=20#441?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/RSlist.lua | 63 +++++++++++++++++++++++++++++++++++ parts/scenes/setting_game.lua | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/parts/RSlist.lua b/parts/RSlist.lua index 100015a5..82ed488b 100644 --- a/parts/RSlist.lua +++ b/parts/RSlist.lua @@ -761,6 +761,68 @@ do ARS_Z.kickTable[25]=upSet end +local DRS_weak +do + local centerPos=TABLE.copy(defaultCenterPos) + centerPos[1]={[0]={1,1},{1,0},{1,1},{1,1}}--Z + centerPos[2]={[0]={1,1},{1,0},{1,1},{1,1}}--S + centerPos[3]={[0]={1,1},{1,0},{1,1},{1,1}}--L + centerPos[4]={[0]={1,1},{1,0},{1,1},{1,1}}--J + centerPos[5]={[0]={1,1},{1,0},{1,1},{1,1}}--T + centerPos[7]={[0]={.5,1.5},{1.5,-.5},{.5,1.5},{1.5,.5}}--I + centerPos[10]={[0]={1,1},{1,0},{1,1},{1,0}}--P + centerPos[11]={[0]={1,1},{1,1},{1,1},{1,1}}--Q + centerPos[15]={[0]={1,1},{1,0},{1,1},{1,1}}--U + centerPos[16]={[0]={1,1},{1,1},{1,1},{1,1}}--V + centerPos[19]={[0]={1.5,1.5},{1.5,0.5},{1.5,1.5},{1.5,0.5}}--J5 + centerPos[20]={[0]={1.5,1.5},{1.5,0.5},{1.5,1.5},{1.5,0.5}}--L5 + centerPos[21]={[0]={1.5,1.5},{1.5,0.5},{1.5,1.5},{1.5,0.5}}--R + centerPos[22]={[0]={1.5,1.5},{1.5,0.5},{1.5,1.5},{1.5,0.5}}--Y + centerPos[23]={[0]={1.5,1.5},{1.5,0.5},{1.5,1.5},{1.5,0.5}}--N + centerPos[24]={[0]={1.5,1.5},{1.5,0.5},{1.5,1.5},{1.5,0.5}}--H + centerPos[26]={[0]={0,1},{0,0},{0,1},{0,0}}--I3 + centerPos[28]={[0]={0,1},{0,0},{0,1},{0,0}}--I2 + + local L={'+0+0','-1+0','+1+0','+0-1','-1-1','+1-1'} + local R={'+0+0','+1+0','-1+0','+0-1','+1-1','-1-1'} + + local Z={ + [01]=R,[10]=L,[03]=L,[30]=R, + [12]=R,[21]=L,[32]=L,[23]=R, + [02]=R,[20]=L,[13]=L,[31]=R, + } + local S=_reflect(Z) + + DRS_weak={ + centerTex=GC.DO{10,10, + {'setLW',2}, + {'dRect',1,1,8,8}, + {'fRect',3,3,4,4}, + }, + centerPos=centerPos, + kickTable={ + Z,S,--Z,S + Z,S,--J,L + Z,--T + noKickSet,--O + Z,--I + + Z,S,--Z5,S5 + Z,S,--P,Q + Z,S,--F,E + Z,Z,Z,Z,--T5,U,V,W + noKickSet,--X + Z,S,--J5,L5 + Z,S,--R,Y + Z,S,--N,H + Z,--I5 + + Z,Z,--I3,C + Z,Z,--I2,O1 + } + } +end + local ASC do local L={'+0+0','+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'} @@ -934,6 +996,7 @@ local RSlist={ SRS_X=SRS_X, BiRS=BiRS, ARS_Z=ARS_Z, + DRS_weak=DRS_weak, ASC=ASC, ASC_plus=ASC_plus, C2=C2, diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 501477a1..cd1bb07c 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -43,7 +43,7 @@ scene.widgetList={ WIDGET.newButton{name='touch', x=990, y=220, w=320,h=80,color=not MOBILE and'dH',font=35, code=goScene'setting_touch',hideF=function()return not SETTING.VKSwitch end}, WIDGET.newSwitch{name='showVK', x=1100, y=150, lim=400, disp=SETval('VKSwitch'), code=SETrev('VKSwitch')}, WIDGET.newSlider{name='reTime', x=330, y=320, w=300,lim=180,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', disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, + WIDGET.newSelector{name='RS', x=300, y=420, w=300,color='S', disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','DRS_weak','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, WIDGET.newSelector{name='menuPos',x=980, y=320, w=300,color='O', disp=SETval('menuPos'), code=SETsto('menuPos'),list={'left','middle','right'}}, WIDGET.newSwitch{name='sysCursor',x=1060, y=390, lim=580, disp=SETval('sysCursor'),code=function()SETTING.sysCursor=not SETTING.sysCursor applyCursor()end}, WIDGET.newSwitch{name='autoPause',x=1060, y=450, lim=580, disp=SETval('autoPause'),code=SETrev('autoPause')},