diff --git a/.gitattributes b/.gitattributes index e2acbee0e34..6e24e4d1818 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17183,6 +17183,7 @@ forge-gui/res/cardsfolder/upcoming/taigam_ojutai_master.txt -text forge-gui/res/cardsfolder/upcoming/teferis_protection.txt -text forge-gui/res/cardsfolder/upcoming/the_ur_dragon.txt -text forge-gui/res/cardsfolder/upcoming/traverse_the_outlands.txt -text +forge-gui/res/cardsfolder/upcoming/vindictive_lich.txt -text forge-gui/res/cardsfolder/upcoming/wasitora_nekoru_queen.txt -text forge-gui/res/cardsfolder/v/vacuumelt.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/vaevictis_asmadi.txt svneol=native#text/plain diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java index 69ac77fe79a..fc88e860997 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -104,10 +104,6 @@ public class CharmEffect extends SpellAbilityEffect { sb.append(Lang.getNumeral(min)).append(" or ").append(list.size() == 2 ? "both" : "more"); } - if (repeat) { - sb.append(". You may choose the same mode more than once."); - } - if (sa.hasParam("ChoiceRestriction")) { String rest = sa.getParam("ChoiceRestriction"); if (rest.equals("NotRemembered")) { @@ -115,8 +111,17 @@ public class CharmEffect extends SpellAbilityEffect { } } + if (repeat) { + sb.append(". You may choose the same mode more than once."); + } + + boolean additionalDesc = sa.hasParam("AdditionalDescription"); + if (additionalDesc) { + sb.append(" ").append(sa.getParam("AdditionalDescription").trim()); + } + if (!list.isEmpty()) { - if (!repeat) { + if (!repeat && !additionalDesc) { sb.append(" \u2014"); } sb.append("\r\n"); diff --git a/forge-gui/res/cardsfolder/upcoming/vindictive_lich.txt b/forge-gui/res/cardsfolder/upcoming/vindictive_lich.txt new file mode 100644 index 00000000000..83946d0ad7f --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/vindictive_lich.txt @@ -0,0 +1,11 @@ +Name:Vindictive Lich +ManaCost:3 B +Types:Creature Zombie Wizard +PT:4/1 +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME dies, ABILITY +SVar:TrigCharm:DB$ Charm | MinCharmNum$ 1 | CharmNum$ 3 | Choices$ SacCreature,DiscardCards,LoseLife | AdditionalDescription$ Each mode must target a different player. +SVar:SacCreature:DB$ Sacrifice | ValidTgts$ Opponent | TargetUnique$ True | SacValid$ Creature | SacMessage$ Creature | SpellDescription$ Target opponent sacrifices a creature. +SVar:DiscardCards:DB$ Discard | ValidTgts$ Opponent | TargetUnique$ True | NumCards$ 2 | Mode$ TgtChoose | SpellDescription$ Target opponent discards two cards. +SVar:LoseLife:DB$ LoseLife | ValidTgts$ Opponent | TargetUnique$ True | LifeAmount$ 5 | SpellDescription$ Target opponent loses 5 life. +SVar:Picture:http://www.wizards.com/global/images/magic/general/vindictive_lich.jpg +Oracle:When Vindictive Lich dies, choose one or more. Each mode must target a different player.\n• Target opponent sacrifices a creature.\n• Target opponent discards two cards.\n• Target opponent loses 5 life. \ No newline at end of file