diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e0803f33..fd4bfb50 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -2,7 +2,6 @@ local C=COLOR return{ anykey="Press a key!", sureQuit="Press again to exit", - httpTimeout="Connection error: Timed out", newDay="A new day, a new beginning!", playedLong="You have been playing for a long time. Make sure to rest well!", playedTooMuch="You have been playing for too long! Playing a block game is fun, but it's time to take a break.", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index ff44ab68..6c716b7d 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -2,7 +2,6 @@ return{ fallback=4, anykey="Pulsa cualquier tecla", sureQuit="Pulsa de nuevo para salir", - httpTimeout="¡Tiempo de espera de conexión agotado!", newDay="[Anti-adicción] ¡Nuevo día, nuevo comienzo!", playedLong="[Anti-adicción] Estuviste jugando un buen rato hoy. Recuerda descansar de vez en cuando.", playedTooMuch="[Anti-adicción] ¡Has jugado mucho por hoy! No puedes jugar más.", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index fa630642..9b192097 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -2,7 +2,6 @@ return{ fallback=4, anykey="Appuyez sur n'importe quelle touche", sureQuit="Appuyez à nouveau pour sortir", - httpTimeout="La connexion au réseau ne s'est pas faite à temps.", newDay="[Anti-addiction] Nouveau jour, nouveau commencement !", playedLong="[Anti-addiction] Vous avez joué pendant un bon bout de temps aujourd'hui. Faites des pauses.", playedTooMuch="[Anti-addiction] Vous avez joué trop longtemps ! Vous ne pouvez plus jouer.", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index a682e657..218dcf79 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -3,7 +3,6 @@ return{ fallback=4, anykey="Pressione qualquer tecla", sureQuit="Aparte novamente para sair", - httpTimeout="Conexão de rede expirou", newDay="[Anti-vício] Novo dia, um começo novo!", playedLong="[Anti-vício] Você andou jogando bastante hoje. Certifique-se de fazer pausas.", playedTooMuch="[Anti-vício] Você esteve jogando demais hoje! Você não pode jogar mais.", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 61257f2e..3e8357dc 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -1,7 +1,6 @@ return{ fallback=4, anykey="↓□↓", - httpTimeout="e??????x", atkModeName={"?","( )","!","←→"}, royale_remain="$1 ~", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 286c1c1a..4ab14088 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -1,6 +1,5 @@ return{ anykey="您开始了", - httpTimeout="没网或者网不好?", playedLong="今天玩很久了,给我注意点", playedTooMuch="特么再玩小心眼睛瞎掉,爬", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index d15a1886..56e70907 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -2,7 +2,6 @@ local C=COLOR return{ anykey="按任意键继续", sureQuit="再按一次退出", - httpTimeout="网络连接超时!", newDay="新的一天,新的开始~", playedLong="已经玩很久了!注意休息!", playedTooMuch="今天玩太久啦!打块好玩但也要适可而止哦~", diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index 86021bdf..0850c0ac 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -1,4 +1,4 @@ -local gc,tc=love.graphics,love.touch +local gc,kb,tc=love.graphics,love.keyboard,love.touch local sin=math.sin local SCR,VK=SCR,VK local GAME=GAME @@ -117,42 +117,48 @@ function scene.gamepadUp(key) end end -function scene.update(dt) - local _ - - --Replay - if GAME.replaying then - _=GAME.replaying - local P1=PLAYERS[1] - local L=GAME.rep - while P1.frameRun==L[_]do - local key=L[_+1] - if key==0 then--Just wait - elseif key<=32 then--Press key - P1:pressKey(key) - VK.press(key) - elseif key<=64 then--Release key - P1:releaseKey(key-32) - VK.release(key-32) - end - _=_+2 - end - GAME.replaying=_ - end - +local function update_common(dt) + --Update control touchMoveLastFrame=false VK.update() --Update players for p=1,#PLAYERS do PLAYERS[p]:update(dt)end - --Warning check - checkWarning() - --Fresh royale target if GAME.modeEnv.royaleMode and PLAYERS[1].frameRun%120==0 then freshMostDangerous() end + + --Warning check + checkWarning() +end +function scene.update(dt) + local repPtr=GAME.replaying + if repPtr then + for _=1,kb.isDown("space")and 3 or 1 do + if repPtr then + local P1=PLAYERS[1] + local L=GAME.rep + while P1.frameRun==L[repPtr]do + local key=L[repPtr+1] + if key==0 then--Just wait + elseif key<=32 then--Press key + P1:pressKey(key) + VK.press(key) + elseif key<=64 then--Release key + P1:releaseKey(key-32) + VK.release(key-32) + end + repPtr=repPtr+2 + end + GAME.replaying=repPtr + end + update_common(dt) + end + else + update_common(dt) + end end local function drawAtkPointer(x,y)