diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 8b7f2e22..fca5aa48 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -639,6 +639,7 @@ return{ reset="Reset", next="Next", blind="Blind", + fast="Fast", }, mg_dtw={ reset="Reset", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 1e09eca0..ef81db44 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -549,6 +549,7 @@ return{ reset="Réinitialiser", next="Prévisualisations", blind="Aveugler", + -- fast="Fast", }, mg_dtw={ reset="Réinitialiser", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 8a2080b9..ce8fe084 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -638,6 +638,7 @@ return{ reset="Resetar", next="Próxima", blind="Cego", + -- fast="Fast", }, mg_dtw={ reset="Resetar", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 4c624fe0..73fe91bc 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -555,6 +555,7 @@ return{ reset="Reiniciar", next="Siguiente", blind="A ciegas", + -- fast="Fast", }, mg_dtw={ reset="Reiniciar", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index a6df2df0..08ee7d08 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -482,6 +482,7 @@ return{ reset="R", next="→", blind="???", + fast="~~→", }, mg_dtw={ reset="R", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 24204914..21598365 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -641,6 +641,7 @@ return{ reset="重置", next="预览", blind="盲打", + fast="速打", }, mg_dtw={ reset="重置", diff --git a/parts/scenes/mg_ten.lua b/parts/scenes/mg_ten.lua index 44ef4d9a..e7651e09 100644 --- a/parts/scenes/mg_ten.lua +++ b/parts/scenes/mg_ten.lua @@ -1,4 +1,5 @@ local gc=love.graphics +local msIsDown,kbIsDown,tcTouches=love.mouse.isDown,love.keyboard.isDown,love.touch.getTouches local setColor,rectangle=gc.setColor,gc.rectangle local int,rnd=math.floor,math.random @@ -33,6 +34,7 @@ local score local nexts local blind +local fast local function reset() progress={} @@ -110,7 +112,7 @@ local function merge() "spin_0" ) end - fallingTimer=15 + fallingTimer=fast and 8 or 12 else board[cy][cx]=chosen end @@ -143,6 +145,10 @@ function scene.keyDown(key) if state==0 then blind=not blind end + elseif key=="e"then + if state==0 then + fast=not fast + end elseif key=="escape"then SCN.back() end @@ -156,9 +162,11 @@ function scene.mouseDown(x,y) merge() end -scene.touchDown=scene.mouseMove scene.touchMove=scene.mouseMove -scene.touchClick=scene.mouseDown +scene.touchDown=scene.mouseMove +function scene.touchClick(x,y) + scene.mouseDown(x,y) +end function scene.update() if state==1 then @@ -193,10 +201,16 @@ function scene.update() state=2 SFX.play("fail") else - fallingTimer=6 + fallingTimer=fast and 4 or 5 SFX.play("move") end end + elseif fast and( + msIsDown(1)or + #tcTouches()>0 or + kbIsDown("space") + )then + merge() end end end @@ -231,7 +245,7 @@ function scene.draw() if state==2 then --Draw no-setting area setColor(1,0,0,.3) - rectangle("fill",15,245,285,140) + rectangle("fill",15,200,285,210) end gc.setLineWidth(10) setColor(1,1,1) @@ -274,8 +288,9 @@ end scene.widgetList={ WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color="lGreen",font=40,code=pressKey"r"}, - WIDGET.newSwitch{name="next", x=240,y=280,font=40,disp=function()return nexts end,code=pressKey"q",hide=function()return state==1 end}, - WIDGET.newSwitch{name="blind", x=240,y=350,font=40,disp=function()return blind end,code=pressKey"w",hide=function()return state==1 end}, + WIDGET.newSwitch{name="next", x=240,y=235,font=40,disp=function()return nexts end,code=pressKey"q",hide=function()return state==1 end}, + WIDGET.newSwitch{name="blind", x=240,y=305,font=40,disp=function()return blind end,code=pressKey"w",hide=function()return state==1 end}, + WIDGET.newSwitch{name="fast", x=240,y=375,font=30,disp=function()return fast end,code=pressKey"e",hide=function()return state==1 end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, }