diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 6e2f460930..022b1a363f 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Graphics
///
/// Retrieves the colour for a .
///
- public Color4 ForHitResult(HitResult judgement)
+ public Color4 TextForHitResult(HitResult judgement)
{
switch (judgement)
{
@@ -125,6 +125,34 @@ namespace osu.Game.Graphics
}
}
+ public Color4 DrawForHitResult(HitResult result)
+ {
+ switch (result)
+ {
+ case HitResult.SmallTickMiss:
+ case HitResult.LargeTickMiss:
+ case HitResult.Miss:
+ return Red;
+
+ case HitResult.Meh:
+ return Yellow;
+
+ case HitResult.Ok:
+ return Green;
+
+ case HitResult.Good:
+ return GreenLight;
+
+ case HitResult.SmallTickHit:
+ case HitResult.LargeTickHit:
+ case HitResult.Great:
+ return Blue;
+
+ default:
+ return BlueLight;
+ }
+ }
+
///
/// Retrieves a colour for the given .
/// A value indicates that a "background" shade from the local
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 2f3ece0e3b..23d4e64191 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Online.Leaderboards
{
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
Text = displayName.ToUpper(),
- Colour = colours.ForHitResult(result),
+ Colour = colours.TextForHitResult(result),
},
new OsuSpriteText
{
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index c2b27d4ce8..a854bf37f5 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Judgements
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Text = Result.GetDescription().ToUpperInvariant(),
- Colour = colours.ForHitResult(Result),
+ Colour = colours.TextForHitResult(Result),
Font = OsuFont.Numeric.With(size: 20),
Scale = new Vector2(0.85f, 1),
}
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 26befd659c..35d28b8e98 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -59,30 +59,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
protected Color4 GetColourForHitResult(HitResult result)
{
- switch (result)
- {
- case HitResult.SmallTickMiss:
- case HitResult.LargeTickMiss:
- case HitResult.Miss:
- return colours.Red;
-
- case HitResult.Meh:
- return colours.Yellow;
-
- case HitResult.Ok:
- return colours.Green;
-
- case HitResult.Good:
- return colours.GreenLight;
-
- case HitResult.SmallTickHit:
- case HitResult.LargeTickHit:
- case HitResult.Great:
- return colours.Blue;
-
- default:
- return colours.BlueLight;
- }
+ return colours.DrawForHitResult(result);
}
///
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index c23a5e668d..429b72c07c 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
- HeaderText.Colour = colours.ForHitResult(Result);
+ HeaderText.Colour = colours.TextForHitResult(Result);
}
}
}