diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index c2a41077..581dcbe3 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -298,6 +298,8 @@ return{ deepDrop="Deep Drop", bone="Bone Blocks", + eventSet="Rule Set", + nextCount="Next", holdCount="Hold", infHold="Infinite Hold", @@ -458,7 +460,6 @@ return{ }, customGame={ title="Custom Game", - subTitle="Basic", defSeq="Default Seq.", noMsn="No missions", @@ -482,6 +483,8 @@ return{ sequence="Edit Sequence (S)", mission="Edit Mission (M)", + eventSet="Rule Set", + nextCount="Next", holdCount="Hold", infHold="Infinite Hold", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 3f3aacc9..a4ea96b2 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -264,6 +264,8 @@ return{ deepDrop="Deep Drop", bone="Bone Block", + -- eventSet="Rule Set", + nextCount="Siguiente", holdCount="Reserva", infHold="Reserva Inft.", @@ -422,7 +424,6 @@ return{ }, customGame={ title="Juego Personalizado", - subTitle="Básico", defSeq="Sec. por defecto", noMsn="Sin misión", @@ -446,6 +447,8 @@ return{ sequence="Editar Secuencia (S)", mission="Editar Misiones (M)", + -- eventSet="Rule Set", + nextCount="Siguiente", holdCount="Reserva", infHold="Reserva Inft.", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index c05e43b4..05919d8c 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -260,6 +260,8 @@ return{ -- deepDrop="Deep Drop", bone="Crochets", + -- eventSet="Rule Set", + nextCount="Prévisualisations de pièces", holdCount="Réserve", infHold="Réserver une fois", @@ -424,7 +426,6 @@ return{ }, customGame={ title="Mode personnalisé", - subTitle="Basique", defSeq="Séquence par défaut", noMsn="Pas de mission", @@ -448,6 +449,8 @@ return{ sequence="Modifier la séquence (S)", mission="Modifier la mission(M)", + -- eventSet="Rule Set", + nextCount="Prévisualisations de pièces", holdCount="Réserve", infHold="Réserver une fois", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index c17a12fa..f65200af 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -286,6 +286,8 @@ return{ -- deepDrop="Deep Drop", bone="Bone Blocks", + -- eventSet="Rule Set", + nextCount="Prox.", holdCount="Segurar", infHold="Segurar Infinito", @@ -446,7 +448,6 @@ return{ }, customGame={ title="Jogo person.", - subTitle="Básico", defSeq="Seq. Padrão", noMsn="Sem missões", @@ -470,6 +471,8 @@ return{ sequence="Editar Sequência (S)", mission="Editar Missão (M)", + -- eventSet="Rule Set", + nextCount="Prox.", holdCount="Segurar", infHold="Segurar Infinito", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 48e35a33..477e2d61 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -131,6 +131,66 @@ return{ quit="X (Q)", tas="#&; (T)", }, + net_menu={ + league="TL", + ffa="FFA", + rooms="< >", + logout="@_@x", + }, + net_league={ + match="!", + }, + net_rooms={ + password="***", + refreshing="R...", + noRoom="X_X", + refresh="R", + new="+< >", + join="→< >", + }, + net_newRoom={ + title="!@#$%^&*", + roomName="xxx", + password="******", + description="...", + + life="", + pushSpeed="_↑__", + garbageSpeed="#↑↑", + visible="?=", + freshLimit="@", + + fieldH="↑[]↓", + bufferLimit="^↑", + heightLimit="#↑", + + drop="↓", + lock="↓_", + wait="→=", + fall="↓=", + + capacity="<0/?>", + create=">", + + ospin="O→Any", + fineKill="12 XX 21", + b2bKill="_1 XX", + easyFresh="↓_↓_↓_", + deepDrop="\\↓↓/", + bone="[]", + + eventSet="Rule Set", + + nextCount="→", + holdCount="[ ]", + infHold="∞*[ ]", + phyHold="P-[ ]", + }, + net_game={ + ready="!_!", + spectate="-_-", + cancel="x", + }, setting_game={ title="%~~%", @@ -280,7 +340,6 @@ return{ }, customGame={ title="!@#$%^&*", - subTitle="!!", defSeq="0-[123]", noMsn="-x-", @@ -304,6 +363,8 @@ return{ sequence="Edit Sequence (S)", mission="Edit Mission (M)", + eventSet="Rule Set", + nextCount="→", holdCount="[ ]", infHold="∞*[ ]", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 9ebdcae0..88676f21 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -298,6 +298,8 @@ return{ deepDrop="深降", bone="骨块", + eventSet="规则包", + nextCount="Next", holdCount="Hold", infHold="无限Hold", @@ -457,7 +459,6 @@ return{ }, customGame={ title="自定义游戏", - subTitle="基本", defSeq="默认序列", noMsn="无任务", @@ -481,6 +482,8 @@ return{ sequence="序列编辑(S)", mission="任务编辑(M)", + eventSet="规则包", + nextCount="Next", holdCount="Hold", infHold="无限Hold", diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 2cb09186..f27dde31 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -200,7 +200,6 @@ end scene.widgetScrollHeight=400 scene.widgetList={ WIDGET.newText{name="title", x=520,y=15,font=70,align='R'}, - WIDGET.newText{name="subTitle",x=530,y=60,font=35,align='L',color='H'}, WIDGET.newKey{name="reset", x=1110,y=90,w=230,h=90,color='R',code=pressKey"delete"}, WIDGET.newKey{name="mod", x=1110,y=200,w=230,h=90,color='Z',code=pressKey"f1"}, @@ -225,38 +224,38 @@ scene.widgetList={ WIDGET.newSelector{name="heightLimit", x=450,y=710,w=260,color='S',list=sList.heightLimit,disp=CUSval('heightLimit'), code=CUSsto('heightLimit')}, WIDGET.newSelector{name="bufferLimit", x=450,y=790,w=260,color='B',list=sList.bufferLimit,disp=CUSval('bufferLimit'), code=CUSsto('bufferLimit')}, - WIDGET.newSelector{name="drop", x=730,y=330,w=260,color='O',list=sList.drop,disp=CUSval('drop'),code=CUSsto('drop')}, - WIDGET.newSelector{name="lock", x=730,y=410,w=260,color='O',list=sList.lock,disp=CUSval('lock'),code=CUSsto('lock')}, - WIDGET.newSelector{name="wait", x=730,y=520,w=260,color='G',list=sList.wait,disp=CUSval('wait'),code=CUSsto('wait')}, - WIDGET.newSelector{name="fall", x=730,y=600,w=260,color='G',list=sList.fall,disp=CUSval('fall'),code=CUSsto('fall')}, + WIDGET.newSelector{name="drop", x=730,y=330,w=260,color='O',list=sList.drop,disp=CUSval('drop'),code=CUSsto('drop')}, + WIDGET.newSelector{name="lock", x=730,y=410,w=260,color='O',list=sList.lock,disp=CUSval('lock'),code=CUSsto('lock')}, + WIDGET.newSelector{name="wait", x=730,y=520,w=260,color='G',list=sList.wait,disp=CUSval('wait'),code=CUSsto('wait')}, + WIDGET.newSelector{name="fall", x=730,y=600,w=260,color='G',list=sList.fall,disp=CUSval('fall'),code=CUSsto('fall')}, --Copy / Paste / Start - WIDGET.newButton{name="copy", x=1070,y=300,w=310,h=70,color='lR',font=25,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=1070,y=380,w=310,h=70,color='lB',font=25,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=1070,y=460,w=310,h=70,color='lY',font=35,code=pressKey"return"}, - WIDGET.newButton{name="puzzle", x=1070,y=540,w=310,h=70,color='lM',font=35,code=pressKey"return2",hideF=function()return not initField end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=pressKey"escape"}, + WIDGET.newButton{name="copy", x=1070,y=300,w=310,h=70,color='lR',font=25,code=pressKey"cC"}, + WIDGET.newButton{name="paste", x=1070,y=380,w=310,h=70,color='lB',font=25,code=pressKey"cV"}, + WIDGET.newButton{name="clear", x=1070,y=460,w=310,h=70,color='lY',font=35,code=pressKey"return"}, + WIDGET.newButton{name="puzzle", x=1070,y=540,w=310,h=70,color='lM',font=35,code=pressKey"return2",hideF=function()return not initField end}, + WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=pressKey"escape"}, --Special rules - WIDGET.newSwitch{name="ospin", x=830, y=750,disp=CUSval('ospin'), code=CUSrev('ospin')}, - WIDGET.newSwitch{name="fineKill", x=830, y=840,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, - WIDGET.newSwitch{name="b2bKill", x=830, y=930,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, - WIDGET.newSwitch{name="easyFresh",x=1170,y=750,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, - WIDGET.newSwitch{name="deepDrop", x=1170,y=840,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, - WIDGET.newSwitch{name="bone", x=1170,y=930,disp=CUSval('bone'), code=CUSrev('bone')}, + WIDGET.newSwitch{name="ospin", x=830, y=750,disp=CUSval('ospin'), code=CUSrev('ospin')}, + WIDGET.newSwitch{name="fineKill", x=830, y=840,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, + WIDGET.newSwitch{name="b2bKill", x=830, y=930,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, + WIDGET.newSwitch{name="easyFresh", x=1170,y=750,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, + WIDGET.newSwitch{name="deepDrop", x=1170,y=840,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, + WIDGET.newSwitch{name="bone", x=1170,y=930,disp=CUSval('bone'), code=CUSrev('bone')}, --Rule set - WIDGET.newSelector{name="eventSet",x=310,y=890,w=320,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, + WIDGET.newSelector{name="eventSet", x=310, y=880,w=360,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, --Next & Hold - WIDGET.newSlider{name="nextCount",x=140, y=960,w=180,unit=6, disp=CUSval('nextCount'),code=CUSsto('nextCount')}, - WIDGET.newSlider{name="holdCount",x=140, y=1030,w=180,unit=6,disp=CUSval('holdCount'),code=CUSsto('holdCount')}, - WIDGET.newSwitch{name="infHold", x=560, y=960, disp=CUSval('infHold'),code=CUSrev('infHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=560, y=1030, disp=CUSval('phyHold'),code=CUSrev('phyHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSlider{name="nextCount", x=140, y=960,w=180,unit=6, disp=CUSval('nextCount'),code=CUSsto('nextCount')}, + WIDGET.newSlider{name="holdCount", x=140, y=1030,w=180,unit=6,disp=CUSval('holdCount'),code=CUSsto('holdCount')}, + WIDGET.newSwitch{name="infHold", x=560, y=960, disp=CUSval('infHold'),code=CUSrev('infHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSwitch{name="phyHold", x=560, y=1030, 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=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}, } return scene \ No newline at end of file diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 11921057..41250089 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -20,6 +20,7 @@ local sList={ lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, + eventSet={'X','attacker_h','attacker_u','backfire_0','backfire_120','backfire_30','backfire_60','checkAttack_100','checkLine_10','checkLine_20','checkLine_40','checkLine_100','checkLine_200','checkLine_400','checkLine_1000','checkTurn_1','checkTurn_7','classic_fast','defender_n','defender_l','dig_h','dig_u','marathon_n','marathon_h','master_ex','master_final','master_h','master_n','master_ph','pctrain_n','pctrain_l','pc_inf','rhythm_e','rhythm_h','rhythm_u','survivor_e','survivor_n','survivor_h','survivor_l','survivor_u','tsd_e','tsd_h','tsd_u','ultra'}, } local scene={} @@ -100,10 +101,13 @@ scene.widgetList={ WIDGET.newSwitch{name="deepDrop", x=1170,y=840,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, WIDGET.newSwitch{name="bone", x=1170,y=930,disp=ROOMval('bone'), code=ROOMrev('bone')}, + --Rule set + WIDGET.newSelector{name="eventSet", x=310,y=880,w=360,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, + --Next & Hold - WIDGET.newSlider{name="nextCount", x=120,y=940,w=200,unit=6, disp=ROOMval('nextCount'),code=ROOMsto('nextCount')}, - WIDGET.newSlider{name="holdCount", x=120,y=1030,w=200,unit=6, disp=ROOMval('holdCount'),code=ROOMsto('holdCount')}, - WIDGET.newSwitch{name="infHold", x=560,y=940, disp=ROOMval('infHold'),code=ROOMrev('infHold'),hideF=function()return ROOMENV.holdCount==0 end}, + WIDGET.newSlider{name="nextCount", x=140,y=960,w=200,unit=6, disp=ROOMval('nextCount'),code=ROOMsto('nextCount')}, + WIDGET.newSlider{name="holdCount", x=140,y=1030,w=200,unit=6, disp=ROOMval('holdCount'),code=ROOMsto('holdCount')}, + WIDGET.newSwitch{name="infHold", x=560,y=960, disp=ROOMval('infHold'),code=ROOMrev('infHold'),hideF=function()return ROOMENV.holdCount==0 end}, WIDGET.newSwitch{name="phyHold", x=560,y=1030, disp=ROOMval('phyHold'),code=ROOMrev('phyHold'),hideF=function()return ROOMENV.holdCount==0 end}, } diff --git a/version.lua b/version.lua index 5ed89fc2..b09d4347 100644 --- a/version.lua +++ b/version.lua @@ -2,6 +2,6 @@ return{ ["apkCode"]=365, ["code"]=1602, ["string"]="V0.16.2@DEV", - ["room"]="V1.1", + ["room"]="V1.a", ["name"]="曲率引擎 Warp drive", } \ No newline at end of file