Merge pull request #604 from peppy/taiko-fixes

Minor taiko improvements
ppy · Apr 7, 2017 · 53c491d · 53c491d
2 parents f5f65fa + aa45515
commit 53c491d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 using OpenTK.Input;
 
 namespace osu.Game.Modes.Taiko.Objects.Drawables
@@ -66,6 +67,10 @@ protected override void UpdateState(ArmedState state)
         {
             Delay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true);
 
+            var circlePiece = MainPiece as CirclePiece;
+
+            circlePiece?.FlashBox.Flush();
+
             switch (State)
             {
                 case ArmedState.Idle:
@@ -77,6 +82,16 @@ protected override void UpdateState(ArmedState state)
                 case ArmedState.Hit:
                     FadeOut(600);
 
+                    var flash = circlePiece?.FlashBox;
+                    if (flash != null)
+                    {
+                        flash.FadeTo(0.9f);
+                        flash.FadeOut(300);
+                    }
+
+
+                    FadeOut(800);
+
                     const float gravity_time = 300;
                     const float gravity_travel_height = 200;
 

diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -64,6 +64,8 @@ public override bool KiaiMode
 
         private readonly Container background;
 
+        public Box FlashBox;
+
         public CirclePiece(bool isStrong = false)
         {
             AddInternal(new Drawable[]
@@ -104,11 +106,13 @@ public CirclePiece(bool isStrong = false)
                     Masking = true,
                     Children = new[]
                     {
-                        new Box
+                        FlashBox = new Box
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                            BlendingMode = BlendingMode.Additive,
                             Alpha = 0,
                             AlwaysPresent = true
                         }

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
@@ -20,6 +20,7 @@
 using osu.Game.Screens.Ranking;
 using System;
 using System.Linq;
+using osu.Framework.Threading;
 using osu.Game.Modes.Scoring;
 
 namespace osu.Game.Screens.Play
@@ -237,14 +238,16 @@ public void Restart()
             });
         }
 
+        private ScheduledDelegate onCompletionEvent;
+
         private void onCompletion()
         {
             // Only show the completion screen if the player hasn't failed
-            if (scoreProcessor.HasFailed)
+            if (scoreProcessor.HasFailed || onCompletionEvent != null)
                 return;
 
             Delay(1000);
-            Schedule(delegate
+            onCompletionEvent = Schedule(delegate
             {
                 ValidForResume = false;
                 Push(new Results