h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 19:13:21 +08:00
Code Issues Releases Wiki Activity

Compute the beatmap maximum achievable combo instead of Beatmap.MaxCombo

Browse Source
This commit is contained in:
Salman Ahmed 2022-03-20 05:33:35 +03:00
parent d36f32a9c9
commit eca7975864
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
View File

@ -65,10 +65,12 @@ namespace osu.Game.Screens.Ranking.Expanded
var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata; var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
string creator = metadata.Author.Username; string creator = metadata.Author.Username;
int? beatmapMaxCombo = scoreManager.GetBeatmapMaximumComboAsync(score).GetResultSafely();
var topStatistics = new List<StatisticDisplay> var topStatistics = new List<StatisticDisplay>
{ {
new AccuracyStatistic(score.Accuracy), new AccuracyStatistic(score.Accuracy),
new ComboStatistic(score.MaxCombo, beatmap.MaxCombo, score.Statistics.All(stat => !stat.Key.BreaksCombo() || stat.Value == 0)), new ComboStatistic(score.MaxCombo, beatmapMaxCombo),
new PerformanceStatistic(score), new PerformanceStatistic(score),
}; };
@ -80,8 +82,6 @@ namespace osu.Game.Screens.Ranking.Expanded
statisticDisplays.AddRange(topStatistics); statisticDisplays.AddRange(topStatistics);
statisticDisplays.AddRange(bottomStatistics); statisticDisplays.AddRange(bottomStatistics);
var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
AddInternal(new FillFlowContainer AddInternal(new FillFlowContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -224,6 +224,8 @@ namespace osu.Game.Screens.Ranking.Expanded
if (score.Date != default) if (score.Date != default)
AddInternal(new PlayedOnText(score.Date)); AddInternal(new PlayedOnText(score.Date));
var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
if (starDifficulty != null) if (starDifficulty != null)
{ {
starAndModDisplay.Add(new StarRatingDisplay(starDifficulty.Value) starAndModDisplay.Add(new StarRatingDisplay(starDifficulty.Value)

5
osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
View File

@ -26,11 +26,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
/// </summary> /// </summary>
/// <param name="combo">The combo to be displayed.</param> /// <param name="combo">The combo to be displayed.</param>
/// <param name="maxCombo">The maximum value of <paramref name="combo"/>.</param> /// <param name="maxCombo">The maximum value of <paramref name="combo"/>.</param>
/// <param name="isPerfect">Whether this is a perfect combo.</param> public ComboStatistic(int combo, int? maxCombo)
public ComboStatistic(int combo, int? maxCombo, bool isPerfect)
: base("combo", combo, maxCombo) : base("combo", combo, maxCombo)
{ {
this.isPerfect = isPerfect; isPerfect = combo == maxCombo;
} }
public override void Appear() public override void Appear()