diff --git a/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java b/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java index 32571d38f5c..6813e110d62 100644 --- a/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java +++ b/Mage.Sets/src/mage/sets/futuresight/ArcanumWings.java @@ -56,7 +56,6 @@ public class ArcanumWings extends CardImpl { this.expansionSetCode = "FUT"; this.subtype.add("Aura"); - // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java b/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java index 29ffc3e64a7..b5053cf16b1 100644 --- a/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java +++ b/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java @@ -31,11 +31,9 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; -import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.AsThoughEffectImpl; -import mage.abilities.effects.Effect; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -112,6 +110,7 @@ public class WorldheartPhoenix extends CardImpl { if (game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD) { Player player = game.getPlayer(affectedControllerId); if (player != null) { + // can sometimes be cast with base mana cost from grave???? player.setCastSourceIdWithAlternateMana(sourceId, new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); return true; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java index 118e1a529c6..7f0e7ac40b9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java @@ -36,6 +36,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -60,15 +61,22 @@ public class EldraziConscription extends CardImpl { this.subtype.add("Eldrazi"); this.subtype.add("Aura"); + // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AnnihilatorAbility(2), AttachmentType.AURA))); + + // Enchanted creature gets +10/+10 and has trample and annihilator 2 + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield)); + Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); + effect.setText("and has trample"); + ability.addEffect(effect); + effect = new GainAbilityAttachedEffect(new AnnihilatorAbility(2), AttachmentType.AURA); + effect.setText("and annihilator 2. (Whenever it attacks, defending player sacrifices two permanents.)"); + ability.addEffect(effect); + this.addAbility(ability); } public EldraziConscription (final EldraziConscription card) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AuraSwapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AuraSwapTest.java new file mode 100644 index 00000000000..04b4ee733d1 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AuraSwapTest.java @@ -0,0 +1,106 @@ +/* + * 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 org.mage.test.cards.abilities.keywords; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * 702.64. Aura swap + * 702.64a Aura swap is an activated ability of some Aura cards. + * "Aura swap [cost]" means "[Cost]: You may exchange this permanent with an Aura card in your hand." + * 702.64b If either half of the exchange can't be completed, the ability has no effect. + * + * @author LevelX2 + */ + +public class AuraSwapTest extends CardTestPlayerBase { + + /** + * Test normal swap + */ + @Test + public void testAuraSwap1() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + // Enchanted creature has flying. + // Aura swap {2}{U} + addCard(Zone.HAND, playerA, "Arcanum Wings"); // {1}{U} + + // Enchant creature + // Enchanted creature gets +10/+10 and has trample and annihilator 2. (Whenever it attacks, defending player sacrifices two permanents.) + addCard(Zone.HAND, playerA, "Eldrazi Conscription"); // {8} + + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcanum Wings", "Silvercoat Lion"); + + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Aura swap"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertHandCount(playerA, "Arcanum Wings", 1); + assertPermanentCount(playerA, "Eldrazi Conscription", 1); + assertPowerToughness(playerA, "Silvercoat Lion", 12, 12); + } + /** + * Test swap canceled because enchantment disenchanted + */ + @Test + public void testAuraSwap2() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + // Enchanted creature has flying. + // Aura swap {2}{U} + addCard(Zone.HAND, playerA, "Arcanum Wings"); // {1}{U} + + // Enchant creature + // Enchanted creature gets +10/+10 and has trample and annihilator 2. (Whenever it attacks, defending player sacrifices two permanents.) + addCard(Zone.HAND, playerA, "Eldrazi Conscription"); // {8} + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + + addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); + addCard(Zone.HAND, playerB, "Disenchant"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcanum Wings", "Silvercoat Lion"); + + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Aura swap"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Disenchant", "Arcanum Wings", "Aura swap"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertGraveyardCount(playerB, "Disenchant", 1); + + assertGraveyardCount(playerA, "Arcanum Wings", 1); + assertPermanentCount(playerA, "Eldrazi Conscription", 0); + assertHandCount(playerA, "Eldrazi Conscription", 1); + assertPowerToughness(playerA, "Silvercoat Lion", 2, 2); + } +}