Merge pull request #4014 from theelk801/master

Implemented Iridescent Drake and fixed bugs

Mage.Sets/src/mage/cards/i/IridescentDrake.java

@@ -0,0 +1,117 @@
+/*
+ *  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.cards.i;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.SubType;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.predicate.other.AuraCardCanAttachToPermanentId;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.common.TargetCardInGraveyard;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class IridescentDrake extends CardImpl {
+
+    public IridescentDrake(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
+
+        this.subtype.add(SubType.DRAKE);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When Iridescent Drake enters the battlefield, put target Aura card from a graveyard onto the battlefield under your control attached to Iridescent Drake.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new IridescentDrakeEffect());
+        ability.addTarget(new TargetCardInGraveyard());
+        this.addAbility(ability);
+    }
+
+    public IridescentDrake(final IridescentDrake card) {
+        super(card);
+    }
+
+    @Override
+    public IridescentDrake copy() {
+        return new IridescentDrake(this);
+    }
+}
+
+class IridescentDrakeEffect extends OneShotEffect {
+
+    public IridescentDrakeEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "put target Aura card from a graveyard onto the battlefield under your control attached to {this}";
+    }
+
+    public IridescentDrakeEffect(final IridescentDrakeEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public IridescentDrakeEffect copy() {
+        return new IridescentDrakeEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        Card targetAuraCard = game.getCard(source.getFirstTarget());
+        if (controller != null
+                && permanent != null
+                && controller.canRespond()
+                && targetAuraCard != null
+                && new AuraCardCanAttachToPermanentId(permanent.getId()).apply(targetAuraCard, game)) {
+            Target target = targetAuraCard.getSpellAbility().getTargets().get(0);
+            if (target != null) {
+                game.getState().setValue("attachTo:" + targetAuraCard.getId(), permanent);
+                controller.moveCards(targetAuraCard, Zone.BATTLEFIELD, source, game);
+                return permanent.addAttachment(targetAuraCard.getId(), game);
+            }
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/p/PrimalWellspring.java

@@ -81,7 +81,7 @@ class PyrimalWellspringTriggeredAbility extends TriggeredAbilityImpl {
     String abilityOriginalId;
 
     public PyrimalWellspringTriggeredAbility(UUID abilityOriginalId, Effect effect) {
-        super(Zone.ALL, effect, true);
+        super(Zone.ALL, effect, false);
         this.abilityOriginalId = abilityOriginalId.toString();
     }
 

Mage.Sets/src/mage/cards/p/PyromancersGoggles.java

@@ -54,7 +54,7 @@ import mage.target.targetpointer.FixedTarget;
 public class PyromancersGoggles extends CardImpl {
 
     public PyromancersGoggles(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}");
         addSuperType(SuperType.LEGENDARY);
 
         // {T}: Add {R} to your mana pool.
@@ -89,7 +89,7 @@ class PyromancersGogglesTriggeredAbility extends TriggeredAbilityImpl {
     String abilityOriginalId;
 
     public PyromancersGogglesTriggeredAbility(UUID abilityOriginalId, Effect effect) {
-        super(Zone.ALL, effect, true);
+        super(Zone.ALL, effect, false);
         this.abilityOriginalId = abilityOriginalId.toString();
     }
 

Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java

@@ -92,7 +92,7 @@ class SunbirdsInvocationTriggeredAbility extends SpellCastControllerTriggeredAbi
             if (spell != null && spell.getFromZone() == Zone.HAND) {
                 if (spell.getCard() != null) {
                     for (Effect effect : getEffects()) {
-                        effect.setTargetPointer(new FixedTarget(spell.getId()));
+                        effect.setTargetPointer(new FixedTarget(spell.getId(), spell.getZoneChangeCounter(game)));
                     }
                     return true;
                 }
@@ -126,7 +126,7 @@ class SunbirdsInvocationEffect extends OneShotEffect {
             return false;
         }
         Cards cards = new CardsImpl();
-        int xValue = game.getStack().getSpell(getTargetPointer().getFirst(game, source)).getConvertedManaCost();
+        int xValue = game.getLastKnownInformation(this.getTargetPointer().getFirst(game, source), Zone.STACK).getConvertedManaCost();
         cards.addAll(controller.getLibrary().getTopCards(game, xValue));
         if (!cards.isEmpty()) {
             controller.revealCards(sourceObject.getIdName(), cards, game);

Mage.Sets/src/mage/sets/UrzasDestiny.java

@@ -104,6 +104,7 @@ public class UrzasDestiny extends ExpansionSet {
         cards.add(new SetCardInfo("Hunting Moa", 109, Rarity.UNCOMMON, mage.cards.h.HuntingMoa.class));
         cards.add(new SetCardInfo("Illuminated Wings", 34, Rarity.COMMON, mage.cards.i.IlluminatedWings.class));
         cards.add(new SetCardInfo("Impatience", 88, Rarity.RARE, mage.cards.i.Impatience.class));
+        cards.add(new SetCardInfo("Iridescent Drake", 35, Rarity.UNCOMMON, mage.cards.i.IridescentDrake.class));
         cards.add(new SetCardInfo("Junk Diver", 132, Rarity.RARE, mage.cards.j.JunkDiver.class));
         cards.add(new SetCardInfo("Keldon Champion", 90, Rarity.UNCOMMON, mage.cards.k.KeldonChampion.class));
         cards.add(new SetCardInfo("Keldon Vandals", 91, Rarity.COMMON, mage.cards.k.KeldonVandals.class));