diff --git a/Mage.Sets/src/mage/cards/s/StockpilingCelebrant.java b/Mage.Sets/src/mage/cards/s/StockpilingCelebrant.java new file mode 100644 index 00000000000..d50e8ed3d51 --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/StockpilingCelebrant.java @@ -0,0 +1,55 @@ +package mage.cards.s; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.filter.common.FilterControlledPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AnotherPredicate; +import mage.target.common.TargetControlledPermanent; + +import java.util.UUID; + +/** + * @author Susucr + */ +public final class StockpilingCelebrant extends CardImpl { + + private static final FilterControlledPermanent filter = + new FilterControlledPermanent("another target nonland permanent you control"); + + static { + filter.add(AnotherPredicate.instance); + filter.add(Predicates.not(CardType.LAND.getPredicate())); + } + + public StockpilingCelebrant(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); + + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.KNIGHT); + this.power = new MageInt(3); + this.toughness = new MageInt(2); + + // When Stockpiling Celebrant enters the battlefield, you may return another target nonland permanent you control to its owner's hand. If you do, scry 2. + Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true); + ability.addTarget(new TargetControlledPermanent(filter)); + ability.addEffect(new ScryEffect(2, false).concatBy("If you do,")); + this.addAbility(ability); + } + + private StockpilingCelebrant(final StockpilingCelebrant card) { + super(card); + } + + @Override + public StockpilingCelebrant copy() { + return new StockpilingCelebrant(this); + } +} diff --git a/Mage.Sets/src/mage/sets/WildsOfEldraine.java b/Mage.Sets/src/mage/sets/WildsOfEldraine.java index 622fc68488b..98a8828c8d7 100644 --- a/Mage.Sets/src/mage/sets/WildsOfEldraine.java +++ b/Mage.Sets/src/mage/sets/WildsOfEldraine.java @@ -225,6 +225,7 @@ public final class WildsOfEldraine extends ExpansionSet { cards.add(new SetCardInfo("Spiteful Hexmage", 108, Rarity.RARE, mage.cards.s.SpitefulHexmage.class)); cards.add(new SetCardInfo("Splashy Spellcaster", 70, Rarity.UNCOMMON, mage.cards.s.SplashySpellcaster.class)); cards.add(new SetCardInfo("Stingblade Assassin", 109, Rarity.COMMON, mage.cards.s.StingbladeAssassin.class)); + cards.add(new SetCardInfo("Stockpiling Celebrant", 32, Rarity.COMMON, mage.cards.s.StockpilingCelebrant.class)); cards.add(new SetCardInfo("Stonesplitter Bolt", 151, Rarity.UNCOMMON, mage.cards.s.StonesplitterBolt.class)); cards.add(new SetCardInfo("Stormkeld Prowler", 71, Rarity.COMMON, mage.cards.s.StormkeldProwler.class)); cards.add(new SetCardInfo("Stormkeld Vanguard", 187, Rarity.UNCOMMON, mage.cards.s.StormkeldVanguard.class)); diff --git a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java index 72b099e1b20..d79614c6af7 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java @@ -37,7 +37,7 @@ public class ReturnToHandChosenControlledPermanentCost extends CostImpl { } } - public ReturnToHandChosenControlledPermanentCost(ReturnToHandChosenControlledPermanentCost cost) { + private ReturnToHandChosenControlledPermanentCost(final ReturnToHandChosenControlledPermanentCost cost) { super(cost); }