From 7ed106c70641e68d7196ca974724d53912f9d1eb Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 15:45:07 +0000 Subject: [PATCH] tweak the input prompt for Discard payment when using "Any". --- src/forge/Cost_Payment.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/forge/Cost_Payment.java b/src/forge/Cost_Payment.java index 95c36f3bbe0..9b73580986b 100644 --- a/src/forge/Cost_Payment.java +++ b/src/forge/Cost_Payment.java @@ -724,12 +724,27 @@ public class Cost_Payment { @Override public void showMessage() { + boolean any = discType.equals("Any") ? true : false; if (AllZone.Human_Hand.getCards().length == 0) stop(); StringBuilder type = new StringBuilder(""); - if (!discType.equals("Any") || !discType.equals("Card")){ + if (any || !discType.equals("Card")){ type.append(" ").append(discType); } - AllZone.Display.showMessage("Select a "+ type.toString() + " card to discard"); + StringBuilder sb = new StringBuilder(); + sb.append("Select "); + if(any) { + sb.append("any "); + } + else { + sb.append("a ").append(type.toString()).append(" "); + } + sb.append("card to discard."); + if(nCards > 1) { + sb.append(" You have "); + sb.append(nCards - nDiscard); + sb.append(" remaining."); + } + AllZone.Display.showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); }