From 1b34a13321f517536c341e0162e9360dba59c5f6 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 6 Mar 2021 13:41:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=80=89=E9=A1=B9=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 25 +++++++++--------------- parts/language/lang_en.lua | 8 -------- parts/language/lang_fr.lua | 8 -------- parts/language/lang_pt.lua | 8 -------- parts/language/lang_sp.lua | 8 -------- parts/language/lang_symbol.lua | 8 -------- parts/language/lang_zh.lua | 8 -------- parts/scenes/custom_advance.lua | 34 ++++++++++++--------------------- 8 files changed, 21 insertions(+), 86 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 1e51e1f4..ed6c08d9 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -153,44 +153,37 @@ CUSTOMENV={--gameEnv for cutsom game wait=0, fall=0, + --Control + mindas=0, + minarr=0, + minsdarr=0, nextCount=6, - nextStartPos=1, holdCount=1, infHold=false, --Visual - block=true, - ghost=.3, - center=1, - bagLine=false, - highCam=false, - nextPos=false, bone=false, - hideBoard=false, - flipBoard=false, --Rule - mindas=0, - minarr=0, - minsdarr=0, sequence="bag", - ospin=true, - deepDrop=false, fieldH=20, - RS="TRS", + ospin=true, noTele=false, fineKill=false, b2bKill=false, - missionKill=false, easyFresh=true, + deepDrop=false, visible="show", target=1e99, freshLimit=1e99, + + opponent="X", life=0, garbageSpeed=1, pushSpeed=3, + missionKill=false, --Else bg="none", diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index ba830400..d2eb3649 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -424,13 +424,6 @@ return{ nextCount="Next", holdCount="Hold", infHold="Infinite Hold", - block="Draw Block", - ghost="Ghost", - center="Center", - upEdge="3D Block", - bagLine="Bag Line", - highCam="Birds-eye View", - nextPos="Next Preview", bone="Bone Blocks", mindas="Min. DAS", @@ -438,7 +431,6 @@ return{ minsdarr="Min. SDARR", noTele="No Teleportation", fieldH="Field height", - RS="Rotation System", ospin="O-Spin", deepDrop="Deep Drop", target="Target", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 99b80ec3..23aeeabd 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -400,13 +400,6 @@ return{ nextCount="Prévisualisations de pièces", holdCount="Réserve", infHold="Réserver une fois", - block="Dessiner le bloc", - ghost="Pièce fantôme", - center="Centre", - upEdge="3D bloc", - bagLine="Ligne du Sac", - highCam="Vue d'oiseau", - nextPos="Prévisualisation de position", bone="Crochets", mindas="DAS minimum", @@ -414,7 +407,6 @@ return{ minsdarr="SDARR minimum", noTele="Pas de téléportation", -- fieldH="Field height", - RS="Système de rotation", ospin="O-spin", -- deepDrop="Deep Drop", target="But", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 493e6776..1662f8e0 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -424,13 +424,6 @@ return{ nextCount="Prox.", holdCount="Segurar", infHold="Segurar Infinito", - block="Mostrar bloco", - ghost="Fantasma", - center="Centro", - upEdge="3D bloco", - bagLine="Linha De Bolsa", - highCam="Vista Olho-De-Pássaro", - nextPos="Próxima pos.", bone="Bone Blocks", mindas="Min. DAS", @@ -438,7 +431,6 @@ return{ minsdarr="Min. SDARR", noTele="Sem teleporte", -- fieldH="Field height", - RS="Sistema de rotação", ospin="O-Spin", -- deepDrop="Deep Drop", target="Alvo", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index e865faae..5247e282 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -400,13 +400,6 @@ return{ nextCount="Siguiente", holdCount="Reserva", -- infHold="Hold Único", - block="Dibujar Bloques", - ghost="Fantasma", - center="Centrar", - upEdge="3D Bloques", - bagLine="Línea de Bag de Pzas.", - highCam="Vista Aérea", - nextPos="Nro. de Pzas. Siguientes", bone="Bone Block", mindas="DAS Mínimo", @@ -414,7 +407,6 @@ return{ minsdarr="SDARR Mínimo", noTele="Sin Teleport", -- fieldH="Field height", - -- RS="Rotation System", ospin="O-Spin", -- deepDrop="Deep Drop", target="Objetivo", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index e7de2651..f9513481 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -281,13 +281,6 @@ return{ nextCount="→", holdCount="[ ]", infHold="∞*[ ]", - block="==↓==", - ghost="__↓__", - center="+", - upEdge="[]`", - bagLine="123|123", - highCam="↑__↑", - nextPos="???←", bone="[]", mindas="mDAS", @@ -295,7 +288,6 @@ return{ minsdarr="msdARR", noTele="X→→X", fieldH="↑[]↓", - RS="''?", ospin="O→Any", deepDrop="\\↓↓/", target="&=", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4d235d6d..021dd224 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -424,13 +424,6 @@ return{ nextCount="Next", holdCount="Hold", infHold="无限Hold", - block="方块可见", - ghost="阴影透明度", - center="中心透明度", - upEdge="3D方块", - bagLine="包分界线", - highCam="超屏视野", - nextPos="生成预览", bone="骨块", mindas="最小DAS", @@ -438,7 +431,6 @@ return{ minsdarr="最小软降ARR", noTele="禁止瞬移", fieldH="场地高度", - RS="旋转系统", ospin="O-spin", deepDrop="穿墙软降", target="目标行数", diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index 9201f0da..f93ac419 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -4,35 +4,17 @@ scene.widgetList={ WIDGET.newText{name="title", x=520,y=5,font=70,align="R"}, WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="grey"}, - --Visual - WIDGET.newSwitch{name="block", x=620, y=600, font=25,disp=lnk_CUSval("block"), code=lnk_CUSrev("block")}, - WIDGET.newSlider{name="ghost", x=500, y=450,w=200,unit=.6,font=25,disp=lnk_CUSval("ghost"), code=lnk_CUSsto("ghost")}, - WIDGET.newSlider{name="center", x=500, y=520,w=200,unit=1, font=25,disp=lnk_CUSval("center"), code=lnk_CUSsto("center")}, - - WIDGET.newSwitch{name="bagLine", x=1190, y=340,disp=lnk_CUSval("bagLine"),code=lnk_CUSrev("bagLine")}, - WIDGET.newSwitch{name="highCam", x=1190, y=410,disp=lnk_CUSval("highCam"),code=lnk_CUSrev("highCam")}, - WIDGET.newSwitch{name="nextPos", x=1190, y=480,disp=lnk_CUSval("nextPos"),code=lnk_CUSrev("nextPos")}, - WIDGET.newSwitch{name="bone", x=1190, y=550,disp=lnk_CUSval("bone"), code=lnk_CUSrev("bone")}, - --Control - WIDGET.newSlider{name="nextCount", x=150,y=450,w=200,unit=6, disp=lnk_CUSval("nextCount"),code=lnk_CUSsto("nextCount")}, - WIDGET.newSlider{name="holdCount", x=150,y=520,w=200,unit=6, disp=lnk_CUSval("holdCount"),code=lnk_CUSsto("holdCount")}, - WIDGET.newSwitch{name="infHold", x=260,y=600, disp=lnk_CUSval("infHold"), code=lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}, - WIDGET.newSlider{name="mindas", x=180, y=150,w=400,unit=15,font=25,disp=lnk_CUSval("mindas"), code=lnk_CUSsto("mindas")}, WIDGET.newSlider{name="minarr", x=180, y=220,w=400,unit=10,font=25,disp=lnk_CUSval("minarr"), code=lnk_CUSsto("minarr")}, WIDGET.newSlider{name="minsdarr", x=180, y=290,w=200,unit=4, font=20,disp=lnk_CUSval("minsdarr"),code=lnk_CUSsto("minsdarr")}, + WIDGET.newSlider{name="nextCount", x=180, y=380,w=200,unit=6, disp=lnk_CUSval("nextCount"),code=lnk_CUSsto("nextCount")}, + WIDGET.newSlider{name="holdCount", x=180, y=450,w=200,unit=6, disp=lnk_CUSval("holdCount"),code=lnk_CUSsto("holdCount")}, + WIDGET.newSwitch{name="infHold", x=280, y=530, disp=lnk_CUSval("infHold"), code=lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}, --Rule - WIDGET.newSwitch{name="ospin", x=910, y=340, font=30,disp=lnk_CUSval("ospin"), code=lnk_CUSrev("ospin")}, - WIDGET.newSwitch{name="noTele", x=910, y=410, font=25,disp=lnk_CUSval("noTele"), code=lnk_CUSrev("noTele")}, - WIDGET.newSwitch{name="fineKill", x=910, y=480, font=20,disp=lnk_CUSval("fineKill"), code=lnk_CUSrev("fineKill")}, - WIDGET.newSwitch{name="b2bKill", x=910, y=550, font=20,disp=lnk_CUSval("b2bKill"), code=lnk_CUSrev("b2bKill")}, - WIDGET.newSwitch{name="easyFresh", x=910, y=620, font=20,disp=lnk_CUSval("easyFresh"),code=lnk_CUSrev("easyFresh")}, - WIDGET.newSwitch{name="deepDrop", x=910, y=690, font=20,disp=lnk_CUSval("deepDrop"),code=lnk_CUSrev("deepDrop")}, + WIDGET.newSelector{name="fieldH", x=550, y=520, w=260,color="sky", list={1,2,3,4,6,8,10,15,20,30,50,100},disp=lnk_CUSval("fieldH"),code=lnk_CUSsto("fieldH")}, - WIDGET.newSelector{name="fieldH", x=250, y=370, w=260,color="sky", list={1,2,3,4,6,8,10,15,20,30,50,100},disp=lnk_CUSval("fieldH"),code=lnk_CUSsto("fieldH")}, - WIDGET.newSelector{name="RS", x=570, y=370, w=260,color="sea", list={"TRS","SRS","C2","C2sym","Classic","None"},disp=lnk_CUSval("RS"),code=lnk_CUSsto("RS")}, WIDGET.newSelector{name="visible", x=840, y=60, w=260,color="lBlue",list={"show","easy","slow","medium","fast","none"},disp=lnk_CUSval("visible"),code=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=lnk_CUSval("target"),code=lnk_CUSsto("target")}, WIDGET.newSelector{name="freshLimit",x=840, y=260, w=260,color="purple",list={0,8,15,1e99}, disp=lnk_CUSval("freshLimit"),code=lnk_CUSsto("freshLimit")}, @@ -40,6 +22,14 @@ scene.widgetList={ WIDGET.newSelector{name="life", x=1120, y=160, w=260,color="red", list={0,1,2,3,5,10,15,26,42,87,500}, disp=lnk_CUSval("life"),code=lnk_CUSsto("life")}, WIDGET.newSelector{name="pushSpeed",x=1120, y=260, w=260,color="red", list={1,2,3,5,15}, disp=lnk_CUSval("pushSpeed"),code=lnk_CUSsto("pushSpeed")}, + WIDGET.newSwitch{name="ospin", x=870, y=350, font=30,disp=lnk_CUSval("ospin"), code=lnk_CUSrev("ospin")}, + WIDGET.newSwitch{name="noTele", x=870, y=440, font=25,disp=lnk_CUSval("noTele"), code=lnk_CUSrev("noTele")}, + WIDGET.newSwitch{name="fineKill", x=870, y=530, font=20,disp=lnk_CUSval("fineKill"),code=lnk_CUSrev("fineKill")}, + WIDGET.newSwitch{name="b2bKill", x=870, y=620, font=20,disp=lnk_CUSval("b2bKill"), code=lnk_CUSrev("b2bKill")}, + WIDGET.newSwitch{name="easyFresh", x=1160, y=350, font=20,disp=lnk_CUSval("easyFresh"),code=lnk_CUSrev("easyFresh")}, + WIDGET.newSwitch{name="deepDrop", x=1160, y=440, font=30,disp=lnk_CUSval("deepDrop"),code=lnk_CUSrev("deepDrop")}, + WIDGET.newSwitch{name="bone", x=1160, y=530, disp=lnk_CUSval("bone"), code=lnk_CUSrev("bone")}, + WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene}, }