From 6e3fe7ec46f47407e68e841c95298351ee5205ab Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Mon, 27 Nov 2023 00:49:37 +0400 Subject: [PATCH] Cascade and other "cast spell without paying" abilities - added card popup support for casting card (closes #11355) --- .../src/main/java/mage/client/components/MageTextArea.java | 1 - Mage.Sets/src/mage/cards/a/AnrakyrTheTraveller.java | 5 ++--- Mage/src/main/java/mage/util/CardUtil.java | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java index 5e4109819cf..3dec773ed1b 100644 --- a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java +++ b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java @@ -62,7 +62,6 @@ public class MageTextArea extends MageEditorPane { SwingUtilities.invokeLater(() -> { String promptText = buffer.toString(); - System.out.println(promptText); MageTextArea.super.setText(promptText); // in case the text don't fit in the panel a tooltip with the text is added if (panelWidth > 0 && MageTextArea.this.getPreferredSize().getWidth() > panelWidth) { diff --git a/Mage.Sets/src/mage/cards/a/AnrakyrTheTraveller.java b/Mage.Sets/src/mage/cards/a/AnrakyrTheTraveller.java index e32d21e1eaa..640901b32f7 100644 --- a/Mage.Sets/src/mage/cards/a/AnrakyrTheTraveller.java +++ b/Mage.Sets/src/mage/cards/a/AnrakyrTheTraveller.java @@ -101,10 +101,9 @@ class AnrakyrTheTravellerEffect extends OneShotEffect { List partsToCast = cardMap.get(cardToCast.getId()); String partsInfo = partsToCast .stream() - .map(MageObject::getIdName) + .map(MageObject::getLogName) .collect(Collectors.joining(" or ")); - if (cardToCast == null - || partsToCast.size() < 1 + if (partsToCast.size() < 1 || !player.chooseUse( Outcome.PlayForFree, "Cast spell by paying life equal to its mana value rather than paying its mana cost (" + partsInfo + ")?", source, game )) { diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 35952db3516..f9e2328d347 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -1377,10 +1377,9 @@ public final class CardUtil { List partsToCast = cardMap.get(cardToCast.getId()); String partsInfo = partsToCast .stream() - .map(MageObject::getIdName) + .map(MageObject::getLogName) .collect(Collectors.joining(" or ")); - if (cardToCast == null - || partsToCast.size() < 1 + if (partsToCast.size() < 1 || !player.chooseUse( Outcome.PlayForFree, "Cast spell without paying its mana cost (" + partsInfo + ")?", source, game )) {