diff --git a/Mage.Sets/src/mage/cards/e/EverAfter.java b/Mage.Sets/src/mage/cards/e/EverAfter.java index 31b8dedeea..272d0aeda7 100644 --- a/Mage.Sets/src/mage/cards/e/EverAfter.java +++ b/Mage.Sets/src/mage/cards/e/EverAfter.java @@ -23,7 +23,7 @@ public final class EverAfter extends CardImpl { // Return up to two target creature cards from your graveyard to the battlefield. Each of those creatures is a black Zombie in addition // to its other colors and types. Put Ever After on the bottom of its owner's library. - this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); + this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, 2, new FilterCreatureCard("creature cards from your graveyard"))); Effect effect = new BecomesBlackZombieAdditionEffect(); effect.setText("Each of those creatures is a black Zombie in addition to its other colors and types"); diff --git a/Mage.Sets/src/mage/cards/r/Reveillark.java b/Mage.Sets/src/mage/cards/r/Reveillark.java index e1a5221631..dd4479bb48 100644 --- a/Mage.Sets/src/mage/cards/r/Reveillark.java +++ b/Mage.Sets/src/mage/cards/r/Reveillark.java @@ -38,9 +38,9 @@ public final class Reveillark extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Reveillark leaves the battlefield, return up to two target creature cards with power 2 or less from your graveyard to the battlefield. - Ability ability = new LeavesBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), false); + Ability ability = new LeavesBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false), false); ability.addTarget(new TargetCardInYourGraveyard(0,2,filter)); - this.addAbility(ability); + this.addAbility(ability); // Evoke {5}{W} this.addAbility(new EvokeAbility(this, "{5}{W}")); } diff --git a/Mage.Sets/src/mage/cards/s/SilvarDevourerOfTheFree.java b/Mage.Sets/src/mage/cards/s/SilvarDevourerOfTheFree.java index 4c5c9e3ab6..ad6a54a3b2 100644 --- a/Mage.Sets/src/mage/cards/s/SilvarDevourerOfTheFree.java +++ b/Mage.Sets/src/mage/cards/s/SilvarDevourerOfTheFree.java @@ -7,6 +7,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HexproofAbility; +import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.PartnerWithAbility; import mage.cards.CardImpl; @@ -50,8 +51,8 @@ public final class SilvarDevourerOfTheFree extends CardImpl { new SacrificeTargetCost(new TargetControlledPermanent(filter)) ); ability.addEffect(new GainAbilitySourceEffect( - HexproofAbility.getInstance(), Duration.EndOfTurn - ).setText("It gains hexproof until end of turn")); + IndestructibleAbility.getInstance(), Duration.EndOfTurn + ).setText("It gains indestructible until end of turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SliceAndDice.java b/Mage.Sets/src/mage/cards/s/SliceAndDice.java index 4a45fd36a4..77865c847b 100644 --- a/Mage.Sets/src/mage/cards/s/SliceAndDice.java +++ b/Mage.Sets/src/mage/cards/s/SliceAndDice.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageAllEffect; @@ -9,25 +7,25 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SliceAndDice extends CardImpl { public SliceAndDice(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); - + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); // Slice and Dice deals 4 damage to each creature. this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent())); // Cycling {2}{R} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}{R}"))); // When you cycle Slice and Dice, you may have it deal 1 damage to each creature. - this.addAbility(new CycleTriggeredAbility(new DamageAllEffect(1, new FilterCreaturePermanent()), true)); - + this.addAbility(new CycleTriggeredAbility(new DamageAllEffect(1, StaticFilters.FILTER_PERMANENT_CREATURE).setText("have it deal 1 damage to each creature"), true)); } public SliceAndDice(final SliceAndDice card) { diff --git a/Mage.Sets/src/mage/cards/s/SunTitan.java b/Mage.Sets/src/mage/cards/s/SunTitan.java index dc1625aebf..7a98c2b9e6 100644 --- a/Mage.Sets/src/mage/cards/s/SunTitan.java +++ b/Mage.Sets/src/mage/cards/s/SunTitan.java @@ -39,7 +39,7 @@ public final class SunTitan extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Whenever Sun Titan enters the battlefield or attacks, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield. - Ability ability = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), true); + Ability ability = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false), true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnburialRites.java b/Mage.Sets/src/mage/cards/u/UnburialRites.java index 985323e848..fea1ab9eb2 100644 --- a/Mage.Sets/src/mage/cards/u/UnburialRites.java +++ b/Mage.Sets/src/mage/cards/u/UnburialRites.java @@ -21,7 +21,7 @@ public final class UnburialRites extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{B}"); // Return target creature card from your graveyard to the battlefield. - this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); + this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); // Flashback {3}{W} diff --git a/Mage.Sets/src/mage/cards/w/WhiplashTrap.java b/Mage.Sets/src/mage/cards/w/WhiplashTrap.java index 26be4131c9..3fc89da184 100644 --- a/Mage.Sets/src/mage/cards/w/WhiplashTrap.java +++ b/Mage.Sets/src/mage/cards/w/WhiplashTrap.java @@ -31,7 +31,7 @@ public final class WhiplashTrap extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{U}"), WhiplashTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher()); // Return two target creatures to their owners' hands. - this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); + this.getSpellAbility().addEffect(new ReturnToHandTargetEffect().setText("return two target creatures to their owners' hands")); this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); }