From 76a895f34830a8389920cedb1d7db47458c7c2df Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Sat, 21 Dec 2019 22:44:52 +0800
Subject: [PATCH] improve code quality

---
 .../Objects/Drawables/Pieces/CirclePiece.cs        |  8 ++++++++
 .../Objects/Drawables/Pieces/KiaiFlash.cs          | 14 ++------------
 .../Skinning/LegacyMainCirclePiece.cs              | 11 +++++++++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
index e6b193b00f..eba3a02376 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
@@ -6,7 +6,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Graphics.Shapes;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
@@ -39,6 +41,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 {
                     RelativeSizeAxes = Axes.Both,
                     Intensity = 0.25f,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.White,
+                        Alpha = 0f,
+                    },
                 },
                 new TrianglesPiece
                 {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/KiaiFlash.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/KiaiFlash.cs
index e7c880c3c1..379deff8bf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/KiaiFlash.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/KiaiFlash.cs
@@ -10,29 +10,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class KiaiFlash : BeatSyncedContainer
     {
-        public Drawable FlashComponent { get; set; }
-
         public float Intensity { get; set; }
 
         public KiaiFlash()
         {
+            EarlyActivationMilliseconds = 80;
             Blending = BlendingParameters.Additive;
-
-            Child = FlashComponent = new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Colour = OsuColour.Gray(1f),
-                Alpha = 0f,
-            };
         }
 
-        protected new double EarlyActivationMilliseconds = 80;
-
         protected override void OnNewBeat(int beatIndex, Game.Beatmaps.ControlPoints.TimingControlPoint timingPoint, Game.Beatmaps.ControlPoints.EffectControlPoint effectPoint, Framework.Audio.Track.TrackAmplitudes amplitudes)
         {
             if (effectPoint.KiaiMode)
             {
-                FlashComponent
+                Child
                     .FadeTo(Intensity, EarlyActivationMilliseconds, Easing.OutQuint)
                     .Then()
                     .FadeOut(timingPoint.BeatLength - 80, Easing.OutSine);
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index ce89fac345..27f9e008ed 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -50,13 +51,19 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(0.921875f),
+                    Size = new Vector2(OsuLegacySkinTransformer.LEGACY_CIRCLE_RADIUS / 64),
 
                     Masking = true,
                     CornerRadius = Size.X / 2,
                     CornerExponent = 2,
 
-                    Intensity = 0.1f
+                    Intensity = 0.1f,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.White,
+                        Alpha = 0f,
+                    }
                 },
                 hitCircleText = new SkinnableSpriteText(new OsuSkinComponent(OsuSkinComponents.HitCircleText), _ => new OsuSpriteText
                 {