From ddbd5f65140b20b35a3c665eebd922bc8faa6f24 Mon Sep 17 00:00:00 2001 From: michaelstephendavies Date: Sat, 16 Jul 2016 17:28:00 +0200 Subject: [PATCH 1/2] Add Infernal Caretaker --- .../mage/sets/legions/InfernalCaretaker.java | 114 ++++++++++++++++++ .../cards/single/InfernalCaretakerTest.java | 56 +++++++++ 2 files changed, 170 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/InfernalCaretakerTest.java diff --git a/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java b/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java new file mode 100644 index 00000000000..e2ea40816f7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java @@ -0,0 +1,114 @@ +/* + * 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.legions; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.keyword.MorphAbility; +import mage.cards.CardImpl; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.filter.common.FilterBySubtypeCard; +import mage.game.Game; +import mage.players.Player; + +/** + * + * @author cg5 + */ +public class InfernalCaretaker extends CardImpl { + + public InfernalCaretaker(UUID ownerId) { + super(ownerId, 76, "Infernal Caretaker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); + this.expansionSetCode = "LGN"; + this.subtype.add("Human"); + this.subtype.add("Cleric"); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // Morph {3}{B} + this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}"))); + + // When Infernal Caretaker is turned face up, return all Zombie cards from all graveyards to their owners' hands. + this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new InfernalCaretakerEffect())); + } + + public InfernalCaretaker(final InfernalCaretaker card) { + super(card); + } + + @Override + public InfernalCaretaker copy() { + return new InfernalCaretaker(this); + } +} + +class InfernalCaretakerEffect extends OneShotEffect { + + private static FilterCard zombieCard = new FilterBySubtypeCard("Zombie"); + + public InfernalCaretakerEffect() { + super(Outcome.ReturnToHand); + this.staticText = "return all Zombie cards from all graveyards to their owners' hands"; + } + + public InfernalCaretakerEffect(final InfernalCaretakerEffect effect) { + super(effect); + } + + @Override + public InfernalCaretakerEffect copy() { + return new InfernalCaretakerEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + Cards toHands = new CardsImpl(); + for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { + Player player = game.getPlayer(playerId); + if (player != null) { + toHands.addAll(player.getGraveyard().getCards(zombieCard, source.getSourceId(), controller.getId(), game)); + } + } + controller.moveCards(toHands.getCards(game), Zone.HAND, source, game); + return true; + } + return false; + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/InfernalCaretakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/InfernalCaretakerTest.java new file mode 100644 index 00000000000..5384067e996 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/InfernalCaretakerTest.java @@ -0,0 +1,56 @@ + +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 cg5 + */ +public class InfernalCaretakerTest extends CardTestPlayerBase { + + @Test + /* + * Infernal Caretaker {3}{B} + * Creature - Human Cleric + * Morph {3}{B} + * When Infernal Caretaker is turned face up, return all Zombie cards from + * all graveyards to their owners' hands. + */ + public void testInfernalCaretaker() { + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 10); + addCard(Zone.BATTLEFIELD, playerA, "Walking Corpse", 1); + addCard(Zone.HAND, playerA, "Infernal Caretaker", 1); + addCard(Zone.GRAVEYARD, playerA, "Walking Corpse", 4); + addCard(Zone.GRAVEYARD, playerA, "Storm Crow", 4); + + addCard(Zone.GRAVEYARD, playerB, "Festering Goblin", 4); + addCard(Zone.GRAVEYARD, playerB, "Elvish Visionary", 4); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Infernal Caretaker"); + setChoice(playerA, "Yes"); // Cast as a morph + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{3}{B}: Turn this face-down permanent face up."); + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "Infernal Caretaker", 1); + assertPermanentCount(playerA, "Walking Corpse", 1); + assertHandCount(playerA, "Walking Corpse", 4); + assertHandCount(playerA, "Storm Crow", 0); + assertHandCount(playerA, "Festering Goblin", 0); + assertHandCount(playerA, "Elvish Visionary", 0); + assertGraveyardCount(playerA, 4); // 4 * Storm Crow + + assertPermanentCount(playerB, "Infernal Caretaker", 0); + assertPermanentCount(playerB, "Walking Corpse", 0); + assertHandCount(playerB, "Walking Corpse", 0); + assertHandCount(playerB, "Storm Crow", 0); + assertHandCount(playerB, "Festering Goblin", 4); + assertHandCount(playerB, "Elvish Visionary", 0); + assertGraveyardCount(playerB, 4); // 4 * Elvish Visionary + } +} From ba4053c7252d33aa9eeea6439a824267d1e17faa Mon Sep 17 00:00:00 2001 From: michaelstephendavies Date: Sat, 16 Jul 2016 22:13:19 +0200 Subject: [PATCH 2/2] Infernal Caretaker - use ReturnToHandFromGraveyardAllEffect --- .../mage/sets/legions/InfernalCaretaker.java | 54 +++---------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java b/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java index e2ea40816f7..92d1a2a045e 100644 --- a/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java +++ b/Mage.Sets/src/mage/sets/legions/InfernalCaretaker.java @@ -29,22 +29,16 @@ package mage.sets.legions; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.ReturnToHandFromGraveyardAllEffect; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.Rarity; -import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterBySubtypeCard; -import mage.game.Game; -import mage.players.Player; /** * @@ -52,6 +46,8 @@ import mage.players.Player; */ public class InfernalCaretaker extends CardImpl { + private static FilterCard zombieCard = new FilterBySubtypeCard("Zombie"); + public InfernalCaretaker(UUID ownerId) { super(ownerId, 76, "Infernal Caretaker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "LGN"; @@ -64,7 +60,9 @@ public class InfernalCaretaker extends CardImpl { this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}"))); // When Infernal Caretaker is turned face up, return all Zombie cards from all graveyards to their owners' hands. - this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new InfernalCaretakerEffect())); + Effect effect = new ReturnToHandFromGraveyardAllEffect(zombieCard); + effect.setText("return all Zombie cards from all graveyards to their owners' hands"); + this.addAbility(new TurnedFaceUpSourceTriggeredAbility(effect)); } public InfernalCaretaker(final InfernalCaretaker card) { @@ -75,40 +73,4 @@ public class InfernalCaretaker extends CardImpl { public InfernalCaretaker copy() { return new InfernalCaretaker(this); } -} - -class InfernalCaretakerEffect extends OneShotEffect { - - private static FilterCard zombieCard = new FilterBySubtypeCard("Zombie"); - - public InfernalCaretakerEffect() { - super(Outcome.ReturnToHand); - this.staticText = "return all Zombie cards from all graveyards to their owners' hands"; - } - - public InfernalCaretakerEffect(final InfernalCaretakerEffect effect) { - super(effect); - } - - @Override - public InfernalCaretakerEffect copy() { - return new InfernalCaretakerEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player controller = game.getPlayer(source.getControllerId()); - if (controller != null) { - Cards toHands = new CardsImpl(); - for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { - Player player = game.getPlayer(playerId); - if (player != null) { - toHands.addAll(player.getGraveyard().getCards(zombieCard, source.getSourceId(), controller.getId(), game)); - } - } - controller.moveCards(toHands.getCards(game), Zone.HAND, source, game); - return true; - } - return false; - } -} +} \ No newline at end of file