diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e2fea713..27aaa0d7 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -309,7 +309,6 @@ return{ layout="Layout", autoPause="Pause while unfocused", swap="Key Combination (Change Atk. Mode)", - fine="Finesse Error SFX", simpMode="Simplistic Style", }, setting_video={ @@ -363,6 +362,8 @@ return{ warn="Warning", vib="Vibration", voc="Voice", + + fine="Finesse Error SFX", cv="Voice Pack", apply="Apply", }, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 41e7f973..044a7b7d 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -284,7 +284,6 @@ return{ layout="Diseño", autoPause="Pausar cuando la ventana no está enfocada", swap="Combinación de Teclas (Cambiar Modo de Ataque)", - fine="Sonido de Error de Finesse", simpMode="Modo Sencillo", }, setting_video={ @@ -337,6 +336,10 @@ return{ warn="Alerta de Peligro", vib="Vibración", voc="Voces", + + fine="Sonido de Error de Finesse", + -- cv="Voice Pack", + -- apply="Apply", }, setting_control={ title="Ajustes de Controles", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 820f85d2..29564a02 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -281,7 +281,6 @@ return{ layout="Disposition", autoPause="Mettre en pause en cas de perte de focus", swap="Combinaison de touches (changer le mode d'attaque)", - fine="Son d'erreur de Finesse", -- simpMode="Simple mode", }, setting_video={ @@ -336,6 +335,10 @@ return{ warn="Alerte de danger", vib="Vibration", voc="Voix", + + fine="Son d'erreur de Finesse", + -- cv="Voice Pack", + -- apply="Apply", }, setting_control={ title="Paramètres de contrôle", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index fbf666a8..06d816e4 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -308,7 +308,6 @@ return{ layout="Layout", autoPause="Pausar quando foco for perco", swap="Combinação de tecla(Mudar modo de atk)", - fine="Som Falha de destreza", -- simpMode="Simple mode", }, setting_video={ @@ -362,6 +361,8 @@ return{ warn="Alerta de perigo", vib="Vibração", voc="Voz", + + fine="Som Falha de destreza", cv="Pacote de voz", apply="Aplicar", }, diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index cfc13c36..9b9ea9a7 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -137,7 +137,6 @@ return{ layout="=-=-=", autoPause="A||", swap="=+=+=", - fine="12 X 21", simpMode=".", }, setting_video={ @@ -190,7 +189,10 @@ return{ spawn="#[]#", warn="!↑↑↑!", vib="=~=", + + fine="12 X 21", voc="~~~", + apply="!", }, setting_control={ title="[~~]", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index f401d724..4be76c4b 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -309,7 +309,6 @@ return{ layout="外观", autoPause="失去焦点自动暂停", swap="组合键切换攻击模式", - fine="极简操作提示音", simpMode="简洁模式", }, setting_video={ @@ -362,6 +361,8 @@ return{ warn="危险警告", vib="振动", voc="语音", + + fine="极简操作提示音", cv="语音包", apply="应用", }, diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 62fce078..05e1b3eb 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -13,9 +13,9 @@ function scene.draw() local t=TIME() local b=math.floor(t*2)%16+1 gc.setColor(1,1,1) - gc.draw(SKIN.curText[b],410,540,t%6.2832,2,nil,15,15) + gc.draw(SKIN.curText[b],410,540-WIDGET.scrollPos,t%6.2832,2,nil,15,15) gc.setColor(1,1,1,t*2%1) - gc.draw(SKIN.curText[b%16+1],410,540,t%6.2832,2,nil,15,15) + gc.draw(SKIN.curText[b%16+1],410,540-WIDGET.scrollPos,t%6.2832,2,nil,15,15) end scene.widgetScrollHeight=200 @@ -31,10 +31,9 @@ scene.widgetList={ WIDGET.newSlider{name="reTime", x=330, y=320, w=300,unit=10,disp=SETval("reTime"),code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S',list={'TRS','SRS','C2','C2sym','Classic','None'},disp=SETval("RS"),code=SETsto("RS")}, WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, - WIDGET.newSwitch{name="autoPause", x=1060, y=310, disp=SETval("autoPause"), code=SETrev("autoPause")}, - WIDGET.newSwitch{name="swap", x=1060, y=380, disp=SETval("swap"), code=SETrev("swap")}, - WIDGET.newSwitch{name="fine", x=1060, y=450, disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, - WIDGET.newSwitch{name="simpMode", x=500, y=800, disp=SETval("simpMode"), + WIDGET.newSwitch{name="autoPause", x=1060, y=350, disp=SETval("autoPause"), code=SETrev("autoPause")}, + WIDGET.newSwitch{name="swap", x=1060, y=460, disp=SETval("swap"), code=SETrev("swap")}, + WIDGET.newSwitch{name="simpMode", x=1060, y=800, disp=SETval("simpMode"), code=function() SETTING.simpMode=not SETTING.simpMode for i=1,#SCN.stack,2 do diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 68720461..4de7520a 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -69,13 +69,14 @@ scene.widgetList={ WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeR')}, WIDGET.newButton{name="graphic",x=1080, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, - WIDGET.newSlider{name="bgm", x=300, y=190,w=420, disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, - WIDGET.newSlider{name="sfx", x=300, y=260,w=420, change=function()SFX.play('blip_1')end,disp=SETval("sfx"),code=SETsto("sfx")}, - WIDGET.newSlider{name="stereo", x=300, y=330,w=420, change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hideF=function()return SETTING.sx==0 end}, - WIDGET.newSlider{name="spawn", x=300, y=400,w=420, change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, - WIDGET.newSlider{name="warn", x=300, y=470,w=420, change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, - WIDGET.newSlider{name="vib", x=300, y=540,w=420,unit=10,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, - WIDGET.newSlider{name="voc", x=300, y=610,w=420, change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, + WIDGET.newSlider{name="bgm", x=300, y=190,w=420,color='lG',disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + WIDGET.newSlider{name="sfx", x=300, y=260,w=420,color='lC',change=function()SFX.play('blip_1')end,disp=SETval("sfx"),code=SETsto("sfx")}, + WIDGET.newSlider{name="stereo", x=300, y=330,w=420,color='lC',change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hideF=function()return SETTING.sx==0 end}, + WIDGET.newSlider{name="spawn", x=300, y=400,w=420,color='lC',change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, + WIDGET.newSlider{name="warn", x=300, y=470,w=420,color='lC',change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, + WIDGET.newSlider{name="vib", x=300, y=540,w=420,color='lN',unit=10,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, + WIDGET.newSlider{name="voc", x=300, y=610,w=420,color='lN',change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, + WIDGET.newSwitch{name="fine", x=1150, y=230,disp=SETval("fine"),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={'miya','naki'},disp=function()return cv end,code=function(i)cv=i end}, WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},