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

* Roiling Waters - Fixed tooltip text.

Browse source
This commit is contained in:
LevelX2 2016-02-08 16:40:06 +01:00
parent 77a8e3e7a9
commit 81590262f6
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/sets/oathofthegatewatch/RoilingWaters.java
View file

@ -47,10 +47,10 @@ import mage.target.targetpointer.SecondTargetPointer;
*/
public class RoilingWaters extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
private final static FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creatures your opponents control");
static {
filter.add(new ControllerPredicate(TargetController.OPPONENT));
FILTER.add(new ControllerPredicate(TargetController.OPPONENT));
}
public RoilingWaters(UUID ownerId) {
@ -59,7 +59,7 @@ public class RoilingWaters extends CardImpl {
// Return up to two target creatures your opponents control to their owners' hands.
this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, filter, false));
this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, FILTER, false));
// Target player draws two cards.
Effect effect = new DrawCardTargetEffect(2);
effect.setTargetPointer(new SecondTargetPointer());

10
Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
View file

@ -36,6 +36,8 @@ import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.game.Game;
import mage.players.Player;
import mage.target.Target;
import mage.target.targetpointer.SecondTargetPointer;
import mage.util.CardUtil;
/**
@ -107,7 +109,13 @@ public class DrawCardTargetEffect extends OneShotEffect {
}
StringBuilder sb = new StringBuilder();
if (mode.getTargets().size() > 0) {
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
Target target;
if (targetPointer instanceof SecondTargetPointer && mode.getTargets().size() > 1) {
target = mode.getTargets().get(1);
} else {
target = mode.getTargets().get(0);
}
sb.append("Target ").append(target.getTargetName());
} else {
sb.append("that player");
}