From 0530b52f8799b6101b71961da1bfddf387944ae2 Mon Sep 17 00:00:00 2001 From: arcox <10953229+arcox@users.noreply.github.com> Date: Tue, 30 Jun 2020 19:30:22 -0400 Subject: [PATCH 1/3] Implement Circling Vultures from WTH (#5489) --- .../src/mage/cards/c/CirclingVultures.java | 90 +++++++++++++++++++ Mage.Sets/src/mage/sets/Weatherlight.java | 1 + 2 files changed, 91 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/c/CirclingVultures.java diff --git a/Mage.Sets/src/mage/cards/c/CirclingVultures.java b/Mage.Sets/src/mage/cards/c/CirclingVultures.java new file mode 100644 index 00000000000..bbb995d19f2 --- /dev/null +++ b/Mage.Sets/src/mage/cards/c/CirclingVultures.java @@ -0,0 +1,90 @@ +package mage.cards.c; + +import java.util.UUID; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.DiscardSourceCost; +import mage.abilities.costs.common.ExileTopCreatureCardOfGraveyardCost; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.*; +import mage.game.Game; + +/** + * @author arcox + */ +public final class CirclingVultures extends CardImpl { + + public CirclingVultures(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}"); + this.subtype.add(SubType.BIRD); + + this.power = new MageInt(3); + this.toughness = new MageInt(2); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // You may discard Circling Vultures any time you could cast an instant. + this.addAbility(new SimpleActivatedAbility(Zone.HAND, new CirclingVulturesEffect(), new CirclingVulturesCost())); + + // At the beginning of your upkeep, sacrifice Circling Vultures unless you exile the top creature card of your graveyard. + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ExileTopCreatureCardOfGraveyardCost(1)), TargetController.YOU, false)); + } + + public CirclingVultures(final CirclingVultures card) { + super(card); + } + + @Override + public CirclingVultures copy() { + return new CirclingVultures(this); + } +} + +class CirclingVulturesCost extends DiscardSourceCost { + public CirclingVulturesCost() { + } + + public CirclingVulturesCost(CirclingVulturesCost cost) { + super(cost); + } + + @Override + public CirclingVulturesCost copy() { + return new CirclingVulturesCost(this); + } + + @Override + public String getText() { + return ""; + } +} + +class CirclingVulturesEffect extends OneShotEffect { + + public CirclingVulturesEffect() { + super(Outcome.Neutral); + this.staticText = "You may discard {this} any time you could cast an instant"; + } + + public CirclingVulturesEffect(final CirclingVulturesEffect effect) { + super(effect); + } + + @Override + public CirclingVulturesEffect copy() { + return new CirclingVulturesEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + return true; + } +} diff --git a/Mage.Sets/src/mage/sets/Weatherlight.java b/Mage.Sets/src/mage/sets/Weatherlight.java index 873a13d575d..081e00769bd 100644 --- a/Mage.Sets/src/mage/sets/Weatherlight.java +++ b/Mage.Sets/src/mage/sets/Weatherlight.java @@ -65,6 +65,7 @@ public final class Weatherlight extends ExpansionSet { cards.add(new SetCardInfo("Choking Vines", 123, Rarity.COMMON, mage.cards.c.ChokingVines.class)); cards.add(new SetCardInfo("Cinder Giant", 93, Rarity.UNCOMMON, mage.cards.c.CinderGiant.class)); cards.add(new SetCardInfo("Cinder Wall", 94, Rarity.COMMON, mage.cards.c.CinderWall.class)); + cards.add(new SetCardInfo("Circling Vultures", 64, Rarity.UNCOMMON, mage.cards.c.CirclingVultures.class)); cards.add(new SetCardInfo("Cloud Djinn", 36, Rarity.UNCOMMON, mage.cards.c.CloudDjinn.class)); cards.add(new SetCardInfo("Coils of the Medusa", 65, Rarity.COMMON, mage.cards.c.CoilsOfTheMedusa.class)); cards.add(new SetCardInfo("Cone of Flame", 95, Rarity.UNCOMMON, mage.cards.c.ConeOfFlame.class)); From 27af985288c55ae708d8b784bc2dd19b41771c6e Mon Sep 17 00:00:00 2001 From: arcox <10953229+arcox@users.noreply.github.com> Date: Wed, 8 Jul 2020 18:25:10 -0400 Subject: [PATCH 2/3] Make Circling Vulture discard effect a special action without cost --- .../src/mage/cards/c/CirclingVultures.java | 54 ++++++++++++------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CirclingVultures.java b/Mage.Sets/src/mage/cards/c/CirclingVultures.java index bbb995d19f2..02930e30955 100644 --- a/Mage.Sets/src/mage/cards/c/CirclingVultures.java +++ b/Mage.Sets/src/mage/cards/c/CirclingVultures.java @@ -4,17 +4,18 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; +import mage.abilities.SpecialAction; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.common.ExileTopCreatureCardOfGraveyardCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; +import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.game.Game; +import mage.players.Player; /** * @author arcox @@ -32,7 +33,7 @@ public final class CirclingVultures extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You may discard Circling Vultures any time you could cast an instant. - this.addAbility(new SimpleActivatedAbility(Zone.HAND, new CirclingVulturesEffect(), new CirclingVulturesCost())); + this.addAbility(new CirclingVulturesSpecialAction()); // At the beginning of your upkeep, sacrifice Circling Vultures unless you exile the top creature card of your graveyard. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ExileTopCreatureCardOfGraveyardCost(1)), TargetController.YOU, false)); @@ -48,43 +49,56 @@ public final class CirclingVultures extends CardImpl { } } -class CirclingVulturesCost extends DiscardSourceCost { - public CirclingVulturesCost() { +class CirclingVulturesSpecialAction extends SpecialAction { + + public CirclingVulturesSpecialAction() { + super(Zone.HAND); + this.setMayActivate(TargetController.YOU); + this.addEffect(new CirclingVulturesDiscardEffect()); } - public CirclingVulturesCost(CirclingVulturesCost cost) { - super(cost); + public CirclingVulturesSpecialAction(final CirclingVulturesSpecialAction ability) { + super(ability); } @Override - public CirclingVulturesCost copy() { - return new CirclingVulturesCost(this); + public CirclingVulturesSpecialAction copy() { + return new CirclingVulturesSpecialAction(this); } @Override - public String getText() { - return ""; + public String getRule() { + return "You may discard {this} any time you could cast an instant."; } } -class CirclingVulturesEffect extends OneShotEffect { - - public CirclingVulturesEffect() { +class CirclingVulturesDiscardEffect extends OneShotEffect { + public CirclingVulturesDiscardEffect() { super(Outcome.Neutral); - this.staticText = "You may discard {this} any time you could cast an instant"; + this.staticText = "discard {this}"; } - public CirclingVulturesEffect(final CirclingVulturesEffect effect) { + public CirclingVulturesDiscardEffect(final CirclingVulturesDiscardEffect effect) { super(effect); } @Override - public CirclingVulturesEffect copy() { - return new CirclingVulturesEffect(this); + public CirclingVulturesDiscardEffect copy() { + return new CirclingVulturesDiscardEffect(this); } @Override public boolean apply(Game game, Ability source) { - return true; + Player player = game.getPlayer(source.getControllerId()); + if (player == null) { + return false; + } + + Card card = player.getHand().get(source.getSourceId(), game); + if (card == null) { + return false; + } + + return player.discard(card, source, game); } -} +} \ No newline at end of file From 4bcffe6bcb083d3b26fa452de98c4021cd2d4ba3 Mon Sep 17 00:00:00 2001 From: arcox <10953229+arcox@users.noreply.github.com> Date: Wed, 8 Jul 2020 18:27:49 -0400 Subject: [PATCH 3/3] newline at eof --- Mage.Sets/src/mage/cards/c/CirclingVultures.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/c/CirclingVultures.java b/Mage.Sets/src/mage/cards/c/CirclingVultures.java index 02930e30955..bee9f4ca4b1 100644 --- a/Mage.Sets/src/mage/cards/c/CirclingVultures.java +++ b/Mage.Sets/src/mage/cards/c/CirclingVultures.java @@ -101,4 +101,4 @@ class CirclingVulturesDiscardEffect extends OneShotEffect { return player.discard(card, source, game); } -} \ No newline at end of file +}