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

DeckHints: extend Type

Browse Source
This commit is contained in:
tool4EvEr
2022-02-19 20:18:13 +01:00
parent 267e071956
commit 797e9a3b66
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-core/src/main/java/forge/card/DeckHints.java
View File

@@ -176,7 +176,14 @@ public class DeckHints {
case TYPE:
String[] types = param.split("\\|");
for (String t : types) {
Iterables.addAll(cards, getMatchingItems(cardList, CardRulesPredicates.subType(t), PaperCard.FN_GET_RULES));
Predicate<CardRules> op;
if (t.contains(".")) {
String[] typeParts = t.split("\\.");
op = Predicates.and(CardRulesPredicates.coreType(true, typeParts[0]), CardRulesPredicates.subType(typeParts[1]));
} else {
op = Predicates.or(CardRulesPredicates.coreType(true, t), CardRulesPredicates.subType(t));
}
Iterables.addAll(cards, getMatchingItems(cardList, op, PaperCard.FN_GET_RULES));
}
break;
case NONE: