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

Merge branch 'neo_st' into 'master'

Browse Source 
NEO: Soul Transfer and support

See merge request core-developers/forge!6185
This commit is contained in:
Michael Kamensky
2022-02-09 07:40:07 +00:00
parent 7499bddbb4 3dacd56a76
commit 17fc5c0695
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
View File

@@ -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());
}
}

11
forge-gui/res/cardsfolder/upcoming/soul_transfer.txt Normal file
View File

@@ -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.