Merge branch 'patch' into 'master'

Add some cards

See merge request core-developers/forge!1613

forge-gui/res/cardsfolder/d/deliver_unto_evil.txt

@@ -0,0 +1,13 @@
+Name:Deliver Unto Evil
+ManaCost:2 B
+Types:Sorcery
+A:SP$ Pump | Cost$ 2 B | ValidTgts$ Card.YouCtrl | TgtPrompt$ Select target card | TargetMin$ 0 | TargetMax$ 4 | TgtZone$ Graveyard | RememberTargets$ True | SubAbility$ DBBranch | StackDescription$ SpellDescription | SpellDescription$ Choose up to four target cards in your graveyard. If you control a Bolas planeswalker, return those cards to your hand. Otherwise, an opponent chooses two of them. Leave the chosen cards in your graveyard and put the rest into your hand. Exile CARDNAME.
+SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | References$ X | TrueSubAbility$ DBChangeZone | FalseSubAbility$ DBChooseOpp | SubAbility$ DBCleanup
+SVar:X:Count$Valid Planeswalker.Bolas+YouCtrl
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Hand
+SVar:DBChooseOpp:DB$ ChoosePlayer | Choices$ Player.Opponent | SubAbility$ DBChoose
+SVar:DBChoose:DB$ ChooseCard | Choices$ Card.IsRemembered | ChoiceZone$ Graveyard | Amount$ 2 | Mandatory$ True | Defined$ ChosenPlayer | ForgetChosen$ True | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Hand
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True | ClearChosenCard$ True | SubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | StackDescription$ None
+Oracle:Choose up to four target cards in your graveyard. If you control a Bolas planeswalker, return those cards to your hand. Otherwise, an opponent chooses two of them. Leave the chosen cards in your graveyard and put the rest into your hand.\nExile Deliver Unto Evil.

forge-gui/res/cardsfolder/f/false_demise.txt

@@ -2,7 +2,7 @@ Name:False Demise
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AITgts$ Card.nonToken | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under your control.
 SVar:TrigChange:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/false_demise.jpg

forge-gui/res/cardsfolder/f/flickerform.txt

@@ -2,7 +2,7 @@ Name:Flickerform
 ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AITgts$ Creature.nonToken | AILogic$ Pump
 A:AB$ Pump | Cost$ 2 W W | Defined$ Enchanted | ImprintCards$ Enchanted | StackDescription$ None | SubAbility$ DBRemAura | SpellDescription$ Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return the other cards exiled this way to the battlefield under their owners' control attached to that creature.
 SVar:DBRemAura:DB$ PumpAll | ValidCards$ Card.IsImprinted,Aura.AttachedTo Creature.IsImprinted | RememberAllPumped$ True | StackDescription$ None | SubAbility$ DBChangeZoneAll
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Battlefield | Destination$ Exile | ChangeType$ Card.IsRemembered | SubAbility$ DelayedEffect

forge-gui/res/cardsfolder/f/fools_demise.txt

@@ -2,7 +2,7 @@ Name:Fool's Demise
 ManaCost:4 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 4 U | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | Cost$ 4 U | ValidTgts$ Creature | AITgts$ Card.nonToken | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under your control.
 SVar:TrigChange:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.

forge-gui/res/cardsfolder/g/gideons_sacrifice.txt

@@ -0,0 +1,8 @@
+Name:Gideon's Sacrifice
+ManaCost:W
+Types:Instant
+A:SP$ ChooseCard | Cost$ W | Choices$ Creature.YouCtrl,Planeswalker.YouCtrl | SubAbility$ DBEffect | SpellDescription$ Choose a creature or planeswalker you control. All damage that would be dealt this turn to you and permanents you control is dealt to the chosen permanent instead (if it's still on the battlefield).
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ DamageEvent | SVars$ GideonSac | References$ DamageEvent,GideonSac | ExileOnMoved$ True | RememberObjects$ ChosenCard
+SVar:DamageEvent:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ You,Permanent.YouCtrl | ReplaceWith$ GideonSac | Description$ All damage that would be dealt this turn to you and permanents you control is dealt to the chosen permanent instead (if it's still on the battlefield).
+SVar:GideonSac:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card
+Oracle:Choose a creature or planeswalker you control. All damage that would be dealt this turn to you and permanents you control is dealt to the chosen permanent instead (if it's still on the battlefield).

forge-gui/res/cardsfolder/g/gift_of_immortality.txt

@@ -2,7 +2,7 @@ Name:Gift of Immortality
 ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AITgts$ Creature.nonToken | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under its owner's control. Return CARDNAME to the battlefield attached to that creature at the beginning of the next end step.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDelTrig
 SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield attached to that creature at the beginning of the next end step. | SubAbility$ DBCleanup | RememberObjects$ Remembered

forge-gui/res/cardsfolder/k/kayas_ghostform.txt

@@ -0,0 +1,11 @@
+Name:Kaya's Ghostform
+ManaCost:B
+Types:Enchantment Aura
+K:Enchant creature or planeswalker you control
+A:SP$ Attach | Cost$ B | ValidTgts$ Creature.YouCtrl,Planeswalker.YouCtrl | TgtPrompt$ Select target creature or planeswalker you control | AITgts$ Card.nonToken | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | TriggerController$ TriggeredCardController | Execute$ TrigReturn | TriggerDescription$ When enchanted permanent dies or is put into exile, return that card to the battlefield under your control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Exile | ValidCard$ Card.AttachedBy | TriggerController$ TriggeredCardController | Execute$ TrigReturn2 | Secondary$ True | TriggerDescription$ When enchanted permanent dies or is put into exile, return that card to the battlefield under your control.
+SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
+SVar:TrigReturn2:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Exile | Destination$ Battlefield | GainControl$ True
+SVar:PlayMain1:TRUE
+Oracle:Enchant creature or planeswalker you control\nWhen enchanted permanent dies or is put into exile, return that card to the battlefield under your control.

forge-gui/res/cardsfolder/s/shades_form.txt

@@ -2,7 +2,7 @@ Name:Shade's Form
 ManaCost:1 B B
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 1 B B | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | Cost$ 1 B B | ValidTgts$ Creature | AITgts$ Creature.nonToken | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Pump | Description$ Enchanted creature has "{B}: This creature gets +1/+1 until end of turn."
 T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigReturn | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under your control.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True

forge-gui/res/cardsfolder/s/single_combat.txt

@@ -0,0 +1,11 @@
+Name:Single Combat
+ManaCost:3 W W
+Types:Sorcery
+A:SP$ RepeatEach | Cost$ 3 W W | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ SacAllOthers | SpellDescription$ Each player chooses a creature or planeswalker they control, then sacrifices the rest. Players can't cast creature or planeswalker spells until the end of your next turn.
+SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature,Planeswalker | TargetControls$ True | Mandantory$ True | RememberChosen$ True
+SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered,Planeswalker.IsNotRemembered | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | Name$ Single Combat Effect | StaticAbilities$ STCantBeCast | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
+SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Creature,Planeswalker | Description$ Players can't cast creature or planeswalker spells.
+AI:RemoveDeck:All
+Oracle:Each player chooses a creature or planeswalker they control, then sacrifices the rest. Players can't cast creature or planeswalker spells until the end of your next turn.

forge-gui/res/cardsfolder/t/the_wanderer.txt

@@ -2,7 +2,7 @@ Name:The Wanderer
 ManaCost:3 W
 Types:Legendary Planeswalker
 Loyalty:5
-R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ You,Permanent.Other | ActiveZones$ Battlefield | Description$ Prevent all noncombat damage that would be dealt to you and other permanents you control.
+R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ You,Permanent.Other+YouCtrl | IsCombat$ False | Description$ Prevent all noncombat damage that would be dealt to you and other permanents you control.
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.powerGE4 | TgtPrompt$ Select target creature with power 4 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power 4 or greater.

forge-gui/res/cardsfolder/t/tolsimir_friend_to_wolves.txt

@@ -0,0 +1,13 @@
+Name:Tolsimir, Friend to Wolves
+ManaCost:2 G G W
+Types:Legendary Creature Elf Scout
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, create Voja, Friend to Elves, a legendary 3/3 green and white Wolf creature token.
+SVar:TrigChangeZone:DB$ Token | TokenAmount$ 1 | TokenScript$ voja_friend_to_elves | LegacyImage$ voja war | TokenOwner$ You
+DeckHas:Ability$Token
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Wolf.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a Wolf enters the battlefield under your control, you gain 3 life and you may have that creature fight up to one target creature an opponent controls.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | SubAbility$ DBFight
+SVar:DBFight:DB$ Fight | Defined$ TriggeredCardLKICopy | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | TargetMin$ 0 | TargetMax$ 1
+SVar:PlayMain1:TRUE
+DeckHints:Type$Wolf
+Oracle:When Tolsimir, Friend to Wolves enters the battlefield, create Voja, Friend to Elves, a legendary 3/3 green and white Wolf creature token.\nWhenever a Wolf enters the battlefield under your control, you gain 3 life and you may have that creature fight up to one target creature an opponent controls.

forge-gui/res/cardsfolder/u/unhallowed_pact.txt

@@ -2,7 +2,7 @@ Name:Unhallowed Pact
 ManaCost:2 B
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AITgts$ Creature.nonToken | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under your control.
 SVar:TrigChange:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unhallowed_pact.jpg

forge-gui/res/editions/War of the Spark.txt

@@ -301,7 +301,7 @@ r_1_1_devil_burn
 r_1_1_goblin
 r_4_4_dragon_flying
 u_2_2_wizard
-voja
+voja_friend_to_elves
 w_0_3_wall_defender
 w_2_2_soldier_vigilance
 w_4_4_angel_flying_vigilance

forge-gui/res/tokenscripts/voja_friend_to_elves.txt

@@ -0,0 +1,6 @@
+Name:Voja, Friend to Elves
+ManaCost:no cost
+Types:Legendary Creature Wolf
+Colors:white,green
+PT:3/3
+Oracle: