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

* DrawCardTargetEffect - Added UpTo option to allow the player to select how many cards to draw.

Browse source
This commit is contained in:
LevelX2 2013-11-17 08:31:29 +01:00
parent 1a0d547e11
commit 859f068e59
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@ public class DrawCardTargetEffect extends OneShotEffect<DrawCardTargetEffect> {
protected DynamicValue amount;
protected boolean optional;
protected boolean upTo;
public DrawCardTargetEffect(int amount) {
this(new StaticValue(amount));
@ -57,16 +58,23 @@ public class DrawCardTargetEffect extends OneShotEffect<DrawCardTargetEffect> {
public DrawCardTargetEffect(DynamicValue amount) {
this(amount, false);
}
public DrawCardTargetEffect(DynamicValue amount, boolean optional) {
this(amount, optional, false);
}
public DrawCardTargetEffect(DynamicValue amount, boolean optional, boolean upto) {
super(Outcome.DrawCard);
this.amount = amount.copy();
this.optional = optional;
this.upTo = upto;
}
public DrawCardTargetEffect(final DrawCardTargetEffect effect) {
super(effect);
this.amount = effect.amount.copy();
this.optional = effect.optional;
this.upTo = effect.upTo;
}
@Override
@ -78,8 +86,12 @@ public class DrawCardTargetEffect extends OneShotEffect<DrawCardTargetEffect> {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (player != null) {
int cardsToDraw = amount.calculate(game, source);
if (upTo) {
cardsToDraw = player.getAmount(0, cardsToDraw, "Draw how many cards?", game);
}
if (!optional || player.chooseUse(outcome, "Use draw effect?", game)) {
player.drawCards(amount.calculate(game, source), game);
player.drawCards(cardsToDraw, game);
}
return true;
}
@ -88,6 +100,9 @@ public class DrawCardTargetEffect extends OneShotEffect<DrawCardTargetEffect> {
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();
if (mode.getTargets().size() > 0) {
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
@ -99,6 +114,9 @@ public class DrawCardTargetEffect extends OneShotEffect<DrawCardTargetEffect> {
} else {
sb.append(" draws ");
}
if (upTo) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(amount.toString())).append(" card");
try {
if (Integer.parseInt(amount.toString()) > 1) {