diff --git a/.gitattributes b/.gitattributes index ff8a77dbe6d..d426a44a5e4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1453,6 +1453,7 @@ res/cardsfolder/c/clout_of_the_dominus.txt svneol=native#text/plain res/cardsfolder/c/clutch_of_the_undercity.txt svneol=native#text/plain res/cardsfolder/c/clutch_of_undeath.txt svneol=native#text/plain res/cardsfolder/c/coal_golem.txt svneol=native#text/plain +res/cardsfolder/c/coalition_victory.txt -text svneol=unset#text/plain res/cardsfolder/c/coast_watcher.txt svneol=native#text/plain res/cardsfolder/c/coastal_drake.txt svneol=native#text/plain res/cardsfolder/c/coastal_hornclaw.txt svneol=native#text/plain diff --git a/res/cardsfolder/c/coalition_victory.txt b/res/cardsfolder/c/coalition_victory.txt new file mode 100644 index 00000000000..dc8dc9f5a57 --- /dev/null +++ b/res/cardsfolder/c/coalition_victory.txt @@ -0,0 +1,13 @@ +Name:Coalition Victory +ManaCost:3 W U B R G +Types:Sorcery +Text:no text +A:SP$ WinsGame | Cost$ 3 W U B R G | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ10 | SpellDescription$ If you have all basic lands and all colored creatures, you win mutha fucker. +SVar:Z:Count$ColoredCreatures +SVar:Y:Count$Domain +SVar:X:SVar$Y/Plus.Z +SVar:RemAIDeck:True + +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/coalition_victory.jpg +End \ No newline at end of file diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index a90949b1b25..32cc34f12b4 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -2942,7 +2942,6 @@ public class CardFactoryUtil { n++; } } - System.out.println("N is equal to" + n); return CardFactoryUtil.doXMath(n, m, c); } @@ -2956,7 +2955,21 @@ public class CardFactoryUtil { n++; } } - System.out.println("Opp N is equal to" + n); + return CardFactoryUtil.doXMath(n, m, c); + } + + //Count$ColoredCreatures *a DOMAIN for creatures* + if (sq[0].contains("ColoredCreatures")) { + someCards.addAll(cardController.getCardsIn(Zone.Battlefield)); + someCards = someCards.filter(CardListFilter.CREATURES); + + final String[] colors = { "green", "white", "red", "blue", "black" }; + + for (int i = 0; i < colors.length; i++) { + if (someCards.getColor(colors[i]).size() > 0) { + n++; + } + } return CardFactoryUtil.doXMath(n, m, c); }