Use ruleset criteria in parsing and filtering

2026-06-02 06:49:54 +08:00 · 2021-03-02 20:11:21 +01:00
parent c375be6b07
commit 42c3309d49
2 changed files with 4 additions and 1 deletions
@@ -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;
        }

@@ -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;
            }
        }