Skip to content

Allow beatmap tagging if at least one score is eligible #36992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imvanni wants to merge 10 commits into
base: master
Choose a base branch
from
+121 −13
Open

Allow beatmap tagging if at least one score is eligible #36992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a1beaa
Allow beatmap tagging if any score is eligible
imvanni Mar 15, 2026
fa91d23
Merge branch 'master' into tagging-use-available-score
bdach Mar 19, 2026
d3fcffe
Simplify prevent tagging reason check
imvanni Mar 19, 2026
73faf88
Add missing tests
imvanni Mar 19, 2026
554c333
Fix indentation
imvanni Mar 19, 2026
ccf8d44
Order test scores with Rank instead
imvanni Mar 19, 2026
f12881c
Fix else if statement
imvanni Mar 20, 2026
34ddcc7
Apply sorting corrections
imvanni Mar 23, 2026
1678f7a
Revert using a method to check tagging prevention reason
imvanni Mar 23, 2026
b05c2af
Add braces for else block
imvanni Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 99 additions & 1 deletion osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
using osu.Game.Tests.Resources;
using osu.Game.Users;
using osuTK;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Rulesets.Catch.Mods;

namespace osu.Game.Tests.Visual.Ranking
{
Expand Down Expand Up @@ -304,6 +306,29 @@ public void TestTaggingConvert()
});
}

[Test]
public void TestTaggingConversionMods()
{
var score = TestResources.CreateTestScoreInfo();
score.Mods = [new OsuModRandom()];

setUpTaggingRequests(() => score.BeatmapInfo);
AddStep("load panel", () =>
{
Child = new PopoverContainer
{
RelativeSizeAxes = Axes.Both,
Child = new StatisticsPanel
{
RelativeSizeAxes = Axes.Both,
State = { Value = Visibility.Visible },
Score = { Value = score },
AchievedScore = score,
}
};
});
}

[Test]
public void TestTaggingInteractionWithLocalScores()
{
Expand All @@ -321,6 +346,7 @@ public void TestTaggingInteractionWithLocalScores()
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.Ruleset = beatmapInfo.Ruleset;
score.TotalScore = 999999;
score.Rank = ScoreRank.D;
score.User = API.LocalUser.Value;
scoreManager.Import(score);
Expand All @@ -332,7 +358,7 @@ public void TestTaggingInteractionWithLocalScores()
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.Ruleset = beatmapInfo.Ruleset;
score.Rank = ScoreRank.D;
score.Rank = ScoreRank.S;
score.User = new APIUser { Username = "notme", Id = 5678 };
scoreManager.Import(score);
});
Expand All @@ -342,17 +368,89 @@ public void TestTaggingInteractionWithLocalScores()
var score = TestResources.CreateTestScoreInfo();
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.Rank = ScoreRank.A;
score.Ruleset = new OsuRuleset().RulesetInfo;
score.User = API.LocalUser.Value;
scoreManager.Import(score);
});

AddStep("import incompatible mod score", () =>
{
var score = TestResources.CreateTestScoreInfo();
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.Rank = ScoreRank.B;
score.Ruleset = beatmapInfo.Ruleset;
score.Mods = [new CatchModMirror()];
score.User = API.LocalUser.Value;
scoreManager.Import(score);
});

AddStep("import correct score", () =>
{
var score = TestResources.CreateTestScoreInfo();
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.TotalScore = 1;
score.Rank = ScoreRank.C;
score.Ruleset = beatmapInfo.Ruleset;
score.User = API.LocalUser.Value;
scoreManager.Import(score);
});

setUpTaggingRequests(() => beatmapInfo);
AddStep("load panel", () =>
{
var score = TestResources.CreateTestScoreInfo();
score.BeatmapInfo = beatmapInfo;

Child = new PopoverContainer
{
RelativeSizeAxes = Axes.Both,
Child = new StatisticsPanel
{
RelativeSizeAxes = Axes.Both,
State = { Value = Visibility.Visible },
Score = { Value = score },
}
};
});
}

[Test]
public void TestTaggingScoreWithClassicMod()
{
BeatmapInfo beatmapInfo = null!;

AddStep(@"Import beatmap", () =>
{
beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();
beatmapInfo = beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First();
beatmapInfo.Ruleset = new OsuRuleset().RulesetInfo;
});

AddStep("import incompatible score", () =>
{
var score = TestResources.CreateTestScoreInfo();
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.Ruleset = beatmapInfo.Ruleset;
score.TotalScore = 1000000;
score.Rank = ScoreRank.S;
score.Mods = [new OsuModRandom()];
score.User = API.LocalUser.Value;
scoreManager.Import(score);
});

AddStep("import correct score", () =>
{
var score = TestResources.CreateTestScoreInfo();
score.BeatmapInfo = beatmapInfo;
score.BeatmapHash = beatmapInfo.Hash;
score.Ruleset = beatmapInfo.Ruleset;
score.TotalScore = 999999;
score.Rank = ScoreRank.C;
score.Mods = [new OsuModClassic()];
score.User = API.LocalUser.Value;
scoreManager.Import(score);
});
Expand Down
34 changes: 22 additions & 12 deletions osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,24 +243,34 @@ protected virtual IEnumerable<StatisticItem> CreateStatisticItems(ScoreInfo newS
{
string? preventTaggingReason = null;

// We may want to iterate on the following conditions further in the future

var localUserScore = AchievedScore ?? realm.Run(r =>
var localUserScores = realm.Run(r =>
r.GetAllLocalScoresForUser(api.LocalUser.Value.Id)
.Filter($@"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $0", newScore.BeatmapInfo.ID)
.AsEnumerable()
.OrderByDescending(score => score.Ruleset.MatchesOnlineID(newScore.BeatmapInfo.Ruleset))
.ThenByDescending(score => score.Rank)
.FirstOrDefault());
.ThenBy(score => score.Rank)
.ToArray());

if (localUserScore == null)
if (localUserScores.Length == 0)
preventTaggingReason = "Play the beatmap to contribute to beatmap tags!";
else if (localUserScore.Ruleset.OnlineID != newScore.BeatmapInfo!.Ruleset.OnlineID)
preventTaggingReason = "Play the beatmap in its original ruleset to contribute to beatmap tags!";
else if (localUserScore.Rank < ScoreRank.C)
preventTaggingReason = "Set a better score to contribute to beatmap tags!";
else if (localUserScore.Mods.Any(m => (m.Type == ModType.Conversion) && !(m is ModClassic)))
preventTaggingReason = "Play this beatmap without conversion mods to contribute to beatmap tags!";
else
{
foreach (ScoreInfo score in localUserScores)
{
// We may want to iterate on the following conditions further in the future
if (score.Ruleset.OnlineID != newScore.BeatmapInfo.Ruleset.OnlineID)
preventTaggingReason = "Play the beatmap in its original ruleset to contribute to beatmap tags!";
else if (score.Rank < ScoreRank.C)
preventTaggingReason = "Set a better score to contribute to beatmap tags!";
else if (score.Mods.Any(m => (m.Type == ModType.Conversion) && !(m is ModClassic)))
preventTaggingReason = "Play this beatmap without conversion mods to contribute to beatmap tags!";
else
{
preventTaggingReason = null;
break;
}
}
}

if (preventTaggingReason == null)
{
Expand Down
Loading