Requested cards: added Skushroud Elf, Pill of the Paruns

Mage.Sets/src/mage/sets/conflux/AncientZiggurat.java

@@ -27,16 +27,16 @@
  */
 package mage.sets.conflux;
 
-import java.util.UUID;
 import mage.ConditionalMana;
-import mage.Mana;
 import mage.abilities.mana.ConditionalAnyColorManaAbility;
 import mage.abilities.mana.builder.ConditionalManaBuilder;
-import mage.abilities.mana.conditional.CreatureCastManaCondition;
+import mage.abilities.mana.conditional.CreatureCastConditionalMana;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author Plopman
@@ -65,7 +65,7 @@ public class AncientZiggurat extends CardImpl {
 class AncientZigguratManaBuilder extends ConditionalManaBuilder {
     @Override
     public ConditionalMana build(Object... options) {
-        return new AncientZigguratConditionalMana(this.mana);
+        return new CreatureCastConditionalMana(this.mana);
     }
 
     @Override
@@ -74,12 +74,4 @@ class AncientZigguratManaBuilder extends ConditionalManaBuilder {
     }
 }
 
-class AncientZigguratConditionalMana extends ConditionalMana {
-
-    public AncientZigguratConditionalMana(Mana mana) {
-        super(mana);
-        staticText = "Spend this mana only to cast a creature spell";
-        addCondition(new CreatureCastManaCondition());
-    }
-}
 

Mage.Sets/src/mage/sets/dissension/PillarOfTheParuns.java

@@ -0,0 +1,116 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.dissension;
+
+import mage.ConditionalMana;
+import mage.MageObject;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.mana.ConditionalAnyColorManaAbility;
+import mage.abilities.mana.builder.ConditionalManaBuilder;
+import mage.abilities.mana.conditional.ManaCondition;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.predicate.mageobject.MulticoloredPredicate;
+import mage.game.Game;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author noxx
+ */
+public class PillarOfTheParuns extends CardImpl {
+
+    public PillarOfTheParuns(UUID ownerId) {
+        super(ownerId, 176, "Pillar of the Paruns", Rarity.RARE, new CardType[]{CardType.LAND}, "");
+        this.expansionSetCode = "DIS";
+
+        // {tap}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell.
+        this.addAbility(new ConditionalAnyColorManaAbility(1, new PillarOfTheParunsManaBuilder()));
+    }
+
+    public PillarOfTheParuns(final PillarOfTheParuns card) {
+        super(card);
+    }
+
+    @Override
+    public PillarOfTheParuns copy() {
+        return new PillarOfTheParuns(this);
+    }
+}
+
+
+class PillarOfTheParunsManaBuilder extends ConditionalManaBuilder {
+    @Override
+    public ConditionalMana build(Object... options) {
+        return new PillarOfTheParunsConditionalMana(this.mana);
+    }
+
+    @Override
+    public String getRule() {
+        return "Spend this mana only to cast a multicolored spell";
+    }
+}
+
+class PillarOfTheParunsConditionalMana extends ConditionalMana {
+
+    public PillarOfTheParunsConditionalMana(Mana mana) {
+        super(mana);
+        staticText = "Spend this mana only to cast a multicolored spell";
+        addCondition(new MultiColoredSpellCastManaCondition());
+    }
+}
+
+class MultiColoredSpellCastManaCondition extends ManaCondition implements Condition {
+
+    private static final MulticoloredPredicate multicolored = new MulticoloredPredicate();
+
+    private static class LazyHolder {
+        private static final MulticoloredPredicate multicolored = new MulticoloredPredicate();
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        if (source instanceof SpellAbility) {
+            MageObject object = game.getObject(source.getSourceId());
+            if (object != null && LazyHolder.multicolored.apply(object, game)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source, UUID originalId) {
+        return apply(game, source);
+    }
+}

Mage.Sets/src/mage/sets/tempest/SkyshroudElf.java

@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.tempest;
+
+import mage.MageInt;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.mana.GreenManaAbility;
+import mage.abilities.mana.SimpleManaAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author noxx
+ */
+public class SkyshroudElf extends CardImpl {
+
+    public SkyshroudElf(UUID ownerId) {
+        super(ownerId, 149, "Skyshroud Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+        this.expansionSetCode = "TMP";
+        this.subtype.add("Elf");
+        this.subtype.add("Druid");
+
+        this.color.setGreen(true);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // {tap}: Add {G} to your mana pool.
+        this.addAbility(new GreenManaAbility());
+
+        // {1}: Add {R} or {W} to your mana pool.
+        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana, new ManaCostsImpl("{1}"));
+        this.addAbility(ability);
+        Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana, new ManaCostsImpl("{1}"));
+        this.addAbility(ability2);
+    }
+
+    public SkyshroudElf(final SkyshroudElf card) {
+        super(card);
+    }
+
+    @Override
+    public SkyshroudElf copy() {
+        return new SkyshroudElf(this);
+    }
+}

Mage/src/mage/abilities/mana/conditional/CreatureCastConditionalMana.java

@@ -37,7 +37,7 @@ public class CreatureCastConditionalMana extends ConditionalMana {
 
     public CreatureCastConditionalMana(Mana mana) {
         super(mana);
-        staticText = "Spend this mana only to cast creature spells";
+        staticText = "Spend this mana only to cast a creature spell";
         addCondition(new CreatureCastManaCondition());
     }
 }