From bc99af5b1b6c81c70c0b923126fa5843fb6cbe7d Mon Sep 17 00:00:00 2001 From: Not-A-Normal-Robot Date: Sat, 16 Sep 2023 19:12:52 +0700 Subject: [PATCH 1/7] Add torikan animation --- Zframework | 2 +- parts/eventsets/master_g.lua | 2 +- parts/eventsets/master_h.lua | 2 +- parts/eventsets/master_n.lua | 4 ++-- parts/language/lang_en.lua | 2 +- parts/player/player.lua | 21 +++++++++++++++++++++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Zframework b/Zframework index c498582a..e16a9161 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit c498582a8cb9ddf3954c4538d383342c1ce14e88 +Subproject commit e16a9161cc6c7fbe2847933fa3ea12671e7cd928 diff --git a/parts/eventsets/master_g.lua b/parts/eventsets/master_g.lua index 810a74e4..b8c2f1f2 100644 --- a/parts/eventsets/master_g.lua +++ b/parts/eventsets/master_g.lua @@ -261,7 +261,7 @@ return { elseif s==5 then if P.stat.frame>420*60 then D.pt=500 - P:win('finish') + P:torikanEnd(420) return else BG.set('glow') diff --git a/parts/eventsets/master_h.lua b/parts/eventsets/master_h.lua index d141f8dc..6031405c 100644 --- a/parts/eventsets/master_h.lua +++ b/parts/eventsets/master_h.lua @@ -40,7 +40,7 @@ return { elseif s==5 then if P.stat.frame>183*60 then D.pt=500 - P:win('finish') + P:torikanEnd(183) return else E.bone=true diff --git a/parts/eventsets/master_n.lua b/parts/eventsets/master_n.lua index 3379f52c..5eda88ec 100644 --- a/parts/eventsets/master_n.lua +++ b/parts/eventsets/master_n.lua @@ -38,9 +38,9 @@ return { elseif s==4 then BG.set('rainbow2') elseif s==5 then - if P.stat.frame>260*60 then + if P.stat.time>260 then D.pt=500 - P:win('finish') + P:torikanEnd(260) return else P.gameEnv.freshLimit=10 diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index b005d627..b63f6571 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -54,7 +54,7 @@ return { win="Win!", lose="Lose", - + torikan="Ended", finish="Finished", gamewin="You Won", gameover="Game Over", diff --git a/parts/player/player.lua b/parts/player/player.lua index 3cb12e5d..98c78431 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -2815,6 +2815,27 @@ function Player:revive() playClearSFX(3) SFX.play('emit') end +function Player:torikanEnd(requiredTime) + if self.stat.time < requiredTime then + return false + end + self:_die() + self.result='torikan' + if self.type=='human' then + GAME.result='torikan' + SFX.play('win') + VOC.play('win') + end + self:_showText(text.torikan,0,0,90,'beat',.5,.2) + self:_showText(STRING.time(self.stat.time).." / "..STRING.time(requiredTime),0,160,30,'beat',.5,.2) + self:_showText("(+"..STRING.time_short(self.stat.time-requiredTime)..")",0,200,30,'beat',.5,.2) + if self.type=='human' then + gameOver() + TASK.new(task_autoPause) + end + self:newTask(task_finish) + return true +end function Player:win(result) if self.result then return From b1dbc4fa87ea71fa5d87c4411b847f2de6336075 Mon Sep 17 00:00:00 2001 From: Not-A-Normal-Robot Date: Thu, 21 Sep 2023 19:44:55 +0700 Subject: [PATCH 2/7] Use pi constants instead of numbers --- parts/backgrounds/blockhole.lua | 4 ++-- parts/backgrounds/blockrain.lua | 2 +- parts/backgrounds/blockspace.lua | 4 ++-- parts/netPlayer.lua | 2 +- parts/scenes/app_reflect.lua | 2 +- parts/scenes/mod.lua | 2 +- parts/scenes/net_rooms.lua | 2 +- parts/scenes/pause.lua | 4 ++-- parts/scenes/setting_game.lua | 4 ++-- parts/scenes/setting_skin.lua | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/parts/backgrounds/blockhole.lua b/parts/backgrounds/blockhole.lua index f759b518..7cdc00aa 100644 --- a/parts/backgrounds/blockhole.lua +++ b/parts/backgrounds/blockhole.lua @@ -19,9 +19,9 @@ function back.update() t=t-1 if t==0 then local S={ - ang=6.2832*rnd(), + ang=MATH.tau*rnd(), d=SCR.rad*1.05/2, - rotate=6.2832*rnd(), + rotate=MATH.tau*rnd(), va=.05-rnd()*.1, size=SCR.rad*(2+rnd()*3)/100, texture=SKIN.lib[SETTING.skinSet][rnd(16)], diff --git a/parts/backgrounds/blockrain.lua b/parts/backgrounds/blockrain.lua index fc2eba5a..f7d6fe4b 100644 --- a/parts/backgrounds/blockrain.lua +++ b/parts/backgrounds/blockrain.lua @@ -21,7 +21,7 @@ function back.update() x=SCR.w*rnd(), y=SCR.h*-.05, k=SCR.rad/200, - ang=rnd()*6.2832, + ang=rnd()*MATH.tau, vy=.5+rnd()*.4, vx=rnd()*.4-.2, va=rnd()*.04-.02, diff --git a/parts/backgrounds/blockspace.lua b/parts/backgrounds/blockspace.lua index ff5ce285..ec36ed99 100644 --- a/parts/backgrounds/blockspace.lua +++ b/parts/backgrounds/blockspace.lua @@ -21,8 +21,8 @@ function back.update() ins(mino,{ block=TEXTURE.miniBlock[r], color=BLOCK_COLORS[SETTING.skin[r]], - ang=6.2832*rnd(), - rotate=6.2832*rnd(), + ang=MATH.tau*rnd(), + rotate=MATH.tau*rnd(), vr=.05-rnd()*.1, d=0, v=.5+rnd(), diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua index 2973077e..95ff64fa 100644 --- a/parts/netPlayer.lua +++ b/parts/netPlayer.lua @@ -121,7 +121,7 @@ function NETPLY.add(d) place=1e99, stat=false, } - local a=math.random()*6.2832 + local a=math.random()*MATH.tau p.x,p.y,p.w,p.h=640+2600*math.cos(a),360+2600*math.sin(a),47,47 ins(PLYlist,p) diff --git a/parts/scenes/app_reflect.lua b/parts/scenes/app_reflect.lua index 4ed1ad74..dd551b43 100644 --- a/parts/scenes/app_reflect.lua +++ b/parts/scenes/app_reflect.lua @@ -115,7 +115,7 @@ function scene.draw() end elseif state==1 then gc.setColor(.2,.7,.4,math.min((60-ct)/10,ct/10)*.8) - gc.arc('fill',640,360,260,-1.5708,-1.5708+(ct/60)*6.2832) + gc.arc('fill',640,360,260,math.pi/2,math.pi/2+(ct/60)*MATH.tau) elseif state==2 and ct<5 then gc.setColor(1,ct>2 and 1 or 0,0) gc.rectangle('fill',640-100,(up and 180 or 540)-100,200,200,10) diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index 8fe99872..d49194d1 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -135,7 +135,7 @@ function scene.draw() if M.list then GC.setColor(1,1,1,t*6) - GC.arc('line','open',0,0,rad+6,0,(M.sel/#M.list)*6.2832) + GC.arc('line','open',0,0,rad+6,0,(M.sel/#M.list)*MATH.tau) end GC.pop() end diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 804d8379..25e0a153 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -109,7 +109,7 @@ function scene.draw() -- Fetching timer if fetchTimer>0 then gc_setColor(1,1,1,.12) - GC.arc('fill','pie',250,630,40,-1.5708,-1.5708-.6283*fetchTimer) + GC.arc('fill','pie',250,630,40,-math.pi/2,-math.pi/2-.6283*fetchTimer) end -- Room list diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 298c4629..c5965fe2 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -85,7 +85,7 @@ function scene.enter() val[2*i-1],val[2*i]=val[i]*standard[2*i-1],val[i]*standard[2*i] end - if P1.result=='win' and P1.stat.piece>4 then + if (P1.result=='win' or P1.result=='torikan') and P1.stat.piece>4 then local acc=P1.stat.finesseRate*.2/P1.stat.piece rank=CHAR.icon['rank'..( acc==1. and "Z" or @@ -294,7 +294,7 @@ function scene.draw() -- Texts local C - _=TIME()%6.2832 + _=TIME()%MATH.tau if _>3.142 then GC.setColor(.97,.97,.97,-timer2*sin(_)) FONT.set(35) diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 0a658782..974728dd 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -18,9 +18,9 @@ function scene.draw() local b=math.floor(t*2)%16+1 gc.setShader(SHADER.blockSatur) gc.setColor(1,1,1) - mDraw(SKIN.lib[SETTING.skinSet][b],0,0,t%6.2832,2) + mDraw(SKIN.lib[SETTING.skinSet][b],0,0,t%MATH.tau,2) gc.setColor(1,1,1,t*2%1) - mDraw(SKIN.lib[SETTING.skinSet][b%16+1],0,0,t%6.2832,2) + mDraw(SKIN.lib[SETTING.skinSet][b%16+1],0,0,t%MATH.tau,2) gc.setShader() -- Draw center diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index f88649e2..02224d99 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -17,7 +17,7 @@ function scene.enter() BG.set() selRS=RSlist[SETTING.RS] for i=1,7 do - minoRot0[i]=SETTING.face[i]*1.57 + minoRot0[i]=SETTING.face[i]*math.pi/2 minoRot[i]=minoRot0[i] end end @@ -64,7 +64,7 @@ end local function _nextDir(i) trySettingWarn() SETTING.face[i]=(SETTING.face[i]+1)%4 - minoRot0[i]=minoRot0[i]+1.5707963 + minoRot0[i]=minoRot0[i]+math.pi/2 if not selEggMode and not GAME.playing then if minoRot0[5]>62 then selEggMode='marathon_bfmax' @@ -119,7 +119,7 @@ scene.widgetList={ SETTING.face[i]=0 end for i=1,7 do - minoRot0[i]=(floor(minoRot0[i]/6.2831853)+(minoRot0[i]%6.2831853>4 and 1 or 0))*6.2831853 + minoRot0[i]=(floor(minoRot0[i]/MATH.tau)+(minoRot0[i]%MATH.tau>4 and 1 or 0))*MATH.tau end SFX.play('hold') end}, From 5e88b23980d170af790eaf68e2c060f8677b3acc Mon Sep 17 00:00:00 2001 From: Not-A-Normal-Robot Date: Fri, 22 Sep 2023 21:03:46 +0700 Subject: [PATCH 3/7] Add color to torikan diff text --- Zframework | 2 +- parts/player/draw.lua | 16 ++++++++++++++++ parts/player/player.lua | 5 ++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Zframework b/Zframework index e16a9161..3c84cf4c 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit e16a9161cc6c7fbe2847933fa3ea12671e7cd928 +Subproject commit 3c84cf4c9afd4528a54baa89924b70d633bce8fa diff --git a/parts/player/draw.lua b/parts/player/draw.lua index bdfeed51..54a24b3d 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -984,6 +984,22 @@ function draw.norm(P,repMode) ENV.mesDisp[i](P,repMode) end + -- Torikan miss amount + if P.result=='torikan' then + gc_setColor(COLOR.dX) + gc_rectangle('fill',150,450,300,60,20,20) + + local diff=P.stat.time-P.stat.torikanReq + if diff>=60 then gc_setColor(COLOR.R) + elseif diff>=30 then gc_setColor(COLOR.F) + elseif diff>=15 then gc_setColor(COLOR.O) + elseif diff>=10 then gc_setColor(COLOR.Y) + elseif diff>=5 then gc_setColor(COLOR.flicker(COLOR.G,COLOR.L,.1)) + else gc_setColor(COLOR.flicker(COLOR.G,COLOR.J,.05)) end + setFont(40) + GC.mStr("(+"..STRING.time_short(diff)..")",300,451) + end + if P.frameRun<180 then _drawStartCounter(P.frameRun) end diff --git a/parts/player/player.lua b/parts/player/player.lua index 98c78431..0cee331e 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -2827,8 +2827,7 @@ function Player:torikanEnd(requiredTime) VOC.play('win') end self:_showText(text.torikan,0,0,90,'beat',.5,.2) - self:_showText(STRING.time(self.stat.time).." / "..STRING.time(requiredTime),0,160,30,'beat',.5,.2) - self:_showText("(+"..STRING.time_short(self.stat.time-requiredTime)..")",0,200,30,'beat',.5,.2) + self.stat.torikanReq=requiredTime if self.type=='human' then gameOver() TASK.new(task_autoPause) @@ -2972,6 +2971,6 @@ function Player:lose(force) -- ::BREAK_notFinished:: end end ---------------------------<\Event>-------------------------- +---------------------------------------------------- return Player From 0fc4957b21a6249c189162bf46e3053d9dcb8f72 Mon Sep 17 00:00:00 2001 From: Not-A-Normal-Robot Date: Fri, 22 Sep 2023 21:30:49 +0700 Subject: [PATCH 4/7] Fade field on torikan and show torikan time --- Zframework | 2 +- parts/player/draw.lua | 5 ++--- parts/player/player.lua | 14 +++++++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Zframework b/Zframework index 3c84cf4c..4a60827b 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit 3c84cf4c9afd4528a54baa89924b70d633bce8fa +Subproject commit 4a60827b8bf56cba1c42e625c8032203b5b0317c diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 54a24b3d..b1d011d5 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -986,9 +986,6 @@ function draw.norm(P,repMode) -- Torikan miss amount if P.result=='torikan' then - gc_setColor(COLOR.dX) - gc_rectangle('fill',150,450,300,60,20,20) - local diff=P.stat.time-P.stat.torikanReq if diff>=60 then gc_setColor(COLOR.R) elseif diff>=30 then gc_setColor(COLOR.F) @@ -997,6 +994,8 @@ function draw.norm(P,repMode) elseif diff>=5 then gc_setColor(COLOR.flicker(COLOR.G,COLOR.L,.1)) else gc_setColor(COLOR.flicker(COLOR.G,COLOR.J,.05)) end setFont(40) + -- self:_showText(STRING.time(self.stat.time).." / "..STRING.time(requiredTime),0,160,50,'beat',.5,.2) + GC.mStr(STRING.time(P.stat.time).." / "..STRING.time(P.stat.torikanReq),300,401) GC.mStr("(+"..STRING.time_short(diff)..")",300,451) end diff --git a/parts/player/player.lua b/parts/player/player.lua index 0cee331e..4e0bf20a 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -2200,6 +2200,18 @@ local function task_finish(self) end end end +local function task_fade(self) + while true do + yield() + self.endCounter=self.endCounter+1 + if self.endCounter<40 then + -- Make field invisible + for j=1,#self.field do for i=1,10 do + self.visTime[j][i]=math.max(3,self.visTime[j][i]-.5) + end end + elseif self.endCounter==60 then return end + end +end local function task_lose(self) while true do yield() @@ -2832,7 +2844,7 @@ function Player:torikanEnd(requiredTime) gameOver() TASK.new(task_autoPause) end - self:newTask(task_finish) + self:newTask(task_fade) return true end function Player:win(result) From a6a20b43326ae076fabb38460bca53d48c4b6341 Mon Sep 17 00:00:00 2001 From: Not-A-Normal-Robot Date: Sat, 23 Sep 2023 16:21:31 +0700 Subject: [PATCH 5/7] Add torikan language entries --- parts/language/lang_es.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_id.lua | 2 +- parts/language/lang_ja.lua | 2 +- parts/language/lang_pt.lua | 2 +- parts/language/lang_symbol.lua | 2 +- parts/language/lang_vi.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/language/lang_zh_code.lua | 2 +- parts/language/lang_zh_trad.lua | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index dba29ac8..5a36351d 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -53,7 +53,7 @@ return { win="¡Victoria!", lose="Derrota", - + --torikan="Ended", finish="Finalizado", gamewin="Has ganado", gameover="Fin del Juego", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 482bfbe0..1978737b 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -54,7 +54,7 @@ return { win="Victoire!", lose="Défaite", - + --torikan="Ended", finish="Terminé", gamewin="Gagné !", gameover="Fin du jeu", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 5706eb01..4b70e5c5 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -55,7 +55,7 @@ return { win="Menang!", lose="Kalah", - + torikan="Tamat", finish="Selesai", gamewin="Anda menang!", gameover="Tamat", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index d4edae45..847e1877 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -55,7 +55,7 @@ return { win="Win!", lose="Lose", - + torikan="Ended", finish="Finished", gamewin="You Won", gameover="Game Over", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index a5d010ab..f78146e1 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -44,7 +44,7 @@ return { -- win="Win", -- lose="Lose", - + --torikan="Ended", finish="Terminou", gamewin="Você venceu!", gameover="Fim de jogo", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index ef5e94cc..f7ff23d5 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -44,7 +44,7 @@ return { win=": )", lose=": (", - + torikan=": /", finish="&", gamewin=">>", gameover="x", diff --git a/parts/language/lang_vi.lua b/parts/language/lang_vi.lua index 94392eaf..d785ab9c 100644 --- a/parts/language/lang_vi.lua +++ b/parts/language/lang_vi.lua @@ -60,7 +60,7 @@ return { win="Thắng!", lose="Thua", - + --torikan="Ended", finish="Hoàn thành", gamewin="Bạn đã thắng", gameover="Kết thúc", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4453b70b..6ce2d100 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -54,7 +54,7 @@ return { win="胜利", lose="失败", - + --torikan="Ended", finish="完成", gamewin="胜利", gameover="游戏结束", diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua index 8c5869ec..f88326f7 100644 --- a/parts/language/lang_zh_code.lua +++ b/parts/language/lang_zh_code.lua @@ -53,7 +53,7 @@ return { win="Win();", lose="Lose();", - + torikan="Torikan();", finish="Result=Finish", gamewin="Result=Win", gameover="Result=GameOver", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 085021a2..0439834e 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -54,7 +54,7 @@ return { win="勝利", lose="失敗", - + --torikan="Ended", finish="完成", gamewin="勝利", gameover="遊戲結束", From a08328ae02f5b6109193d94e36470390e7c2f4c0 Mon Sep 17 00:00:00 2001 From: Not-A-Normal-Robot Date: Sat, 23 Sep 2023 16:21:31 +0700 Subject: [PATCH 6/7] Add Vietnamese translation for torikan --- parts/language/lang_es.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_id.lua | 2 +- parts/language/lang_ja.lua | 2 +- parts/language/lang_pt.lua | 2 +- parts/language/lang_symbol.lua | 2 +- parts/language/lang_vi.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/language/lang_zh_code.lua | 2 +- parts/language/lang_zh_trad.lua | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index dba29ac8..5a36351d 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -53,7 +53,7 @@ return { win="¡Victoria!", lose="Derrota", - + --torikan="Ended", finish="Finalizado", gamewin="Has ganado", gameover="Fin del Juego", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 482bfbe0..1978737b 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -54,7 +54,7 @@ return { win="Victoire!", lose="Défaite", - + --torikan="Ended", finish="Terminé", gamewin="Gagné !", gameover="Fin du jeu", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 5706eb01..4b70e5c5 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -55,7 +55,7 @@ return { win="Menang!", lose="Kalah", - + torikan="Tamat", finish="Selesai", gamewin="Anda menang!", gameover="Tamat", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index d4edae45..847e1877 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -55,7 +55,7 @@ return { win="Win!", lose="Lose", - + torikan="Ended", finish="Finished", gamewin="You Won", gameover="Game Over", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index a5d010ab..f78146e1 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -44,7 +44,7 @@ return { -- win="Win", -- lose="Lose", - + --torikan="Ended", finish="Terminou", gamewin="Você venceu!", gameover="Fim de jogo", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index ef5e94cc..f7ff23d5 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -44,7 +44,7 @@ return { win=": )", lose=": (", - + torikan=": /", finish="&", gamewin=">>", gameover="x", diff --git a/parts/language/lang_vi.lua b/parts/language/lang_vi.lua index 94392eaf..929e5caf 100644 --- a/parts/language/lang_vi.lua +++ b/parts/language/lang_vi.lua @@ -60,7 +60,7 @@ return { win="Thắng!", lose="Thua", - + torikan="Torikan!", finish="Hoàn thành", gamewin="Bạn đã thắng", gameover="Kết thúc", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4453b70b..6ce2d100 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -54,7 +54,7 @@ return { win="胜利", lose="失败", - + --torikan="Ended", finish="完成", gamewin="胜利", gameover="游戏结束", diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua index 8c5869ec..f88326f7 100644 --- a/parts/language/lang_zh_code.lua +++ b/parts/language/lang_zh_code.lua @@ -53,7 +53,7 @@ return { win="Win();", lose="Lose();", - + torikan="Torikan();", finish="Result=Finish", gamewin="Result=Win", gameover="Result=GameOver", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 085021a2..0439834e 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -54,7 +54,7 @@ return { win="勝利", lose="失敗", - + --torikan="Ended", finish="完成", gamewin="勝利", gameover="遊戲結束", From 54758fd705c2ba485e8aed1c4006c112ad95f82d Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Fri, 6 Oct 2023 02:22:36 +0800 Subject: [PATCH 7/7] update Zframework --- Zframework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zframework b/Zframework index 4a60827b..2d1b2472 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit 4a60827b8bf56cba1c42e625c8032203b5b0317c +Subproject commit 2d1b2472999e9b9714dcdae5e819e29bcc361e4a