From fc748317003120e8938e1582c0689129c33a54af Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 19 Nov 2021 02:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0lockout=E5=88=A4=E8=B4=9F?= =?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=88=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/customEnv0.lua | 1 + parts/language/lang_en.lua | 2 ++ parts/language/lang_es.lua | 2 ++ parts/language/lang_fr.lua | 2 ++ parts/language/lang_pt.lua | 2 ++ parts/language/lang_symbol.lua | 2 ++ parts/language/lang_zh.lua | 2 ++ parts/language/lang_zh_grass.lua | 2 ++ parts/language/lang_zh_trad.lua | 2 ++ parts/player/gameEnv0.lua | 1 + parts/player/player.lua | 2 +- parts/scenes/customGame.lua | 19 ++++++++++--------- parts/scenes/net_newRoom.lua | 13 +++++++------ 13 files changed, 36 insertions(+), 16 deletions(-) diff --git a/parts/customEnv0.lua b/parts/customEnv0.lua index 903cf275..6ef4f4a5 100644 --- a/parts/customEnv0.lua +++ b/parts/customEnv0.lua @@ -20,6 +20,7 @@ return{ --Rule sequence='bag', + lockout=false, fieldH=20, heightLimit=1e99, bufferLimit=1e99, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index abb73b59..21c39b49 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -303,6 +303,7 @@ return{ ospin="O-spin", fineKill="100% Finesse", b2bKill="No B2B break", + lockout="Fail when lock out", easyFresh="Normal Lock Reset", deepDrop="Deep Drop", bone="Bone Blocks", @@ -515,6 +516,7 @@ return{ ospin="O-Spin", fineKill="100% Finesse", b2bKill="No B2B break", + lockout="Fail when lock out", easyFresh="Normal Lock Reset", deepDrop="Deep Drop", bone="Bone Blocks", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index a2a859d8..66130f19 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -269,6 +269,7 @@ return{ ospin="O-Spin", fineKill="100% Finesse", b2bKill="No Romper B2B ", + -- lockout="Fail when lock out", easyFresh="Reinicio de Bloqueo Normal", deepDrop="Deep Drop", bone="Bone Block", @@ -481,6 +482,7 @@ return{ ospin="O-Spin", fineKill="100% Finesse", b2bKill="No Romper B2B ", + -- lockout="Fail when lock out", easyFresh="Reinicio de Bloqueo Normal", deepDrop="Deep Drop", bone="Bone Block", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 2d046629..3f9ac22d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -265,6 +265,7 @@ return{ ospin="O-spin", fineKill="100% Finesse", b2bKill="Sans perte de B2B", + -- lockout="Fail when lock out", easyFresh="Réinit. de verrouillage normale", -- deepDrop="Deep Drop", bone="Crochets", @@ -482,6 +483,7 @@ return{ ospin="O-spin", fineKill="100% Finesse", b2bKill="Sans perte de B2B", + -- lockout="Fail when lock out", easyFresh="Réinit. de verrouillage normale", -- deepDrop="Deep Drop", bone="Crochets", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 6e0d3a1c..eb407388 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -291,6 +291,7 @@ return{ ospin="O-Spin", fineKill="100% Finesse", b2bKill="Sem Quebrar B2B", + -- lockout="Fail when lock out", easyFresh="Reset De Trava Normal", -- deepDrop="Deep Drop", bone="Bone Blocks", @@ -504,6 +505,7 @@ return{ ospin="O-Spin", fineKill="100% Finesse", b2bKill="Sem Quebrar B2B", + -- lockout="Fail when lock out", easyFresh="Reset De Trava Normal", -- deepDrop="Deep Drop", bone="Bone Blocks", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 9eb2a931..b7f5bb0e 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -197,6 +197,7 @@ return{ ospin="O→Any", fineKill="12 XX 21", b2bKill="_1 XX", + lockout="X ↑_↓_↑", easyFresh="↓_↓_↓_", deepDrop="\\↓↓/", bone="[]", @@ -409,6 +410,7 @@ return{ ospin="O→Any", fineKill="12 XX 21", b2bKill="_1 XX", + lockout="X ↑_↓_↑", easyFresh="↓_↓_↓_", deepDrop="\\↓↓/", bone="[]", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 2fd8eeda..9652c7fa 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -303,6 +303,7 @@ return{ ospin="O-spin", fineKill="强制极简", b2bKill="强制B2B", + lockout="锁定在外时失败", easyFresh="普通刷新锁延", deepDrop="深降", bone="骨块", @@ -515,6 +516,7 @@ return{ ospin="O-spin", fineKill="强制极简", b2bKill="强制B2B", + lockout="锁定在外时失败", easyFresh="普通刷新锁延", deepDrop="深降", bone="骨块", diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 4243f1de..fd17f325 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -301,6 +301,7 @@ return{ ospin="O型自旋", fineKill="100%精巧", b2bKill="没有背靠背中断", + lockout="锁定时失败", easyFresh="正常锁复位", deepDrop="深滴", bone="骨块", @@ -514,6 +515,7 @@ return{ ospin="O型自旋", fineKill="100%精巧", b2bKill="没有背靠背中断", + lockout="锁定时失败", easyFresh="正常锁复位", deepDrop="深滴", bone="骨块", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 8bf508af..538be68f 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -302,6 +302,7 @@ return{ ospin="O-spin", fineKill="100% finesse", b2bKill="強制B2B", + lockout="鎖定在外時失敗", easyFresh="普通刷新鎖延", deepDrop="深降", bone="骨塊", @@ -514,6 +515,7 @@ return{ ospin="O-spin", fineKill="強制finesse", b2bKill="強制B2B", + lockout="鎖定在外時失敗", easyFresh="普通刷新鎖延", deepDrop="深降", bone="骨塊", diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index d9189d32..5a93011b 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -31,6 +31,7 @@ return{ drop=60,lock=60, wait=0,fall=0, bone=false, + lockout=false, fieldH=20,heightLimit=1e99, nextCount=6,nextStartPos=1, holdMode='hold',holdCount=1, diff --git a/parts/player/player.lua b/parts/player/player.lua index 3d57c788..f558e95f 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1653,7 +1653,7 @@ do end --Check height limit - if cc==0 and #self.field>ENV.heightLimit then + if cc==0 and(#self.field>ENV.heightLimit or ENV.lockout and CY>ENV.fieldH)then finish='lose' end diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 1a56d65d..2844dbb5 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -181,7 +181,7 @@ function scene.draw() gc.translate(0,WIDGET.scrollPos) end -scene.widgetScrollHeight=400 +scene.widgetScrollHeight=450 scene.widgetList={ WIDGET.newText{name='title', x=520,y=15,font=70,align='R'}, @@ -225,12 +225,13 @@ scene.widgetList={ WIDGET.newSelector{name='eventSet', x=1050,y=740,w=340,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, --Special rules - WIDGET.newSwitch{name='ospin', x=850, y=810,lim=210,disp=CUSval('ospin'), code=CUSrev('ospin')}, - WIDGET.newSwitch{name='fineKill', x=850, y=870,lim=210,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, - WIDGET.newSwitch{name='b2bKill', x=850, y=930,lim=210,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, - WIDGET.newSwitch{name='easyFresh', x=1170,y=810,lim=250,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, - WIDGET.newSwitch{name='deepDrop', x=1170,y=870,lim=250,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, - WIDGET.newSwitch{name='bone', x=1170,y=930,lim=250,disp=CUSval('bone'), code=CUSrev('bone')}, + WIDGET.newSwitch{name='ospin', x=850, y=820 ,lim=210,disp=CUSval('ospin'), code=CUSrev('ospin')}, + WIDGET.newSwitch{name='fineKill', x=850, y=880 ,lim=210,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, + WIDGET.newSwitch{name='b2bKill', x=850, y=940 ,lim=210,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, + WIDGET.newSwitch{name='lockout', x=850, y=1000,lim=210,disp=CUSval('lockout'), code=CUSrev('lockout')}, + WIDGET.newSwitch{name='easyFresh', x=1170,y=820 ,lim=250,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, + WIDGET.newSwitch{name='deepDrop', x=1170,y=880 ,lim=250,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, + WIDGET.newSwitch{name='bone', x=1170,y=940 ,lim=250,disp=CUSval('bone'), code=CUSrev('bone')}, --Next & Hold WIDGET.newSelector{name='holdMode', x=310, y=890, w=300,color='lY',list=sList.holdMode,disp=CUSval('holdMode'),code=CUSsto('holdMode')}, @@ -240,8 +241,8 @@ scene.widgetList={ WIDGET.newSwitch{name='phyHold', x=560, y=1030,lim=200, disp=CUSval('phyHold'),code=CUSrev('phyHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, --BG & BGM - WIDGET.newSelector{name='bg', x=840, y=1030,w=250,color='Y',list=BG.getList(),disp=CUSval('bg'),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, - WIDGET.newSelector{name='bgm', x=1120,y=1030,w=250,color='Y',list=BGM.getList(),disp=CUSval('bgm'),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, + WIDGET.newSelector{name='bg', x=840, y=1090,w=250,color='Y',list=BG.getList(),disp=CUSval('bg'),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, + WIDGET.newSelector{name='bgm', x=1120,y=1090,w=250,color='Y',list=BGM.getList(),disp=CUSval('bgm'),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, } return scene diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 07c79a6f..8878dc97 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -94,12 +94,13 @@ scene.widgetList={ WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, --Special rules - WIDGET.newSwitch{name='ospin', x=850, y=750,lim=210,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, - WIDGET.newSwitch{name='fineKill', x=850, y=840,lim=210,disp=ROOMval('fineKill'), code=ROOMrev('fineKill')}, - WIDGET.newSwitch{name='b2bKill', x=850, y=930,lim=210,disp=ROOMval('b2bKill'), code=ROOMrev('b2bKill')}, - WIDGET.newSwitch{name='easyFresh', x=1170,y=750,lim=250,disp=ROOMval('easyFresh'),code=ROOMrev('easyFresh')}, - WIDGET.newSwitch{name='deepDrop', x=1170,y=840,lim=250,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, - WIDGET.newSwitch{name='bone', x=1170,y=930,lim=250,disp=ROOMval('bone'), code=ROOMrev('bone')}, + WIDGET.newSwitch{name='ospin', x=850, y=760 ,lim=210,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, + WIDGET.newSwitch{name='fineKill', x=850, y=850 ,lim=210,disp=ROOMval('fineKill'), code=ROOMrev('fineKill')}, + WIDGET.newSwitch{name='b2bKill', x=850, y=940 ,lim=210,disp=ROOMval('b2bKill'), code=ROOMrev('b2bKill')}, + WIDGET.newSwitch{name='lockout', x=850, y=1030,lim=210,disp=ROOMval('lockout'), code=ROOMval('lockout')}, + WIDGET.newSwitch{name='easyFresh', x=1170,y=760 ,lim=250,disp=ROOMval('easyFresh'),code=ROOMrev('easyFresh')}, + WIDGET.newSwitch{name='deepDrop', x=1170,y=850 ,lim=250,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, + WIDGET.newSwitch{name='bone', x=1170,y=940 ,lim=250,disp=ROOMval('bone'), code=ROOMrev('bone')}, --Rule set WIDGET.newSelector{name='eventSet', x=310,y=880,w=360,color='H',list=sList.eventSet,disp=ROOMval('eventSet'),code=ROOMsto('eventSet')},