h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Code Issues Releases Wiki Activity

Use ruleset criteria in parsing and filtering

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-03-02 20:11:21 +01:00
parent c375be6b07
commit 42c3309d49
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -73,6 +73,9 @@ namespace osu.Game.Screens.Select.Carousel
if (match)
match &= criteria.Collection?.Beatmaps.Contains(Beatmap) ?? true;
if (match && criteria.RulesetCriteria != null)
match &= criteria.RulesetCriteria.Matches(Beatmap);
Filtered.Value = !match;
}

2
osu.Game/Screens/Select/FilterQueryParser.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
return updateCriteriaText(ref criteria.Artist, op, value);
default:
return false;
return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
}
}