diff --git a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java index 762ff96ce0..8268bcd0d3 100644 --- a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java +++ b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -63,7 +64,7 @@ public class CabalTherapy extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new CabalTherapyEffect()); // Flashback-Sacrifice a creature. - this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1)), TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,new FilterControlledCreaturePermanent("a creature"), true)), TimingRule.SORCERY)); } public CabalTherapy(final CabalTherapy card) { @@ -80,7 +81,7 @@ class CabalTherapyEffect extends OneShotEffect { public CabalTherapyEffect() { super(Outcome.Exile); - staticText = "Name a nonland card. Search target player's hand for all cards with that name and discard them."; + staticText = "Name a nonland card. Search target player's hand for all cards with that name and discard them"; } public CabalTherapyEffect(final CabalTherapyEffect effect) { diff --git a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java index b6a541631f..232ac2fb3c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java +++ b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java @@ -35,6 +35,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledCreaturePermanent; @@ -55,7 +56,7 @@ public class DreadReturn extends CardImpl { this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); // Flashback-Sacrifice three creatures. - this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(3)), TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(3,3,new FilterControlledCreaturePermanent("three creatures"),true,true)), TimingRule.SORCERY)); } public DreadReturn(final DreadReturn card) { diff --git a/Mage/src/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/mage/abilities/keyword/FlashbackAbility.java index ce63b0d6c4..c07cc67f91 100644 --- a/Mage/src/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/mage/abilities/keyword/FlashbackAbility.java @@ -67,18 +67,20 @@ public class FlashbackAbility extends /*SpellAbility*/ ActivatedAbilityImpl 0) { + sbRule.append("--"); + } else { + sbRule.append(" "); + } if (manaCosts.size() > 0) { sbRule.append(manaCosts.getText()); - first = false; } if (costs.size() > 0) { - if (first) { - sbRule.append(","); - } sbRule.append(costs.getText()); + sbRule.append("."); } + sbRule.append(" (You may cast this card from your graveyard for its flashback cost. Then exile it.)"); return sbRule.toString(); } }