diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java index 1e6ebb4e64f..e8aeae06184 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FeralDeceiver.java @@ -28,28 +28,22 @@ package mage.sets.championsofkamigawa; import java.util.UUID; + +import mage.abilities.common.FeralDeceiverAbility; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; -import mage.cards.Card; import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.game.Game; -import mage.players.Player; /** * @@ -84,38 +78,3 @@ public class FeralDeceiver extends CardImpl { } } -class FeralDeceiverAbility extends LimitedTimesPerTurnActivatedAbility { - - public FeralDeceiverAbility(Zone zone, Effect effect, Cost cost) { - super(zone, effect, cost); - } - - public FeralDeceiverAbility(FeralDeceiverAbility ability) { - super(ability); - } - - @Override - public FeralDeceiverAbility copy() { - return new FeralDeceiverAbility(this); - } - - @Override - public boolean checkIfClause(Game game) { - Player player = game.getPlayer(this.getControllerId()); - if (player != null) { - Cards cards = new CardsImpl(); - Card card = player.getLibrary().getFromTop(game); - cards.add(card); - player.revealCards("Feral Deceiver", cards, game); - if (card != null && card.getCardType().contains(CardType.LAND)) { - return true; - } - } - return false; - } - - @Override - public String getRule() { - return "{2}: Reveal the top card of your library. If it's a land card, {this} gets +2/+2 and gains trample until end of turn. Activate this ability only once each turn."; - } -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java index 106785dc970..1294815ffd4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HarshDeceiver.java @@ -29,27 +29,20 @@ package mage.sets.championsofkamigawa; import java.util.UUID; +import mage.abilities.common.FeralDeceiverAbility; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.cards.Card; import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.game.Game; -import mage.players.Player; /** * @@ -83,39 +76,3 @@ public class HarshDeceiver extends CardImpl { return new HarshDeceiver(this); } } - -class HarshDeceiverAbility extends LimitedTimesPerTurnActivatedAbility { - - public HarshDeceiverAbility(Zone zone, Effect effect, Cost cost) { - super(zone, effect, cost); - } - - public HarshDeceiverAbility(HarshDeceiverAbility ability) { - super(ability); - } - - @Override - public HarshDeceiverAbility copy() { - return new HarshDeceiverAbility(this); - } - - @Override - public boolean checkIfClause(Game game) { - Player player = game.getPlayer(this.getControllerId()); - if (player != null) { - Cards cards = new CardsImpl(); - Card card = player.getLibrary().getFromTop(game); - cards.add(card); - player.revealCards("Harsh Deceiver", cards, game); - if (card != null && card.getCardType().contains(CardType.LAND)) { - return true; - } - } - return false; - } - - @Override - public String getRule() { - return "{2}: Reveal the top card of your library. If it's a land card, untap {this} and it gets +1/+1 until end of turn. Activate this ability only once each turn."; - } -} \ No newline at end of file diff --git a/Mage/src/main/java/mage/abilities/common/FeralDeceiverAbility.java b/Mage/src/main/java/mage/abilities/common/FeralDeceiverAbility.java new file mode 100644 index 00000000000..7258b908e33 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/common/FeralDeceiverAbility.java @@ -0,0 +1,50 @@ +package mage.abilities.common; + +import mage.abilities.costs.Cost; +import mage.abilities.effects.Effect; +import mage.cards.Card; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Zone; +import mage.game.Game; +import mage.players.Player; + +/** + * Created by Eric on 9/24/2016. + */ +public class FeralDeceiverAbility extends LimitedTimesPerTurnActivatedAbility { + + public FeralDeceiverAbility(Zone zone, Effect effect, Cost cost) { + super(zone, effect, cost); + } + + public FeralDeceiverAbility(FeralDeceiverAbility ability) { + super(ability); + } + + @Override + public FeralDeceiverAbility copy() { + return new FeralDeceiverAbility(this); + } + + @Override + public boolean checkIfClause(Game game) { + Player player = game.getPlayer(this.getControllerId()); + if (player != null) { + Cards cards = new CardsImpl(); + Card card = player.getLibrary().getFromTop(game); + cards.add(card); + player.revealCards("Feral Deceiver", cards, game); + if (card != null && card.getCardType().contains(CardType.LAND)) { + return true; + } + } + return false; + } + + @Override + public String getRule() { + return "{2}: Reveal the top card of your library. If it's a land card, {this} gets +2/+2 and gains trample until end of turn. Activate this ability only once each turn."; + } +}