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

Merge branch 'velus' into 'master'

Browse Source 
MH2: Mount Velus Manticore and support

See merge request core-developers/forge!4809
This commit is contained in:
Michael Kamensky
2021-06-03 05:15:59 +00:00
parent 7a3c9c5b49 5ac9d3fdff
commit 2144de87d4
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1966,6 +1966,15 @@ public class AbilityUtils {
if (sq[0].contains("CardSumPT")) {
return doXMath((c.getNetPower() + c.getNetToughness()), expr, c, ctb);
}
if (sq[0].contains("CardNumTypes")) {
Card ce;
if (sq[0].contains("Remembered")) {
ce = (Card) c.getFirstRemembered();
} else {
ce = c;
}
return doXMath(getNumberOfTypes(ce), expr, c, ctb);
}
if (sq[0].contains("CardNumColors")) {
return doXMath(CardUtil.getColors(c).countColors(), expr, c, ctb);
@@ -3647,6 +3656,12 @@ public class AbilityUtils {
return someCards;
}
public static int getNumberOfTypes(final Card card) {
EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class);
Iterables.addAll(types, card.getType().getCoreTypes());
return types.size();
}
public static int getCardTypesFromList(final CardCollectionView list) {
EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class);
for (Card c1 : list) {