diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 43b2d11c..0ed9e0a9 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -267,6 +267,7 @@ SETTING={--Settings autoPause=true, fine=false, appLock=false, + simpMode=false, lang=1, skinSet=1, skin={ diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 5dd484ff..ad29011a 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -223,6 +223,10 @@ return{ music="Music Room", sound="SE Room", }, + main_simple={ + sprint="Sprint", + marathon="Marathon", + }, mode={ mod="Mods (F1)", start="Start", @@ -273,6 +277,7 @@ return{ swap="Key Combination (Change Atk. Mode)", fine="Finesse Error Sound", appLock="App Lock (Password: 626)", + simpMode="Simple mode", calc="App Lock", }, setting_video={ diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 79bc25d8..591fbcf1 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -201,6 +201,10 @@ return{ music="Salon musical", sound="Salon SE", }, + main_simple={ + sprint="Sprint", + marathon="Marathon", + }, mode={ -- mod="Mods (F1)", start="Démarrer", @@ -252,6 +256,7 @@ return{ swap="Combinaison de touches (changer le mode d'attaque)", fine="Son d'erreur de Finesse", appLock="Verrouillage d'appli (MDP : 626)", + -- simpMode="Simple mode", calc="Verrouillage d'appli", }, setting_video={ diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 8bedd07d..9d648ef9 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -223,6 +223,10 @@ return{ music="Música", sound="SFX", }, + main_simple={ + sprint="Sprint", + marathon="Maratona", + }, mode={ mod="Mods (F1)", start="Começar", @@ -273,6 +277,7 @@ return{ swap="Combinação de tecla(Mudar modo de atk)", fine="Som Falha de destreza", appLock="App Lock (Senha: 626)", + -- simpMode="Simple mode", calc="App Lock", }, setting_video={ diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 1c9eaaf1..fa2f2dd5 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -203,6 +203,10 @@ return{ music="Música", sound="Sala de SE", }, + main_simple={ + sprint="Sprint", + marathon="Maratón", + }, mode={ -- mod="Mods (F1)", start="Empezar", @@ -253,6 +257,7 @@ return{ swap="Combinación de Teclas (Cambiar Modo de Ataque)", fine="Sonido de Error de Finesse", appLock="Bloqueo de App (Contraseña: 626)", + -- simpMode="Simple mode", calc="Bloqueo de App", }, setting_video={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index b461a058..8c1688ce 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -136,6 +136,7 @@ return{ swap="=+=+=", fine="12 X 21", appLock="?XX(=626)", + -- simpMode="_", calc="?XX", }, setting_video={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 2593815e..739ae86d 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -224,6 +224,10 @@ return{ music="音乐室", sound="音效室", }, + main_simple={ + sprint="40行", + marathon="马拉松", + }, mode={ mod="Mods (F1)", start="开始", @@ -274,6 +278,7 @@ return{ swap="组合键切换攻击模式", fine="极简操作提示音", appLock="软件锁(密码626)", + simpMode="简洁模式", calc="软件锁", }, setting_video={ diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua index fedbabfc..52f5ddbf 100644 --- a/parts/scenes/intro.lua +++ b/parts/scenes/intro.lua @@ -21,11 +21,11 @@ function scene.mouseDown(_,_,k) LOG.print("Old version detected & saving file changed, please restart the game",600,COLOR.yellow) else if newVersionLaunch then - SCN.push("main") + SCN.push(SETTING.simpMode and"main_simple"or"main") SCN.swapTo("history","fade") LOG.print(text.newVersion,"warn",COLOR.lBlue) else - SCN.go("main") + SCN.go(SETTING.simpMode and"main_simple"or"main") end end end diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua new file mode 100644 index 00000000..a0897a72 --- /dev/null +++ b/parts/scenes/main_simple.lua @@ -0,0 +1,29 @@ +local gc=love.graphics + +local scene={} + +local tip=gc.newText(getFont(30),"") + +function scene.sceneInit() + tip:set(text.getTip()) + BG.set() +end + +function scene.draw() + gc.setColor(1,1,1) + mDraw(TEXTURE.title_color,640,160) + mDraw(tip,640,660) +end + +scene.widgetList={ + WIDGET.newText{name="system", x=750,y=280,fText=SYSTEM,color="white",font=30,align="L"}, + WIDGET.newText{name="version", x=950,y=280,fText=VERSION_NAME,color="white",font=30,align="L"}, + WIDGET.newButton{name="sprint", x=260,y=480,w=260,font=50,code=function()loadGame("sprint_40l",true)end}, + WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame("marathon_n",true)end}, + WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText="...",font=50,code=goScene"setting_game"}, + WIDGET.newButton{name="lang", x=1000,y=560,w=120,fText="言/A",font=40,code=goScene"lang"}, + WIDGET.newButton{name="help", x=1160,y=400,w=120,fText="?",font=80,code=goScene"help"}, + WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText="X",font=70,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}, +} + +return scene \ No newline at end of file diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 27a579a2..6ffb4524 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -12,7 +12,7 @@ end function scene.draw() gc.setColor(1,1,1) - gc.draw(SKIN.curText[int(TIME()*2)%16+1],740,540,TIME()%6.28319,2,nil,15,15) + gc.draw(SKIN.curText[int(TIME()*2)%16+1],710,540,TIME()%6.28319,2,nil,15,15) end scene.widgetList={ @@ -24,14 +24,15 @@ scene.widgetList={ WIDGET.newButton{name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=goScene"setting_control"}, WIDGET.newButton{name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=goScene"setting_key"}, WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=goScene"setting_touch"}, - WIDGET.newSlider{name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=lnk_SETval("reTime"), code=lnk_SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, + WIDGET.newSlider{name="reTime", x=350, y=340, w=300,unit=10,disp=lnk_SETval("reTime"),code=lnk_SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=500, y=420, w=300,color="sea",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=lnk_SETval("RS"),code=lnk_SETsto("RS")}, - WIDGET.newButton{name="layout", x=580, y=540, w=200,h=70, font=35,code=goScene"setting_skin"}, - WIDGET.newSwitch{name="autoPause", x=1080, y=320, font=20,disp=lnk_SETval("autoPause"),code=lnk_SETrev("autoPause")}, - WIDGET.newSwitch{name="swap", x=1080, y=380, font=20,disp=lnk_SETval("swap"), code=lnk_SETrev("swap")}, - WIDGET.newSwitch{name="fine", x=1080, y=440, font=20,disp=lnk_SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}, - WIDGET.newSwitch{name="appLock", x=1080, y=500, font=20,disp=lnk_SETval("appLock"), code=lnk_SETrev("appLock")}, - WIDGET.newButton{name="calc", x=970, y=550, w=150,h=60,color="dGrey", font=25,code=goScene"calculator",hide=function()return not SETTING.appLock end}, + WIDGET.newButton{name="layout", x=550, y=540, w=200,h=70, font=35,code=goScene"setting_skin"}, + WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=lnk_SETval("autoPause"),code=lnk_SETrev("autoPause")}, + WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=lnk_SETval("swap"), code=lnk_SETrev("swap")}, + WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=lnk_SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}, + WIDGET.newSwitch{name="appLock", x=1060, y=490, font=20,disp=lnk_SETval("appLock"), code=lnk_SETrev("appLock")}, + WIDGET.newSwitch{name="simpMode", x=1060, y=550, font=25,disp=lnk_SETval("simpMode"),code=lnk_SETrev("simpMode")}, + WIDGET.newButton{name="calc", x=1195, y=490, w=150,h=60,color="dGrey", font=25,code=goScene"calculator",hide=function()return not SETTING.appLock end}, WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene}, }