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 988e313275a..23caee7e56c 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 @@ -120,10 +120,13 @@ public class CharmEffect extends SpellAbilityEffect { } if (additionalDesc) { + String addDescS = (sa.getParam("AdditionalDescription")); if (optional) { - sb.append(". ").append(sa.getParam("AdditionalDescription").trim()); + sb.append(". ").append(addDescS.trim()); + } else if (addDescS.startsWith(("."))) { + sb.append(addDescS.trim()); } else { - sb.append(" ").append(sa.getParam("AdditionalDescription").trim()); + sb.append(" ").append(addDescS.trim()); } } diff --git a/forge-gui/res/cardsfolder/upcoming/soul_transfer.txt b/forge-gui/res/cardsfolder/upcoming/soul_transfer.txt new file mode 100644 index 00000000000..01e939998e6 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/soul_transfer.txt @@ -0,0 +1,11 @@ +Name:Soul Transfer +ManaCost:1 B B +Types:Sorcery +A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ X | Choices$ Exile,Return | AdditionalDescription$ . If you control an artifact and an enchantment as you cast this spell, you may choose both. +SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature or planeswalker | ValidTgts$ Creature,Planeswalker | SpellDescription$ Exile target creature or planeswalker. +SVar:Return:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn,Planeswalker.YouOwn | TgtPrompt$ Select target creature or planeswalker | SpellDescription$ Return target creature or planeswalker card from your graveyard to your hand. +SVar:X:Count$Compare B GE2.2.1 +SVar:B:SVar$A/Plus.E +SVar:A:Count$Valid Artifact.YouCtrl/LimitMax.1 +SVar:E:Count$Valid Enchantment.YouCtrl/LimitMax.1 +Oracle:Choose one. If you control an artifact and an enchantment as you cast this spell, you may choose both.\n• Exile target creature or planeswalker.\n• Return target creature or planeswalker card from your graveyard to your hand.