diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs index 7cf42b966a..4a59ad9534 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs @@ -40,7 +40,7 @@ namespace osu.Desktop.VisualTests.Tests DrainRate = 1, }, StarDifficulty = 5.3f, - Metric = new BeatmapMetric + Metrics = new BeatmapMetrics { Ratings = Enumerable.Range(0,10), Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6), @@ -56,8 +56,8 @@ namespace osu.Desktop.VisualTests.Tests private void newRetryAndFailValues() { - details.Beatmap.Metric.Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6); - details.Beatmap.Metric.Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6); + details.Beatmap.Metrics.Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6); + details.Beatmap.Metrics.Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6); details.Beatmap = details.Beatmap; lastRange += 100; } diff --git a/osu.Game/Database/BeatmapInfo.cs b/osu.Game/Database/BeatmapInfo.cs index 7dc62d64e8..3e84825919 100644 --- a/osu.Game/Database/BeatmapInfo.cs +++ b/osu.Game/Database/BeatmapInfo.cs @@ -42,7 +42,7 @@ namespace osu.Game.Database public BeatmapDifficulty Difficulty { get; set; } [Ignore] - public BeatmapMetric Metric { get; set; } + public BeatmapMetrics Metrics { get; set; } public string Path { get; set; } diff --git a/osu.Game/Database/BeatmapMetric.cs b/osu.Game/Database/BeatmapMetrics.cs similarity index 80% rename from osu.Game/Database/BeatmapMetric.cs rename to osu.Game/Database/BeatmapMetrics.cs index ae21bc4170..91320110d0 100644 --- a/osu.Game/Database/BeatmapMetric.cs +++ b/osu.Game/Database/BeatmapMetrics.cs @@ -5,7 +5,10 @@ using System.Collections.Generic; namespace osu.Game.Database { - public class BeatmapMetric + /// + /// Beatmap metrics based on acculumated online data from community plays. + /// + public class BeatmapMetrics { /// /// Total vote counts of user ratings on a scale of 0..length. diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs index 0d3a9ba9ee..a0d15101e0 100644 --- a/osu.Game/Screens/Select/BeatmapDetails.cs +++ b/osu.Game/Screens/Select/BeatmapDetails.cs @@ -61,9 +61,9 @@ namespace osu.Game.Screens.Select approachRate.Value = beatmap.Difficulty.ApproachRate; stars.Value = (float)beatmap.StarDifficulty; - if (beatmap.Metric?.Ratings.Any() ?? false) + if (beatmap.Metrics?.Ratings.Any() ?? false) { - var ratings = beatmap.Metric.Ratings.ToList(); + var ratings = beatmap.Metrics.Ratings.ToList(); ratingsContainer.Show(); negativeRatings.Text = ratings.GetRange(0, ratings.Count / 2).Sum().ToString(); @@ -75,10 +75,10 @@ namespace osu.Game.Screens.Select else ratingsContainer.Hide(); - if ((beatmap.Metric?.Retries.Any() ?? false) && beatmap.Metric.Fails.Any()) + if ((beatmap.Metrics?.Retries.Any() ?? false) && beatmap.Metrics.Fails.Any()) { - var retries = beatmap.Metric.Retries; - var fails = beatmap.Metric.Fails; + var retries = beatmap.Metrics.Retries; + var fails = beatmap.Metrics.Fails; retryFailContainer.Show(); float maxValue = fails.Zip(retries, (fail, retry) => fail + retry).Max(); diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 76ec4d3387..578704f4f8 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -76,7 +76,7 @@ - +