Merge pull request #7721 from recapitalverb/display-accuracy

Add {ScoreInfo,UserStatistics}.Accuracy

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -277,7 +277,7 @@ namespace osu.Game.Online.Leaderboards
         protected virtual IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
         {
             new LeaderboardScoreStatistic(FontAwesome.Solid.Link, "Max Combo", model.MaxCombo.ToString()),
-            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy))
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", model.DisplayAccuracy)
         };
 
         protected override bool OnHover(HoverEvent e)

osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs

@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = $@"{score.Accuracy:P2}",
+                    Text = score.DisplayAccuracy,
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },

osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs

@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             set
             {
                 totalScoreColumn.Text = $@"{value.TotalScore:N0}";
-                accuracyColumn.Text = $@"{value.Accuracy:P2}";
+                accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
                 ppColumn.Text = $@"{value.PP:N0}";
 

osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -178,7 +177,7 @@ namespace osu.Game.Overlays.Profile.Header
             if (user?.Statistics != null)
             {
                 userStats.Add(new UserStatsLine("Ranked Score", user.Statistics.RankedScore.ToString("#,##0")));
-                userStats.Add(new UserStatsLine("Hit Accuracy", Math.Round(user.Statistics.Accuracy, 2).ToString("#0.00'%'")));
+                userStats.Add(new UserStatsLine("Hit Accuracy", user.Statistics.DisplayAccuracy));
                 userStats.Add(new UserStatsLine("Play Count", user.Statistics.PlayCount.ToString("#,##0")));
                 userStats.Add(new UserStatsLine("Total Score", user.Statistics.TotalScore.ToString("#,##0")));
                 userStats.Add(new UserStatsLine("Total Hits", user.Statistics.TotalHits.ToString("#,##0")));

osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs

@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
         {
-            Text = $"{Score.Accuracy:0.00%}",
+            Text = Score.DisplayAccuracy,
             Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
             Colour = colours.Yellow,
         };

osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs

@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         protected sealed override Drawable[] CreateAdditionalContent(UserStatistics item) => new[]
         {
-            new ColoredRowText { Text = $@"{item.Accuracy:F2}%", },
+            new ColoredRowText { Text = item.DisplayAccuracy, },
             new ColoredRowText { Text = $@"{item.PlayCount:N0}", },
         }.Concat(CreateUniqueContent(item)).Concat(new[]
         {

osu.Game/Scoring/ScoreInfo.cs

@@ -13,6 +13,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
+using osu.Game.Utils;
 
 namespace osu.Game.Scoring
 {
@@ -31,6 +32,9 @@ namespace osu.Game.Scoring
         [Column(TypeName = "DECIMAL(1,4)")]
         public double Accuracy { get; set; }
 
+        [JsonIgnore]
+        public string DisplayAccuracy => Accuracy.FormatAccuracy();
+
         [JsonProperty(@"pp")]
         public double? PP { get; set; }
 

osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         protected override IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
         {
-            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy)),
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", model.DisplayAccuracy),
             new LeaderboardScoreStatistic(FontAwesome.Solid.Sync, "Total Attempts", score.TotalAttempts.ToString()),
             new LeaderboardScoreStatistic(FontAwesome.Solid.Check, "Completed Beatmaps", score.CompletedBeatmaps.ToString()),
         };

osu.Game/Screens/Ranking/Results.cs

@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Ranking
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.BottomCentre,
-                                Text = $"{Score.Accuracy:P2}",
+                                Text = Score.DisplayAccuracy,
                                 Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 40),
                                 RelativePositionAxes = Axes.X,
                                 X = 0.9f,

osu.Game/Screens/Select/LocalScoreDeleteDialog.cs

@@ -32,8 +32,7 @@ namespace osu.Game.Screens.Select
             BeatmapInfo beatmap = beatmapManager.QueryBeatmap(b => b.ID == score.BeatmapInfoID);
             Debug.Assert(beatmap != null);
 
-            string accuracy = string.Format(score.Accuracy == 1 ? "{0:0%}" : "{0:0.00%}", score.Accuracy);
+            BodyText = $"{score.User} ({score.DisplayAccuracy}, {score.Rank})";
-            BodyText = $"{score.User} ({accuracy}, {score.Rank})";
 
             Icon = FontAwesome.Regular.TrashAlt;
             HeaderText = "Confirm deletion of local score";

osu.Game/Users/UserStatistics.cs

@@ -4,6 +4,7 @@
 using System;
 using Newtonsoft.Json;
 using osu.Game.Scoring;
+using osu.Game.Utils;
 using static osu.Game.Users.User;
 
 namespace osu.Game.Users
@@ -43,6 +44,9 @@ namespace osu.Game.Users
         [JsonProperty(@"hit_accuracy")]
         public decimal Accuracy;
 
+        [JsonIgnore]
+        public string DisplayAccuracy => Accuracy.FormatAccuracy();
+
         [JsonProperty(@"play_count")]
         public int PlayCount;
 

osu.Game/Utils/FormatUtils.cs

@@ -0,0 +1,24 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Utils
+{
+    public static class FormatUtils
+    {
+        /// <summary>
+        /// Turns the provided accuracy into a percentage with 2 decimal places.
+        /// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
+        /// </summary>
+        /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <returns>formatted accuracy in percentage</returns>
+        public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
+
+        /// <summary>
+        /// Turns the provided accuracy into a percentage with 2 decimal places.
+        /// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
+        /// </summary>
+        /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <returns>formatted accuracy in percentage</returns>
+        public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
+    }
+}