From 249935bd1b725c89c1c27d359cc523761da01716 Mon Sep 17 00:00:00 2001 From: grimreap124 <19590931+grimreap124@users.noreply.github.com> Date: Sun, 23 Jun 2024 09:50:41 +1000 Subject: [PATCH] [ACR] Implement Escape Detection (#12501) * ACR-Implement-Escape-Detection * ACR-Implement-Escape-Detection --- .../src/mage/cards/e/EscapeDetection.java | 58 +++++++++++++++++++ Mage.Sets/src/mage/sets/AssassinsCreed.java | 1 + .../abilities/keyword/FreerunningAbility.java | 9 ++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/cards/e/EscapeDetection.java diff --git a/Mage.Sets/src/mage/cards/e/EscapeDetection.java b/Mage.Sets/src/mage/cards/e/EscapeDetection.java new file mode 100644 index 00000000000..ff81d39f7c4 --- /dev/null +++ b/Mage.Sets/src/mage/cards/e/EscapeDetection.java @@ -0,0 +1,58 @@ +package mage.cards.e; + +import java.util.UUID; + +import mage.ObjectColor; +import mage.abilities.Ability; +import mage.abilities.costs.Cost; +import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; +import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.abilities.keyword.FreerunningAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterControlledPermanent; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.target.common.TargetControlledCreaturePermanent; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author grimreap124 + */ +public final class EscapeDetection extends CardImpl { + + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature you control"); + + static { + filter.add(new ColorPredicate(ObjectColor.BLUE)); + } + + public EscapeDetection(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); + + + // Freerunning--Return a blue creature you control to its owner's hand. + Cost cost = new ReturnToHandChosenControlledPermanentCost( + new TargetControlledCreaturePermanent(1, 1, filter, true)); + this.addAbility(new FreerunningAbility(cost)); + + // Return target creature to its owner's hand. + this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + // Draw a card. + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); + } + + private EscapeDetection(final EscapeDetection card) { + super(card); + } + + @Override + public EscapeDetection copy() { + return new EscapeDetection(this); + } +} diff --git a/Mage.Sets/src/mage/sets/AssassinsCreed.java b/Mage.Sets/src/mage/sets/AssassinsCreed.java index 11d513d5384..ad001d782ec 100644 --- a/Mage.Sets/src/mage/sets/AssassinsCreed.java +++ b/Mage.Sets/src/mage/sets/AssassinsCreed.java @@ -43,6 +43,7 @@ public final class AssassinsCreed extends ExpansionSet { cards.add(new SetCardInfo("Detained by Legionnaires", 277, Rarity.COMMON, mage.cards.d.DetainedByLegionnaires.class)); cards.add(new SetCardInfo("Eagle Vision", 17, Rarity.UNCOMMON, mage.cards.e.EagleVision.class)); cards.add(new SetCardInfo("Eivor, Battle-Ready", 274, Rarity.MYTHIC, mage.cards.e.EivorBattleReady.class)); + cards.add(new SetCardInfo("Escape Detection", 18, Rarity.UNCOMMON, mage.cards.e.EscapeDetection.class)); cards.add(new SetCardInfo("Escarpment Fortress", 278, Rarity.RARE, mage.cards.e.EscarpmentFortress.class)); cards.add(new SetCardInfo("Ezio, Blade of Vengeance", 275, Rarity.MYTHIC, mage.cards.e.EzioBladeOfVengeance.class)); cards.add(new SetCardInfo("Fatal Push", 90, Rarity.UNCOMMON, mage.cards.f.FatalPush.class)); diff --git a/Mage/src/main/java/mage/abilities/keyword/FreerunningAbility.java b/Mage/src/main/java/mage/abilities/keyword/FreerunningAbility.java index 93d653edca6..79bbeb6ecf9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FreerunningAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FreerunningAbility.java @@ -3,6 +3,9 @@ package mage.abilities.keyword; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeSourceCostsImpl; +import mage.abilities.costs.Cost; +import mage.abilities.costs.mana.ManaCost; +import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.hint.ConditionHint; import mage.abilities.hint.Hint; import mage.constants.SubType; @@ -28,7 +31,11 @@ public class FreerunningAbility extends AlternativeSourceCostsImpl { "if you dealt combat damage to a player this turn with an Assassin or commander"; public FreerunningAbility(String manaString) { - super(FREERUNNING_KEYWORD, FREERUNNING_REMINDER, manaString); + this(new ManaCostsImpl<>(manaString)); + } + + public FreerunningAbility(Cost cost) { + super(FREERUNNING_KEYWORD, FREERUNNING_REMINDER, cost); this.setRuleAtTheTop(true); this.addWatcher(new FreerunningWatcher()); this.addHint(FreerunningCondition.getHint());