From bcb1331c0fd6112fc367dd40a88639bb30176455 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 7 Jan 2015 17:47:08 -0600 Subject: [PATCH] - Fixes for a few cards. Fix for Conspire ability. --- Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/ScarscaleRitual.java | 6 +++++- Mage.Sets/src/mage/sets/shadowmoor/TorporDust.java | 1 - Mage/src/mage/abilities/keyword/ConspireAbility.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java b/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java index c3b61e3cfbe..5fa05293835 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java @@ -66,10 +66,10 @@ public class RiversGrasp extends CardImpl { Target targetPlayer = new TargetPlayer(); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new ReturnToHandTargetEffect(), - new ManaWasSpentCondition(ColoredManaSymbol.U), "If {U} was spent to cast River's Grasp, return up to one target creature to its owner's hand")); + new ManaWasSpentCondition(ColoredManaSymbol.U), "If {U} was spent to cast {this}, return up to one target creature to its owner's hand")); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new RiversGraspEffect(), - new ManaWasSpentCondition(ColoredManaSymbol.B), " If {B} was spent to cast River's Grasp, target player reveals his or her hand, you choose a nonland card from it, then that player discards that card")); + new ManaWasSpentCondition(ColoredManaSymbol.B), " If {B} was spent to cast {this}, target player reveals his or her hand, you choose a nonland card from it, then that player discards that card")); this.getSpellAbility().addTarget(targetCreature); this.getSpellAbility().addTarget(targetPlayer); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ScarscaleRitual.java b/Mage.Sets/src/mage/sets/shadowmoor/ScarscaleRitual.java index 6042ef3a2a4..242203fede3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ScarscaleRitual.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ScarscaleRitual.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.counters.CounterType; +import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -83,7 +84,10 @@ class ScarscaleRitualCost extends CostImpl { @Override public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { - return true; + for (Permanent permanent :game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), controllerId, game)) { + return permanent != null; + } + return false; } @Override diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TorporDust.java b/Mage.Sets/src/mage/sets/shadowmoor/TorporDust.java index 9ed8a41243e..d9f7a5cdde5 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TorporDust.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TorporDust.java @@ -67,7 +67,6 @@ public class TorporDust extends CardImpl { // Enchanted creature gets -3/-0. Effect effect = new BoostEnchantedEffect(-3, -0, Duration.WhileOnBattlefield); - effect.setText("Enchanted creature gets -3/-0"); Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); this.addAbility(ability2); diff --git a/Mage/src/mage/abilities/keyword/ConspireAbility.java b/Mage/src/mage/abilities/keyword/ConspireAbility.java index 56ef9db214a..379e1700d4f 100644 --- a/Mage/src/mage/abilities/keyword/ConspireAbility.java +++ b/Mage/src/mage/abilities/keyword/ConspireAbility.java @@ -80,7 +80,7 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional filter.add(new SharesColorWithSourcePredicate()); } - Cost costConspire = new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false)); + Cost costConspire = new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true)); OptionalAdditionalCost conspireCost = new OptionalAdditionalCostImpl(keywordText, "-", reminderTextCost, costConspire); public ConspireAbility(Card card) {