diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java index bae5a408fe7..d1a5a5a21de 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java @@ -78,6 +78,20 @@ public class DiscardEffect extends SpellAbilityEffect { if (mode.equals("Defined")) { sb.append(" defined cards"); + + if (sa.getHostCard() != null) { + final List toDiscard = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedCards"), sa); + if (!toDiscard.isEmpty()) { + sb.append(": "); + + List definedNames = Lists.newArrayList(); + for (Card discarded : toDiscard) { + definedNames.add(discarded.toString()); + } + + sb.append(String.join(",", definedNames)); + } + } } if (mode.equals("Random")) { diff --git a/forge-gui/res/cardsfolder/w/wand_of_ith.txt b/forge-gui/res/cardsfolder/w/wand_of_ith.txt index ebebf44c423..8734b82b438 100644 --- a/forge-gui/res/cardsfolder/w/wand_of_ith.txt +++ b/forge-gui/res/cardsfolder/w/wand_of_ith.txt @@ -3,7 +3,7 @@ ManaCost:4 Types:Artifact A:AB$ Reveal | Cost$ 3 T | ValidTgts$ Player | TgtPrompt$ Select target player | Random$ True | IsCursed$ True | PlayerTurn$ True | RememberRevealed$ True | SubAbility$ DBDiscard1 | SpellDescription$ Target player reveals a card at random from his or her hand. If it's a land card, that player discards it unless he or she pays 1 life. If it isn't a land card, the player discards it unless he or she pays life equal to its converted mana cost. Activate this ability only during your turn. SVar:DBDiscard1:DB$ Discard | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | ConditionCompare$ EQ1 | Mode$ Defined | DefinedCards$ Remembered | UnlessCost$ PayLife<1> | UnlessPayer$ RememberedController | SubAbility$ DBDiscard2 -SVar:DBDiscard2:DB$ Discard | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | Mode$ Defined | DefinedCards$ Remembered | UnlessCost$ PayLife | UnlessPayer$ RememberedController | SubAbility$ DBCleanup | References$ X +SVar:DBDiscard2:DB$ Discard | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | Mode$ Defined | DefinedCards$ Remembered | UnlessCost$ PayLife | UnlessPayer$ RememberedController | SubAbility$ DBCleanup | References$ X | S SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$CardManaCost SVar:Picture:http://www.wizards.com/global/images/magic/general/wand_of_ith.jpg