external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Improved prompt for Wand of Ith.

Browse Source
This commit is contained in:
Agetian
2017-08-22 04:33:56 +00:00
parent 1e6467cf80
commit e7c30da23c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
View File

@@ -78,6 +78,20 @@ public class DiscardEffect extends SpellAbilityEffect {
if (mode.equals("Defined")) { if (mode.equals("Defined")) {
sb.append(" defined cards"); sb.append(" defined cards");
if (sa.getHostCard() != null) {
final List<Card> toDiscard = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedCards"), sa);
if (!toDiscard.isEmpty()) {
sb.append(": ");
List<String> definedNames = Lists.newArrayList();
for (Card discarded : toDiscard) {
definedNames.add(discarded.toString());
}
sb.append(String.join(",", definedNames));
}
}
} }
if (mode.equals("Random")) { if (mode.equals("Random")) {

2
forge-gui/res/cardsfolder/w/wand_of_ith.txt
View File

@@ -3,7 +3,7 @@ ManaCost:4
Types:Artifact 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. 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: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<X> | UnlessPayer$ RememberedController | SubAbility$ DBCleanup | References$ X SVar:DBDiscard2:DB$ Discard | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | Mode$ Defined | DefinedCards$ Remembered | UnlessCost$ PayLife<X> | UnlessPayer$ RememberedController | SubAbility$ DBCleanup | References$ X | S
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Remembered$CardManaCost SVar:X:Remembered$CardManaCost
SVar:Picture:http://www.wizards.com/global/images/magic/general/wand_of_ith.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/wand_of_ith.jpg