Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion forge-core/src/main/java/forge/item/PaperCardPredicates.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static Predicate<PaperCard> printedInAnyEditions(final String[] editionCo
}

/**
* Filters cards that only printed in any of the specified editions.
* Filters cards that were only printed in any of the specified editions.
*/
public static Predicate<PaperCard> onlyPrintedInEditions(final String[] editionCodes) {
Set<String> editions = new HashSet<>(Arrays.asList(editionCodes));
Expand All @@ -97,6 +97,24 @@ public static Predicate<PaperCard> isObtainableAnyEdition() {
);
}

/**
* Returns a predicate that checks whether a card has at least one printing
* in a non-restricted edition and that printing is obtainable.
* @param restrictedEditionCodes Array of edition codes that are restricted.
* @return Predicate
*/
public static Predicate<PaperCard> isObtainableNotRestricted(final String[] restrictedEditionCodes) {
Set<String> restrictedEditions = new HashSet<>(Arrays.asList(restrictedEditionCodes));

return card -> StaticData.instance().getCommonCards()
.getAllCards(card.getName()).stream()
.map(PaperCard::getEdition)
.anyMatch(editionCode ->
!restrictedEditions.contains(editionCode) &&
StaticData.instance().getCardEdition(editionCode).isCardObtainable(card.getName())
);
}

private static final class PredicatePrintedWithRarity implements Predicate<PaperCard> {
private final CardRarity matchingRarity;

Expand Down
2 changes: 1 addition & 1 deletion forge-gui-mobile/src/forge/adventure/data/RewardData.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static private void initializeAllCards(){
if (configData.allowedEditions != null && configData.allowedEditions.length > 0) {
allCards = IterableUtil.filter(allCards, PaperCardPredicates.printedInAnyEditions(configData.allowedEditions));
} else if (configData.restrictedEditions != null && configData.restrictedEditions.length > 0) {
allCards = IterableUtil.filter(allCards, PaperCardPredicates.onlyPrintedInEditions(configData.restrictedEditions).negate());
allCards = IterableUtil.filter(allCards, PaperCardPredicates.isObtainableNotRestricted(configData.restrictedEditions));
} else {
allCards = IterableUtil.filter(allCards, PaperCardPredicates.isObtainableAnyEdition());
}
Expand Down