From 9c34cb07778b19c843172ead6fdc1cef62c1a617 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Jun 2021 14:20:08 +0900
Subject: [PATCH] Share colour constants with default drawable piece
 implementations

---
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                    | 8 ++++----
 .../Skinning/Default/CentreHitCirclePiece.cs              | 3 ++-
 .../Skinning/Default/RimHitCirclePiece.cs                 | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index bbee54d139..2038da9344 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
     {
         public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
 
-        public Bindable<Color4> DisplayColour { get; } = new Bindable<Color4>(colour_centre);
+        public Bindable<Color4> DisplayColour { get; } = new Bindable<Color4>(COLOUR_CENTRE);
 
         /// <summary>
         /// The <see cref="HitType"/> that actuates this <see cref="Hit"/>.
@@ -25,15 +25,15 @@ namespace osu.Game.Rulesets.Taiko.Objects
             set => TypeBindable.Value = value;
         }
 
-        private static readonly Color4 colour_centre = Color4Extensions.FromHex(@"bb1177");
-        private static readonly Color4 colour_rim = Color4Extensions.FromHex(@"2299bb");
+        public static readonly Color4 COLOUR_CENTRE = Color4Extensions.FromHex(@"bb1177");
+        public static readonly Color4 COLOUR_RIM = Color4Extensions.FromHex(@"2299bb");
 
         public Hit()
         {
             TypeBindable.BindValueChanged(_ =>
             {
                 updateSamplesFromType();
-                DisplayColour.Value = Type == HitType.Centre ? colour_centre : colour_rim;
+                DisplayColour.Value = Type == HitType.Centre ? COLOUR_CENTRE : COLOUR_RIM;
             });
 
             SamplesBindable.BindCollectionChanged((_, __) => updateTypeFromSamples());
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
index f65bb54726..455b2fc596 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CentreHitCirclePiece.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Taiko.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Default
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AccentColour = colours.PinkDarker;
+            AccentColour = Hit.COLOUR_CENTRE;
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
index ca2ab301be..bd21d511b1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/RimHitCirclePiece.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Taiko.Objects;
 using osuTK;
 using osuTK.Graphics;
 
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AccentColour = colours.BlueDarker;
+            AccentColour = Hit.COLOUR_RIM;
         }
 
         /// <summary>