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

CardType: sanisfy Battle types

Browse Source
This commit is contained in:
Hans Mackowiak
2023-04-08 18:41:40 +02:00
committed by Chris H
parent 2e24d43ab6
commit ae455edf9f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -619,6 +619,9 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
if (!isDungeon()) { if (!isDungeon()) {
Iterables.removeIf(subtypes, Predicates.IS_DUNGEON_TYPE); Iterables.removeIf(subtypes, Predicates.IS_DUNGEON_TYPE);
} }
if (!isBattle()) {
Iterables.removeIf(subtypes, Predicates.IS_BATTLE_TYPE);
}
} }
@Override @Override
@@ -857,6 +860,12 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
return CardType.isADungeonType(input); return CardType.isADungeonType(input);
} }
}; };
public static Predicate<String> IS_BATTLE_TYPE = new Predicate<String>() {
@Override
public boolean apply(String input) {
return CardType.isABattleType(input);
}
};
} }
///////// Utility methods ///////// Utility methods
@@ -890,6 +899,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
sortedSubTypes.addAll(Constant.ARTIFACT_TYPES); sortedSubTypes.addAll(Constant.ARTIFACT_TYPES);
sortedSubTypes.addAll(Constant.WALKER_TYPES); sortedSubTypes.addAll(Constant.WALKER_TYPES);
sortedSubTypes.addAll(Constant.DUNGEON_TYPES); sortedSubTypes.addAll(Constant.DUNGEON_TYPES);
sortedSubTypes.addAll(Constant.BATTLE_TYPES);
Collections.sort(sortedSubTypes); Collections.sort(sortedSubTypes);
} }
return sortedSubTypes; return sortedSubTypes;