From ec8c77abfb9c80d05b3784c06546d65dbd508512 Mon Sep 17 00:00:00 2001
From: kms70847 <kevin.m.smiley@gmail.com>
Date: Mon, 12 Aug 2019 23:09:40 -0400
Subject: [PATCH] Fix typos in card files, mostly having to do with missing or
 extra pipes

---
 forge-gui/res/cardsfolder/a/aura_graft.txt                     | 2 +-
 forge-gui/res/cardsfolder/b/balduvian_warlord.txt              | 2 +-
 forge-gui/res/cardsfolder/c/cemetery_recruitment.txt           | 2 +-
 forge-gui/res/cardsfolder/c/charnel_troll.txt                  | 2 +-
 forge-gui/res/cardsfolder/c/circle_of_protection_artifacts.txt | 2 +-
 forge-gui/res/cardsfolder/c/crimson_kobolds.txt                | 1 -
 forge-gui/res/cardsfolder/c/crookshank_kobolds.txt             | 1 -
 forge-gui/res/cardsfolder/d/delight_in_the_hunt.txt            | 2 +-
 forge-gui/res/cardsfolder/f/fraying_omnipotence.txt            | 2 +-
 forge-gui/res/cardsfolder/m/martial_glory.txt                  | 2 +-
 forge-gui/res/cardsfolder/m/mirror_strike.txt                  | 2 +-
 forge-gui/res/cardsfolder/n/neoform.txt                        | 2 +-
 forge-gui/res/cardsfolder/n/nicol_bolas_dragon_god.txt         | 2 +-
 forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt            | 1 -
 forge-gui/res/cardsfolder/n/nissas_triumph.txt                 | 2 +-
 forge-gui/res/cardsfolder/p/perish_the_thought.txt             | 2 +-
 forge-gui/res/cardsfolder/r/recuperate.txt                     | 2 +-
 forge-gui/res/cardsfolder/r/ruthless_instincts.txt             | 2 +-
 forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt            | 2 +-
 forge-gui/res/cardsfolder/t/teferis_time_twist.txt             | 2 +-
 forge-gui/res/cardsfolder/t/trostanis_summoner.txt             | 2 +-
 forge-gui/res/cardsfolder/u/undercity_reaches.txt              | 2 +-
 forge-gui/res/cardsfolder/u/unnatural_hunger.txt               | 2 +-
 forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt           | 2 +-
 forge-gui/res/cardsfolder/w/waste_not.txt                      | 2 +-
 forge-gui/res/cardsfolder/y/your_fate_is_thrice_sealed.txt     | 2 +-
 26 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/aura_graft.txt b/forge-gui/res/cardsfolder/a/aura_graft.txt
index 43c5eee393b..9f38dac4570 100644
--- a/forge-gui/res/cardsfolder/a/aura_graft.txt
+++ b/forge-gui/res/cardsfolder/a/aura_graft.txt
@@ -2,7 +2,7 @@ Name:Aura Graft
 ManaCost:1 U
 Types:Instant
 A:SP$ GainControl | Cost$ 1 U | ValidTgts$ Aura.AttachedTo Permanent | TgtPrompt$ Select target Aura attached to a permanent | SubAbility$ ChooseNewHost | SpellDescription$ Gain control of target Aura that's attached to a permanent. Attach it to another permanent it can enchant.
-SVar:ChooseNewHost:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Permanent.CanBeEnchantedByTargeted+NotEnchantedByTargeted | ChoiceZone$ Battlefield | SubAbility$ ReEnchant | RememberChosen$ True | AILogic$ AtLeast1 |
+SVar:ChooseNewHost:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Permanent.CanBeEnchantedByTargeted+NotEnchantedByTargeted | ChoiceZone$ Battlefield | SubAbility$ ReEnchant | RememberChosen$ True | AILogic$ AtLeast1
 SVar:ReEnchant:DB$ Attach | Object$ ParentTarget | Defined$ Remembered
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_graft.jpg
diff --git a/forge-gui/res/cardsfolder/b/balduvian_warlord.txt b/forge-gui/res/cardsfolder/b/balduvian_warlord.txt
index 31db1b2f362..13492f119f8 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_warlord.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_warlord.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Human Barbarian
 PT:3/2
 A:AB$ RemoveFromCombat | Cost$ T | ActivationPhases$ Declare Blockers | ValidTgts$ Creature.blocking | Defined$ Targeted | UnblockCreaturesBlockedOnlyBy$ Targeted | SubAbility$ ChooseAttacker | SpellDescription$ Remove target blocking creature from combat. Creatures it was blocking that hadn’t become blocked by another creature this combat become unblocked.
-SVar:ChooseAttacker:DB$ ChooseCard | Defined$ You | Choices$ Creature.attacking | ChoiceTitle$ Choose an attacker to block | RememberChosen$ True | | Mandatory$ True | SubAbility$ Block | SpellDescriptions$ None | StackDescription$ None
+SVar:ChooseAttacker:DB$ ChooseCard | Defined$ You | Choices$ Creature.attacking | ChoiceTitle$ Choose an attacker to block | RememberChosen$ True | Mandatory$ True | SubAbility$ Block | SpellDescriptions$ None | StackDescription$ None
 SVar:Block:DB$ Block | DefinedAttacker$ Remembered | DefinedBlocker$ ParentTarget | SpellDescription$ Then it blocks an attacking creature of your choice. Activate this ability only during the declare blockers step. | StackDescription$ SpellDescription | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:{T}: Remove target blocking creature from combat. Creatures it was blocking that hadn’t become blocked by another creature this combat become unblocked, then it blocks an attacking creature of your choice. Activate this ability only during the declare blockers step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/cemetery_recruitment.txt b/forge-gui/res/cardsfolder/c/cemetery_recruitment.txt
index 0f5315edb96..7e9a62a7e04 100644
--- a/forge-gui/res/cardsfolder/c/cemetery_recruitment.txt
+++ b/forge-gui/res/cardsfolder/c/cemetery_recruitment.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SubAbility$ DBDraw | RememberTargets$ True | SpellDescription$ Return target creature card from your graveyard to your hand. If it's a Zombie card, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card.Zombie | ConditionCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHints:Type$Zombie
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cemetery_recruitment.jpg
 Oracle:Return target creature card from your graveyard to your hand. If it's a Zombie card, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/charnel_troll.txt b/forge-gui/res/cardsfolder/c/charnel_troll.txt
index cfcdff7459f..e8a61c9a464 100644
--- a/forge-gui/res/cardsfolder/c/charnel_troll.txt
+++ b/forge-gui/res/cardsfolder/c/charnel_troll.txt
@@ -6,7 +6,7 @@ K:Trample
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile a creature card from your graveyard. If you do, put a +1/+1 counter on CARDNAME. Otherwise sacrifice it.
 SVar:TrigExile:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouOwn | ChangeNum$ 1 | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ GE1 | SubAbility$ DBSac
-SVar:DBSac:DB$ Sacrifice | SacValid# Self | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
+SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ PutCounter | Cost$ B G Discard<1/Creature> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 SVar:NeedsToPlayVar:Z GE1
diff --git a/forge-gui/res/cardsfolder/c/circle_of_protection_artifacts.txt b/forge-gui/res/cardsfolder/c/circle_of_protection_artifacts.txt
index 6610cc119d1..4d31eebbfab 100644
--- a/forge-gui/res/cardsfolder/c/circle_of_protection_artifacts.txt
+++ b/forge-gui/res/cardsfolder/c/circle_of_protection_artifacts.txt
@@ -1,7 +1,7 @@
 Name:Circle of Protection: Artifacts
 ManaCost:1 W
 Types:Enchantment
-A:AB$ ChooseSource | Cost$ 2 | Choices$ Artifact | AILogic$ NeedsPrevention | SubAbility$ DBEffect | DBEffect | SpellDescription$ The next time an artifact source of your choice would deal damage to you this turn, prevent that damage.
+A:AB$ ChooseSource | Cost$ 2 | Choices$ Artifact | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time an artifact source of your choice would deal damage to you this turn, prevent that damage.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromSource | SVars$ RPreventNextFromSource,ExileEffect | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
 SVar:RPreventNextFromSource:Event$ DamageDone | ValidSource$ Card.ChosenCard+Artifact | ValidTarget$ You | ReplaceWith$ ExileEffect | PreventionEffect$ True | Description$ The next time the chosen artifact source deals damage to you, prevent that damage.
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
diff --git a/forge-gui/res/cardsfolder/c/crimson_kobolds.txt b/forge-gui/res/cardsfolder/c/crimson_kobolds.txt
index fc0280357f0..2e7f222c8b9 100644
--- a/forge-gui/res/cardsfolder/c/crimson_kobolds.txt
+++ b/forge-gui/res/cardsfolder/c/crimson_kobolds.txt
@@ -3,6 +3,5 @@ ManaCost:0
 Types:Creature Kobold
 Colors:red
 PT:0/1
-Colors:red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crimson_kobolds.jpg
 Oracle:
diff --git a/forge-gui/res/cardsfolder/c/crookshank_kobolds.txt b/forge-gui/res/cardsfolder/c/crookshank_kobolds.txt
index eb88f103901..db8c0db672c 100644
--- a/forge-gui/res/cardsfolder/c/crookshank_kobolds.txt
+++ b/forge-gui/res/cardsfolder/c/crookshank_kobolds.txt
@@ -3,6 +3,5 @@ ManaCost:0
 Types:Creature Kobold
 Colors:red
 PT:0/1
-Colors:red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crookshank_kobolds.jpg
 Oracle:
diff --git a/forge-gui/res/cardsfolder/d/delight_in_the_hunt.txt b/forge-gui/res/cardsfolder/d/delight_in_the_hunt.txt
index 599fe65e9e7..6115b264e90 100644
--- a/forge-gui/res/cardsfolder/d/delight_in_the_hunt.txt
+++ b/forge-gui/res/cardsfolder/d/delight_in_the_hunt.txt
@@ -4,6 +4,6 @@ Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create a 3/3 black Horror creature token and prevent all damage that would be dealt to creatures you control this turn.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_3_3_horror | TokenOwner$ You | LegacyImage$ b 3 3 horror e01 | SubAbility$ DBPrevent
 SVar:DBPrevent:DB$ Effect | Name$ Delight in the Hunt Effect | ReplacementEffects$ RPrevent
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | | ActiveZones$ Command | ValidTarget$ Creature.YouCtrl | Description$ Prevent all damage that would be dealt to creatures you control this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ Creature.YouCtrl | Description$ Prevent all damage that would be dealt to creatures you control this turn.
 SVar:Picture:https://downloads.cardforge.org/images/cards/E01/Delight in the Hunt.full.jpg
 Oracle:When you set this scheme in motion, create a 3/3 black Horror creature token and prevent all damage that would be dealt to creatures you control this turn.
diff --git a/forge-gui/res/cardsfolder/f/fraying_omnipotence.txt b/forge-gui/res/cardsfolder/f/fraying_omnipotence.txt
index c2d0c1f2deb..f5b4e6b437c 100644
--- a/forge-gui/res/cardsfolder/f/fraying_omnipotence.txt
+++ b/forge-gui/res/cardsfolder/f/fraying_omnipotence.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ RepeatEach | Cost$ 3 B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILifeThreshold$ 1 | SpellDescription$ Each player loses half their life, then discards half the cards in their hand, then sacrifices half the creatures they control. Round up each time.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ A | References$ A | Defined$ Player.IsRemembered | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | NumCards$ C | References$ C | Defined$ Player.IsRemembered | Mode$ TgtChoose | SubAbility$ DBCreature
-SVar:DBCreature:DB$ Sacrifice | SacValid$ Creature | Amount$ E | References$ E | Defined$ Player.IsRemembered |
+SVar:DBCreature:DB$ Sacrifice | SacValid$ Creature | Amount$ E | References$ E | Defined$ Player.IsRemembered
 SVar:A:PlayerCountRemembered$LifeTotal/HalfUp
 SVar:C:PlayerCountRemembered$CardsInHand/HalfUp
 SVar:E:PlayerCountRemembered$Valid Creature.RememberedPlayerCtrl/HalfUp
diff --git a/forge-gui/res/cardsfolder/m/martial_glory.txt b/forge-gui/res/cardsfolder/m/martial_glory.txt
index 2a4f9b13641..c79d4a74dbd 100644
--- a/forge-gui/res/cardsfolder/m/martial_glory.txt
+++ b/forge-gui/res/cardsfolder/m/martial_glory.txt
@@ -2,6 +2,6 @@ Name:Martial Glory
 ManaCost:R W
 Types:Instant
 A:SP$ Pump | Cost$ R W | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +3/+0 | NumAtt$ +3 | SubAbility$ DBPump | SpellDescription$ Target creature gets +3/+0 until end of turn. Target creature gets +0/+3 until end of turn.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +0/+3 | NumDef$ +3 |
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +0/+3 | NumDef$ +3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/martial_glory.jpg
 Oracle:Target creature gets +3/+0 until end of turn.\nTarget creature gets +0/+3 until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/mirror_strike.txt b/forge-gui/res/cardsfolder/m/mirror_strike.txt
index a88124e15c6..b9029d0b991 100644
--- a/forge-gui/res/cardsfolder/m/mirror_strike.txt
+++ b/forge-gui/res/cardsfolder/m/mirror_strike.txt
@@ -1,7 +1,7 @@
 Name:Mirror Strike
 ManaCost:3 W
 Types:Instant
-A:SP$ Effect | Cost$ 3 W | Name$ Mirror Strike Effect | ReplacementEffects$ DamageEvent | SVars$ MirrorStrikeDmg | | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | ValidTgts$ Creature.attacking+unblocked | TgtPrompt$ Select target unblocked creature | IsCurse$ True | SpellDescription$ All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
+A:SP$ Effect | Cost$ 3 W | Name$ Mirror Strike Effect | ReplacementEffects$ DamageEvent | SVars$ MirrorStrikeDmg | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | ValidTgts$ Creature.attacking+unblocked | TgtPrompt$ Select target unblocked creature | IsCurse$ True | SpellDescription$ All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
 SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature.IsRemembered | ValidTarget$ You | ReplaceWith$ MirrorStrikeDmg | IsCombat$ True | Description$ All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
 SVar:MirrorStrikeDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ReplacedSourceController | VarType$ Player
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/n/neoform.txt b/forge-gui/res/cardsfolder/n/neoform.txt
index 1cec96e217a..9f313595051 100644
--- a/forge-gui/res/cardsfolder/n/neoform.txt
+++ b/forge-gui/res/cardsfolder/n/neoform.txt
@@ -2,7 +2,7 @@ Name:Neoform
 ManaCost:G U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ G U Sac<1/Creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | ChangeNum$ 1 | References$ X | RememberChanged$ True | SubAbility$ DBCounter | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield with an additional +1/+1 counter on it, then shuffle your library.
-SVar:DBCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1 | Static$ True | SubAbility$ DBCleanup |
+SVar:DBCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1 | Static$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Sacrificed$CardManaCost/Plus.1
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/n/nicol_bolas_dragon_god.txt b/forge-gui/res/cardsfolder/n/nicol_bolas_dragon_god.txt
index 36f042bf69e..98949eca1d1 100644
--- a/forge-gui/res/cardsfolder/n/nicol_bolas_dragon_god.txt
+++ b/forge-gui/res/cardsfolder/n/nicol_bolas_dragon_god.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Bolas
 Loyalty:4
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Planeswalker.Other | GainsLoyaltyAbilities$ True | Description$ CARDNAME has all loyalty abilities of all other planeswalkers on the battlefield.
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | NumCards$ 1 | SubAbility$ DBChangeZone | Planeswalker$ True | SpellDescription$ You draw a card. Each opponent exiles a card from their hand or a permanent they control.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield,Hand | Destination$ Exile | DefinedPlayer$ Player.Opponent | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True |
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield,Hand | Destination$ Exile | DefinedPlayer$ Player.Opponent | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True
 AI:RemoveDeck:Random
 A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Planeswalker$ True | SpellDescription$ Destroy target creature or planeswalker.
 A:AB$ LosesGame | Cost$ SubCounter<8/LOYALTY> | Defined$ Player.Opponent+controlsLegendary.Creature_EQ0+controlsPlaneswalker_LE0 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Each opponent who doesn't control a legendary creature or planeswalker loses the game.
diff --git a/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt b/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt
index 44284e93ebf..daf889cdf9b 100644
--- a/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt
@@ -21,7 +21,6 @@ Types:Legendary Planeswalker Nissa
 Loyalty:3
 A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | DestinationZone$ Battlefield | DestinationZone2$ Hand | SpellDescription$ Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | LegacyImage$ ashaya the awoken world ori | TokenScript$ ashaya_the_awoken_world | TokenOwner$ You | SpellDescription$ Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World.
- | SpellDescription$ Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.
 A:AB$ Untap | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Land | TgtPrompt$ Choose target land | TargetMin$ 0 | TargetMax$ 6 | RememberTargets$ True | SubAbility$ DBAnimate | SpellDescription$ Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 6 | Toughness$ 6 | Types$ Creature,Elemental | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/n/nissas_triumph.txt b/forge-gui/res/cardsfolder/n/nissas_triumph.txt
index 7352cbf13ce..18007ed1c5a 100644
--- a/forge-gui/res/cardsfolder/n/nissas_triumph.txt
+++ b/forge-gui/res/cardsfolder/n/nissas_triumph.txt
@@ -2,5 +2,5 @@ Name:Nissa's Triumph
 ManaCost:G G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ G G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic+Forest | ChangeNum$ 2 | ConditionPresent$ Planeswalker.Nissa+YouCtrl | ConditionCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for up to two basic Forest cards. If you control a Nissa planeswalker, instead search your library for up to three land cards. Reveal those cards, put them into your hand, then shuffle your library.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 3 | ConditionPresent$ Planeswalker.Nissa+YouCtrl | ConditionCompare$ GE1 | 
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 3 | ConditionPresent$ Planeswalker.Nissa+YouCtrl | ConditionCompare$ GE1
 Oracle:Search your library for up to two basic Forest cards. If you control a Nissa planeswalker, instead search your library for up to three land cards. Reveal those cards, put them into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/p/perish_the_thought.txt b/forge-gui/res/cardsfolder/p/perish_the_thought.txt
index e2ddc1e9bff..a7b2ebb2028 100644
--- a/forge-gui/res/cardsfolder/p/perish_the_thought.txt
+++ b/forge-gui/res/cardsfolder/p/perish_the_thought.txt
@@ -2,6 +2,6 @@ Name:Perish the Thought
 ManaCost:2 B
 Types:Sorcery
 A:SP$ RevealHand | Cost$ 2 B | Defined$ Targeted | ValidTgts$ Opponent | SubAbility$ ShuffleCardtoLib | StackDescription$ SpellDescription | SpellDescription$ Target opponent reveals their hand.
-SVar:ShuffleCardtoLib:DB$ ChangeZone | Origin$ Hand | Destination$ Library | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | Shuffle$ True | Mandatory$ True | AlreadyRevealed$ True StackDescription$ SpellDescription | SpellDescription$ You choose a card from it. That player shuffles that card into their library.
+SVar:ShuffleCardtoLib:DB$ ChangeZone | Origin$ Hand | Destination$ Library | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | Shuffle$ True | Mandatory$ True | AlreadyRevealed$ True | StackDescription$ SpellDescription | SpellDescription$ You choose a card from it. That player shuffles that card into their library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/perish_the_thought.jpg
 Oracle:Target opponent reveals their hand. You choose a card from it. That player shuffles that card into their library.
diff --git a/forge-gui/res/cardsfolder/r/recuperate.txt b/forge-gui/res/cardsfolder/r/recuperate.txt
index d55e8325679..aad536f52d7 100644
--- a/forge-gui/res/cardsfolder/r/recuperate.txt
+++ b/forge-gui/res/cardsfolder/r/recuperate.txt
@@ -2,7 +2,7 @@ Name:Recuperate
 ManaCost:3 W
 Types:Instant
 A:SP$ Charm | Cost$ 3 W | Choices$ DBGainLife,DBPreventDmg | CharmNum$ 1
-SVar:DBGainLife:DB$ GainLife | GainLife | LifeAmount$ 6 | SpellDescription$ You gain 6 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 6 | SpellDescription$ You gain 6 life.
 SVar:DBPreventDmg:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 6 | SpellDescription$ Prevent the next 6 damage that would be dealt to target creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/recuperate.jpg
 Oracle:Choose one —\n• You gain 6 life.\n• Prevent the next 6 damage that would be dealt to target creature this turn.
diff --git a/forge-gui/res/cardsfolder/r/ruthless_instincts.txt b/forge-gui/res/cardsfolder/r/ruthless_instincts.txt
index b1abd8ecd79..eaa409a5d95 100644
--- a/forge-gui/res/cardsfolder/r/ruthless_instincts.txt
+++ b/forge-gui/res/cardsfolder/r/ruthless_instincts.txt
@@ -2,7 +2,7 @@ Name:Ruthless Instincts
 ManaCost:2 G
 Types:Instant
 A:SP$ Charm | Cost$ 2 G | Choices$ DBPump1,DBPump2
-SVar:DBPump1:DB$ Pump | ValidTgts$ Creature.notattacking | TgtPrompt$ Select target nonattacking creature | KW$ Reach & Deathtouch | SubAbility DBUntap | SpellDescription$ Target nonattacking creature gains reach and deathtouch until end of turn. Untap it.
+SVar:DBPump1:DB$ Pump | ValidTgts$ Creature.notattacking | TgtPrompt$ Select target nonattacking creature | KW$ Reach & Deathtouch | SubAbility$ DBUntap | SpellDescription$ Target nonattacking creature gains reach and deathtouch until end of turn. Untap it.
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
 SVar:DBPump2:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target attacking creature gets +2/+2 and gains trample until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ruthless_instincts.jpg
diff --git a/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt b/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt
index 1aaedbfcd85..55b16fb43b5 100644
--- a/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt
+++ b/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt
@@ -3,7 +3,7 @@ ManaCost:10
 Types:Creature Eldrazi
 PT:7/11
 K:Annihilator:1
-A:AB$ Token | Cost$ 4 | TokenAmount$ 2 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You | c 0 1 eldrazi spawn sac roe | SpellDescription$ Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
+A:AB$ Token | Cost$ 4 | TokenAmount$ 2 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You | LegacyImage$ c 0 1 eldrazi spawn sac roe | SpellDescription$ Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 A:AB$ Play | Cost$ 20 | Valid$ Card.Eldrazi+YouOwn | ValidZone$ Sideboard | WithoutManaCost$ True | Amount$ SpawnsireX | Controller$ You | Optional$ True | References$ SpawnsireX | SpellDescription$ Cast any number of Eldrazi cards you own from outside the game without paying their mana costs.
 SVar:SpawnsireX:Count$TypeInYourSideboard.Eldrazi
 DeckHints:Type$Eldrazi
diff --git a/forge-gui/res/cardsfolder/t/teferis_time_twist.txt b/forge-gui/res/cardsfolder/t/teferis_time_twist.txt
index 0d474640a75..29b5fc3bb65 100644
--- a/forge-gui/res/cardsfolder/t/teferis_time_twist.txt
+++ b/forge-gui/res/cardsfolder/t/teferis_time_twist.txt
@@ -2,7 +2,7 @@ Name:Teferi's Time Twist
 ManaCost:1 U
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | AILogic$ DelayedBlink | SubAbility$ DBAnimate | SpellDescription$ Exile target permanent you control. Return that card to the battlefield under its owner’s control at the beginning of the next end step. If it enters the battlefield as a creature, it enters with an additional +1/+1 counter on it.
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Keywords$ etbCounter:P1P1:1:ValidCard$ Creature.IsRemembered | RememberObjects$ Remembered | SubAbility$ DelTrig | AILogic$ Always
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Keywords$ etbCounter:P1P1:1 | ValidCard$ Creature.IsRemembered | RememberObjects$ Remembered | SubAbility$ DelTrig | AILogic$ Always
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigBounce | RememberObjects$ Remembered | AILogic$ Always | TriggerDescription$ Return that card to the battlefield under its owner’s control at the beginning of the next end step. If it enters the battlefield as a creature, it enters with an additional +1/+1 counter on it.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered
 SVar:Picture:https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=460999&type=card
diff --git a/forge-gui/res/cardsfolder/t/trostanis_summoner.txt b/forge-gui/res/cardsfolder/t/trostanis_summoner.txt
index 0630f628c52..b83f14ca6fe 100644
--- a/forge-gui/res/cardsfolder/t/trostanis_summoner.txt
+++ b/forge-gui/res/cardsfolder/t/trostanis_summoner.txt
@@ -3,7 +3,7 @@ ManaCost:5 G W
 Types:Creature Elf Shaman
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 white Knight creature token with vigilance, a 3/3 green Centaur creature token, and a 4/4 green Rhino creature token with trample.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_knight_vigilance | TokenOwner$ You | LegacyImage$ w 2 2 knight vigilance dgm | SubAbility$ DBCentaurToken |
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_knight_vigilance | TokenOwner$ You | LegacyImage$ w 2 2 knight vigilance dgm | SubAbility$ DBCentaurToken
 SVar:DBCentaurToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_centaur | TokenOwner$ You | LegacyImage$ g 3 3 centaur dgm | SubAbility$ DBRhinoToken
 SVar:DBRhinoToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_rhino_trample | TokenOwner$ You | LegacyImage$ g 4 4 rhino trample dgm
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/u/undercity_reaches.txt b/forge-gui/res/cardsfolder/u/undercity_reaches.txt
index e9d502c876a..835363d9fef 100644
--- a/forge-gui/res/cardsfolder/u/undercity_reaches.txt
+++ b/forge-gui/res/cardsfolder/u/undercity_reaches.txt
@@ -4,7 +4,7 @@ Types:Plane Ravnica
 T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Player | OptionalDecider$ TriggeredSourceController | CombatDamage$ True | TriggerZones$ Command | Execute$ TrigDraw | TriggerDescription$ Whenever a creature deals combat damage to a player, its controller may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ TriggeredSourceController | NumCards$ 1
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you have no maximum hand size for the rest of the game.
-SVar:RolledChaos:DB$ Effect | Effect | Name$ Undercity Reaches Effect | StaticAbilities$ STHandSize | Duration$ Permanent
+SVar:RolledChaos:DB$ Effect | Name$ Undercity Reaches Effect | StaticAbilities$ STHandSize | Duration$ Permanent
 SVar:STHandSize:Mode$ Continuous | EffectZone$ Command | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undercity_reaches.jpg
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
diff --git a/forge-gui/res/cardsfolder/u/unnatural_hunger.txt b/forge-gui/res/cardsfolder/u/unnatural_hunger.txt
index b7f3686fb93..dd8a9812d45 100644
--- a/forge-gui/res/cardsfolder/u/unnatural_hunger.txt
+++ b/forge-gui/res/cardsfolder/u/unnatural_hunger.txt
@@ -2,7 +2,7 @@ Name:Unnatural Hunger
 ManaCost:3 B B
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 3 B B | ValidTgts$ Creature | Card.powerGE3 | AILogic$ Curse
+A:SP$ Attach | Cost$ 3 B B | ValidTgts$ Creature | AILogic$ Curse
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, CARDNAME deals damage to that player equal to that creature's power unless they sacrifice another creature.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X | UnlessCost$ Sac<1/Creature.NotEnchantedBy> | UnlessPayer$ EnchantedController
 SVar:X:Enchanted$CardPower
diff --git a/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt b/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt
index f570d8b3fb8..7d4eafe369a 100644
--- a/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt
+++ b/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt
@@ -2,7 +2,7 @@ Name:Vivien of the Arkbow
 ManaCost:4 G G
 Types:Legendary Planeswalker Vivien
 A:AB$ PutCounter | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | CounterNum$ 2 | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | AIActivateLast$ True | SpellDescription$ Put two +1/+1 counters on up to one target creature.
-A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ TailDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control.
+A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ TailDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control.
 SVar:TailDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | References$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 A:AB$ PumpAll | Cost$ SubCounter<9/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +4 | NumDef$ +4 | KW$ Trample | SpellDescription$ Creatures you control get +4/+4 and gain trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/waste_not.txt b/forge-gui/res/cardsfolder/w/waste_not.txt
index 356f588cefb..8aa16209075 100644
--- a/forge-gui/res/cardsfolder/w/waste_not.txt
+++ b/forge-gui/res/cardsfolder/w/waste_not.txt
@@ -2,7 +2,7 @@ Name:Waste Not
 ManaCost:1 B
 Types:Enchantment
 T:Mode$ Discarded | ValidCard$ Creature.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent discards a creature card, create a 2/2 black Zombie creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You | LegacyImage$ b 2 2 zombie m15 | 
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You | LegacyImage$ b 2 2 zombie m15
 T:Mode$ Discarded | ValidCard$ Land.OppOwn | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever an opponent discards a land card, add {B}{B}.
 SVar:TrigMana:DB$ Mana | Produced$ B | Amount$ 2 | Defined$ You
 T:Mode$ Discarded | ValidCard$ Card.nonLand+nonCreature+OppOwn | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent discards a noncreature, nonland card, draw a card.
diff --git a/forge-gui/res/cardsfolder/y/your_fate_is_thrice_sealed.txt b/forge-gui/res/cardsfolder/y/your_fate_is_thrice_sealed.txt
index fb8edbeb019..65ed0812ce0 100644
--- a/forge-gui/res/cardsfolder/y/your_fate_is_thrice_sealed.txt
+++ b/forge-gui/res/cardsfolder/y/your_fate_is_thrice_sealed.txt
@@ -2,6 +2,6 @@ Name:Your Fate Is Thrice Sealed
 ManaCost:no cost
 Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ RevealFate | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, reveal the top three cards of your library. Put all land cards revealed this way onto the battlefield and the rest into your hand.
-SVar:RevealFate:DB$ Dig | DigNum$ 3 | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | DestinationZone$ Battlefield | DestinationZone2$ Hand |
+SVar:RevealFate:DB$ Dig | DigNum$ 3 | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | DestinationZone$ Battlefield | DestinationZone2$ Hand
 SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/Your Fate Is Thrice Sealed.full.jpg
 Oracle:When you set this scheme in motion, reveal the top three cards of your library. Put all land cards revealed this way onto the battlefield and the rest into your hand.