From b4ca801766800ccf3ec16f93dde26e11f233282f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 20 Sep 2014 20:17:12 +0200 Subject: [PATCH] * Daybreak Coronet - Fixed that it was not checked correctly if the target of Daybreak Coronet was still legal. --- .../sets/futuresight/DaybreakCoronet.java | 48 ++++--- .../cards/single/DaybreakCoronetTest.java | 117 ++++++++++++++++++ 2 files changed, 149 insertions(+), 16 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/DaybreakCoronetTest.java diff --git a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java index e3eee7538e9..2f94acffbb0 100644 --- a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java +++ b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java @@ -30,10 +30,9 @@ package mage.sets.futuresight; import java.util.LinkedList; import java.util.List; import java.util.UUID; - -import mage.constants.*; 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.continious.BoostEnchantedEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -42,6 +41,12 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -55,12 +60,6 @@ import mage.target.common.TargetCreaturePermanent; */ public class DaybreakCoronet extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with another Aura attached to it."); - - static { - filter.add(new AuraAttachedPredicate()); - } - public DaybreakCoronet(UUID ownerId) { super(ownerId, 21, "Daybreak Coronet", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}{W}"); this.expansionSetCode = "FUT"; @@ -69,6 +68,8 @@ public class DaybreakCoronet extends CardImpl { this.color.setWhite(true); // Enchant creature with another Aura attached to it + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with another Aura attached to it."); + filter.add(new AuraAttachedPredicate(this.getId())); TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); @@ -76,10 +77,17 @@ public class DaybreakCoronet extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 and has first strike, vigilance, and lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); + Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); + effect.setText("and has first strike"); + ability.addEffect(effect); + effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); + effect.setText(", vigilance"); + ability.addEffect(effect); + effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA); + effect.setText(", and lifelink"); + ability.addEffect(effect); + this.addAbility(ability); } public DaybreakCoronet(final DaybreakCoronet card) { @@ -93,16 +101,24 @@ public class DaybreakCoronet extends CardImpl { } class AuraAttachedPredicate implements Predicate { + + private final UUID ownId; + + public AuraAttachedPredicate(UUID ownId) { + this.ownId = ownId; + } @Override public boolean apply(Permanent input, Game game) { List attachments = new LinkedList(); attachments.addAll(input.getAttachments()); for (UUID uuid : attachments) { - Permanent attachment = game.getPermanent(uuid); - if (attachment != null - && attachment.getSubtype().contains("Aura")) { - return true; + if (!uuid.equals(ownId)) { + Permanent attachment = game.getPermanent(uuid); + if (attachment != null + && attachment.getSubtype().contains("Aura")) { + return true; + } } } return false; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/DaybreakCoronetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/DaybreakCoronetTest.java new file mode 100644 index 00000000000..b2226fb6db6 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/DaybreakCoronetTest.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 org.mage.test.cards.single; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class DaybreakCoronetTest extends CardTestPlayerBase { + + // Daybreak Coronet {W}{W} + // Enchantment — Aura + // Enchant creature with another Aura attached to it + // Enchanted creature gets +3/+3 and has first strike, vigilance, and lifelink. (Damage dealt by the creature also causes its controller to gain that much life.) + + + @Test + public void testCantEnchantTargetWithoutAura() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.HAND, playerA, "Daybreak Coronet"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Daybreak Coronet", "Silvercoat Lion"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertPermanentCount(playerA, "Daybreak Coronet", 0); + + } + + @Test + public void testCanBeCastIfEnchantedByAura() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.HAND, playerA, "Holy Strength"); + addCard(Zone.HAND, playerA, "Daybreak Coronet"); + + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Holy Strength", "Silvercoat Lion"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Daybreak Coronet", "Silvercoat Lion"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertPermanentCount(playerA, "Daybreak Coronet", 1); + + } + /* + If Daybreak Coronet is already attached to a permanent and + the other aura is destroyed. The target for Daybreak Coronet + gets illegal and the Daybreak Coronet has to go to graveyard. + */ + @Test + public void testTargetGetsIllegal() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + addCard(Zone.HAND, playerA, "Holy Strength"); + addCard(Zone.HAND, playerA, "Daybreak Coronet"); + + addCard(Zone.BATTLEFIELD, playerB, "Plains", 1); + addCard(Zone.HAND, playerB, "Demystify"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Holy Strength", "Silvercoat Lion"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Daybreak Coronet", "Silvercoat Lion"); + + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Demystify", "Holy Strength"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertGraveyardCount(playerA, "Holy Strength", 1); + assertGraveyardCount(playerB, "Demystify", 1); + assertPermanentCount(playerA, "Daybreak Coronet", 0); + assertGraveyardCount(playerA, "Daybreak Coronet", 1); + + } +}