diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 7c6342b8..ee20a478 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -36,8 +36,10 @@ return{ combo="Combo",maxcmb="Max Combo", pc="Perfect Clear",ko="KO", - win="You Win!", + win="Win", + lose="Lose", finish="Finish", + gamewin="You Win!", gameover="Game Over", pause="Pause", pauseCount="Pauses", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index d1e6d89c..63b7ece4 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -37,8 +37,10 @@ return{ pc="Perfect Clear",ko="KO", - win="Gagné !", + -- win="Win", + -- lose="Lose", finish="Terminé", + gamewin="Gagné !", gameover="Fin du jeu", pause="Pause", pauseCount="Pauses", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index bb8a866d..583da9b8 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -37,8 +37,10 @@ return{ combo="Combo",maxcmb="Combo máximo", pc="Tudo limpo",ko="KO", - win="Você venceu!", + -- win="Win", + -- lose="Lose", finish="Terminou", + gamewin="Você venceu!", gameover="Fim de jogo", pause="Pausa", pauseCount="Pausas", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index af84b7c9..41f60507 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -36,8 +36,10 @@ return{ combo="Combo",maxcmb="Combo Máx.", pc="Perfect Clear",ko="KO", - win="Victoria", + -- win="Win", + -- lose="Lose", finish="Fin", + gamewin="Victoria", gameover="Fin del Juego", pause="Pausa", pauseCount="Veces pausadas", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index f6fb2e5d..1f41eb44 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -25,7 +25,9 @@ return{ missionFailed="-X_X-", win=": )", + lose=": (", finish="&", + gamewin=">>", gameover="x", pause="=", pauseCount="==", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 43576b87..c1e4dfc5 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -26,9 +26,11 @@ return{ combo="连击",maxcmb="最大连", pc="消干净了",ko="淘汰", - win="成了", + win="好了", + lose="挂了", finish="可以的", - gameover="挂了", + gamewin="成了", + gameover="没了", pause="歇会", pauseCount="歇多久了", finesse_ap="您", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index fe25d42d..3d78166f 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -37,7 +37,9 @@ return{ pc="Perfect Clear",ko="KO", win="胜利", + lose="失败", finish="完成", + gamewin="胜利", gameover="游戏结束", pause="暂停", pauseCount="暂停统计", diff --git a/parts/list.lua b/parts/list.lua index 6f57d123..6aef2e18 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -166,8 +166,9 @@ do--drawableText anykey=T(40), replaying=T(20), next=T(40),hold=T(40), - win=T(120),finish=T(120), - gameover=T(100),pause=T(120), + win=T(120),lose=T(120), + finish=T(120), + gamewin=T(100),gameover=T(100),pause=T(120), speedLV=T(20), line=T(25),atk=T(20),eff=T(20), diff --git a/parts/player/draw.lua b/parts/player/draw.lua index c22f7f6c..f152ea96 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -9,7 +9,7 @@ local gc_stencil,gc_setStencilTest=gc.stencil,gc.setStencilTest local int,ceil,rnd=math.floor,math.ceil,math.random local max,min,sin,modf=math.max,math.min,math.sin,math.modf -local setFont,mStr=setFont,mStr +local setFont,mDraw,mStr=setFont,mDraw,mStr local TIME=TIME local frameColorList={ @@ -867,7 +867,7 @@ function draw.small(P) --Draw result if P.result then gc_setColor(1,1,1,min(P.endCounter,60)*.01) - setFont(20)mStr(drawableText[P.result],32,47) + setFont(20)mDraw(drawableText[P.result],30,60,nil,P.size) setFont(15)mStr(P.modeData.place,30,82) end gc_pop() diff --git a/parts/player/player.lua b/parts/player/player.lua index 4780d958..5b2562f3 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1702,7 +1702,7 @@ function Player:win(result) self:changeAtk() end if self.type=='human'then - GAME.result=result or'win' + GAME.result=result or'gamewin' SFX.play('win') VOC.play('win') if GAME.modeEnv.royaleMode then @@ -1807,7 +1807,7 @@ function Player:lose(force) self:showTextF(self.modeData.place,0,120,60,'appear',.26,.9) end self.gameEnv.keepVisible=self.gameEnv.visible~='show' - self:showTextF(text.gameover,0,0,60,'appear',.26,.9) + self:showTextF(text.lose,0,0,90,'appear',.26,.9) if self.type=='human'then GAME.result='gameover' SFX.play('fail')