Improved interactions between pay X and other effects;

Mage.Sets/src/mage/cards/c/CeruleanDrake.java

@@ -0,0 +1,84 @@
+package mage.cards.c;
+
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.effects.common.CounterTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.ProtectionAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.ObjectPlayer;
+import mage.filter.predicate.ObjectPlayerPredicate;
+import mage.game.Game;
+import mage.game.stack.StackObject;
+import mage.target.TargetSpell;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class CeruleanDrake extends CardImpl {
+
+    private static final FilterSpell filter = new FilterSpell("spell that targets you");
+
+    static {
+        filter.add(CeruleanDrakePredicate.instance);
+    }
+
+    public CeruleanDrake(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
+
+        this.subtype.add(SubType.DRAKE);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Protection from red
+        this.addAbility(ProtectionAbility.from(ObjectColor.RED));
+
+        // Sacrifice Cerulean Drake: Counter target spell that targets you.
+        Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new SacrificeSourceCost());
+        ability.addTarget(new TargetSpell(filter));
+        this.addAbility(ability);
+    }
+
+    private CeruleanDrake(final CeruleanDrake card) {
+        super(card);
+    }
+
+    @Override
+    public CeruleanDrake copy() {
+        return new CeruleanDrake(this);
+    }
+}
+
+enum CeruleanDrakePredicate implements ObjectPlayerPredicate<ObjectPlayer<StackObject>> {
+    instance;
+
+    @Override
+    public boolean apply(ObjectPlayer<StackObject> input, Game game) {
+        if (input.getPlayerId() == null) {
+            return false;
+        }
+        return input
+                .getObject()
+                .getStackAbility()
+                .getTargets()
+                .stream()
+                .anyMatch(
+                        target -> target
+                                .getTargets()
+                                .stream()
+                                .anyMatch(uuid -> uuid != null && uuid.equals(input.getPlayerId()))
+                );
+    }
+}

Mage.Sets/src/mage/cards/d/DrawnFromDreams.java

@@ -0,0 +1,36 @@
+package mage.cards.d;
+
+import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.abilities.effects.common.LookLibraryAndPickControllerEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Zone;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class DrawnFromDreams extends CardImpl {
+
+    public DrawnFromDreams(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}{U}");
+
+        // Look at the top seven cards of your library. Put two of them into your hand and the rest on the bottom of your library in a random order.
+        this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(
+                new StaticValue(7), false, new StaticValue(2),
+                StaticFilters.FILTER_CARD, Zone.LIBRARY, false, false
+        ).setBackInRandomOrder(true));
+    }
+
+    private DrawnFromDreams(final DrawnFromDreams card) {
+        super(card);
+    }
+
+    @Override
+    public DrawnFromDreams copy() {
+        return new DrawnFromDreams(this);
+    }
+}

Mage.Sets/src/mage/cards/e/ElvishReclaimer.java

@@ -0,0 +1,67 @@
+package mage.cards.e;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.CardsInControllerGraveCondition;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.StaticFilters;
+import mage.target.common.TargetCardInLibrary;
+import mage.target.common.TargetControlledPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ElvishReclaimer extends CardImpl {
+
+    private static final Condition condition
+            = new CardsInControllerGraveCondition(3, StaticFilters.FILTER_CARD_LAND);
+
+    public ElvishReclaimer(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}");
+
+        this.subtype.add(SubType.ELF);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(2);
+
+        // Elvish Reclaimer gets +2/+2 as long as there are three or more land cards in your graveyard.
+        this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
+                new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield),
+                condition, "{this} gets +2/+2 as long as there are three or more land cards in your graveyard."
+        )));
+
+        // {2}, {T}, Sacrifice a land: Search your library for a land card, put it onto the battlefield tapped, then shuffle your library.
+        Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(
+                new TargetCardInLibrary(StaticFilters.FILTER_CARD_LAND_A), true
+        ), new GenericManaCost(2));
+        ability.addCost(new TapSourceCost());
+        ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(
+                StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT
+        )));
+        this.addAbility(ability);
+    }
+
+    private ElvishReclaimer(final ElvishReclaimer card) {
+        super(card);
+    }
+
+    @Override
+    public ElvishReclaimer copy() {
+        return new ElvishReclaimer(this);
+    }
+}

Mage.Sets/src/mage/cards/f/FerociousPup.java

@@ -0,0 +1,38 @@
+package mage.cards.f;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.game.permanent.token.WolfToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class FerociousPup extends CardImpl {
+
+    public FerociousPup(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
+
+        this.subtype.add(SubType.WOLF);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(1);
+
+        // When Ferocious Pup enters the battlefield, create a 2/2 green Wolf creature token.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken())));
+    }
+
+    private FerociousPup(final FerociousPup card) {
+        super(card);
+    }
+
+    @Override
+    public FerociousPup copy() {
+        return new FerociousPup(this);
+    }
+}

Mage.Sets/src/mage/cards/h/HeraldOfTheSun.java

@@ -0,0 +1,61 @@
+package mage.cards.h;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class HeraldOfTheSun extends CardImpl {
+
+    private static final FilterPermanent filter
+            = new FilterCreaturePermanent("another target creature with flying");
+
+    static {
+        filter.add(new AbilityPredicate(FlyingAbility.class));
+        filter.add(AnotherPredicate.instance);
+    }
+
+    public HeraldOfTheSun(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}");
+
+        this.subtype.add(SubType.ANGEL);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // {3}{W}: Put a +1/+1 counter on another target creature with flying.
+        Ability ability = new SimpleActivatedAbility(
+                new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{3}{W}")
+        );
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability);
+    }
+
+    private HeraldOfTheSun(final HeraldOfTheSun card) {
+        super(card);
+    }
+
+    @Override
+    public HeraldOfTheSun copy() {
+        return new HeraldOfTheSun(this);
+    }
+}

Mage.Sets/src/mage/cards/l/LeylineOfAbundance.java

@@ -0,0 +1,57 @@
+package mage.cards.l;
+
+import mage.Mana;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.TapForManaAllTriggeredManaAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.ManaEffect;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+import mage.abilities.effects.mana.BasicManaEffect;
+import mage.abilities.keyword.LeylineAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SetTargetPointer;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class LeylineOfAbundance extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterCreaturePermanent("you tap a creature");
+
+    public LeylineOfAbundance(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}");
+
+        // If Leyline of Abundance is in your opening hand, you may begin the game with it on the battlefield.
+        this.addAbility(LeylineAbility.getInstance());
+
+        // Whenever you tap a creature for mana, add an additional {G}.
+        this.addAbility(new TapForManaAllTriggeredManaAbility(
+                (ManaEffect) new BasicManaEffect(Mana.GreenMana(1))
+                        .setText("add an additional {G}"),
+                filter, SetTargetPointer.NONE
+        ));
+
+        // {6}{G}{G}: Put a +1/+1 counter on each creature you control.
+        this.addAbility(new SimpleActivatedAbility(new AddCountersAllEffect(
+                CounterType.P1P1.createInstance(),
+                StaticFilters.FILTER_CONTROLLED_CREATURE
+        ), new ManaCostsImpl("{6}{G}{G}")));
+    }
+
+    private LeylineOfAbundance(final LeylineOfAbundance card) {
+        super(card);
+    }
+
+    @Override
+    public LeylineOfAbundance copy() {
+        return new LeylineOfAbundance(this);
+    }
+}

Mage.Sets/src/mage/cards/l/LotusField.java

@@ -0,0 +1,51 @@
+package mage.cards.l;
+
+import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.SacrificeControllerEffect;
+import mage.abilities.effects.mana.AddManaOfAnyColorEffect;
+import mage.abilities.keyword.HexproofAbility;
+import mage.abilities.mana.SimpleManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Zone;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class LotusField extends CardImpl {
+
+    public LotusField(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
+
+        // Hexproof
+        this.addAbility(HexproofAbility.getInstance());
+
+        // Lotus Field enters the battlefield tapped.
+        this.addAbility(new EntersBattlefieldTappedAbility());
+
+        // When Lotus Field enters the battlefield, sacrifice two lands.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(
+                new SacrificeControllerEffect(StaticFilters.FILTER_LAND, 2, "")
+        ));
+
+        // {T}: Add three mana of any color.
+        this.addAbility(new SimpleManaAbility(
+                Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new TapSourceCost()
+        ));
+    }
+
+    private LotusField(final LotusField card) {
+        super(card);
+    }
+
+    @Override
+    public LotusField copy() {
+        return new LotusField(this);
+    }
+}

Mage.Sets/src/mage/cards/m/ManifoldKey.java

@@ -0,0 +1,56 @@
+package mage.cards.m;
+
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterArtifactPermanent;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ManifoldKey extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterArtifactPermanent("another target artifact");
+
+    static {
+        filter.add(AnotherPredicate.instance);
+    }
+
+    public ManifoldKey(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}");
+
+        // {1}, {T}: Untap another target artifact.
+        Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(1));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability);
+
+        // {3}, {T}: Target creature can't be blocked this turn.
+        ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), new GenericManaCost(3));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    private ManifoldKey(final ManifoldKey card) {
+        super(card);
+    }
+
+    @Override
+    public ManifoldKey copy() {
+        return new ManifoldKey(this);
+    }
+}

Mage.Sets/src/mage/cards/m/MuYanlingSkyDancer.java

@@ -0,0 +1,60 @@
+package mage.cards.m;
+
+import mage.abilities.Ability;
+import mage.abilities.LoyaltyAbility;
+import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.GetEmblemEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.effects.common.continuous.LoseAbilityTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.game.command.emblems.MuYanlingSkyDancerEmblem;
+import mage.game.permanent.token.MuYanlingSkyDancerToken;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class MuYanlingSkyDancer extends CardImpl {
+
+    public MuYanlingSkyDancer(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{1}{U}{U}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.YANLING);
+        this.addAbility(new PlaneswalkerEntersWithLoyaltyCountersAbility(2));
+
+        // +2: Until your next turn, up to one target creature gets -2/-0 and loses flying.
+        Ability ability = new LoyaltyAbility(new BoostTargetEffect(
+                -2, 0, Duration.UntilYourNextTurn
+        ).setText("Until your next turn, up to one target creature gets -2/-0"), 2);
+        ability.addEffect(new LoseAbilityTargetEffect(
+                FlyingAbility.getInstance(), Duration.UntilYourNextTurn
+        ).setText("and loses flying"));
+        ability.addTarget(new TargetCreaturePermanent(0, 1));
+        this.addAbility(ability);
+
+        // −3: Create a 4/4 blue Elemental Bird creature token with flying.
+        this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new MuYanlingSkyDancerToken()), -3));
+
+        // −8: You get an emblem with "Islands you control have '{T}: Draw a card'."
+        this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new MuYanlingSkyDancerEmblem())));
+    }
+
+    private MuYanlingSkyDancer(final MuYanlingSkyDancer card) {
+        super(card);
+    }
+
+    @Override
+    public MuYanlingSkyDancer copy() {
+        return new MuYanlingSkyDancer(this);
+    }
+}

Mage.Sets/src/mage/cards/o/OgreSiegebreaker.java

@@ -0,0 +1,53 @@
+package mage.cards.o;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class OgreSiegebreaker extends CardImpl {
+
+    private static final FilterPermanent filter
+            = new FilterCreaturePermanent("creature that was dealt damage this turn");
+
+    static {
+        filter.add(new WasDealtDamageThisTurnPredicate());
+    }
+
+    public OgreSiegebreaker(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{R}");
+
+        this.subtype.add(SubType.OGRE);
+        this.subtype.add(SubType.BERSERKER);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(3);
+
+        // {2}{B}{R}: Destroy target creature that was dealt damage this turn.
+        Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}{R}"));
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability);
+    }
+
+    private OgreSiegebreaker(final OgreSiegebreaker card) {
+        super(card);
+    }
+
+    @Override
+    public OgreSiegebreaker copy() {
+        return new OgreSiegebreaker(this);
+    }
+}

Mage.Sets/src/mage/cards/r/RetributiveWand.java

@@ -0,0 +1,46 @@
+package mage.cards.r;
+
+import mage.abilities.Ability;
+import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.target.common.TargetAnyTarget;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class RetributiveWand extends CardImpl {
+
+    public RetributiveWand(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
+
+        // {3}, {T}: Retributive Wand deals 1 damage to any target.
+        Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(3));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetAnyTarget());
+        this.addAbility(ability);
+
+        // When Retributive Wand is put into a graveyard from the battlefield, it deals 5 damage to any target.
+        ability = new PutIntoGraveFromBattlefieldSourceTriggeredAbility(
+                new DamageTargetEffect(5, "it")
+        );
+        ability.addTarget(new TargetAnyTarget());
+        this.addAbility(ability);
+    }
+
+    private RetributiveWand(final RetributiveWand card) {
+        super(card);
+    }
+
+    @Override
+    public RetributiveWand copy() {
+        return new RetributiveWand(this);
+    }
+}

Mage.Sets/src/mage/cards/s/SpectralSailor.java

@@ -0,0 +1,49 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.keyword.FlashAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class SpectralSailor extends CardImpl {
+
+    public SpectralSailor(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}");
+
+        this.subtype.add(SubType.SPIRIT);
+        this.subtype.add(SubType.PIRATE);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Flash
+        this.addAbility(FlashAbility.getInstance());
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // {3}{U}: Draw a card.
+        this.addAbility(new SimpleActivatedAbility(
+                new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}")
+        ));
+    }
+
+    private SpectralSailor(final SpectralSailor card) {
+        super(card);
+    }
+
+    @Override
+    public SpectralSailor copy() {
+        return new SpectralSailor(this);
+    }
+}

Mage.Sets/src/mage/cards/v/VoraciousHydra.java

@@ -0,0 +1,104 @@
+package mage.cards.v;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect;
+import mage.abilities.effects.common.FightTargetSourceEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class VoraciousHydra extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.NOT_YOU));
+    }
+
+    public VoraciousHydra(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{X}{G}{G}");
+
+        this.subtype.add(SubType.HYDRA);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(1);
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+
+        // Voracious Hydra enters the battlefield with X +1/+1 counters on it.
+        this.addAbility(new EntersBattlefieldAbility(
+                new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance())
+        ));
+
+        // When Voracious Hydra enters the battlefield, choose one —
+        // • Double the number of +1/+1 counters on Voracious Hydra.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new VoraciousHydraEffect(), false);
+
+        // • Voracious Hydra fights target creature you don't control.
+        Mode mode = new Mode(
+                new FightTargetSourceEffect()
+                        .setText("{this} fights target creature you don't control")
+        );
+        mode.addTarget(new TargetPermanent(filter));
+        ability.addMode(mode);
+        this.addAbility(ability);
+    }
+
+    private VoraciousHydra(final VoraciousHydra card) {
+        super(card);
+    }
+
+    @Override
+    public VoraciousHydra copy() {
+        return new VoraciousHydra(this);
+    }
+}
+
+class VoraciousHydraEffect extends OneShotEffect {
+
+    VoraciousHydraEffect() {
+        super(Outcome.Benefit);
+        staticText = "Double the number of +1/+1 counters on {this}";
+    }
+
+    private VoraciousHydraEffect(final VoraciousHydraEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public VoraciousHydraEffect copy() {
+        return new VoraciousHydraEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (permanent == null) {
+            return false;
+        }
+        return permanent.addCounters(CounterType.P1P1.createInstance(
+                permanent.getCounters(game).getCount(CounterType.P1P1)
+        ), source, game);
+    }
+}

Mage.Sets/src/mage/cards/w/WolfridersSaddle.java

@@ -0,0 +1,86 @@
+package mage.cards.w;
+
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneSourceEffect;
+import mage.abilities.effects.common.continuous.BoostEquippedEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EquipAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.AttachmentType;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.permanent.token.WolfToken;
+import mage.players.Player;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class WolfridersSaddle extends CardImpl {
+
+    public WolfridersSaddle(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}{G}");
+
+        this.subtype.add(SubType.EQUIPMENT);
+
+        // When Wolfrider's Saddle enters the battlefield, create a 2/2 green Wolf creature token, then attach Wolfrider's Saddle to it.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new WolfridersSaddleEffect()));
+
+        // Equipped creature gets +1/+1 and can't be blocked by more than one creature.
+        Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 1));
+        ability.addEffect(new GainAbilityAttachedEffect(
+                new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect()), AttachmentType.EQUIPMENT
+        ).setText("and can't be blocked by more than one creature"));
+        this.addAbility(ability);
+
+        // Equip {3}
+        this.addAbility(new EquipAbility(3));
+    }
+
+    private WolfridersSaddle(final WolfridersSaddle card) {
+        super(card);
+    }
+
+    @Override
+    public WolfridersSaddle copy() {
+        return new WolfridersSaddle(this);
+    }
+}
+
+class WolfridersSaddleEffect extends CreateTokenEffect {
+
+    WolfridersSaddleEffect() {
+        super(new WolfToken());
+        staticText = "create a 2/2 green Wolf creature token, then attach {this} to it.";
+    }
+
+    private WolfridersSaddleEffect(final WolfridersSaddleEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null == !super.apply(game, source)) {
+            return false;
+        }
+        Permanent p = game.getPermanent(this.getLastAddedTokenId());
+        if (p == null) {
+            return false;
+        }
+        p.addAttachment(source.getSourceId(), game);
+        return true;
+    }
+
+    @Override
+    public WolfridersSaddleEffect copy() {
+        return new WolfridersSaddleEffect(this);
+    }
+}

Mage.Sets/src/mage/cards/y/YarokTheDesecrated.java

@@ -0,0 +1,101 @@
+package mage.cards.y;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.abilities.keyword.DeathtouchAbility;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.game.Game;
+import mage.game.events.EntersTheBattlefieldEvent;
+import mage.game.events.GameEvent;
+import mage.game.events.NumberOfTriggersEvent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class YarokTheDesecrated extends CardImpl {
+
+    public YarokTheDesecrated(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{G}{U}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.ELEMENTAL);
+        this.subtype.add(SubType.HORROR);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(5);
+
+        // Deathtouch
+        this.addAbility(DeathtouchAbility.getInstance());
+
+        // Lifelink
+        this.addAbility(LifelinkAbility.getInstance());
+
+        // If a permanent entering the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
+        this.addAbility(new SimpleStaticAbility(new YarokTheDesecratedEffect()));
+    }
+
+    private YarokTheDesecrated(final YarokTheDesecrated card) {
+        super(card);
+    }
+
+    @Override
+    public YarokTheDesecrated copy() {
+        return new YarokTheDesecrated(this);
+    }
+}
+
+class YarokTheDesecratedEffect extends ReplacementEffectImpl {
+
+    YarokTheDesecratedEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.Benefit);
+        staticText = "If a permanent entering the battlefield causes a triggered ability " +
+                "of a permanent you control to trigger, that ability triggers an additional time";
+    }
+
+    private YarokTheDesecratedEffect(final YarokTheDesecratedEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public YarokTheDesecratedEffect copy() {
+        return new YarokTheDesecratedEffect(this);
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.NUMBER_OF_TRIGGERS;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        if (!(event instanceof NumberOfTriggersEvent)) {
+            return false;
+        }
+        NumberOfTriggersEvent numberOfTriggersEvent = (NumberOfTriggersEvent) event;
+        if (!source.isControlledBy(event.getPlayerId())) {
+            return false;
+        }
+        GameEvent sourceEvent = numberOfTriggersEvent.getSourceEvent();
+        // Only EtB triggers
+        if (sourceEvent == null
+                || sourceEvent.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD
+                || !(sourceEvent instanceof EntersTheBattlefieldEvent)) {
+            return false;
+        }
+        EntersTheBattlefieldEvent entersTheBattlefieldEvent = (EntersTheBattlefieldEvent) sourceEvent;
+        // Only for triggers of permanents
+        return game.getPermanent(numberOfTriggersEvent.getSourceId()) != null;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        event.setAmount(event.getAmount() + 1);
+        return false;
+    }
+}

Mage.Sets/src/mage/sets/CoreSet2020.java

@@ -36,6 +36,7 @@ public final class CoreSet2020 extends ExpansionSet {
         cards.add(new SetCardInfo("Bloodthirsty Aerialist", 91, Rarity.UNCOMMON, mage.cards.b.BloodthirstyAerialist.class));
         cards.add(new SetCardInfo("Bone Splinters", 92, Rarity.COMMON, mage.cards.b.BoneSplinters.class));
         cards.add(new SetCardInfo("Captivating Gyre", 51, Rarity.UNCOMMON, mage.cards.c.CaptivatingGyre.class));
+        cards.add(new SetCardInfo("Cerulean Drake", 53, Rarity.UNCOMMON, mage.cards.c.CeruleanDrake.class));
         cards.add(new SetCardInfo("Chandra's Embercat", 129, Rarity.COMMON, mage.cards.c.ChandrasEmbercat.class));
         cards.add(new SetCardInfo("Chandra's Spitfire", 132, Rarity.UNCOMMON, mage.cards.c.ChandrasSpitfire.class));
         cards.add(new SetCardInfo("Chandra, Acolyte of Flame", 126, Rarity.RARE, mage.cards.c.ChandraAcolyteOfFlame.class));
@@ -50,10 +51,13 @@ public final class CoreSet2020 extends ExpansionSet {
         cards.add(new SetCardInfo("Disenchant", 14, Rarity.COMMON, mage.cards.d.Disenchant.class));
         cards.add(new SetCardInfo("Disfigure", 95, Rarity.UNCOMMON, mage.cards.d.Disfigure.class));
         cards.add(new SetCardInfo("Dragon Mage", 135, Rarity.UNCOMMON, mage.cards.d.DragonMage.class));
+        cards.add(new SetCardInfo("Drawn from Dreams", 56, Rarity.RARE, mage.cards.d.DrawnFromDreams.class));
         cards.add(new SetCardInfo("Dread Presence", 96, Rarity.RARE, mage.cards.d.DreadPresence.class));
         cards.add(new SetCardInfo("Dungeon Geists", 57, Rarity.RARE, mage.cards.d.DungeonGeists.class));
+        cards.add(new SetCardInfo("Elvish Reclaimer", 169, Rarity.RARE, mage.cards.e.ElvishReclaimer.class));
         cards.add(new SetCardInfo("Ember Hauler", 137, Rarity.UNCOMMON, mage.cards.e.EmberHauler.class));
         cards.add(new SetCardInfo("Empyrean Eagle", 208, Rarity.UNCOMMON, mage.cards.e.EmpyreanEagle.class));
+        cards.add(new SetCardInfo("Ferocious Pup", 171, Rarity.COMMON, mage.cards.f.FerociousPup.class));
         cards.add(new SetCardInfo("Field of the Dead", 247, Rarity.RARE, mage.cards.f.FieldOfTheDead.class));
         cards.add(new SetCardInfo("Flame Sweep", 139, Rarity.UNCOMMON, mage.cards.f.FlameSweep.class));
         cards.add(new SetCardInfo("Flood of Tears", 59, Rarity.RARE, mage.cards.f.FloodOfTears.class));
@@ -62,31 +66,42 @@ public final class CoreSet2020 extends ExpansionSet {
         cards.add(new SetCardInfo("Goblin Ringleader", 143, Rarity.UNCOMMON, mage.cards.g.GoblinRingleader.class));
         cards.add(new SetCardInfo("Growth Cycle", 175, Rarity.COMMON, mage.cards.g.GrowthCycle.class));
         cards.add(new SetCardInfo("Hanged Executioner", 22, Rarity.RARE, mage.cards.h.HangedExecutioner.class));
+        cards.add(new SetCardInfo("Heart-Piercer Bow", 228, Rarity.COMMON, mage.cards.h.HeartPiercerBow.class));
+        cards.add(new SetCardInfo("Herald of the Sun", 23, Rarity.UNCOMMON, mage.cards.h.HeraldOfTheSun.class));
         cards.add(new SetCardInfo("Infuriate", 145, Rarity.COMMON, mage.cards.i.Infuriate.class));
         cards.add(new SetCardInfo("Ironroot Warlord", 209, Rarity.UNCOMMON, mage.cards.i.IronrootWarlord.class));
         cards.add(new SetCardInfo("Kaalia, Zenith Seeker", 210, Rarity.MYTHIC, mage.cards.k.KaaliaZenithSeeker.class));
         cards.add(new SetCardInfo("Kykar, Wind's Fury", 212, Rarity.MYTHIC, mage.cards.k.KykarWindsFury.class));
+        cards.add(new SetCardInfo("Leyline of Abundance", 179, Rarity.RARE, mage.cards.l.LeylineOfAbundance.class));
         cards.add(new SetCardInfo("Leyline of Anticipation", 64, Rarity.RARE, mage.cards.l.LeylineOfAnticipation.class));
         cards.add(new SetCardInfo("Leyline of Sanctity", 26, Rarity.RARE, mage.cards.l.LeylineOfSanctity.class));
         cards.add(new SetCardInfo("Leyline of the Void", 107, Rarity.RARE, mage.cards.l.LeylineOfTheVoid.class));
         cards.add(new SetCardInfo("Loaming Shaman", 180, Rarity.UNCOMMON, mage.cards.l.LoamingShaman.class));
+        cards.add(new SetCardInfo("Lotus Field", 249, Rarity.RARE, mage.cards.l.LotusField.class));
         cards.add(new SetCardInfo("Loxodon Lifechanter", 27, Rarity.RARE, mage.cards.l.LoxodonLifechanter.class));
         cards.add(new SetCardInfo("Loyal Pegasus", 28, Rarity.UNCOMMON, mage.cards.l.LoyalPegasus.class));
+        cards.add(new SetCardInfo("Manifold Key", 230, Rarity.UNCOMMON, mage.cards.m.ManifoldKey.class));
         cards.add(new SetCardInfo("Moldervine Reclamation", 214, Rarity.UNCOMMON, mage.cards.m.MoldervineReclamation.class));
+        cards.add(new SetCardInfo("Mu Yanling, Sky Dancer", 68, Rarity.MYTHIC, mage.cards.m.MuYanlingSkyDancer.class));
         cards.add(new SetCardInfo("Negate", 69, Rarity.COMMON, mage.cards.n.Negate.class));
         cards.add(new SetCardInfo("Octoprophet", 70, Rarity.COMMON, mage.cards.o.Octoprophet.class));
+        cards.add(new SetCardInfo("Ogre Siegebreaker", 215, Rarity.UNCOMMON, mage.cards.o.OgreSiegebreaker.class));
         cards.add(new SetCardInfo("Pacifism", 32, Rarity.COMMON, mage.cards.p.Pacifism.class));
         cards.add(new SetCardInfo("Planar Cleansing", 33, Rarity.RARE, mage.cards.p.PlanarCleansing.class));
         cards.add(new SetCardInfo("Pulse of Murasa", 189, Rarity.UNCOMMON, mage.cards.p.PulseOfMurasa.class));
         cards.add(new SetCardInfo("Raise the Alarm", 34, Rarity.COMMON, mage.cards.r.RaiseTheAlarm.class));
         cards.add(new SetCardInfo("Reckless Air Strike", 154, Rarity.COMMON, mage.cards.r.RecklessAirStrike.class));
+        cards.add(new SetCardInfo("Renowned Weaponsmith", 72, Rarity.UNCOMMON, mage.cards.r.RenownedWeaponsmith.class));
+        cards.add(new SetCardInfo("Retributive Wand", 236, Rarity.UNCOMMON, mage.cards.r.RetributiveWand.class));
         cards.add(new SetCardInfo("Rotting Regisaur", 111, Rarity.RARE, mage.cards.r.RottingRegisaur.class));
         cards.add(new SetCardInfo("Rule of Law", 35, Rarity.UNCOMMON, mage.cards.r.RuleOfLaw.class));
         cards.add(new SetCardInfo("Scholar of the Ages", 74, Rarity.UNCOMMON, mage.cards.s.ScholarOfTheAges.class));
         cards.add(new SetCardInfo("Scuttlemutt", 238, Rarity.UNCOMMON, mage.cards.s.Scuttlemutt.class));
         cards.add(new SetCardInfo("Silverback Shaman", 195, Rarity.COMMON, mage.cards.s.SilverbackShaman.class));
         cards.add(new SetCardInfo("Sorin, Imperious Bloodlord", 115, Rarity.MYTHIC, mage.cards.s.SorinImperiousBloodlord.class));
+        cards.add(new SetCardInfo("Spectral Sailor", 76, Rarity.UNCOMMON, mage.cards.s.SpectralSailor.class));
         cards.add(new SetCardInfo("Starfield Mystic", 39, Rarity.RARE, mage.cards.s.StarfieldMystic.class));
+        cards.add(new SetCardInfo("Steel Overseer", 239, Rarity.RARE, mage.cards.s.SteelOverseer.class));
         cards.add(new SetCardInfo("Temple of Epiphany", 253, Rarity.RARE, mage.cards.t.TempleOfEpiphany.class));
         cards.add(new SetCardInfo("Temple of Malady", 254, Rarity.RARE, mage.cards.t.TempleOfMalady.class));
         cards.add(new SetCardInfo("Temple of Mystery", 255, Rarity.RARE, mage.cards.t.TempleOfMystery.class));
@@ -98,7 +113,12 @@ public final class CoreSet2020 extends ExpansionSet {
         cards.add(new SetCardInfo("Unchained Berserker", 164, Rarity.UNCOMMON, mage.cards.u.UnchainedBerserker.class));
         cards.add(new SetCardInfo("Unsummon", 78, Rarity.COMMON, mage.cards.u.Unsummon.class));
         cards.add(new SetCardInfo("Vampire of the Dire Moon", 120, Rarity.UNCOMMON, mage.cards.v.VampireOfTheDireMoon.class));
+        cards.add(new SetCardInfo("Vial of Dragonfire", 241, Rarity.COMMON, mage.cards.v.VialOfDragonfire.class));
+        cards.add(new SetCardInfo("Voracious Hydra", 200, Rarity.RARE, mage.cards.v.VoraciousHydra.class));
         cards.add(new SetCardInfo("Wakeroot Elemental", 202, Rarity.RARE, mage.cards.w.WakerootElemental.class));
+        cards.add(new SetCardInfo("Wolfkin Bond", 203, Rarity.COMMON, mage.cards.w.WolfkinBond.class));
+        cards.add(new SetCardInfo("Wolfrider's Saddle", 204, Rarity.UNCOMMON, mage.cards.w.WolfridersSaddle.class));
         cards.add(new SetCardInfo("Yarok's Fenlurker", 123, Rarity.UNCOMMON, mage.cards.y.YaroksFenlurker.class));
+        cards.add(new SetCardInfo("Yarok, the Desecrated", 220, Rarity.MYTHIC, mage.cards.y.YarokTheDesecrated.class));
     }
 }