From 753340efc6d469ad5cdd40f1b96a9633e4c74745 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 11 Jun 2015 12:57:00 +0200 Subject: [PATCH] * Teferi, Mage of Zhalfir - Fixed that Flash was not given to cards in the libraray (so e.g. Mystical Teachings did not work for creatures that did not have Flash by itself). --- .../journeyintonyx/KeranosGodOfStorms.java | 2 - .../sets/timespiral/TeferiMageOfZhalfir.java | 7 +- .../add/AddAbilitiesToNonPermanentsTest.java | 78 +++++++++++++++++++ 3 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/add/AddAbilitiesToNonPermanentsTest.java diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java index 3175e4c5d0..f94df13e69 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java @@ -46,7 +46,6 @@ import mage.cards.CardImpl; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; -import mage.constants.PhaseStep; import mage.constants.Rarity; import mage.constants.WatcherScope; import mage.constants.Zone; @@ -56,7 +55,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.Watcher; -import mage.watchers.common.CardsDrawnDuringDrawStepWatcher; /** * diff --git a/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java b/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java index e545ced4af..12ce53027f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java +++ b/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java @@ -126,7 +126,12 @@ class TeferiMageOfZhalfirAddFlashEffect extends ContinuousEffectImpl { game.getState().addOtherAbility(card, FlashAbility.getInstance()); } } - // in Library seems not relevant yet + // in Library (e.g. for Mystical Teachings) + for (Card card: controller.getLibrary().getCards(game)) { + if (card.getOwnerId().equals(controller.getId()) && card.getCardType().contains(CardType.CREATURE)) { + game.getState().addOtherAbility(card, FlashAbility.getInstance()); + } + } return true; } return false; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/add/AddAbilitiesToNonPermanentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/add/AddAbilitiesToNonPermanentsTest.java new file mode 100644 index 0000000000..242f9e5c2a --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/add/AddAbilitiesToNonPermanentsTest.java @@ -0,0 +1,78 @@ +/* + * 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.add; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import mage.counters.CounterType; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class AddAbilitiesToNonPermanentsTest extends CardTestPlayerBase { + + + /** + * With Teferi, Mage of Zhalfir on the battlefield it has to be possible to search for + * a God of Storms in the deck by using Mystical Teachings. + * + */ + @Test + public void testSearchForCardWithFlashInLibrary() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + // Flash + // Creature cards you own that aren't on the battlefield have flash. + // Each opponent can cast spells only any time he or she could cast a sorcery. + addCard(Zone.BATTLEFIELD, playerA, "Teferi, Mage of Zhalfir"); + + // Search your library for an instant card or a card with flash, reveal it, and put it into your hand. Then shuffle your library. + // Flashback {5}{B} + addCard(Zone.HAND, playerA, "Mystical Teachings"); // "{3}{U}" + + addCard(Zone.LIBRARY, playerA, "Keranos, God of Storms"); + addCard(Zone.LIBRARY, playerA, "Plains", 3); + + skipInitShuffling(); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mystical Teachings"); + addTarget(playerA, "Keranos, God of Storms"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertGraveyardCount(playerA, "Mystical Teachings", 1); + assertHandCount(playerA, "Keranos, God of Storms", 1); + } +}