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] 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