From 391134b1d3f328640fcb89f3b5d2228b4fc4750b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2017 17:15:51 +0900
Subject: [PATCH] Adjust glow a bit

---
 .../Objects/Drawables/DrawableCentreHit.cs         |  1 -
 .../Objects/Drawables/DrawableCentreHitStrong.cs   |  1 -
 .../Objects/Drawables/DrawableRimHit.cs            |  1 -
 .../Objects/Drawables/DrawableRimHitStrong.cs      |  1 -
 .../Objects/Drawables/Pieces/CirclePiece.cs        | 14 ++++++++------
 .../Objects/Drawables/Pieces/TaikoPiece.cs         |  5 -----
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
index b2760e6914..8bb78669ca 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private void load(OsuColour colours)
         {
             MainPiece.AccentColour = colours.PinkDarker;
-            MainPiece.KiaiFlashColour = colours.PinkLight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHitStrong.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHitStrong.cs
index da2e4a5733..434fb9377f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHitStrong.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHitStrong.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private void load(OsuColour colours)
         {
             MainPiece.AccentColour = colours.PinkDarker;
-            MainPiece.KiaiFlashColour = colours.PinkLight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
index cd5ceaa965..20e8d36105 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private void load(OsuColour colours)
         {
             MainPiece.AccentColour = colours.BlueDarker;
-            MainPiece.KiaiFlashColour = colours.BlueLight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHitStrong.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHitStrong.cs
index c9387f6e72..4b1bb62bab 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHitStrong.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHitStrong.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private void load(OsuColour colours)
         {
             MainPiece.AccentColour = colours.BlueDarker;
-            MainPiece.KiaiFlashColour = colours.BlueLight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index 992c10fa99..3ea05b6558 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
         public const float SYMBOL_SIZE = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER * 0.45f;
         public const float SYMBOL_BORDER = 8;
         public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
-        private const double pre_beat_transition_time = 50;
+        private const double pre_beat_transition_time = 80;
 
         /// <summary>
         /// The colour of the inner circle and outer glows.
@@ -144,13 +144,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             Content.Width = 1 / Content.Scale.X;
         }
 
+        private const float edge_alpha_kiai = 0.5f;
+
         private void resetEdgeEffects()
         {
             background.EdgeEffect = new EdgeEffect
             {
                 Type = EdgeEffectType.Glow,
-                Colour = AccentColour,
-                Radius = KiaiMode ? 40 : 8
+                Colour = AccentColour.Opacity(KiaiMode ? edge_alpha_kiai : 1f),
+                Radius = KiaiMode ? 32 : 8
             };
         }
 
@@ -162,11 +164,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             if (beatIndex % (int)timingPoint.TimeSignature != 0)
                 return;
 
-            double duration = timingPoint.BeatLength * (int)timingPoint.TimeSignature;
+            double duration = timingPoint.BeatLength * 2;
 
-            background.FadeEdgeEffectTo(KiaiFlashColour, pre_beat_transition_time, EasingTypes.OutQuint);
+            background.FadeEdgeEffectTo(1, pre_beat_transition_time, EasingTypes.OutQuint);
             using (background.BeginDelayedSequence(pre_beat_transition_time))
-                background.FadeEdgeEffectTo(AccentColour, duration, EasingTypes.OutQuint);
+                background.FadeEdgeEffectTo(edge_alpha_kiai, duration, EasingTypes.OutQuint);
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
index 9ef9224942..5e7e9e6350 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
@@ -20,11 +20,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
             set { accentColour = value; }
         }
 
-        /// <summary>
-        /// The colour to be flashed on a kiai beat.
-        /// </summary>
-        public Color4 KiaiFlashColour;
-
         private bool kiaiMode;
         /// <summary>
         /// Whether Kiai mode effects are enabled for this circle piece.