github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixes for a few cards. Fix for Conspire ability.

Browse source
This commit is contained in:
Jeff 2015-01-07 17:47:08 -06:00
parent 66f298512d
commit bcb1331c0f
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/shadowmoor/RiversGrasp.java
View file

@ -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);

6
Mage.Sets/src/mage/sets/shadowmoor/ScarscaleRitual.java
View file

@ -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

1
Mage.Sets/src/mage/sets/shadowmoor/TorporDust.java
View file

@ -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);

2
Mage/src/mage/abilities/keyword/ConspireAbility.java
View file

@ -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) {