diff --git a/src/main/java/forge/card/CardRulesPredicates.java b/src/main/java/forge/card/CardRulesPredicates.java index 37a5f18fd6e..855b95e91b9 100644 --- a/src/main/java/forge/card/CardRulesPredicates.java +++ b/src/main/java/forge/card/CardRulesPredicates.java @@ -538,6 +538,8 @@ public final class CardRulesPredicates { /** The Constant isMulticolor. */ public static final Predicate IS_MULTICOLOR = CardRulesPredicates.hasAtLeastCntColors((byte) 2); + + public static final Predicate IS_MONOCOLOR = CardRulesPredicates.hasCntColors((byte) 1); /** The Constant colors. */ public static final List> COLORS = new ArrayList>(); diff --git a/src/main/java/forge/quest/BoosterUtils.java b/src/main/java/forge/quest/BoosterUtils.java index 9f5c2687f2d..6785457eda9 100644 --- a/src/main/java/forge/quest/BoosterUtils.java +++ b/src/main/java/forge/quest/BoosterUtils.java @@ -83,11 +83,11 @@ public final class BoosterUtils { colorFilters.add(CardRulesPredicates.Presets.IS_COLORLESS); } - colorFilters.add(CardRulesPredicates.Presets.IS_WHITE); - colorFilters.add(CardRulesPredicates.Presets.IS_RED); - colorFilters.add(CardRulesPredicates.Presets.IS_BLUE); - colorFilters.add(CardRulesPredicates.Presets.IS_BLACK); - colorFilters.add(CardRulesPredicates.Presets.IS_GREEN); + colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_WHITE)); + colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_RED)); + colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_BLUE)); + colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_BLACK)); + colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_GREEN)); } // This will save CPU time when sets are limited