From 55187a8380811c07a2e7ebfab33d55f7a95cd3ea Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Tue, 14 Mar 2017 11:55:19 -0300 Subject: [PATCH] Warnings, accuracy formatting --- .../Tests/TestCaseLeaderboard.cs | 16 ++++++++-------- .../Select/Leaderboards/LeaderboardScore.cs | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs index e8b14d8a6d..0396a2d81b 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs @@ -10,9 +10,9 @@ using osu.Game.Modes.Osu.Mods; using osu.Game.Screens.Select.Leaderboards; using osu.Game.Users; -namespace osu.Desktop.VisualTests +namespace osu.Desktop.VisualTests.Tests { - class TestCaseLeaderboard : TestCase + internal class TestCaseLeaderboard : TestCase { public override string Description => @"From song select"; @@ -115,7 +115,7 @@ namespace osu.Desktop.VisualTests new Score { Rank = ScoreRank.B, - Accuracy = 100, + Accuracy = 98.26, MaxCombo = 244, TotalScore = 1707827, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, @@ -133,7 +133,7 @@ namespace osu.Desktop.VisualTests new Score { Rank = ScoreRank.C, - Accuracy = 100, + Accuracy = 96.54, MaxCombo = 244, TotalScore = 1707827, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, @@ -151,7 +151,7 @@ namespace osu.Desktop.VisualTests new Score { Rank = ScoreRank.F, - Accuracy = 100, + Accuracy = 60.25, MaxCombo = 244, TotalScore = 1707827, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, @@ -169,7 +169,7 @@ namespace osu.Desktop.VisualTests new Score { Rank = ScoreRank.F, - Accuracy = 100, + Accuracy = 51.40, MaxCombo = 244, TotalScore = 1707827, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, @@ -187,7 +187,7 @@ namespace osu.Desktop.VisualTests new Score { Rank = ScoreRank.F, - Accuracy = 100, + Accuracy = 42.22, MaxCombo = 244, TotalScore = 1707827, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, @@ -218,7 +218,7 @@ namespace osu.Desktop.VisualTests Size = new Vector2(550f, 450f), }); - AddButton(@"New Scores", () => newScores()); + AddButton(@"New Scores", newScores); newScores(); } } diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs index b04bfff4f4..4cc334c144 100644 --- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs +++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs @@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select.Leaderboards for (int i = 0; i < drawables.Length; i++) { - drawables[i].FadeIn(100 + (i * 50)); + drawables[i].FadeIn(100 + i * 50); } }); }); @@ -221,7 +221,7 @@ namespace osu.Game.Screens.Select.Leaderboards Children = new Drawable[] { maxCombo = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()), - accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.Accuracy.ToString()), + accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, string.Format(Score.Accuracy % 1 == 0 ? "{0:0}" : "{0:0.00}", Score.Accuracy)), }, }, }, @@ -263,7 +263,7 @@ namespace osu.Game.Screens.Select.Leaderboards } } - class GlowingSpriteText : Container + private class GlowingSpriteText : Container { public GlowingSpriteText(string text, string font, int textSize, Color4 textColour, Color4 glowColour) { @@ -308,7 +308,7 @@ namespace osu.Game.Screens.Select.Leaderboards } } - class ScoreModIcon : Container + private class ScoreModIcon : Container { public ScoreModIcon(FontAwesome icon, Color4 colour) { @@ -337,7 +337,7 @@ namespace osu.Game.Screens.Select.Leaderboards } } - class ScoreComponentLabel : Container + private class ScoreComponentLabel : Container { public ScoreComponentLabel(FontAwesome icon, string value) {