diff --git a/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs b/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs index 240fa5cd07..cbd2c27add 100644 --- a/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs +++ b/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs @@ -20,7 +20,7 @@ public class CatchComboCounter : OsuComboCounter protected override string FormatCount(ulong count) { - return count.ToString("#,0"); + return $@"{count:#,0}x"; } public override void Roll(ulong newValue = 0) diff --git a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs b/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs index d32900532f..ba37e65647 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs @@ -14,7 +14,7 @@ namespace osu.Game.GameModes.Play.Mania { /// - /// Allows tint and vertical scaling animation. Used in osu!taiko and osu!mania. + /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania. /// public class ManiaComboCounter : TaikoComboCounter { diff --git a/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs b/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs index 8d4f9b4e67..209fae57b7 100644 --- a/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs +++ b/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs @@ -47,7 +47,7 @@ public override void Load(BaseGame game) protected override string FormatCount(ulong count) { - return count.ToString("#,0") + "x"; + return $@"{count:#,0}x"; } protected virtual void transformPopOut(ulong currentValue, ulong newValue) diff --git a/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs b/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs index 677be076cd..84019739ea 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs @@ -12,6 +12,9 @@ namespace osu.Game.GameModes.Play.Taiko { + /// + /// Allows tint and scaling animations. Used in osu!taiko. + /// public class TaikoComboCounter : ComboCounter { protected virtual int AnimationDuration => 300; diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs index e65953c265..a47aca738e 100644 --- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs +++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs @@ -1,7 +1,6 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; using osu.Framework.MathUtils; @@ -40,11 +39,6 @@ public ScoreCounter(uint leading = 0) LeadingZeroes = leading; } - public override void Load(BaseGame game) - { - base.Load(game); - } - protected override double GetProportionalDuration(ulong currentValue, ulong newValue) { return currentValue > newValue ? currentValue - newValue : newValue - currentValue;