From c80562f83e0148314dbbd51beba3a4811f189fb2 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 7 Dec 2021 15:41:24 -0500 Subject: [PATCH 1/4] prompt capping --- forge-gui/res/languages/en-US.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index b53e2269736..c95f2c8d7e4 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1253,7 +1253,7 @@ lblChooseCreature=Choose a creature lblChosenCards=Chosen Cards lblAttacker=Attacker lblTriggeredby=Triggered by -lblChooseWhichCardstoReveal=Choose Which Cards to Reveal +lblChooseWhichCardstoReveal=Choose which card(s) to reveal lblChooseCardsActivateOpeningHandandOrder=Choose cards to activate from opening hand and their order lblActivateFirst=Activate first lblChooseOptionalCosts=Choose optional Costs From 9384a7380c6f31cde2e080092bf248841831a5f9 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 7 Dec 2021 21:37:03 -0500 Subject: [PATCH 2/4] cap lblIfYouDo --- forge-gui/res/languages/en-US.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index c95f2c8d7e4..7466df7d5e2 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1755,7 +1755,7 @@ lblFinalMatch=FINAL MATCH #DualListBox.java lblSelectOrder=Select Order #HumanPlay.java -lblIfYouDo=if you do +lblIfYouDo=If you do lblOr=or lblDoYouWantPay=Do you want to pay lblDoYouWantPayNLife=Do you want to pay {0} life? From 9638983775591ce88c9f04cb8d5b1a37053c46a0 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 7 Dec 2021 21:38:16 -0500 Subject: [PATCH 3/4] HumanPlay allow for customizable OrString --- forge-gui/src/main/java/forge/player/HumanPlay.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index 50589a6aa06..0df0fdfd16c 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -243,10 +243,15 @@ public class HumanPlay { if (!parts.isEmpty()) { costPart = parts.get(0); } - String orString = prompt == null ? sourceAbility.getStackDescription().trim() : ""; + String orString; + if (sourceAbility.hasParam("OrString")) { + orString = sourceAbility.getParam("OrString"); + } else { + orString = prompt == null ? sourceAbility.getStackDescription().trim() : ""; + } if (!orString.isEmpty()) { if (sourceAbility.hasParam("UnlessSwitched")) { - orString = TextUtil.concatWithSpace(" (" + Localizer.getInstance().getMessage("lblIfYouDo") + ":", orString, ")"); +a orString = TextUtil.concatWithSpace(" (" + Localizer.getInstance().getMessage("lblIfYouDo") + ":", orString + ")"); } else { orString = TextUtil.concatWithSpace(" (" + Localizer.getInstance().getMessage("lblOr") + ":", orString, ")"); } From 2778008d4d3d727ef2bd27da271aa34ab8098b66 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 7 Dec 2021 21:39:46 -0500 Subject: [PATCH 4/4] eliminate redundant "Select X Card card(s)" --- forge-gui/src/main/java/forge/player/HumanPlay.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index 0df0fdfd16c..804c2a4a9ec 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -558,7 +558,8 @@ a orString = TextUtil.concatWithSpace(" (" + Localizer.getInstanc if (list.size() < amount) { return false; } // unable to pay (not enough cards) InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, amount, amount, list, sourceAbility); - inp.setMessage(Localizer.getInstance().getMessage("lblSelectNSpecifyTypeCardsToAction", cpl.getDescriptiveType(), actionName)); + String cardDesc = cpl.getDescriptiveType().equalsIgnoreCase("Card") ? "" : cpl.getDescriptiveType(); + inp.setMessage(Localizer.getInstance().getMessage("lblSelectNSpecifyTypeCardsToAction", cardDesc, actionName)); inp.setCancelAllowed(true); inp.showAndWait();