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