From 1fba3283d4a3229580e2de246dbc5e3c1586f91d Mon Sep 17 00:00:00 2001 From: pfps Date: Fri, 13 Jan 2017 21:13:15 +0000 Subject: [PATCH] Add in more description of spellability when selecting targets and paying mana costs --- .../java/forge/match/input/InputPayManaOfCostPayment.java | 1 + .../src/main/java/forge/match/input/InputPayManaSimple.java | 3 ++- .../src/main/java/forge/match/input/InputSelectTargets.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java b/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java index 2dacf4fd0e1..7221d65ed47 100644 --- a/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java +++ b/forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java @@ -48,6 +48,7 @@ public class InputPayManaOfCostPayment extends InputPayMana { if (messagePrefix != null) { msg.append(messagePrefix).append("\n"); } + msg.append(saPaidFor.getStackDescription()).append("\n"); msg.append("Pay Mana Cost: ").append(displayMana); if (this.phyLifeToLose > 0) { msg.append(" ("); diff --git a/forge-gui/src/main/java/forge/match/input/InputPayManaSimple.java b/forge-gui/src/main/java/forge/match/input/InputPayManaSimple.java index 6f5810fe56d..32eeda082dc 100644 --- a/forge-gui/src/main/java/forge/match/input/InputPayManaSimple.java +++ b/forge-gui/src/main/java/forge/match/input/InputPayManaSimple.java @@ -119,7 +119,8 @@ public class InputPayManaSimple extends InputPayMana { */ @Override protected String getMessage() { - final StringBuilder msg = new StringBuilder("Pay Mana Cost: " + this.manaCost.toString(false, player.getManaPool())); + final StringBuilder msg = new StringBuilder(saPaidFor.getStackDescription()).append("\n"); + msg.append("Pay Mana Cost: ").append(this.manaCost.toString(false, player.getManaPool())); if (this.phyLifeToLose > 0) { msg.append(" ("); msg.append(this.phyLifeToLose); diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java index c9e14fb4168..0257fc6302d 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java @@ -59,7 +59,7 @@ public final class InputSelectTargets extends InputSyncronizedBase { sb.append("Parent Targeted:"); sb.append(sa.getUniqueTargets()).append("\n"); } - sb.append(sa.getHostCard() + " - " + tgt.getVTSelection()); + sb.append(sa.getStackDescription()).append("\n").append(tgt.getVTSelection()); final int maxTargets = tgt.getMaxTargets(sa.getHostCard(), sa); final int targeted = sa.getTargets().getNumTargeted(); @@ -273,4 +273,4 @@ public final class InputSelectTargets extends InputSyncronizedBase { private boolean hasAllTargets() { return tgt.isMaxTargetsChosen(sa.getHostCard(), sa) || ( tgt.getStillToDivide() == 0 && tgt.isDividedAsYouChoose()); } -} \ No newline at end of file +}