MKM 20 cards (#4624)

* UPDATE

* update

* Fix Behind the Mask

* update

* final update

* Update living_conundrum.txt

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
This commit is contained in:
Simisays
2024-02-05 05:11:02 +01:00
committed by GitHub
parent 89c3f56953
commit f952b75d53
20 changed files with 200 additions and 22 deletions

View File

@@ -717,28 +717,7 @@ public class AbilityUtils {
val = doXMath(ObjectUtils.firstNonNull(count, 0), m, card, ability);
} else { // these ones only for handling lists
Iterable<Card> list = null;
if (calcX[0].startsWith("Sacrificed")) {
list = sa.getRootAbility().getPaidList("Sacrificed", true);
}
else if (calcX[0].startsWith("Discarded")) {
list = sa.getRootAbility().getPaidList("Discarded", true);
}
else if (calcX[0].startsWith("Exiled")) {
list = sa.getRootAbility().getPaidList("Exiled", true);
}
else if (calcX[0].startsWith("Milled")) {
list = sa.getRootAbility().getPaidList("Milled", true);
}
else if (calcX[0].startsWith("Tapped")) {
list = sa.getRootAbility().getPaidList("Tapped", true);
}
else if (calcX[0].startsWith("Revealed")) {
list = sa.getRootAbility().getPaidList("Revealed", true);
}
else if (calcX[0].startsWith("Returned")) {
list = sa.getRootAbility().getPaidList("Returned", true);
}
else if (calcX[0].startsWith("Targeted")) {
if (calcX[0].startsWith("Targeted")) {
list = sa.findTargetedCards();
}
else if (calcX[0].startsWith("AllTargeted")) {
@@ -775,6 +754,9 @@ public class AbilityUtils {
final SpellAbility root = sa.getRootAbility();
list = new CardCollection((Card) root.getReplacingObject(AbilityKey.fromString(calcX[0].substring(8))));
}
else {
list = getPaidCards(sa, calcX[0]);
}
if (list != null) {
// there could be null inside!
list = Iterables.filter(list, Card.class);