From f63db4dd19e4531c8031255aa7add0a040f6c761 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 9 Dec 2020 14:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Edas=E6=89=93=E6=96=AD?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 2 +- parts/language/lang_en.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_sp.lua | 2 +- parts/language/lang_symbol.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/player/gameEnv0.lua | 1 + parts/player/player.lua | 5 +++++ parts/scenes/setting_control.lua | 17 +++++++++-------- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index c75798a1..a2af09c8 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -223,7 +223,7 @@ RANKS={sprint_10=0} SETTING={ --Game - das=10,arr=2, + das=10,arr=2,dascut=0, sddas=0,sdarr=2, ihs=true,irs=true,ims=true, maxNext=6, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 5e68688e..2d5a7c23 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -295,7 +295,7 @@ return{ title="Control Settings", preview="Preview", - das="DAS",arr="ARR", + das="DAS",arr="ARR",dascut="DAS cut", sddas="Soft Drop DAS",sdarr="Soft Drop ARR", ihs="Initial Hold", irs="Initial Rotation", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 3fad7da5..7afd9577 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -297,7 +297,7 @@ return{ title="Paramètres de contrôle", preview="Aperçu", - das="DAS",arr="ARR", + das="DAS",arr="ARR",-- dascut="DAS cut", sddas="DAS de chute rapide",sdarr="ARR de chute rapide", ihs="Réserve Initiale", irs="Rotation Initiale", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index d0ed4591..4e7750ca 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -298,7 +298,7 @@ return{ title="Ajustes de Controles", preview="Ejemplo", - das="DAS",arr="ARR", + das="DAS",arr="ARR",-- dascut="DAS cut", sddas="DAS de C. Ráp.",sdarr="ARR de C. Rápida", ihs="Resv. Inicial", irs="Rot. Inicial", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 93e04a22..2f2f3cd8 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -203,7 +203,7 @@ return{ title="[~~]", preview="?:", - das="x---x x x",arr="x x-x-x", + das="x---x x x",arr="x x-x-x",dascut="x x ↓___x x", sddas="↓---↓ ↓ ↓",sdarr="↓ ↓-↓-↓", ihs="![ ]", irs="!''", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index c3740e7f..e6aa65f0 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -320,7 +320,7 @@ return{ title="控制设置", preview="预览", - das="DAS",arr="ARR", + das="DAS",arr="ARR",dascut="DAS打断", sddas="软降DAS",sdarr="软降ARR", ihs="提前Hold", irs="提前旋转", diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 87585a52..e8edc92a 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -1,6 +1,7 @@ return{ das=10, arr=2, + dascut=0, sddas=2, sdarr=2, ihs=true, diff --git a/parts/player/player.lua b/parts/player/player.lua index b317e83d..4c8516a5 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -531,6 +531,11 @@ function Player.resetBlock(P) end end + --DAS cut + if P.gameEnv.dascut>0 then + P.moving=P.moving-(P.moving>0 and 1 or -1)*P.gameEnv.dascut + end + --Spawn SFX if P.sound and id<8 then SFX.fplay(spawnSFX_name[id],SETTING.spawn) diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index 5a1a7b95..505be4aa 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -85,17 +85,18 @@ scene.widgetList={ WIDGET.newText{name="title", x=80, y=50,font=70,align="L"}, WIDGET.newText{name="preview", x=520, y=540,font=40,align="R"}, - WIDGET.newSlider{name="das", x=250, y=200,w=910,unit=26,disp=WIDGET.lnk_SETval("das"), show=sliderShow,code=WIDGET.lnk_SETsto("das")}, - WIDGET.newSlider{name="arr", x=250, y=290,w=525,unit=15,disp=WIDGET.lnk_SETval("arr"), show=sliderShow,code=WIDGET.lnk_SETsto("arr")}, - WIDGET.newSlider{name="sddas", x=250, y=380,w=350,unit=10,disp=WIDGET.lnk_SETval("sddas"),show=sliderShow,code=WIDGET.lnk_SETsto("sddas")}, - WIDGET.newSlider{name="sdarr", x=250, y=470,w=140,unit=4, disp=WIDGET.lnk_SETval("sdarr"),show=sliderShow,code=WIDGET.lnk_SETsto("sdarr")}, - WIDGET.newSwitch{name="ihs", x=1100, y=290, disp=WIDGET.lnk_SETval("ihs"), code=WIDGET.lnk_SETrev("ihs")}, - WIDGET.newSwitch{name="irs", x=1100, y=380, disp=WIDGET.lnk_SETval("irs"), code=WIDGET.lnk_SETrev("irs")}, - WIDGET.newSwitch{name="ims", x=1100, y=470, disp=WIDGET.lnk_SETval("ims"), code=WIDGET.lnk_SETrev("ims")}, + WIDGET.newSlider{name="das", x=250, y=190,w=600,unit=20,disp=WIDGET.lnk_SETval("das"), show=sliderShow,code=WIDGET.lnk_SETsto("das")}, + WIDGET.newSlider{name="arr", x=250, y=260,w=525,unit=15,disp=WIDGET.lnk_SETval("arr"), show=sliderShow,code=WIDGET.lnk_SETsto("arr")}, + WIDGET.newSlider{name="sddas", x=250, y=330,w=350,unit=10,disp=WIDGET.lnk_SETval("sddas"),show=sliderShow,code=WIDGET.lnk_SETsto("sddas")}, + WIDGET.newSlider{name="sdarr", x=250, y=400,w=140,unit=4, disp=WIDGET.lnk_SETval("sdarr"),show=sliderShow,code=WIDGET.lnk_SETsto("sdarr")}, + WIDGET.newSlider{name="dascut", x=250, y=470,w=600,unit=20,disp=WIDGET.lnk_SETval("dascut"),show=sliderShow,code=WIDGET.lnk_SETsto("dascut")}, + WIDGET.newSwitch{name="ihs", x=1100, y=260, disp=WIDGET.lnk_SETval("ihs"), code=WIDGET.lnk_SETrev("ihs")}, + WIDGET.newSwitch{name="irs", x=1100, y=330, disp=WIDGET.lnk_SETval("irs"), code=WIDGET.lnk_SETrev("irs")}, + WIDGET.newSwitch{name="ims", x=1100, y=400, disp=WIDGET.lnk_SETval("ims"), code=WIDGET.lnk_SETrev("ims")}, WIDGET.newButton{name="reset", x=160, y=580,w=200,h=100,color="lRed",font=40, code=function() local _=SETTING - _.das,_.arr=10,2 + _.das,_.arr,_.dascut=10,2,0 _.sddas,_.sdarr=0,2 _.ihs,_.irs,_.ims=false,false,false end},