diff --git a/Mage.Sets/src/mage/cards/d/DeathbonnetSprout.java b/Mage.Sets/src/mage/cards/d/DeathbonnetSprout.java index 1dca8bc1abc..051e7980c91 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbonnetSprout.java +++ b/Mage.Sets/src/mage/cards/d/DeathbonnetSprout.java @@ -2,7 +2,7 @@ package mage.cards.d; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -16,6 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; +import mage.constants.TargetController; import mage.filter.StaticFilters; import java.util.UUID; @@ -43,7 +44,9 @@ public final class DeathbonnetSprout extends CardImpl { // At the beginning of your upkeep, mill a card. Then if there are three or more creature cards in your graveyard, transform Deathbonnet Sprout. this.addAbility(new TransformAbility()); - Ability ability = new EntersBattlefieldTriggeredAbility(new MillCardsControllerEffect(1)); + Ability ability = new BeginningOfUpkeepTriggeredAbility( + new MillCardsControllerEffect(1), TargetController.YOU, false + ); ability.addEffect(new ConditionalOneShotEffect( new TransformSourceEffect(true), condition, "Then if there are three or more creature cards in your graveyard, transform {this}" diff --git a/Mage.Sets/src/mage/cards/h/HallowedRespite.java b/Mage.Sets/src/mage/cards/h/HallowedRespite.java index c7176564068..8b790cd7edb 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedRespite.java +++ b/Mage.Sets/src/mage/cards/h/HallowedRespite.java @@ -38,7 +38,7 @@ public final class HallowedRespite extends CardImpl { // Exile target nonlegendary creature, then return it to the battlefield under its owner's control. If it entered under your control, put a +1/+1 counter on it. Otherwise, tap it. this.getSpellAbility().addEffect(new ExileTargetForSourceEffect()); - this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, false)); + this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, false).setText(", then return it to the battlefield under its owner's control")); this.getSpellAbility().addEffect(new HallowedRespiteEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/i/InheritedFiend.java b/Mage.Sets/src/mage/cards/i/InheritedFiend.java index 82cb137fd31..e76ba9ef80c 100644 --- a/Mage.Sets/src/mage/cards/i/InheritedFiend.java +++ b/Mage.Sets/src/mage/cards/i/InheritedFiend.java @@ -12,6 +12,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; +import mage.filter.FilterCard; +import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; import java.util.UUID; @@ -21,6 +23,8 @@ import java.util.UUID; */ public final class InheritedFiend extends CardImpl { + private static final FilterCard filter = new FilterCreatureCard("creature card from a graveyard"); + public InheritedFiend(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, ""); @@ -37,7 +41,7 @@ public final class InheritedFiend extends CardImpl { // {2}{B}: Exile target creature card from a graveyard. Put a +1/+1 counter on Inherited Fiend. Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).concatBy(".")); - ability.addTarget(new TargetCardInGraveyard()); + ability.addTarget(new TargetCardInGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrganHoarder.java b/Mage.Sets/src/mage/cards/o/OrganHoarder.java index 68116a867a7..e72aad0f934 100644 --- a/Mage.Sets/src/mage/cards/o/OrganHoarder.java +++ b/Mage.Sets/src/mage/cards/o/OrganHoarder.java @@ -29,7 +29,7 @@ public final class OrganHoarder extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( StaticValue.get(3), false, StaticValue.get(1), StaticFilters.FILTER_CARD, Zone.GRAVEYARD, false, false, false, Zone.HAND, false - ))); + ).setText("look at the top three cards of your library, then put one of them into your hand and the rest into your graveyard"))); } private OrganHoarder(final OrganHoarder card) { diff --git a/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java b/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java index 0463022624e..687b1aa3ef5 100644 --- a/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java +++ b/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java @@ -24,7 +24,7 @@ public final class OtherworldlyGaze extends CardImpl { this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect( StaticValue.get(3), false, StaticValue.get(5), StaticFilters.FILTER_CARD_CARDS, Zone.LIBRARY, true, false, true, Zone.GRAVEYARD, false - )); + ).setText("look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order")); // Flashback {1}{U} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{U}")));