diff --git a/Mage.Sets/src/mage/cards/a/AshPartyCrasher.java b/Mage.Sets/src/mage/cards/a/AshPartyCrasher.java index 5e2d9a24d09..e43eeae3085 100644 --- a/Mage.Sets/src/mage/cards/a/AshPartyCrasher.java +++ b/Mage.Sets/src/mage/cards/a/AshPartyCrasher.java @@ -38,10 +38,11 @@ public final class AshPartyCrasher extends CardImpl { // Celebration -- Whenever Ash, Party Crasher attacks, if two or more nonland permanents entered the battlefield under your control this turn, put a +1/+1 counter on Ash. Ability ability = new ConditionalInterveningIfTriggeredAbility( new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false), - CelebrationCondition.instance, - "Whenever {this} attacks, if two or more nonland permanents entered the battlefield under your control this turn, put a +1/+1 counter on {this}." + CelebrationCondition.instance, "Whenever {this} attacks, if two or more nonland permanents " + + "entered the battlefield under your control this turn, put a +1/+1 counter on {this}." ); ability.setAbilityWord(AbilityWord.CELEBRATION); + ability.addHint(CelebrationCondition.getHint()); this.addAbility(ability, new CelebrationWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GallantPieWielder.java b/Mage.Sets/src/mage/cards/g/GallantPieWielder.java new file mode 100644 index 00000000000..8bcff02129e --- /dev/null +++ b/Mage.Sets/src/mage/cards/g/GallantPieWielder.java @@ -0,0 +1,51 @@ +package mage.cards.g; + +import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.CelebrationCondition; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.keyword.DoubleStrikeAbility; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.AbilityWord; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.watchers.common.CelebrationWatcher; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class GallantPieWielder extends CardImpl { + + public GallantPieWielder(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(2); + this.toughness = new MageInt(3); + + // First strike + this.addAbility(FirstStrikeAbility.getInstance()); + + // Celebration -- Gallant Pie-Wielder has double strike as long as two or more nonland permanents entered the battlefield under your control this turn. + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance()), + CelebrationCondition.instance, "{this} as double strike as long as two or " + + "more nonland permanents entered the battlefield under your control this turn" + )).addHint(CelebrationCondition.getHint()).setAbilityWord(AbilityWord.CELEBRATION), new CelebrationWatcher()); + } + + private GallantPieWielder(final GallantPieWielder card) { + super(card); + } + + @Override + public GallantPieWielder copy() { + return new GallantPieWielder(this); + } +} diff --git a/Mage.Sets/src/mage/sets/WildsOfEldraine.java b/Mage.Sets/src/mage/sets/WildsOfEldraine.java index d23a186c20f..61e13ee42b4 100644 --- a/Mage.Sets/src/mage/sets/WildsOfEldraine.java +++ b/Mage.Sets/src/mage/sets/WildsOfEldraine.java @@ -26,6 +26,7 @@ public final class WildsOfEldraine extends ExpansionSet { cards.add(new SetCardInfo("Faerie Dreamthief", 89, Rarity.UNCOMMON, mage.cards.f.FaerieDreamthief.class)); cards.add(new SetCardInfo("Forest", 266, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Frolicking Familiar", 226, Rarity.UNCOMMON, mage.cards.f.FrolickingFamiliar.class)); + cards.add(new SetCardInfo("Gallant Pie-Wielder", 15, Rarity.UNCOMMON, mage.cards.g.GallantPieWielder.class)); cards.add(new SetCardInfo("Glass Casket", 16, Rarity.UNCOMMON, mage.cards.g.GlassCasket.class)); cards.add(new SetCardInfo("Greta, Sweettooth Scourge", 205, Rarity.UNCOMMON, mage.cards.g.GretaSweettoothScourge.class)); cards.add(new SetCardInfo("Island", 263, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage/src/main/java/mage/abilities/condition/common/CelebrationCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CelebrationCondition.java index 1e7c9390dfe..ddc90bb27e8 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CelebrationCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CelebrationCondition.java @@ -3,6 +3,8 @@ package mage.abilities.condition.common; import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.abilities.hint.ConditionHint; +import mage.abilities.hint.Hint; import mage.game.Game; import mage.watchers.common.CelebrationWatcher; @@ -11,6 +13,7 @@ import mage.watchers.common.CelebrationWatcher; */ public enum CelebrationCondition implements Condition { instance; + private static final Hint hint = new ConditionHint(instance, "You had two or more nonland permanents enter this turn"); @Override public boolean apply(Game game, Ability source) { @@ -22,4 +25,8 @@ public enum CelebrationCondition implements Condition { public String toString() { return "two or more nonland permanents entered the battlefield under your control this turn"; } + + public static Hint getHint() { + return hint; + } }