diff --git a/main.lua b/main.lua index 82a67646..71b52d00 100644 --- a/main.lua +++ b/main.lua @@ -55,6 +55,8 @@ CUSTOMENV={ minsdarr=0, sequence="bag", ospin=false, + RS="TRS", + noTele=false, fineKill=false, missionKill=false, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index da409190..7f3a262d 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -208,6 +208,7 @@ return{ touch="Touch Settings", reTime="Start Delay", maxNext="Next Queue Length", + RS="Rotation System", layout="Layout", autoPause="Pause when focus is lost", swap="Key Combination (Change Atk. Mode)", @@ -356,6 +357,7 @@ return{ minarr="Min. ARR", minsdarr="Min. SDARR", noTele="No Teleportation", + RS="Rotation System", ospin="O-Spin", target="Target", visible="Visibility", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 8c60aab5..dae81db0 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -213,6 +213,7 @@ return{ touch="Boutons virtuels", reTime="Délai de démarrage", maxNext="Nombre de prévisualisations de pièces", + -- RS="Rotation System", layout="Skin, orientations, etc.", autoPause="Mettre en pause en cas de perte de focus", swap="Combinaison de touches (changer le mode d'attaque)", @@ -362,6 +363,7 @@ return{ minarr="ARR minimum", minsdarr="SDARR minimum", noTele="Pas de téléportation", + -- RS="Rotation System", ospin="O-spin", target="But", visible="Visibilité", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 1441e67d..3893dc35 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -216,6 +216,7 @@ return{ touch="Controles Táctiles", reTime="Retraso de Inicio", maxNext="Cantidad de Pzas. Siguientes", + -- RS="Rotation System", layout="Diseño", autoPause="Pausar cuando la ventana no está enfocada", swap="Combinación de Teclas (Cambiar Modo de Ataque)", @@ -360,6 +361,7 @@ return{ minarr="ARR Mínimo", minsdarr="SDARR Mínimo", noTele="Sin Teleport", + -- RS="Rotation System", ospin="O-Spin", target="Objetivo", visible="Visibilidad", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 9396c1ef..e4d2cc27 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -147,6 +147,7 @@ return{ touch="_?", reTime="3-2-1", maxNext="=123", + RS="''?", layout="=-=-=", autoPause="A||", swap="=+=+=", @@ -293,6 +294,7 @@ return{ minarr="mARR", minsdarr="msdARR", noTele="X→→X", + RS="''?", ospin="O→Any", target="&=", visible="?=", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 501aa25b..402f7a5e 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -213,6 +213,7 @@ return{ touch="触屏设置", reTime="开局等待时间", maxNext="最大预览数量", + RS="旋转系统", layout="外观", autoPause="失去焦点自动暂停", swap="组合键切换攻击模式", @@ -359,6 +360,7 @@ return{ minarr="最小ARR", minsdarr="最小软降ARR", noTele="禁止瞬移", + RS="旋转系统", ospin="O-spin", target="目标行数", visible="能见度", diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index d3114835..5241f63f 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -22,16 +22,17 @@ WIDGET.init("custom_advance",{ WIDGET.newSlider({name="minsdarr", x=180, y=290,w=200,unit=4, font=20, disp=WIDGET.lnk_CUSval("minsdarr"), code=WIDGET.lnk_CUSsto("minsdarr")}), --Rule - WIDGET.newSwitch({name="ospin", x=910, y=340, font=30, disp=WIDGET.lnk_CUSval("ospin"), code=WIDGET.lnk_CUSrev("ospin")}), - WIDGET.newSwitch({name="noTele", x=910, y=420, font=25, disp=WIDGET.lnk_CUSval("noTele"), code=WIDGET.lnk_CUSrev("noTele")}), - WIDGET.newSwitch({name="fineKill", x=910, y=490, font=20, disp=WIDGET.lnk_CUSval("fineKill"), code=WIDGET.lnk_CUSrev("fineKill")}), - WIDGET.newSwitch({name="easyFresh", x=910, y=560, font=20, disp=WIDGET.lnk_CUSval("easyFresh"),code=WIDGET.lnk_CUSrev("easyFresh")}), - WIDGET.newSelector({name="visible", x=840, y=60,w=260,color="lBlue", list={"show","time","fast","none"}, disp=WIDGET.lnk_CUSval("visible"), code=WIDGET.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=WIDGET.lnk_CUSval("target"), code=WIDGET.lnk_CUSsto("target")}), - WIDGET.newSelector({name="freshLimit", x=840, y=260,w=260,color="purple", list={0,8,15,1e99}, disp=WIDGET.lnk_CUSval("freshLimit"),code=WIDGET.lnk_CUSsto("freshLimit")}), - WIDGET.newSelector({name="opponent", x=1120, y=60,w=260,color="red", list={0,1,2,3,4,5,6,7,8,9,10}, disp=WIDGET.lnk_CUSval("opponent"),code=WIDGET.lnk_CUSsto("opponent")}), - 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=WIDGET.lnk_CUSval("life"), code=WIDGET.lnk_CUSsto("life")}), - WIDGET.newSelector({name="pushSpeed", x=1120, y=260,w=260,color="red", list={1,2,3,5,15}, disp=WIDGET.lnk_CUSval("pushSpeed"),code=WIDGET.lnk_CUSsto("pushSpeed")}), + WIDGET.newSwitch({name="ospin", x=910, y=340, font=30, disp=WIDGET.lnk_CUSval("ospin"), code=WIDGET.lnk_CUSrev("ospin")}), + WIDGET.newSwitch({name="noTele", x=910, y=420, font=25, disp=WIDGET.lnk_CUSval("noTele"), code=WIDGET.lnk_CUSrev("noTele")}), + WIDGET.newSwitch({name="fineKill", x=910, y=490, font=20, disp=WIDGET.lnk_CUSval("fineKill"), code=WIDGET.lnk_CUSrev("fineKill")}), + WIDGET.newSwitch({name="easyFresh", x=910, y=560, font=20, disp=WIDGET.lnk_CUSval("easyFresh"),code=WIDGET.lnk_CUSrev("easyFresh")}), + WIDGET.newSelector({name="RS", x=560, y=340, w=260,color="sea", list={"TRS","AIRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_CUSval("RS"),code=WIDGET.lnk_CUSsto("RS")}), + WIDGET.newSelector({name="visible", x=840, y=60, w=260,color="lBlue",list={"show","time","fast","none"}, disp=WIDGET.lnk_CUSval("visible"), code=WIDGET.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=WIDGET.lnk_CUSval("target"), code=WIDGET.lnk_CUSsto("target")}), + WIDGET.newSelector({name="freshLimit", x=840, y=260, w=260,color="purple",list={0,8,15,1e99}, disp=WIDGET.lnk_CUSval("freshLimit"),code=WIDGET.lnk_CUSsto("freshLimit")}), + WIDGET.newSelector({name="opponent", x=1120, y=60, w=260,color="red", list={0,1,2,3,4,5,6,7,8,9,10}, disp=WIDGET.lnk_CUSval("opponent"),code=WIDGET.lnk_CUSsto("opponent")}), + 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=WIDGET.lnk_CUSval("life"), code=WIDGET.lnk_CUSsto("life")}), + WIDGET.newSelector({name="pushSpeed", x=1120, y=260, w=260,color="red", list={1,2,3,5,15}, disp=WIDGET.lnk_CUSval("pushSpeed"),code=WIDGET.lnk_CUSsto("pushSpeed")}), WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 2c4f4847..47ae94fe 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -12,7 +12,7 @@ end function Pnt.setting_game() gc.setColor(1,1,1) - gc.draw(SKIN.curText[int(Timer()*2)%16+1],590,540,Timer()%6.28319,2,nil,15,15) + gc.draw(SKIN.curText[int(Timer()*2)%16+1],740,540,Timer()%6.28319,2,nil,15,15) end WIDGET.init("setting_game",{ @@ -26,7 +26,8 @@ WIDGET.init("setting_game",{ WIDGET.newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=WIDGET.lnk_goScene("setting_touch")}), WIDGET.newSlider({name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=WIDGET.lnk_SETval("reTime"), code=WIDGET.lnk_SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}), WIDGET.newSlider({name="maxNext", x=350, y=440, w=300,unit=6, font=30,disp=WIDGET.lnk_SETval("maxNext"), code=WIDGET.lnk_SETsto("maxNext")}), - WIDGET.newButton({name="layout", x=460, y=540, w=140,h=70, font=35,code=WIDGET.lnk_goScene("setting_skin")}), + WIDGET.newSelector({name="RS", x=300, y=540, w=300,color="sea",list={"TRS","AIRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}), + WIDGET.newButton({name="layout", x=580, y=540, w=200,h=70, font=35,code=WIDGET.lnk_goScene("setting_skin")}), WIDGET.newSwitch({name="autoPause", x=1080, y=320, font=20,disp=WIDGET.lnk_SETval("autoPause"),code=WIDGET.lnk_SETrev("autoPause")}), WIDGET.newSwitch({name="swap", x=1080, y=380, font=20,disp=WIDGET.lnk_SETval("swap"), code=WIDGET.lnk_SETrev("swap")}), WIDGET.newSwitch({name="fine", x=1080, y=440, font=20,disp=WIDGET.lnk_SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}),