diff --git a/Mage.Sets/src/mage/cards/s/ShipwreckSifters.java b/Mage.Sets/src/mage/cards/s/ShipwreckSifters.java new file mode 100644 index 0000000000..1e95e8709b --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/ShipwreckSifters.java @@ -0,0 +1,60 @@ +package mage.cards.s; + +import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.DiscardCardControllerTriggeredAbility; +import mage.abilities.effects.common.DrawDiscardControllerEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.DisturbAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.counters.CounterType; +import mage.filter.FilterCard; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AbilityPredicate; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class ShipwreckSifters extends CardImpl { + + private static final FilterCard filter = new FilterCard("a Spirit card or a card with disturb"); + + static { + filter.add(Predicates.or( + SubType.SPIRIT.getPredicate(), + new AbilityPredicate(DisturbAbility.class) + )); + } + + public ShipwreckSifters(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); + + this.subtype.add(SubType.SPIRIT); + this.power = new MageInt(1); + this.toughness = new MageInt(2); + + // When Shipwreck Sifters enters the battlefield, draw a card, then discard a card. + this.addAbility(new EntersBattlefieldTriggeredAbility( + new DrawDiscardControllerEffect(1, 1) + )); + + // Whenever you discard a Spirit card or a card with disturb, put a +1/+1 counter on Shipwreck Sifters. + this.addAbility(new DiscardCardControllerTriggeredAbility( + new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, filter + )); + } + + private ShipwreckSifters(final ShipwreckSifters card) { + super(card); + } + + @Override + public ShipwreckSifters copy() { + return new ShipwreckSifters(this); + } +} diff --git a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java index 97d0aab3b6..b3eea59b15 100644 --- a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java +++ b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java @@ -246,6 +246,7 @@ public final class InnistradMidnightHunt extends ExpansionSet { cards.add(new SetCardInfo("Shadowbeast Sighting", 198, Rarity.COMMON, mage.cards.s.ShadowbeastSighting.class)); cards.add(new SetCardInfo("Shady Traveler", 120, Rarity.COMMON, mage.cards.s.ShadyTraveler.class)); cards.add(new SetCardInfo("Shipwreck Marsh", 267, Rarity.RARE, mage.cards.s.ShipwreckMarsh.class)); + cards.add(new SetCardInfo("Shipwreck Sifters", 74, Rarity.COMMON, mage.cards.s.ShipwreckSifters.class)); cards.add(new SetCardInfo("Siege Zombie", 121, Rarity.COMMON, mage.cards.s.SiegeZombie.class)); cards.add(new SetCardInfo("Sigarda, Champion of Light", 240, Rarity.MYTHIC, mage.cards.s.SigardaChampionOfLight.class)); cards.add(new SetCardInfo("Sigardian Savior", 34, Rarity.MYTHIC, mage.cards.s.SigardianSavior.class)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/DiscardCardControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/effects/common/DiscardCardControllerTriggeredAbility.java index 0a0914953c..0d7a295b6c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DiscardCardControllerTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DiscardCardControllerTriggeredAbility.java @@ -11,7 +11,6 @@ import mage.game.events.GameEvent; /** * @author TheElk801 */ - public class DiscardCardControllerTriggeredAbility extends TriggeredAbilityImpl { private final FilterCard filter; @@ -48,6 +47,6 @@ public class DiscardCardControllerTriggeredAbility extends TriggeredAbilityImpl @Override public String getTriggerPhrase() { - return "Whenever you discard " + filter.getMessage() + ", " ; + return "Whenever you discard " + filter.getMessage() + ", "; } -} \ No newline at end of file +}