Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show "slider end" statistic next to slider ticks on results screen (and use correct colour) #26522

Merged
merged 3 commits into from Jan 14, 2024
Merged

Show "slider end" statistic next to slider ticks on results screen (and use correct colour) #26522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eecd868
Use darker blue for `SliderTailHit` result
bdach Jan 14, 2024
1cd7656
Reorder hit results so that `SliderTailHit` is next to `SmallTickHit`
bdach Jan 14, 2024
13060c8
Merge branch 'master' into slider-tick-display
frenzibyte Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions osu.Game/Graphics/OsuColour.cs
View file
Open in desktop
Expand Up @@ -95,6 +95,7 @@ public Color4 ForHitResult(HitResult result)

case HitResult.SmallTickHit:
case HitResult.LargeTickHit:
case HitResult.SliderTailHit:
case HitResult.Great:
return Blue;

Expand Down
18 changes: 9 additions & 9 deletions osu.Game/Rulesets/Scoring/HitResult.cs
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ public enum HitResult
/// </summary>
[Description(@"")]
[EnumMember(Value = "none")]
[Order(14)]
[Order(15)]
None,

/// <summary>
Expand Down Expand Up @@ -71,7 +71,7 @@ public enum HitResult
/// Indicates small tick miss.
/// </summary>
[EnumMember(Value = "small_tick_miss")]
[Order(11)]
[Order(12)]
SmallTickMiss,

/// <summary>
Expand All @@ -87,7 +87,7 @@ public enum HitResult
/// </summary>
[EnumMember(Value = "large_tick_miss")]
[Description("-")]
[Order(10)]
[Order(11)]
LargeTickMiss,

/// <summary>
Expand All @@ -103,30 +103,30 @@ public enum HitResult
/// </summary>
[Description("S Bonus")]
[EnumMember(Value = "small_bonus")]
[Order(9)]
[Order(10)]
SmallBonus,

/// <summary>
/// Indicates a large bonus.
/// </summary>
[Description("L Bonus")]
[EnumMember(Value = "large_bonus")]
[Order(8)]
[Order(9)]
LargeBonus,

/// <summary>
/// Indicates a miss that should be ignored for scoring purposes.
/// </summary>
[EnumMember(Value = "ignore_miss")]
[Description("-")]
[Order(13)]
[Order(14)]
IgnoreMiss,

/// <summary>
/// Indicates a hit that should be ignored for scoring purposes.
/// </summary>
[EnumMember(Value = "ignore_hit")]
[Order(12)]
[Order(13)]
IgnoreHit,

/// <summary>
Expand All @@ -136,14 +136,14 @@ public enum HitResult
/// May be paired with <see cref="IgnoreHit"/>.
/// </remarks>
[EnumMember(Value = "combo_break")]
[Order(15)]
[Order(16)]
ComboBreak,

/// <summary>
/// A special judgement similar to <see cref="LargeTickHit"/> that's used to increase the valuation of the final tick of a slider.
/// </summary>
[EnumMember(Value = "slider_tail_hit")]
[Order(16)]
[Order(8)]
SliderTailHit,

/// <summary>
Expand Down