diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 4f2509f2..b5f326f1 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -506,7 +506,7 @@ return{ play_clear="Start-Clear", play_puzzle="Start-Puzzle", - reset="Reset (Del)", + reset="Reset (del)", advance="More (A)", mod="Mods (F1)", field="Edit Field (F)", @@ -625,7 +625,6 @@ return{ title="Account", }, app_15p={ - reset="Shuffle", color="Color", invis="Invis", slide="Slide", @@ -633,42 +632,33 @@ return{ revKB="Reverse", }, app_schulteG={ - reset="Reset", rank="Size", invis="Invis", disappear="Hide", tapFX="Tap FX", }, - app_pong={ - reset="Restart", - }, app_AtoZ={ level="Level", keyboard="Keyboard", - reset="Reset", }, app_2048={ - reset="Reset", invis="Invis", tapControl="Tap controls", skip="Skip Round", }, app_ten={ - reset="Reset", next="Next", invis="Invis", fast="Fast", }, app_dtw={ - reset="Reset", color="Color", mode="Mode", bgm="BGM", arcade="Arcade", }, app_link={ - reset="Reset", invis="Invis", }, savedata={ diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 4053b7a7..d74739f5 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -583,7 +583,6 @@ return{ title="Cuenta", }, app_15p={ - reset="Mezclar", color="Color", invis="A ciegas", slide="Mover", @@ -591,46 +590,34 @@ return{ revKB="Deshacer", }, app_schulteG={ - reset="Reiniciar", rank="Tamaño", invis="A ciegas", disappear="No mostrar", tapFX="Sonido al pulsar", }, - app_pong={ - reset="Reiniciar", - }, app_AtoZ={ level="Nivel", keyboard="Teclado", - reset="Reiniciar", }, app_2048={ - reset="Reiniciar", invis="A ciegas", tapControl="Control táctil", skip="Saltar ronda", }, app_ten={ - reset="Reiniciar", next="Siguiente", invis="A ciegas", fast="Rápido", }, app_dtw={ - reset="Reiniciar", color="Color", mode="Modo", bgm="BGM", arcade="Arcade", }, app_link={ - reset="Reiniciar", invis="A ciegas", }, - app_arithmetic={ - reset="Reiniciar", - }, savedata={ export="Exportar al portapapeles", import="Importar de portapapeles", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 40c237e0..15b0ef99 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -472,7 +472,7 @@ return{ play_clear="Démarrer Clear", play_puzzle="Démarrer Puzzle", - -- reset="Reset (Del)", + -- reset="Reset (del)", advance="Plus (A)", mod="Mods (F1)", field="Modifier la matrice (F)", @@ -578,7 +578,6 @@ return{ title="Compte", }, app_15p={ - reset="Réinitialiser", color="Couleur", invis="Aveugler", slide="Glisser", @@ -586,34 +585,26 @@ return{ revKB="Inverser", }, app_schulteG={ - reset="Réinitialiser", rank="Taille", invis="Aveugler", disappear="Cacher", tapFX="Effet quand tapé", }, - app_pong={ - reset="Redémarrer", - }, app_AtoZ={ level="niveau", keyboard="Clavier", - reset="Redémarrer", }, app_2048={ - reset="Réinitialiser", invis="Aveugler", tapControl="Contrôle par toucher", skip="Passer Round", }, app_ten={ - reset="Réinitialiser", next="Prévisualisations", invis="Aveugler", -- fast="Fast", }, app_dtw={ - reset="Réinitialiser", color="Couleur", mode="Mode", bgm="Musique", @@ -626,12 +617,8 @@ return{ qq="QQ du créateur", }, app_link={ - reset="Réinitialiser", invis="Aveugler", }, - app_arithmetic={ - reset="Réinitialiser", - }, savedata={ -- export="Export to clipboard", -- import="Import from clipboard", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 2768f18b..f0398db8 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -494,7 +494,7 @@ return{ play_clear="Iniciar-Limpar", play_puzzle="Iniciar-Puzzle", - -- reset="Reset (Del)", + -- reset="Reset (del)", advance="Mais (A)", mod="Mods (F1)", field="Editar Tab. (F)", @@ -614,7 +614,6 @@ return{ title="Conta", }, app_15p={ - reset="Embaralhar", C="Cor", invis="Cego", slide="Deslizar", @@ -622,46 +621,34 @@ return{ revKB="Reverso", }, app_schulteG={ - reset="Resetar", rank="Tamanho", invis="Cego", disappear="Escond.", tapFX="FX De Toque", }, - app_pong={ - reset="Reiniciar", - }, app_AtoZ={ level="Nivel", keyboard="Teclado", - reset="Reiniciar", }, app_2048={ - reset="Resetar", invis="Cego", -- tapControl="Tap control", -- skip="Skip Round", }, app_ten={ - reset="Resetar", next="Próxima", invis="Cego", -- fast="Fast", }, app_dtw={ - reset="Resetar", -- color="Color", -- mode="Mode", bgm="BGM", -- arcade="Arcade", }, app_link={ - reset="Resetar", invis="Cego", }, - app_arithmetic={ - reset="Resetar", - }, savedata={ -- export="Export to clipboard", -- import="Import from clipboard", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 10fe14e1..b0679f04 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -149,7 +149,7 @@ return{ }, mod={ title="?!?!?!", - reset="R", + reset="R (tab)", unranked="X!!!", }, pause={ @@ -396,7 +396,7 @@ return{ play_clear="Start-Clear", play_puzzle="Start-Puzzle", - reset="Reset (Del)", + reset="Reset (del)", advance="More (A)", mod="?!?!?! (F1)", field="Edit Field (F)", @@ -508,7 +508,6 @@ return{ title="@_@", }, app_15p={ - reset="!@#$%", color="~~~", invis="???", slide="~_~", @@ -516,34 +515,26 @@ return{ revKB="Reverse", }, app_schulteG={ - reset="!@#$%", rank="←?→", invis="???", disappear="=X=", tapFX="↓ !", }, - app_pong={ - reset="R", - }, app_AtoZ={ level="_ _ _", keyboard="[##]", - reset="R", }, app_2048={ - reset="R", invis="???", tapControl="_↓", skip=">>", }, app_ten={ - reset="R", next="→", invis="???", fast="~~→", }, app_dtw={ - reset="R", color="~~~", mode="?", bgm="#~#", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index ac028a51..09979486 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -505,7 +505,7 @@ return{ play_clear="开始-消除", play_puzzle="开始-拼图", - reset="重置所有(Del)", + reset="重置所有(del)", advance="更多设置(A)", mod="Mods (F1)", field="场地编辑(F)", @@ -624,7 +624,6 @@ return{ title="帐户", }, app_15p={ - reset="打乱", color="颜色", invis="盲打", slide="滑动操作", @@ -632,50 +631,35 @@ return{ revKB="键盘反向", }, app_schulteG={ - reset="重来", rank="尺寸", invis="盲打", disappear="消失", tapFX="点击动画", }, - app_pong={ - reset="重置", - }, app_AtoZ={ level="关卡", keyboard="键盘", - reset="重置", - }, - app_UTTT={ - reset="重置", }, app_2048={ - reset="重置", invis="盲打", tapControl="点击操作", skip="跳过回合", }, app_ten={ - reset="重置", next="预览", invis="盲打", fast="速打", }, app_dtw={ - reset="重置", color="颜色", mode="模式", bgm="音乐", arcade="街机", }, app_link={ - reset="重置", invis="盲打", }, - app_arithmetic={ - reset="重置", - }, savedata={ export="导出到剪切板", import="从剪切板导入", diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index ea0191c2..cd4e6d5e 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -503,7 +503,7 @@ return{ play_clear="清场", play_puzzle="开始拼图", - reset="复位(Del)", + reset="复位(del)", advance="更多(A)", mod="多重器官衰竭(F1)", field="编辑字段(F)", @@ -622,7 +622,6 @@ return{ title="帐户", }, app_15p={ - reset="洗牌", color="颜色", invis="英维斯", slide="滑动", @@ -635,9 +634,6 @@ return{ disappear="隐藏", tapFX="Tap外汇", }, - app_pong={ - reset="重新启动", - }, app_AtoZ={ level="水平仪", keyboard="键盘", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 62c52100..d02aec8d 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -504,7 +504,7 @@ return{ play_clear="開始-清除", play_puzzle="開始-拼圖", - reset="重設所有(Del)", + reset="重設所有(del)", advance="更多設置(A)", mod="Mods (F1)", field="場地編輯(F)", @@ -623,7 +623,6 @@ return{ title="賬戶", }, app_15p={ - reset="打亂", color="顏色", invis="盲打", slide="滑動操作", @@ -631,50 +630,35 @@ return{ revKB="鍵盤反向", }, app_schulteG={ - reset="重新啟動", rank="尺寸", invis="盲打", disappear="消失", tapFX="點擊動畫", }, - app_pong={ - reset="重設", - }, app_AtoZ={ level="等級", keyboard="鍵盤", - reset="重設", - }, - app_UTTT={ - reset="重設", }, app_2048={ - reset="重設", invis="盲打", tapControl="點擊操作", skip="跳過回合", }, app_ten={ - reset="重設", next="預覽", invis="盲打", fast="速打", }, app_dtw={ - reset="重設", color="顏色", mode="模式", bgm="音樂", arcade="街機", }, app_link={ - reset="重設", invis="盲打", }, - app_arithmetic={ - reset="重設", - }, savedata={ export="導出到剪貼板", import="從剪貼板導入", diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index 0e079c95..43107935 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -309,7 +309,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset', x=160, y=100,w=180,h=100,color='lG',font=40,code=pressKey'space'}, + WIDGET.newButton{name='reset', x=160, y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'space'}, colorSelector, WIDGET.newSwitch{name='invis', x=240, y=330,lim=200,font=40,disp=function()return invis end, code=pressKey'w',hideF=ifGaming}, WIDGET.newSwitch{name='slide', x=240, y=420,lim=200,font=40,disp=function()return slide end, code=pressKey'e',hideF=ifGaming}, diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index fa1c26ef..9b87a52f 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -480,7 +480,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset', x=155, y=100,w=180,h=100,color='lG',font=40,code=pressKey'r'}, + WIDGET.newButton{name='reset', x=155, y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, WIDGET.newSwitch{name='invis', x=240, y=300,lim=200,font=40,disp=function()return invis end,code=pressKey'q',hideF=function()return state==1 end}, WIDGET.newSwitch{name='tapControl',x=240, y=370,lim=200,font=40,disp=function()return tapControl end,code=pressKey'w',hideF=function()return state==1 end}, diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index 7f676088..197858bb 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -117,7 +117,7 @@ end scene.widgetList={ WIDGET.newSelector{name='level', x=640,y=640,w=200,list={'A_Z','Z_A','Tech1','Tech2','KeyTest1','KeyTest2','Hello','Roll1','Roll2','Roll3','ZZZ','ZXZX','ZMZM','Stair','Stair2','Stair3','BPW'},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hideF=function()return state>0 end}, - WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey'space'}, + WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'space'}, WIDGET.newButton{name='keyboard',x=160,y=210,w=180,h=100,code=function()love.keyboard.setTextInput(true,0,select(2,SCR.xOy:transformPoint(0,500)),1,1)end,hide=not MOBILE}, WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index 2ead8fd1..0e681237 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -231,7 +231,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset',x=1140,y=540,w=170,h=80,font=40,color='lG',code=restart}, + WIDGET.newButton{name='reset',x=1140,y=540,w=170,h=80,font=50,fText=CHAR.icon.retry_spin,color='lG',code=restart}, WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index 9fcba7f5..8670bbb9 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -216,7 +216,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey'r'}, + WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, WIDGET.newKey{name='X',x=540,y=620,w=90,font=60,fText=CHAR.key.clear,code=pressKey'backspace'}, WIDGET.newKey{name='0',x=640,y=620,w=90,font=60,fText="0",code=pressKey'0'}, WIDGET.newKey{name='-',x=740,y=620,w=90,font=60,fText="-",code=pressKey'-'}, diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 183ad57a..5745d7c1 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -380,7 +380,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey'r'}, + WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, modeSelector,bgmSelector,colorSelector, arcadeSwitch, WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, diff --git a/parts/scenes/app_link.lua b/parts/scenes/app_link.lua index cf71b1dd..426b5dda 100644 --- a/parts/scenes/app_link.lua +++ b/parts/scenes/app_link.lua @@ -399,7 +399,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset',x=80,y=60,w=110,h=60,color='lG',code=pressKey'r',hideF=function()return state==0 end}, + WIDGET.newButton{name='reset',x=80,y=60,w=110,h=60,color='lG',fText=CHAR.icon.retry_spin,code=pressKey'r',hideF=function()return state==0 end}, WIDGET.newSwitch{name='invis',x=100,y=140,lim=80,disp=function()return invis end,code=pressKey'q',hideF=function()return state==1 end}, WIDGET.newButton{name='back',x=1200,y=660,w=110,font=50,fText=CHAR.icon.back,code=pressKey'escape'}, } diff --git a/parts/scenes/app_memorize.lua b/parts/scenes/app_memorize.lua index ce0090fd..f86f33ef 100644 --- a/parts/scenes/app_memorize.lua +++ b/parts/scenes/app_memorize.lua @@ -6,18 +6,20 @@ local level local showNum local showTime local input +local inputTime local scene={} -local function _newNum(lv) +local function newNum(lv) local num="" - for _=1,4+lv^.626 do num=num..math.random(0,9)end + for _=1,4+lv^.66 do num=num..math.random(0,9)end return num end local function freshLevel() - showNum=_newNum(level) - showTime=#showNum*.355+math.max(4-level,0) + showNum=newNum(level) + showTime=math.max(4-level,0)+#showNum*math.max(.5-#showNum*.01,.3) + inputTime=2+#showNum*math.max(1-#showNum*.01,.626) input='' end local function _reset() @@ -33,6 +35,7 @@ function scene.sceneInit() level=0 input='' showNum='memoriZe' + BGM.play('reason') end function scene.keyDown(key,isRep) @@ -62,7 +65,9 @@ function scene.update(dt) showTime=showTime-dt if showTime<=0 then timeUsed=timeUsed+dt - if showTime<-10 then + inputTime=inputTime-dt + if inputTime<=0 then + inputTime=0 state=1 SFX.play('finesseError_long',.6) end @@ -79,24 +84,29 @@ function scene.draw() GC.mStr("["..level.."]",640,30) FONT.set(60) - GC.mStr(input,640,150) + GC.mStr(input,640,160) if state==0 then if showTime<=0 then FONT.set(30) gc.setColor(1,.7,.7,-3*showTime) - GC.mStr(("%.1f"):format(showTime+10),640,210) + GC.mStr(("%.1f"):format(inputTime),640,230) end gc.setColor(1,1,1,showTime/1.26) else gc.setColor(1,.4,.4) end - FONT.set(100) - GC.mStr(showNum,640,60) + if #showNum<=10 then + FONT.set(100) + GC.mStr(showNum,640,60) + else + FONT.set(60) + GC.mStr(showNum,640,90) + end end scene.widgetList={ - WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey'r'}, + WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, WIDGET.newKey{name='X',x=540,y=620,w=90,font=60,fText=CHAR.key.clear,code=pressKey'backspace'}, WIDGET.newKey{name='0',x=640,y=620,w=90,font=60,fText="0",code=pressKey'0'}, WIDGET.newKey{name='1',x=540,y=520,w=90,font=60,fText="1",code=pressKey'1'}, diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index 429cb170..e92c86b6 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -176,7 +176,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name='reset',x=640,y=45,w=150,h=50,font=35,code=pressKey'r'}, + WIDGET.newKey{name='reset',x=640,y=45,w=150,h=50,font=35,fText=CHAR.icon.retry_spin,code=pressKey'r'}, WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index 2832bfab..bd388ccf 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -166,7 +166,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey'space',hideF=function()return state==0 end}, + WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'space',hideF=function()return state==0 end}, WIDGET.newSlider{name='rank', x=130,y=250,lim=105,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hideF=function()return state>0 end}, WIDGET.newSwitch{name='invis', x=240,y=330,lim=200,font=40,disp=function()return invis end, code=pressKey'q',hideF=function()return state==1 end}, WIDGET.newSwitch{name='disappear',x=240,y=420,lim=200,font=40,disp=function()return disappear end,code=pressKey'w',hideF=function()return state==1 end}, diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index 04a3f420..e5098653 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -302,7 +302,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='reset',x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey'r'}, + WIDGET.newButton{name='reset',x=160,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, WIDGET.newSwitch{name='next', x=240,y=235,lim=200,font=40,disp=function()return nexts end,code=pressKey'q',hideF=function()return state==1 end}, WIDGET.newSwitch{name='invis',x=240,y=305,lim=200,font=40,disp=function()return invis end,code=pressKey'w',hideF=function()return state==1 end}, WIDGET.newSwitch{name='fast', x=240,y=375,lim=200,font=30,disp=function()return fast end,code=pressKey'e',hideF=function()return state==1 end},