h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Support displaying "unranked PP" placeholder

Browse Source
This commit is contained in:
Salman Ahmed 2024-02-05 23:28:21 +03:00
parent 4be4ed7ab2
commit 6b7ffc240b
4 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -180,10 +180,12 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
if (showPerformancePoints) if (showPerformancePoints)
{ {
if (score.PP != null) if (!score.Ranked)
content.Add(new StatisticText(score.PP, format: @"N0")); content.Add(new UnrankedPerformancePointsPlaceholder { Font = OsuFont.GetFont(size: text_size) });
else else if (score.PP == null)
content.Add(new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(text_size) }); content.Add(new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(text_size) });
else
content.Add(new StatisticText(score.PP, format: @"N0"));
} }
content.Add(new ScoreboardTime(score.Date, text_size) content.Add(new ScoreboardTime(score.Date, text_size)

8
osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
View File

@ -125,10 +125,12 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
ppColumn.Alpha = value.BeatmapInfo!.Status.GrantsPerformancePoints() ? 1 : 0; ppColumn.Alpha = value.BeatmapInfo!.Status.GrantsPerformancePoints() ? 1 : 0;
if (value.PP is double pp) if (!value.Ranked)
ppColumn.Text = pp.ToLocalisableString(@"N0"); ppColumn.Drawable = new UnrankedPerformancePointsPlaceholder { Font = smallFont };
else else if (value.PP is not double pp)
ppColumn.Drawable = new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(smallFont.Size) }; ppColumn.Drawable = new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(smallFont.Size) };
else
ppColumn.Text = pp.ToLocalisableString(@"N0");
statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn); statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);
modsColumn.Mods = value.Mods; modsColumn.Mods = value.Mods;

11
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
View File

@ -216,7 +216,18 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
if (!Score.PP.HasValue) if (!Score.PP.HasValue)
{ {
if (Score.Beatmap?.Status.GrantsPerformancePoints() == true) if (Score.Beatmap?.Status.GrantsPerformancePoints() == true)
{
if (!Score.Ranked)
{
return new UnrankedPerformancePointsPlaceholder
{
Font = OsuFont.GetFont(weight: FontWeight.Bold),
Colour = colourProvider.Highlight1
};
}
return new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(16), Colour = colourProvider.Highlight1 }; return new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(16), Colour = colourProvider.Highlight1 };
}
return new OsuSpriteText return new OsuSpriteText
{ {

26
osu.Game/Scoring/Drawables/UnrankedPerformancePointsPlaceholder.cs Normal file
View File

@ -0,0 +1,26 @@
// 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.
#nullable disable
using osu.Framework.Graphics;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
namespace osu.Game.Scoring.Drawables
{
/// <summary>
/// A placeholder used in PP columns for scores that do not award PP.
/// </summary>
public partial class UnrankedPerformancePointsPlaceholder : SpriteText, IHasTooltip
{
public LocalisableString TooltipText => "pp is not awarded for this score"; // todo: replace with localised string ScoresStrings.StatusNoPp.
public UnrankedPerformancePointsPlaceholder()
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Text = "-";
}
}
}