github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-09 09:11:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

ReturnToHandChosenControlledPermanentCost: fix text for n > 1

Browse source
This commit is contained in:
Neil Gentleman 2016-11-05 10:27:38 -07:00
parent 6887dfb61d
commit 531577890d
4 changed files with 6 additions and 5 deletions
Mage.Sets/src/mage/cards
e
Ensnare.java
g
Gush.java
t
Thwart.java
Mage/src/main/java/mage/abilities/costs/common
ReturnToHandChosenControlledPermanentCost.java

2
Mage.Sets/src/mage/cards/e/Ensnare.java
View file

@ -59,7 +59,7 @@ public class Ensnare extends CardImpl {
this.addAbility(ability); this.addAbility(ability);
// Tap all creatures. // Tap all creatures.
this.getSpellAbility().addEffect(new TapAllEffect(new FilterCreaturePermanent())); this.getSpellAbility().addEffect(new TapAllEffect(new FilterCreaturePermanent("creatures")));
} }
public Ensnare(final Ensnare card) { public Ensnare(final Ensnare card) {

2
Mage.Sets/src/mage/cards/g/Gush.java
View file

@ -44,7 +44,7 @@ import mage.target.common.TargetControlledPermanent;
*/ */
public class Gush extends CardImpl { public class Gush extends CardImpl {
private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Island"); private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands");
static{ static{
filter.add(new SubtypePredicate("Island")); filter.add(new SubtypePredicate("Island"));
} }

2
Mage.Sets/src/mage/cards/t/Thwart.java
View file

@ -44,7 +44,7 @@ import mage.target.common.TargetControlledPermanent;
* @author markedagain * @author markedagain
*/ */
public class Thwart extends CardImpl { public class Thwart extends CardImpl {
private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Island"); private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands");
static{ static{
filter.add(new SubtypePredicate("Island")); filter.add(new SubtypePredicate("Island"));
} }

5
Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java
View file

@ -40,6 +40,7 @@ import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import mage.util.CardUtil;
/** /**
* *
@ -51,9 +52,9 @@ public class ReturnToHandChosenControlledPermanentCost extends CostImpl {
target.setNotTarget(true); target.setNotTarget(true);
this.addTarget(target); this.addTarget(target);
if (target.getMaxNumberOfTargets() > 1 && target.getMaxNumberOfTargets() == target.getNumberOfTargets()) { if (target.getMaxNumberOfTargets() > 1 && target.getMaxNumberOfTargets() == target.getNumberOfTargets()) {
this.text = new StringBuilder("return ").append(target.getMaxNumberOfTargets()).append(" ").append(target.getTargetName()).append(" you control to its owner's hand").toString(); this.text = "return " + CardUtil.numberToText(target.getMaxNumberOfTargets()) + " " + target.getTargetName() + " you control to their owner's hand";
} else { } else {
this.text = new StringBuilder("return ").append(target.getTargetName()).append(" you control to its owner's hand").toString(); this.text = "return " + target.getTargetName() + " you control to its owner's hand";
} }
} }