Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder

osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs

@@ -0,0 +1,101 @@
+// 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 System.Collections.Generic;
+using osu.Game.Overlays.Profile.Sections;
+using osu.Game.Overlays.Profile.Sections.Ranks;
+using osu.Framework.Graphics;
+using osu.Game.Scoring;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneUserProfileScores : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableProfileScore),
+            typeof(DrawableProfileWeightedScore),
+            typeof(ProfileItemContainer),
+        };
+
+        public TestSceneUserProfileScores()
+        {
+            var score = new ScoreInfo
+            {
+                PP = 134.32,
+                Rank = ScoreRank.A,
+                Beatmap = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "Triumph & Regret",
+                        Artist = "typeMARS"
+                    },
+                    Version = "[4K] Regret"
+                },
+                Date = DateTimeOffset.Now,
+                Mods = new Mod[]
+                {
+                    new OsuModHardRock(),
+                    new OsuModDoubleTime(),
+                },
+                Accuracy = 0.998546
+            };
+
+            var noPPScore = new ScoreInfo
+            {
+                Rank = ScoreRank.B,
+                Beatmap = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "C18H27NO3(extend)",
+                        Artist = "Team Grimoire"
+                    },
+                    Version = "[4K] Cataclysmic Hypernova"
+                },
+                Date = DateTimeOffset.Now,
+                Accuracy = 0.55879
+            };
+
+            Add(new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new[]
+                {
+                    new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(score)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85))
+                }
+            });
+        }
+
+        private class ColourProvidedContainer : Container
+        {
+            [Cached]
+            private readonly OverlayColourProvider colourProvider;
+
+            public ColourProvidedContainer(OverlayColourScheme colourScheme, DrawableProfileScore score)
+            {
+                colourProvider = new OverlayColourProvider(colourScheme);
+
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+                Add(score);
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs

@@ -4,11 +4,13 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Overlays.Profile.Sections.Ranks;
 using osu.Game.Users;
@@ -20,7 +22,15 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableProfileScore), typeof(RanksSection) };
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableProfileScore),
+            typeof(DrawableProfileWeightedScore),
+            typeof(RanksSection)
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
         public TestSceneUserRanks()
         {

osu.Game/Graphics/DrawableDate.cs

@@ -29,9 +29,9 @@ namespace osu.Game.Graphics
             }
         }
 
-        public DrawableDate(DateTimeOffset date)
+        public DrawableDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE)
         {
-            Font = OsuFont.GetFont(weight: FontWeight.Regular, italics: true);
+            Font = OsuFont.GetFont(weight: FontWeight.Regular, size: textSize, italics: true);
             Date = date;
         }
 

osu.Game/Graphics/UserInterface/OsuSliderBar.cs

@@ -177,7 +177,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 if (DisplayAsPercentage)
                 {
-                    TooltipText = floatValue.ToString("P0");
+                    TooltipText = floatValue.ToString("0%");
                 }
                 else
                 {

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:P0}" : @"{0:P2}", model.Accuracy))
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy))
         };
 
         protected override bool OnHover(HoverEvent e)

osu.Game/Overlays/BeatmapSet/SuccessRate.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.BeatmapSet
             int playCount = beatmap?.OnlineInfo?.PlayCount ?? 0;
 
             var rate = playCount != 0 ? (float)passCount / playCount : 0;
-            successPercent.Text = rate.ToString("P0");
+            successPercent.Text = rate.ToString("0%");
             successRate.Length = rate;
             percentContainer.ResizeWidthTo(successRate.Length, 250, Easing.InOutCubic);
 

osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -13,32 +12,25 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
-using System.Collections.Generic;
 using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
-    public class DrawableMostPlayedBeatmap : OsuHoverContainer
+    public class DrawableMostPlayedBeatmap : CompositeDrawable
     {
         private const int cover_width = 100;
         private const int corner_radius = 6;
-        private const int height = 50;
 
         private readonly BeatmapInfo beatmap;
         private readonly int playCount;
 
-        private Box background;
-
-        protected override IEnumerable<Drawable> EffectTargets => new[] { background };
-
         public DrawableMostPlayedBeatmap(BeatmapInfo beatmap, int playCount)
         {
             this.beatmap = beatmap;
             this.playCount = playCount;
-            Enabled.Value = true; //manually enabled, because we have no action
 
             RelativeSizeAxes = Axes.X;
-            Height = height;
+            Height = 50;
 
             Masking = true;
             CornerRadius = corner_radius;
@@ -47,10 +39,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            IdleColour = colours.GreySeafoam;
+            AddRangeInternal(new Drawable[]
-            HoverColour = colours.GreySeafoamLight;
-
-            Children = new Drawable[]
             {
                 new UpdateableBeatmapSetCover
                 {
@@ -72,8 +61,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             CornerRadius = corner_radius,
                             Children = new Drawable[]
                             {
-                                background = new Box { RelativeSizeAxes = Axes.Both },
+                                new ProfileItemContainer
-                                new Container
+                                {
+                                    Child = new Container
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         Padding = new MarginPadding(10),
@@ -111,7 +101,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             }
                         }
                     }
-            };
+                }
+            });
         }
 
         private class MostPlayedBeatmapMetadataContainer : BeatmapMetadataContainer

osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs

@@ -0,0 +1,63 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Profile.Sections
+{
+    public class ProfileItemContainer : Container
+    {
+        private const int hover_duration = 200;
+
+        protected override Container<Drawable> Content => content;
+
+        private Color4 idleColour;
+        private Color4 hoverColour;
+
+        private readonly Box background;
+        private readonly Container content;
+
+        public ProfileItemContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+            Masking = true;
+            CornerRadius = 6;
+
+            AddRangeInternal(new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            background.Colour = idleColour = colourProvider.Background4;
+            hoverColour = colourProvider.Background3;
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            background.FadeColour(hoverColour, hover_duration, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            background.FadeColour(idleColour, hover_duration, Easing.OutQuint);
+        }
+    }
+}

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

@@ -1,47 +0,0 @@
-// 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 osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
-
-namespace osu.Game.Overlays.Profile.Sections.Ranks
-{
-    public class DrawablePerformanceScore : DrawableProfileScore
-    {
-        private readonly double? weight;
-
-        public DrawablePerformanceScore(ScoreInfo score, double? weight = null)
-            : base(score)
-        {
-            this.weight = weight;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
-        {
-            double pp = Score.PP ?? 0;
-            RightFlowContainer.Add(new OsuSpriteText
-            {
-                Text = $"{pp:0}pp",
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
-            });
-
-            if (weight.HasValue)
-            {
-                RightFlowContainer.Add(new OsuSpriteText
-                {
-                    Text = $"weighted: {pp * weight:0}pp ({weight:P0})",
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Colour = colour.GrayA,
-                    Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular, italics: true)
-                });
-            }
-        }
-    }
-}

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

@@ -1,76 +1,225 @@
 // 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 osuTK;
+using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osu.Game.Beatmaps;
+using osuTK;
-using osu.Framework.Localisation;
+using osuTK.Graphics;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public abstract class DrawableProfileScore : DrawableProfileRow
+    public class DrawableProfileScore : CompositeDrawable
     {
-        private readonly FillFlowContainer modsContainer;
+        private const int performance_width = 80;
+        private const int content_padding = 10;
+
         protected readonly ScoreInfo Score;
 
-        protected DrawableProfileScore(ScoreInfo score)
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        public DrawableProfileScore(ScoreInfo score)
         {
             Score = score;
 
             RelativeSizeAxes = Axes.X;
-            Height = 60;
+            Height = 40;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(new ProfileItemContainer
+            {
                 Children = new Drawable[]
                 {
-                modsContainer = new FillFlowContainer
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Left = content_padding, Right = performance_width + content_padding },
+                        Children = new Drawable[]
+                        {
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(8, 0),
+                                Children = new Drawable[]
+                                {
+                                    new UpdateableRank(Score.Rank)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Size = new Vector2(50, 20),
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Vertical,
+                                        Spacing = new Vector2(0, 2),
+                                        Children = new Drawable[]
+                                        {
+                                            new ScoreBeatmapMetadataContainer(Score.Beatmap),
+                                            new FillFlowContainer
+                                            {
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(5, 0),
+                                                Children = new Drawable[]
+                                                {
+                                                    new OsuSpriteText
+                                                    {
+                                                        Text = $"{Score.Beatmap.Version}",
+                                                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                                                        Colour = colours.Yellow
+                                                    },
+                                                    new DrawableDate(Score.Date, 12)
+                                                    {
+                                                        Colour = colourProvider.Foreground1
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(15),
+                                Children = new[]
+                                {
+                                    CreateRightContent().With(c =>
+                                    {
+                                        c.Anchor = Anchor.CentreRight;
+                                        c.Origin = Anchor.CentreRight;
+                                    }),
+                                    new FillFlowContainer
                                     {
                                         AutoSizeAxes = Axes.Both,
                                         Anchor = Anchor.CentreRight,
                                         Origin = Anchor.CentreRight,
-                    Spacing = new Vector2(1),
+                                        Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Right = 160 }
+                                        Spacing = new Vector2(2),
-                }
+                                        Children = Score.Mods.Select(mod => new ModIcon(mod)
-            };
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colour)
                                         {
-            var text = new OsuSpriteText
+                                            Scale = new Vector2(0.35f)
-            {
+                                        }).ToList(),
-                Text = $"accuracy: {Score.Accuracy:P2}",
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Colour = colour.GrayA,
-                Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular, italics: true)
-            };
-
-            RightFlowContainer.Insert(1, text);
-
-            LeftFlowContainer.Add(new ProfileScoreBeatmapMetadataContainer(Score.Beatmap));
-            LeftFlowContainer.Add(new DrawableDate(Score.Date));
-
-            foreach (Mod mod in Score.Mods)
-                modsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.5f) });
                                     }
-
+                                }
-        protected override Drawable CreateLeftVisual() => new UpdateableRank(Score.Rank)
+                            }
+                        }
+                    },
+                    new Container
                     {
                         RelativeSizeAxes = Axes.Y,
-            Width = 60,
+                        Width = performance_width,
-            FillMode = FillMode.Fit,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Size = new Vector2(1, 0.5f),
+                                Colour = Color4.Black.Opacity(0.5f),
+                                Shear = new Vector2(-0.45f, 0),
+                                EdgeSmoothness = new Vector2(2, 0),
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Y,
+                                Size = new Vector2(1, -0.5f),
+                                Position = new Vector2(0, 1),
+                                Colour = Color4.Black.Opacity(0.5f),
+                                Shear = new Vector2(0.45f, 0),
+                                EdgeSmoothness = new Vector2(2, 0),
+                            },
+                            createDrawablePerformance().With(d =>
+                            {
+                                d.Anchor = Anchor.Centre;
+                                d.Origin = Anchor.Centre;
+                            })
+                        }
+                    }
+                }
+            });
+        }
+
+        [NotNull]
+        protected virtual Drawable CreateRightContent() => CreateDrawableAccuracy();
+
+        protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
+        {
+            Text = $"{Score.Accuracy:0.00%}",
+            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+            Colour = colours.Yellow,
         };
 
-        private class ProfileScoreBeatmapMetadataContainer : BeatmapMetadataContainer
+        private Drawable createDrawablePerformance()
         {
-            public ProfileScoreBeatmapMetadataContainer(BeatmapInfo beatmap)
+            if (Score.PP.HasValue)
+            {
+                return new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                            Text = $"{Score.PP:0}",
+                            Colour = colourProvider.Highlight1
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Text = "pp",
+                            Colour = colourProvider.Light3
+                        }
+                    }
+                };
+            }
+
+            return new OsuSpriteText
+            {
+                Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                Text = "-",
+                Colour = colourProvider.Highlight1
+            };
+        }
+
+        private class ScoreBeatmapMetadataContainer : BeatmapMetadataContainer
+        {
+            public ScoreBeatmapMetadataContainer(BeatmapInfo beatmap)
                 : base(beatmap)
             {
             }
@@ -79,16 +228,19 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             {
                 new OsuSpriteText
                 {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
                     Text = new LocalisedString((
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ")),
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ")),
-                    Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold, italics: true)
+                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
                 },
                 new OsuSpriteText
                 {
-                    Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Anchor = Anchor.BottomLeft,
-                    Padding = new MarginPadding { Top = 3 },
+                    Origin = Anchor.BottomLeft,
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular, italics: true)
+                    Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Font = OsuFont.GetFont(size: 12, italics: true)
                 },
             };
         }

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

@@ -0,0 +1,55 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Scoring;
+
+namespace osu.Game.Overlays.Profile.Sections.Ranks
+{
+    public class DrawableProfileWeightedScore : DrawableProfileScore
+    {
+        private readonly double weight;
+
+        public DrawableProfileWeightedScore(ScoreInfo score, double weight)
+            : base(score)
+        {
+            this.weight = weight;
+        }
+
+        protected override Drawable CreateRightContent() => new FillFlowContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Vertical,
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            Width = 60,
+                            Child = CreateDrawableAccuracy()
+                        },
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                            Text = $"{Score.PP * weight:0}pp",
+                        },
+                    }
+                },
+                new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 12),
+                    Text = $@"weighted {weight:0%}"
+                }
+            }
+        };
+    }
+}

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

@@ -1,31 +0,0 @@
-// 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 osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
-
-namespace osu.Game.Overlays.Profile.Sections.Ranks
-{
-    public class DrawableTotalScore : DrawableProfileScore
-    {
-        public DrawableTotalScore(ScoreInfo score)
-            : base(score)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RightFlowContainer.Add(new OsuSpriteText
-            {
-                Text = Score.TotalScore.ToString("#,###"),
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
-            });
-        }
-    }
-}

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

@@ -15,14 +15,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
     public class PaginatedScoreContainer : PaginatedContainer<APILegacyScoreInfo>
     {
-        private readonly bool includeWeight;
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string header, string missing, bool includeWeight = false)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string header, string missing)
             : base(user, header, missing)
         {
             this.type = type;
-            this.includeWeight = includeWeight;
 
             ItemsPerPage = 5;
 
@@ -43,10 +41,10 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             switch (type)
             {
                 default:
-                    return new DrawablePerformanceScore(model.CreateScoreInfo(Rulesets), includeWeight ? Math.Pow(0.95, ItemsContainer.Count) : (double?)null);
+                    return new DrawableProfileScore(model.CreateScoreInfo(Rulesets));
 
-                case ScoreType.Recent:
+                case ScoreType.Best:
-                    return new DrawableTotalScore(model.CreateScoreInfo(Rulesets));
+                    return new DrawableProfileWeightedScore(model.CreateScoreInfo(Rulesets), Math.Pow(0.95, ItemsContainer.Count));
             }
         }
     }

osu.Game/Overlays/Profile/Sections/RanksSection.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", "No performance records. :(", true),
+                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", "No performance records. :("),
                 new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks", "No awesome performance records yet. :("),
             };
         }

osu.Game/Rulesets/Mods/ModTimeRamp.cs

@@ -20,6 +20,9 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         private const double final_rate_progress = 0.75f;
 
+        [SettingSource("Initial rate", "The starting speed of the track")]
+        public abstract BindableNumber<double> InitialRate { get; }
+
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
@@ -69,6 +72,6 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
         private void applyAdjustment(double amount) =>
-            SpeedChange.Value = 1 + (FinalRate.Value - 1) * Math.Clamp(amount, 0, 1);
+            SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
     }
 }

osu.Game/Rulesets/Mods/ModWindDown.cs

@@ -17,6 +17,16 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
         public override double ScoreMultiplier => 1.0;
 
+        [SettingSource("Initial rate", "The starting speed of the track")]
+        public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+        {
+            MinValue = 1,
+            MaxValue = 2,
+            Default = 1,
+            Value = 1,
+            Precision = 0.01,
+        };
+
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {

osu.Game/Rulesets/Mods/ModWindUp.cs

@@ -17,6 +17,16 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
         public override double ScoreMultiplier => 1.0;
 
+        [SettingSource("Initial rate", "The starting speed of the track")]
+        public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+        {
+            MinValue = 0.5,
+            MaxValue = 1,
+            Default = 1,
+            Value = 1,
+            Precision = 0.01,
+        };
+
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {

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:P0}" : @"{0:P2}", model.Accuracy)),
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy)),
             new LeaderboardScoreStatistic(FontAwesome.Solid.Sync, "Total Attempts", score.TotalAttempts.ToString()),
             new LeaderboardScoreStatistic(FontAwesome.Solid.Check, "Completed Beatmaps", score.CompletedBeatmaps.ToString()),
         };

osu.Game/Screens/Select/LocalScoreDeleteDialog.cs

@@ -32,7 +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:P0}" : "{0:P2}", score.Accuracy);
+            string accuracy = string.Format(score.Accuracy == 1 ? "{0:0%}" : "{0:0.00%}", score.Accuracy);
             BodyText = $"{score.User} ({accuracy}, {score.Rank})";
 
             Icon = FontAwesome.Regular.TrashAlt;