From 9373520bca1ebc0f38d16bca5163eb9ed2e28a5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Tue, 21 Apr 2020 05:59:37 +0300
Subject: [PATCH] Add constant for special colour of catcher on default skin

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f37dae29dd..97d0fb0ada 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -25,6 +25,14 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
 
+        /// <summary>
+        /// The default colour used directly for <see cref="Catcher.Colour"/>.
+        /// </summary>
+        /// <remarks>
+        /// This colour is only used when no skin overrides <see cref="CatchSkinColour.HyperDash"/>.
+        /// </remarks>
+        public static readonly Color4 DEFAULT_CATCHER_HYPER_DASH_COLOUR = Color4.OrangeRed;
+
         /// <summary>
         /// Whether we are hyper-dashing or not.
         /// </summary>
@@ -285,7 +293,13 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (hyperDashing)
             {
-                this.FadeColour(hyperDashColour == DefaultHyperDashColour ? Color4.OrangeRed : hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
+                // special behaviour for catcher colour if no skin overrides.
+                var catcherColour =
+                    hyperDashColour == DEFAULT_HYPER_DASH_COLOUR
+                        ? DEFAULT_CATCHER_HYPER_DASH_COLOUR
+                        : hyperDashColour;
+
+                this.FadeColour(catcherColour, hyper_dash_transition_length, Easing.OutQuint);
                 this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
             }
             else