external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Apparently the conversion to predicate presets in new quest creation failed to adhere to monocolored requirements, leading to too many multicolored cards in a new quest

Browse Source
This commit is contained in:
Sol
2013-04-16 01:06:02 +00:00
parent d3571f81af
commit 81b3cbb5dd
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/CardRulesPredicates.java
View File

@@ -538,6 +538,8 @@ public final class CardRulesPredicates {
/** The Constant isMulticolor. */ /** The Constant isMulticolor. */
public static final Predicate<CardRules> IS_MULTICOLOR = CardRulesPredicates.hasAtLeastCntColors((byte) 2); public static final Predicate<CardRules> IS_MULTICOLOR = CardRulesPredicates.hasAtLeastCntColors((byte) 2);
public static final Predicate<CardRules> IS_MONOCOLOR = CardRulesPredicates.hasCntColors((byte) 1);
/** The Constant colors. */ /** The Constant colors. */
public static final List<Predicate<CardRules>> COLORS = new ArrayList<Predicate<CardRules>>(); public static final List<Predicate<CardRules>> COLORS = new ArrayList<Predicate<CardRules>>();

10
src/main/java/forge/quest/BoosterUtils.java
View File

@@ -83,11 +83,11 @@ public final class BoosterUtils {
colorFilters.add(CardRulesPredicates.Presets.IS_COLORLESS); colorFilters.add(CardRulesPredicates.Presets.IS_COLORLESS);
} }
colorFilters.add(CardRulesPredicates.Presets.IS_WHITE); colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_WHITE));
colorFilters.add(CardRulesPredicates.Presets.IS_RED); colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_RED));
colorFilters.add(CardRulesPredicates.Presets.IS_BLUE); colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_BLUE));
colorFilters.add(CardRulesPredicates.Presets.IS_BLACK); colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_BLACK));
colorFilters.add(CardRulesPredicates.Presets.IS_GREEN); colorFilters.add(Predicates.and(CardRulesPredicates.Presets.IS_MONOCOLOR, CardRulesPredicates.Presets.IS_GREEN));
} }
// This will save CPU time when sets are limited // This will save CPU time when sets are limited