Fix some bad replacements from the References change

forge-gui/res/cardsfolder/a/arlinn_kord_arlinn_embraced_by_the_moon.txt

@@ -22,7 +22,7 @@ A:AB$ DealDamage | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$
 SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Name$ Emblem - Arlinn, Embraced by the Moon | Image$ emblem_arlinn_embraced_by_the_moon | StaticAbilities$ STArlinn | SVars$ ArlinnX,ArlinnDealDamage | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.'"
 SVar:STArlinn:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Haste | AddAbility$ ArlinnDealDamage | AddSVar$ ArlinnX | Description$ Creatures you control have haste and "{T}: This creature deals damage equal to its power to any target."
-SVar:ArlinnDealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ ArlinnXrlinnX | SpellDescription$ This creature deals damage equal to its power to any target.
+SVar:ArlinnDealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ ArlinnX | SpellDescription$ This creature deals damage equal to its power to any target.
 SVar:ArlinnX:Count$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arlinn_embraced_by_the_moon.jpg
 Oracle:[+1]: Creatures you control get +1/+1 and gain trample until end of turn.\n[−1]: Arlinn, Embraced by the Moon deals 3 damage to any target. Transform Arlinn, Embraced by the Moon.\n[−6]: You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.'"

forge-gui/res/cardsfolder/a/arrow_storm.txt

@@ -1,7 +1,7 @@
 Name:Arrow Storm
 ManaCost:3 R R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0aidTest | SubAbility$ DBDmg | SpellDescription$ CARDNAME deals 4 damage to any target. Raid — If you attacked this turn, instead CARDNAME deals 5 damage to that permanent or player and the damage can't be prevented.
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | SubAbility$ DBDmg | SpellDescription$ CARDNAME deals 4 damage to any target. Raid — If you attacked this turn, instead CARDNAME deals 5 damage to that permanent or player and the damage can't be prevented.
-SVar:DBDmg:DB$ DealDamage | Defined$ Targeted | NumDmg$ 5 | NoPrevention$ True | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1aidTest | StackDescription$ Raid — If you attacked this turn, instead CARDNAME deals 5 damage to {Targeted} and the damage can't be prevented.
+SVar:DBDmg:DB$ DealDamage | Defined$ Targeted | NumDmg$ 5 | NoPrevention$ True | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | StackDescription$ Raid — If you attacked this turn, instead CARDNAME deals 5 damage to {Targeted} and the damage can't be prevented.
 SVar:RaidTest:Count$AttackersDeclared
 Oracle:Arrow Storm deals 4 damage to any target.\nRaid — If you attacked this turn, instead Arrow Storm deals 5 damage to that permanent or player and the damage can't be prevented.

forge-gui/res/cardsfolder/b/bob_bevy_of_beebles.txt

@@ -13,7 +13,7 @@ SVar:Loy:Count$CardCounters.LOYALTY
 SVar:Beeb:Count$Valid Beeble.YouCtrl
 K:The number of loyalty counters on CARDNAME is equal to the number of Beebles you control.
 SVar:NHand:Count$InYourHand
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Beeble | TargetMin$ 0 | TargetMax$ NHandHand | KW$ HIDDEN Unblockable | TgtPrompt$ Select target creature | SpellDescription$ Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Beeble | TargetMin$ 0 | TargetMax$ NHand | KW$ HIDDEN Unblockable | TgtPrompt$ Select target creature | SpellDescription$ Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.
 A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
 DeckHas:Ability$Token
 Oracle:As B.O.B. (Bevy of Beebles) enters the battlefield, create four 1/1 blue Beeble creature tokens.\nThe number of loyalty counters on B.O.B. is equal to the number of Beebles you control. (Create or sacrifice Beebles whenever B.O.B. gains or loses loyalty.)\n[+1]: Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.\n[−1]: Draw a card.

forge-gui/res/cardsfolder/b/boreal_outrider.txt

@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Snow Creature Elf Warrior
 PT:3/2
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | SnowSpentForCardsColor$ True | TriggerDescription$ Whenever you cast a creature spell, if {S} of any of that spell's colors was spent to cast it, that creature enters the battlefield with an additional +1/+1 counter on it. ({S} is mana from a snow source.)
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat | SVars$ DBPutP1P1,ToBattlefield,DBExileTBCreat,DBPutP1P1,ToBattlefield,DBExile
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat | SVars$ DBPutP1P1,ToBattlefield,DBExile
 SVar:ETBCreat:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | Description$ That creature enters the battlefield with an additional +1/+1 counter on it.
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 1 | SubAbility$ ToBattlefield
 SVar:ToBattlefield:DB$ InternalEtbReplacement | SubAbility$ DBExile

forge-gui/res/cardsfolder/b/bring_low.txt

@@ -1,7 +1,7 @@
 Name:Bring Low
 ManaCost:3 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X,Y | SpellDescription$ CARDNAME deals 3 damage to target creature. If that creature has a +1/+1 counter on it, CARDNAME deals 5 damage to it instead.
+A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SpellDescription$ CARDNAME deals 3 damage to target creature. If that creature has a +1/+1 counter on it, CARDNAME deals 5 damage to it instead.
 SVar:Y:Targeted$Valid Creature.counters_GE1_P1P1
 SVar:X:Count$Compare Y GE1.5.3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bring_low.jpg

forge-gui/res/cardsfolder/b/builders_bane.txt

@@ -1,7 +1,7 @@
 Name:Builder's Bane
 ManaCost:X X R
 Types:Sorcery
-A:SP$ Destroy | Cost$ X X R | ValidTgts$ Artifact | TargetMin$ 0 | TargetMax$ Maxtgt,Maxtgt | RememberTargets$ True | SubAbility$ DBRepeat | StackDescription$ SpellDescription | SpellDescription$ Destroy X target artifacts. CARDNAME deals damage to each player equal to the number of artifacts they controlled that were put into a graveyard this way.
+A:SP$ Destroy | Cost$ X X R | ValidTgts$ Artifact | TargetMin$ 0 | TargetMax$ Maxtgt | RememberTargets$ True | SubAbility$ DBRepeat | StackDescription$ SpellDescription | SpellDescription$ Destroy X target artifacts. CARDNAME deals damage to each player equal to the number of artifacts they controlled that were put into a graveyard this way.
 SVar:Maxtgt:Count$Valid Artifact
 SVar:X:TargetedObjects$Amount
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDmg | SubAbility$ DBCleanup | DamageMap$ True

forge-gui/res/cardsfolder/c/chandra_heart_of_fire.txt

@@ -8,7 +8,7 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ Play |
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until end of turn, you may play cards exiled this way.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
-A:AB$ ChangeZone | Cost$ SubCounter<9/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Graveyard,Library | Destination$ Exile | ChangeType$ Instant.Red,Sorcery.Red | RememberChanged$ True | ChangeNum$ Z,Y,Z | SubAbility$ DBEffect2 | StackDescription$ SpellDescription | SpellDescription$ Search your graveyard and library for any number of red instant and/or sorcery cards, exile them, then shuffle your library. You may cast them this turn. Add six {R}.
+A:AB$ ChangeZone | Cost$ SubCounter<9/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Graveyard,Library | Destination$ Exile | ChangeType$ Instant.Red,Sorcery.Red | RememberChanged$ True | ChangeNum$ Z | SubAbility$ DBEffect2 | StackDescription$ SpellDescription | SpellDescription$ Search your graveyard and library for any number of red instant and/or sorcery cards, exile them, then shuffle your library. You may cast them this turn. Add six {R}.
 SVar:DBEffect2:DB$ Effect | Name$ Chandra, Heart of Fire Ultimate Effect | RememberObjects$ Remembered | StaticAbilities$ Play2 | SubAbility$ DBMana | ForgetOnMoved$ Exile
 SVar:Play2:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may cast the exiled red instant and/or sorcery spells this turn.
 SVar:DBMana:DB$ Mana | Produced$ R | Amount$ 6 | SubAbility$ DBCleanup | StackDescription$ None

forge-gui/res/cardsfolder/c/collapsing_borders.txt

@@ -2,7 +2,7 @@ Name:Collapsing Borders
 ManaCost:3 R
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Domain — At the beginning of each player's upkeep, that player gains 1 life for each basic land type among lands they control. Then CARDNAME deals 3 damage to that player.
-SVar:TrigGainLife:DB$ GainLife | Defined$ TriggeredPlayer | LifeAmount$ DomainX | SubAbility$ DBDamageomainX
+SVar:TrigGainLife:DB$ GainLife | Defined$ TriggeredPlayer | LifeAmount$ DomainX | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 3
 SVar:DomainX:Count$DomainActivePlayer
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/c/curse_of_the_cabal.txt

@@ -3,7 +3,7 @@ ManaCost:9 B
 Types:Sorcery
 K:Suspend:2:2 B B
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigCursePayUP | TriggerZones$ Exile | IsPresent$ Card.suspended+Self | PresentZone$ Exile | TriggerDescription$ At the beginning of each player's upkeep, if CARDNAME is suspended, that player may sacrifice a permanent. If the player does, put two time counters on CARDNAME.
-A:SP$ Sacrifice | Cost$ 9 B | ValidTgts$ Player | TgtPrompt$ Select target player | Amount$ CurseX | SacValid$ PermanenturseX | SpellDescription$ Target player sacrifices half the permanents they control, rounded down.
+A:SP$ Sacrifice | Cost$ 9 B | ValidTgts$ Player | TgtPrompt$ Select target player | Amount$ CurseX | SacValid$ Permanent | SpellDescription$ Target player sacrifices half the permanents they control, rounded down.
 SVar:TrigCursePayUP:DB$ Sacrifice | Amount$ 1 | SacValid$ Permanent | Defined$ TriggeredPlayer | Optional$ True | AILogic$ OpponentOnly | RememberSacrificed$ True | SubAbility$ DBCursePutCounter
 SVar:DBCursePutCounter:DB$ PutCounter | CounterType$ TIME | CounterNum$ 2 | ConditionCheckSVar$ CurseY | ConditionSVarCompare$ GT0 | SubAbility$ DBCurseCleanup
 SVar:DBCurseCleanup:DB$ Cleanup | ClearRemembered$ True

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

@@ -4,7 +4,7 @@ Types:Creature Avatar
 PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ CastEach | TriggerDescription$ When CARDNAME enters the battlefield, for each opponent, you may cast up to one target instant or sorcery card from that player's graveyard without paying its mana cost. If a spell cast this way would be put into a graveyard this turn, exile it instead.
-SVar:CastEach:DB$ Play | ValidTgts$ Instant.OppCtrl,Sorcery.OppCtrl | TgtZone$ Graveyard | TgtPrompt$ Select target instant or sorcery card in each opponent's graveyard | TargetMin$ 0 | TargetMax$ OneEachneEach | TargetsWithDifferentControllers$ True | Amount$ All | WithoutManaCost$ True | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
+SVar:CastEach:DB$ Play | ValidTgts$ Instant.OppCtrl,Sorcery.OppCtrl | TgtZone$ Graveyard | TgtPrompt$ Select target instant or sorcery card in each opponent's graveyard | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | Amount$ All | WithoutManaCost$ True | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
 SVar:OneEach:PlayerCountOpponents$Amount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diluvian_primordial.jpg
 Oracle:Flying\nWhen Diluvian Primordial enters the battlefield, for each opponent, you may cast up to one target instant or sorcery card from that player's graveyard without paying its mana cost. If a spell cast this way would be put into a graveyard this turn, exile it instead.

forge-gui/res/cardsfolder/e/electrostatic_bolt.txt

@@ -2,7 +2,7 @@ Name:Electrostatic Bolt
 ManaCost:R
 Types:Instant
 A:SP$ DealDamage | Cost$ R | NumDmg$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature to deal damage to | ConditionCheckSVar$ ElectrostaticCheck | ConditionSVarCompare$ EQ0 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 2 damage to target creature. If it's an artifact creature, CARDNAME deals 4 damage to it instead.
-SVar:DBDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 4 | ConditionCheckSVar$ ElectrostaticCheck | ConditionSVarCompare$ EQ1 | StackDescription$ If it's an artifact creature, Electrostatic Bolt deals 4 damage instead.lectrostaticCheck
+SVar:DBDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 4 | ConditionCheckSVar$ ElectrostaticCheck | ConditionSVarCompare$ EQ1 | StackDescription$ If it's an artifact creature, Electrostatic Bolt deals 4 damage instead.
 SVar:ElectrostaticCheck:Targeted$Valid Creature.Artifact
 SVar:Picture:http://www.wizards.com/global/images/magic/general/electrostatic_bolt.jpg
 Oracle:Electrostatic Bolt deals 2 damage to target creature. If it's an artifact creature, Electrostatic Bolt deals 4 damage to it instead.

forge-gui/res/cardsfolder/e/enigma_thief.txt

@@ -5,6 +5,6 @@ PT:5/5
 K:Prowl:3 U
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ReturnOneEach | TriggerDescription$ When CARDNAME enters the battlefield, for each opponent, return up to one target nonland permanent that player controls to its owner's hand.
-SVar:ReturnOneEach:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand+OppCtrl | TargetMin$ 0 | TargetMax$ OneEachneEach | TargetsWithDifferentControllers$ True | TgtPrompt$ Select up to one target nonland permanent each opponent controls
+SVar:ReturnOneEach:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand+OppCtrl | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | TgtPrompt$ Select up to one target nonland permanent each opponent controls
 SVar:OneEach:PlayerCountOpponents$Amount
 Oracle:Prowl {3}{U} (You may cast this spell for its prowl cost if you dealt combat damage to a player this turn with a Sphinx or a Rogue.)\nFlying\nWhen Enigma Thief enters the battlefield, for each opponent, return up to one target nonland permanent that player controls to its owner's hand.

forge-gui/res/cardsfolder/e/exert_influence.txt

@@ -1,7 +1,7 @@
 Name:Exert Influence
 ManaCost:4 U
 Types:Sorcery
-A:SP$ GainControl | Cost$ 4 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1,Y | SpellDescription$ Converge — Gain control of target creature if its power is less than or equal to the number of colors of mana spent to cast this spell.
+A:SP$ GainControl | Cost$ 4 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SpellDescription$ Converge — Gain control of target creature if its power is less than or equal to the number of colors of mana spent to cast this spell.
 SVar:Y:Count$Converge
 SVar:X:Targeted$Valid Creature.powerLEY
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/e/explosive_growth.txt

@@ -2,7 +2,7 @@ Name:Explosive Growth
 ManaCost:G
 Types:Instant
 K:Kicker:5
-A:SP$ Pump | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ WasKicked | NumDef$ WasKickedasKicked | SpellDescription$ Target creature gets +2/+2 until end of turn. If this spell was kicked, that creature gets +5/+5 until end of turn instead.
+A:SP$ Pump | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ WasKicked | NumDef$ WasKicked | SpellDescription$ Target creature gets +2/+2 until end of turn. If this spell was kicked, that creature gets +5/+5 until end of turn instead.
 SVar:WasKicked:Count$Kicked.5.2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/explosive_growth.jpg
 Oracle:Kicker {5} (You may pay an additional {5} as you cast this spell.)\nTarget creature gets +2/+2 until end of turn. If this spell was kicked, that creature gets +5/+5 until end of turn instead.

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

@@ -1,7 +1,7 @@
 Name:Fireball
 ManaCost:X R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | TargetMin$ 0 | TargetMax$ MaxTargets | DivideEvenly$ RoundedDown,MaxTargets,Maxplayer,Maxcreature,IncreaseCost | SpellDescription$ This spell costs {1} more to cast for each target beyond the first.
+A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | TargetMin$ 0 | TargetMax$ MaxTargets | DivideEvenly$ RoundedDown | SpellDescription$ This spell costs {1} more to cast for each target beyond the first.
 S:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ IncreaseCost | EffectZone$ All | Description$ CARDNAME deals X damage divided evenly, rounded down, among any number of targets.
 SVar:X:Count$xPaid
 SVar:MaxTargets:SVar$Maxplayer/Plus.Maxcreatureorplaneswalker

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

@@ -1,7 +1,7 @@
 Name:Grindstone
 ManaCost:1
 Types:Artifact
-A:AB$ Repeat | Cost$ 3 T | ValidTgts$ Player | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesColorilledSharesColor,MaxRepeats | RepeatSVarCompare$ EQ2 | SubAbility$ DBCleanup | SpellDescription$ Target player mills two cards. If two cards that share a color were milled this way, repeat this process. | StackDescription$ SpellDescription
+A:AB$ Repeat | Cost$ 3 T | ValidTgts$ Player | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesColor | RepeatSVarCompare$ EQ2 | SubAbility$ DBCleanup | SpellDescription$ Target player mills two cards. If two cards that share a color were milled this way, repeat this process. | StackDescription$ SpellDescription
 SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBPeek
 SVar:DBPeek:DB$ PeekAndReveal | Defined$ Targeted | PeekAmount$ 2 | NoPeek$ True | NoReveal$ True | RememberPeeked$ True | SubAbility$ DBGrind
 SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | NoReveal$ True

forge-gui/res/cardsfolder/h/heart_of_bogardan.txt

@@ -3,8 +3,8 @@ ManaCost:2 R R
 Types:Enchantment
 K:Cumulative upkeep:2
 T:Mode$ PayCumulativeUpkeep | ValidCard$ Card.Self | Paid$ False | Execute$ TrigDmg | TriggerDescription$ When a player doesn't pay CARDNAME's cumulative upkeep, CARDNAME deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls, where X is twice the number of age counters on CARDNAME minus 2.
-SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ Y,Y | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$  CARDNAME deals X damage to target player or planeswalker and each creature that player or planeswalker's controller controls.
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ Y | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$  CARDNAME deals X damage to target player or planeswalker and each creature that player or planeswalker's controller controls.
-SVar:DmgAll:DB$ DamageAll | NumDmg$ Y,Y | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DmgAll:DB$ DamageAll | NumDmg$ Y | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
 SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:TriggeredCard$CardCounters.AGE/Twice
 SVar:Y:SVar$X/Minus.2

forge-gui/res/cardsfolder/h/helm_of_kaldra.txt

@@ -3,8 +3,8 @@ ManaCost:3
 Types:Legendary Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike & Trample & Haste | Description$ Equipped creature has first strike, trample, and haste.
-A:AB$ Token | Cost$ 1 | TokenAmount$ 1 | LegacyImage$ kaldra 5dn | TokenScript$ kaldra | TokenOwner$ You | SubAbility$ DBAttachEach | RememberTokens$ True | ConditionCheckSVar$ HelmX | ConditionSVarCompare$ EQ3 | AILogic$ NeverelmX | SpellDescription$ If you control Equipment named CARDNAME, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it.
+A:AB$ Token | Cost$ 1 | TokenAmount$ 1 | LegacyImage$ kaldra 5dn | TokenScript$ kaldra | TokenOwner$ You | SubAbility$ DBAttachEach | RememberTokens$ True | ConditionCheckSVar$ HelmX | ConditionSVarCompare$ EQ3 | AILogic$ Never | SpellDescription$ If you control Equipment named CARDNAME, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it.
-SVar:DBAttachEach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Equipment.YouCtrl+namedHelm of Kaldra,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra | CheckSVar$ HelmY | SVarCompare$ EQ1elmY | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup
+SVar:DBAttachEach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Equipment.YouCtrl+namedHelm of Kaldra,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra | CheckSVar$ HelmY | SVarCompare$ EQ1 | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup
 SVar:DBAttach:DB$ Attach | Object$ Imprinted | Defined$ Remembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:HelmX:Count$Valid Equipment.YouCtrl+namedHelm of Kaldra,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra

forge-gui/res/cardsfolder/h/heretics_punishment.txt

@@ -2,7 +2,7 @@ Name:Heretic's Punishment
 ManaCost:4 R
 Types:Enchantment
 A:AB$ Mill | Cost$ 3 R | NumCards$ 3 | RememberMilled$ True | SubAbility$ DBHereticDamage | SpellDescription$ Choose any target, then mill three cards. CARDNAME deals damage to that permanent or player equal to the highest converted mana cost among the milled cards.
-SVar:DBHereticDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ HereticX | SubAbility$ DBHereticCleanupereticX
+SVar:DBHereticDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ HereticX | SubAbility$ DBHereticCleanup
 SVar:DBHereticCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:HereticX:Count$HighestCMC_Card.IsRemembered
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/h/huatlis_spurring.txt

@@ -1,7 +1,7 @@
 Name:Huatli's Spurring
 ManaCost:R
 Types:Instant
-A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X,Y | SpellDescription$ Target creature gets +2/+0 until end of turn. If you control a Huatli planeswalker, that creature gets +4/+0 until end of turn instead.
+A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SpellDescription$ Target creature gets +2/+0 until end of turn. If you control a Huatli planeswalker, that creature gets +4/+0 until end of turn instead.
 SVar:Y:Count$Valid Planeswalker.Huatli+YouCtrl
 SVar:X:Count$Compare Y GE1.4.2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/huatlis_spurring.jpg

forge-gui/res/cardsfolder/j/jaces_triumph.txt

@@ -1,7 +1,7 @@
 Name:Jace's Triumph
 ManaCost:2 U
 Types:Sorcery
-A:SP$ Draw | Cost$ 2 U | NumCards$ X,Y | SpellDescription$ Draw two cards. If you control a Jace planeswalker, draw three cards instead.
+A:SP$ Draw | Cost$ 2 U | NumCards$ X | SpellDescription$ Draw two cards. If you control a Jace planeswalker, draw three cards instead.
 SVar:Y:Count$Valid Planeswalker.Jace+YouCtrl
 SVar:X:Count$Compare Y GE1.3.2
 Oracle:Draw two cards. If you control a Jace planeswalker, draw three cards instead.

forge-gui/res/cardsfolder/j/jaws_of_stone.txt

@@ -1,7 +1,7 @@
 Name:Jaws of Stone
 ManaCost:5 R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 5 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target to distribute damage to | NumDmg$ OrigMountains | TargetMin$ Min | TargetMax$ OrigMountainsin,OrigMountains | DividedAsYouChoose$ OrigMountains | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of targets, where X is the number of Mountains you control as you cast this spell.
+A:SP$ DealDamage | Cost$ 5 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target to distribute damage to | NumDmg$ OrigMountains | TargetMin$ Min | TargetMax$ OrigMountains | DividedAsYouChoose$ OrigMountains | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of targets, where X is the number of Mountains you control as you cast this spell.
 T:Mode$ SpellCast | ValidCard$ Card.Self | Static$ True | Execute$ CountMountainsAtCast
 SVar:CountMountainsAtCast:DB$ StoreSVar | SVar$ OrigMountains | Type$ Count | Expression$ Valid Mountain.YouCtrl
 SVar:OrigMountains:Count$Valid Mountain.YouCtrl

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

@@ -2,7 +2,7 @@ Name:Keeper of the Dead
 ManaCost:B B
 Types:Creature Human Wizard
 PT:1/2
-A:AB$ Pump | Cost$ B T | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent with at least two fewer creature cards in their graveyard than you | CheckSVar$ X | SVarCompare$ GEY | SubAbility$ DeadKeepersDestroy | StackDescription$ None,Y | SpellDescription$ Choose target opponent who had at least two fewer creature cards in their graveyard than you did as you activated this ability. Destroy target nonblack creature that player controls.
+A:AB$ Pump | Cost$ B T | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent with at least two fewer creature cards in their graveyard than you | CheckSVar$ X | SVarCompare$ GEY | SubAbility$ DeadKeepersDestroy | StackDescription$ None | SpellDescription$ Choose target opponent who had at least two fewer creature cards in their graveyard than you did as you activated this ability. Destroy target nonblack creature that player controls.
 SVar:DeadKeepersDestroy:DB$ Destroy | ValidTgts$ Creature.nonBlack+TargetedPlayerCtrl | TgtPrompt$ Select target nonblack creature targeted player controls
 SVar:X:Count$TypeInYourYard.Creature/Minus.2
 SVar:Y:Count$TypeInOppYard.Creature

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

@@ -3,7 +3,7 @@ ManaCost:8 C C
 Types:Legendary Creature Eldrazi
 PT:12/12
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDraw | CheckSVar$ Y | SVarCompare$ LT7 | TriggerDescription$ When you cast this spell, if you have fewer than seven cards in hand, draw cards equal to the difference.
-SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ Difference,Difference
+SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ Difference
 SVar:Y:Count$InYourHand
 SVar:Difference:Number$7/Minus.Y
 K:Menace

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

@@ -2,7 +2,7 @@ Name:Kumena's Speaker
 ManaCost:G
 Types:Creature Merfolk Shaman
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ TotalX | SVarCompare$ GE1otalX | Description$ CARDNAME gets +1/+1 as long as you control another Merfolk or an Island.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ TotalX | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control another Merfolk or an Island.
 SVar:X1:Count$Valid Island.YouCtrl
 SVar:X2:Count$Valid Creature.Merfolk+Other+YouCtrl
 SVar:TotalX:SVar$X1/Plus.X2

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

@@ -2,7 +2,7 @@ Name:Kyren Toy
 ManaCost:3
 Types:Artifact
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ C | Amount$ Y,Y | AILogic$ ManaRitualBattery.1 | SpellDescription$ Add an amount of {C} equal to X plus one.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ C | Amount$ Y | AILogic$ ManaRitualBattery.1 | SpellDescription$ Add an amount of {C} equal to X plus one.
 SVar:Y:SVar$X/Plus.1
 SVar:X:Count$xPaid
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/l/lookouts_dispersal.txt

@@ -1,7 +1,7 @@
 Name:Lookout's Dispersal
 ManaCost:2 U
 Types:Instant
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | CheckSVar$ Piracy | SVarCompare$ GE1iracy | Description$ This spell costs {1} less to cast if you control a Pirate.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | CheckSVar$ Piracy | SVarCompare$ GE1 | Description$ This spell costs {1} less to cast if you control a Pirate.
 SVar:Piracy:Count$Valid Pirate.YouCtrl
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SpellDescription$ Counter target spell unless its controller pays {4}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lookouts_dispersal.jpg

forge-gui/res/cardsfolder/l/lost_legacy.txt

@@ -2,9 +2,9 @@ Name:Lost Legacy
 ManaCost:1 B B
 Types:Sorcery
 A:SP$ NameCard | Cost$ 1 B B | Defined$ You | ValidCards$ Card.nonLand+nonArtifact | ValidDesc$ nonartifact, nonland | SubAbility$ ExileHand | SpellDescription$ Choose a nonartifact, nonland card name. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. That player shuffles their library, then draws a card for each card exiled from their hand this way. | StackDescription$ SpellDescription
-SVar:ExileHand:DB$ ChangeZone | ValidTgts$ Player | TgtPrompt$ Select target player | RememberTargets$ True | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInHandumInHand | Chooser$ You | SubAbility$ ExileLib | RememberChanged$ True | StackDescription$ None
+SVar:ExileHand:DB$ ChangeZone | ValidTgts$ Player | TgtPrompt$ Select target player | RememberTargets$ True | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInHand | Chooser$ You | SubAbility$ ExileLib | RememberChanged$ True | StackDescription$ None
-SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInLibumInLib | Chooser$ You | Shuffle$ True | SubAbility$ ExileYard | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInLib | Chooser$ You | Shuffle$ True | SubAbility$ ExileYard | StackDescription$ None
-SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInYardumInYard | Chooser$ You | Hidden$ True | SubAbility$ Draw | StackDescription$ None
+SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.NamedCard | ChangeNum$ NumInYard | Chooser$ You | Hidden$ True | SubAbility$ Draw | StackDescription$ None
 SVar:Draw:DB$ Draw | Defined$ TargetedPlayer | NumCards$ X | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize

forge-gui/res/cardsfolder/m/goblin_bowling_team.txt

@@ -4,6 +4,6 @@ Types:Creature - Goblin
 PT:1/1
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.Self | ReplaceWith$ RollDamage | Description$ If CARDNAME would deal damage to a permanent or player, it deals that much damage plus the result of a six-sided die roll to that permanent or player instead.
 SVar:RollDamage:DB$ RollDice | ResultSVar$ Result | SubAbility$ DmgPlus
-SVar:DmgPlus:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
+SVar:DmgPlus:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
 SVar:X:ReplaceCount$DamageAmount/Plus.Result
 Oracle:If Goblin Bowling Team would deal damage to a permanent or player, it deals that much damage plus the result of a six-sided die roll to that permanent or player instead.

forge-gui/res/cardsfolder/m/magus_of_the_mind.txt

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 PT:4/5
 A:AB$ Shuffle | Cost$ U T Sac<1/CARDNAME> | SubAbility$ DBExile | SpellDescription$ Shuffle your library, then exile the top X cards, where X is one plus the number of spells cast this turn. Until end of turn, you may play lands and cast spells from among cards exiled this way without paying their mana costs.
 SVar:DBExile:DB$ Dig | Defined$ You | DestinationZone$ Exile | DigNum$ X | ChangeNum$ All | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ Playlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
 SVar:Play:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$ThisTurnCast_Card/Plus.1

forge-gui/res/cardsfolder/m/mana_seism.txt

@@ -1,7 +1,7 @@
 Name:Mana Seism
 ManaCost:1 R
 Types:Sorcery
-A:SP$ Sacrifice | Cost$ 1 R | Defined$ You | Amount$ SacXacX | SacValid$ Land | RememberSacrificed$ True | Optional$ True | SubAbility$ DBMana | SpellDescription$ Sacrifice any number of lands, then add that much {C}.
+A:SP$ Sacrifice | Cost$ 1 R | Defined$ You | Amount$ SacX | SacValid$ Land | RememberSacrificed$ True | Optional$ True | SubAbility$ DBMana | SpellDescription$ Sacrifice any number of lands, then add that much {C}.
 SVar:DBMana:DB$ Mana | Produced$ C | Amount$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SacX:Count$Valid Land.YouCtrl

forge-gui/res/cardsfolder/m/mask_of_intolerance.txt

@@ -1,7 +1,7 @@
 Name:Mask of Intolerance
 ManaCost:2
 Types:Artifact
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | CheckSVar$ CheckLandTypesheckLandTypes | SVarCompare$ GE4 | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, CARDNAME deals 3 damage to that player.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | CheckSVar$ CheckLandTypes | SVarCompare$ GE4 | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, CARDNAME deals 3 damage to that player.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 3
 SVar:CheckLandTypes:Count$DomainActivePlayer
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/m/monstrous_onslaught.txt

@@ -1,7 +1,7 @@
 Name:Monstrous Onslaught
 ManaCost:3 G G
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute damage to | NumDmg$ OrigPower | TargetMin$ Min | TargetMax$ OrigPowerin,OrigPower | DividedAsYouChoose$ OrigPower | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of target creatures, where X is the greatest power among creatures you control as you cast this spell.
+A:SP$ DealDamage | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute damage to | NumDmg$ OrigPower | TargetMin$ Min | TargetMax$ OrigPower | DividedAsYouChoose$ OrigPower | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of target creatures, where X is the greatest power among creatures you control as you cast this spell.
 T:Mode$ SpellCast | ValidCard$ Card.Self | Static$ True | Execute$ CountPowerAtCast
 SVar:CountPowerAtCast:DB$ StoreSVar | SVar$ OrigPower | Type$ Count | Expression$ GreatestPower_Creature.YouCtrl
 SVar:OrigPower:Count$GreatestPower_Creature.YouCtrl

forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt

@@ -5,7 +5,7 @@ PT:0/0
 K:Changeling
 K:ETBReplacement:Copy:DBCopy:Optional
 SVar:DBCopy:DB$ Clone | Choices$ Permanent.Other+YouCtrl | AddTypes$ Legendary,Snow | SubAbility$ DBConditionEffect | AddKeywords$ Changeling (This card is every creature type.) | SpellDescription$ You may have Moritte of the Frost enter the battlefield as a copy of a permanent you control, except it’s legendary and snow in addition to its other types and, if it’s a creature, it enters with two additional +1/+1 counters on it and has changeling.
-SVar:DBConditionEffect:DB$ Effect | RememberObjects$ Self | Name$ Moritte of the Frost Effect | ReplacementEffects$ ETBCreat | SVars$ DBPutP1P1,ToBattlefield,DBExileTBCreat,DBPutP1P1,ToBattlefield,DBExile
+SVar:DBConditionEffect:DB$ Effect | RememberObjects$ Self | Name$ Moritte of the Frost Effect | ReplacementEffects$ ETBCreat | SVars$ DBPutP1P1,ToBattlefield,DBExile
 SVar:ETBCreat:Event$ Moved | ValidCard$ Creature.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | Description$ If it’s a creature, it enters with two additional +1/+1 counters on it.
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ ToBattlefield
 SVar:ToBattlefield:DB$ InternalEtbReplacement | SubAbility$ DBExile

forge-gui/res/cardsfolder/n/nimble_trapfinder.txt

@@ -2,7 +2,7 @@ Name:Nimble Trapfinder
 ManaCost:1 U
 Types:Creature Human Rogue
 PT:2/1
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ JoinedParty | SVarCompare$ GE1oinedParty | Description$ CARDNAME can't be blocked if you had another Cleric, Rogue, Warrior, or Wizard enter the battlefield under your control this turn.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ JoinedParty | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked if you had another Cleric, Rogue, Warrior, or Wizard enter the battlefield under your control this turn.
 SVar:JoinedParty:Count$ThisTurnEntered_Battlefield_Cleric.YouCtrl+Other,Rogue.YouCtrl+Other,Warrior.YouCtrl+Other,Wizard.YouCtrl+Other
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ4 | Execute$ TrigAnimateAll | TriggerDescription$ At the beginning of combat on your turn, if you have a full party, creatures you control gain "Whenever this creature deals combat damage to a player, draw a card" until end of turn.
 SVar:TrigAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ TrigCDPlayer | sVars$ TrigDraw

forge-gui/res/cardsfolder/n/nissa_revane.txt

@@ -3,8 +3,8 @@ ManaCost:2 G G
 Types:Legendary Planeswalker Nissa
 Loyalty:2
 A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.namedNissa's Chosen | ChangeNum$ 1 | Planeswalker$ True | StackDescription$ SpellDescription | SpellDescription$ Search your library for a card named Nissa's Chosen and put it onto the battlefield. Then shuffle your library.
-A:AB$ GainLife | Cost$ AddCounter<1/LOYALTY> | LifeAmount$ XLife | Planeswalker$ TrueLife | SpellDescription$ You gain 2 life for each Elf you control.
+A:AB$ GainLife | Cost$ AddCounter<1/LOYALTY> | LifeAmount$ XLife | Planeswalker$ True | SpellDescription$ You gain 2 life for each Elf you control.
-A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Elf | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescriptionFetch | SpellDescription$ Search your library for any number of Elf creature cards and put them onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Elf | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | SpellDescription$ Search your library for any number of Elf creature cards and put them onto the battlefield. Then shuffle your library.
 SVar:XLife:Count$TypeYouCtrl.Elf/Times.2
 SVar:XFetch:Count$TypeInYourLibrary.Elf
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/n/nissas_pilgrimage.txt

@@ -1,7 +1,7 @@
 Name:Nissa's Pilgrimage
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 G | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic+Forest | ChangeNum$ X,Y | RememberChanged$ True | SubAbility$ DBBattlefield | Shuffle$ False | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
+A:SP$ ChangeZone | Cost$ 2 G | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic+Forest | ChangeNum$ X | RememberChanged$ True | SubAbility$ DBBattlefield | Shuffle$ False | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
 SVar:DBBattlefield:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | SubAbility$ DBHand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | ForgetChanged$ True | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to the battlefield | Shuffle$ False | StackDescription$ None
 SVar:DBHand:DB$ ChangeZone | Origin$ Library | Destination$ Hand | Defined$ Remembered | NoLooking$ True | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

forge-gui/res/cardsfolder/n/not_of_this_world.txt

@@ -1,8 +1,8 @@
 Name:Not of This World
 ManaCost:7
 Types:Tribal Instant Eldrazi
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ TrueostReduction,CheckTgt | EffectZone$ All | Description$ This spell costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ True | EffectZone$ All | Description$ This spell costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
-A:SP$ Counter | Cost$ 7 | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability that targets a permanent you control | ValidTgts$ Card | TargetValidTargeting$ Permanent.YouCtrl+inZoneBattlefieldostReduction,CheckTgt | SpellDescription$ Counter target spell or ability that targets a permanent you control.
+A:SP$ Counter | Cost$ 7 | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability that targets a permanent you control | ValidTgts$ Card | TargetValidTargeting$ Permanent.YouCtrl+inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a permanent you control.
 SVar:CostReduction:Count$Compare CheckTgt GE1.7.0
 SVar:CheckTgt:TargetedByTarget$Valid Card.powerGE7+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/not_of_this_world.jpg

forge-gui/res/cardsfolder/o/overblaze.txt

@@ -2,7 +2,7 @@ Name:Overblaze
 ManaCost:3 R
 Types:Instant Arcane
 K:Splice:Arcane:2 R R
-A:SP$ Effect | Cost$ 3 R | Name$ Overblaze Effect | ValidTgts$ Permanent,Player | RememberObjects$ Targeted | ReplacementEffects$ OverblazeEvent | SVars$ DmgTwice,XverblazeEvent,DmgTwice,X | SpellDescription$ Each time target permanent would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
+A:SP$ Effect | Cost$ 3 R | Name$ Overblaze Effect | ValidTgts$ Permanent,Player | RememberObjects$ Targeted | ReplacementEffects$ OverblazeEvent | SVars$ DmgTwice,X | SpellDescription$ Each time target permanent would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
 SVar:OverblazeEvent:Event$ DamageDone | ValidSource$ Permanent.IsRemembered | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ Each time target permanent would deal noncombat damage to a permanent or player this turn, it deals double that damage instead.
 SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
 SVar:X:ReplaceCount$DamageAmount/Twice

forge-gui/res/cardsfolder/o/overload.txt

@@ -2,7 +2,7 @@ Name:Overload
 ManaCost:R
 Types:Instant
 K:Kicker:2
-A:SP$ Destroy | Cost$ R | ValidTgts$ Artifact | AITgts$ Artifact.cmcLEX,Y | TgtPrompt$ Select target artifact with converted mana cost 2 or less (5 or less if kicked) | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | SpellDescription$ Destroy target artifact if its converted mana cost is 2 or less. If this spell was kicked, destroy that artifact if its converted mana cost is 5 or less instead.
+A:SP$ Destroy | Cost$ R | ValidTgts$ Artifact | AITgts$ Artifact.cmcLEX | TgtPrompt$ Select target artifact with converted mana cost 2 or less (5 or less if kicked) | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | SpellDescription$ Destroy target artifact if its converted mana cost is 2 or less. If this spell was kicked, destroy that artifact if its converted mana cost is 5 or less instead.
 SVar:X:Count$Kicked.5.2
 SVar:Y:Targeted$CardManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overload.jpg

forge-gui/res/cardsfolder/p/phyrexian_purge.txt

@@ -1,7 +1,7 @@
 Name:Phyrexian Purge
 ManaCost:2 B R
 Types:Sorcery
-A:SP$ Destroy | Cost$ 2 B R PayLife<X> | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxPayLifeLimit,Y,MaxPayLifeLimit | SpellDescription$ This spell costs 3 life more to cast for each target. Destroy any number of target creatures.
+A:SP$ Destroy | Cost$ 2 B R PayLife<X> | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxPayLifeLimit | SpellDescription$ This spell costs 3 life more to cast for each target. Destroy any number of target creatures.
 SVar:MaxPayLifeLimit:Count$YourLifeTotal/DivideEvenlyDown.3
 SVar:X:SVar$Y/Times.3
 SVar:Y:Targeted$Amount

forge-gui/res/cardsfolder/p/prohibit.txt

@@ -2,7 +2,7 @@ Name:Prohibit
 ManaCost:1 U
 Types:Instant
 K:Kicker:2
-A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | ValidTgts$ Card | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX,Y | SpellDescription$ Counter target spell if its converted mana cost is 2 or less. If this spell was kicked, counter that spell if its converted mana cost is 4 or less instead.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | ValidTgts$ Card | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | SpellDescription$ Counter target spell if its converted mana cost is 2 or less. If this spell was kicked, counter that spell if its converted mana cost is 4 or less instead.
 SVar:X:Count$Kicked.4.2
 SVar:Y:Targeted$CardManaCost
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/q/quest_for_pure_flame.txt

@@ -3,7 +3,7 @@ ManaCost:R
 Types:Enchantment
 T:Mode$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Opponent | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever a source you control deals damage to an opponent, you may put a quest counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-A:AB$ Effect | Name$ Pure Flame Effect | Cost$ SubCounter<4/QUEST> Sac<1/CARDNAME> | ReplacementEffects$ DamageEvent | SVars$ DmgTwice,XamageEvent,DmgTwice,X | SpellDescription$ If any source you control would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
+A:AB$ Effect | Name$ Pure Flame Effect | Cost$ SubCounter<4/QUEST> Sac<1/CARDNAME> | ReplacementEffects$ DamageEvent | SVars$ DmgTwice,X | SpellDescription$ If any source you control would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
 SVar:DamageEvent:Event$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If any source you control would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
 SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
 SVar:X:ReplaceCount$DamageAmount/Twice

forge-gui/res/cardsfolder/r/raiding_party.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Enchantment
 S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.White | Description$ CARDNAME can't be the target of white spells or abilities from white sources.
 A:AB$ RepeatEach | Cost$ Sac<1/Orc/Orc> | CostDesc$ Sacrifice an Orc: | RepeatPlayers$ Player | RepeatSubAbility$ ChooseCardsToTap | SubAbility$ DBDestroy | SpellDescription$ Each player may tap any number of untapped white creatures they control. For each creature tapped this way, that player chooses up to two Plains. Then destroy all Plains that weren't chosen this way by any player.
-SVar:ChooseCardsToTap:DB$ ChooseCard | Defined$ Remembered | MinAmount$ 0 | Amount$ NumCreaturesumCreatures,NumPlainsDiv2 | Choices$ Creature.untapped+White+RememberedPlayerCtrl | ChoiceTitle$ Choose any number of untapped white creatures you control | ChoiceZone$ Battlefield | RememberChosen$ True | AIMaxAmount$ NumPlainsDiv2 | SubAbility$ DBTap
+SVar:ChooseCardsToTap:DB$ ChooseCard | Defined$ Remembered | MinAmount$ 0 | Amount$ NumCreatures | Choices$ Creature.untapped+White+RememberedPlayerCtrl | ChoiceTitle$ Choose any number of untapped white creatures you control | ChoiceZone$ Battlefield | RememberChosen$ True | AIMaxAmount$ NumPlainsDiv2 | SubAbility$ DBTap
 SVar:DBTap:DB$ Tap | Defined$ Remembered | SubAbility$ ChoosePlainsToSave
 SVar:ChoosePlainsToSave:DB$ ChooseCard | Defined$ Remembered | MinAmount$ 0 | Amount$ TappedXTwo | Choices$ Plains | ChoiceTitle$ Choose up to two Plains for each creature tapped | ChoiceZone$ Battlefield | ImprintChosen$ True | AILogic$ OwnCard | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True

forge-gui/res/cardsfolder/r/ravaging_blaze.txt

@@ -2,7 +2,7 @@ Name:Ravaging Blaze
 ManaCost:X R R
 Types:Instant
 A:SP$ DealDamage | Cost$ X R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ DmgController | SpellDescription$ CARDNAME deals X damage to target creature.
-SVar:DmgController:DB$ DealDamage | Defined$ TargetedController | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE2,Y | SpellDescription$ Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, CARDNAME also deals X damage to that creature's controller.
+SVar:DmgController:DB$ DealDamage | Defined$ TargetedController | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE2 | SpellDescription$ Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, CARDNAME also deals X damage to that creature's controller.
 SVar:X:Count$xPaid
 SVar:Y:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ravaging_blaze.jpg

forge-gui/res/cardsfolder/r/reap.txt

@@ -2,7 +2,7 @@ Name:Reap
 ManaCost:1 G
 Types:Instant
 A:SP$ Pump | Cost$ 1 G | TgtPrompt$ Select target Opponent | ValidTgts$ Opponent | SubAbility$ GraveReap | StackDescription$ Select target opponent. | SpellDescription$ Return up to X target cards from your graveyard to your hand, where X is the number of black permanents target opponent controls as you cast this spell.
-SVar:GraveReap:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ NrBlackAtCastingrBlackAtCasting | TgtPrompt$ Choose target card in your graveyard | ValidTgts$ Card.YouCtrl
+SVar:GraveReap:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ NrBlackAtCasting | TgtPrompt$ Choose target card in your graveyard | ValidTgts$ Card.YouCtrl
 SVar:NrBlackAtCasting:Count$Valid Permanent.Black+TargetedPlayerCtrl
 SVar:AIPlayForSub:True
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/r/rushing_river.txt

@@ -2,7 +2,7 @@ Name:Rushing River
 ManaCost:2 U
 Types:Instant
 K:Kicker:Sac<1/Land>
-A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | TargetMin$ X | TargetMax$ X,Z | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target nonland permanent to its owner's hand. If this spell was kicked, return another target nonland permanent to its owner's hand.
+A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | TargetMin$ X | TargetMax$ X | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target nonland permanent to its owner's hand. If this spell was kicked, return another target nonland permanent to its owner's hand.
 SVar:X:Count$Kicked.2.1
 SVar:NeedsToPlayKickedVar:Z GE2
 SVar:Z:Count$Valid Permanent.nonLand+OppCtrl

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

@@ -2,7 +2,7 @@ Name:Sandals of Abdallah
 ManaCost:4
 Types:Artifact
 A:AB$ Pump | Cost$ 2 T | KW$ Islandwalk | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ AbdallahsSandalsEffect | SpellDescription$ Target creature gains islandwalk until end of turn. When that creature dies this turn, destroy CARDNAME. (A creature with islandwalk can't be blocked as long as defending player controls an Island.)
-SVar:AbdallahsSandalsEffect:DB$ Effect | Name$ Sandals of Abdallah Effect | Triggers$ SandalWearerDied | SVars$ ExileEffect,SandalsDestroyedandalWearerDied,ExileEffect,SandalsDestroyed | RememberObjects$ Targeted | ImprintCards$ Self
+SVar:AbdallahsSandalsEffect:DB$ Effect | Name$ Sandals of Abdallah Effect | Triggers$ SandalWearerDied | SVars$ ExileEffect,SandalsDestroyed | RememberObjects$ Targeted | ImprintCards$ Self
 SVar:SandalWearerDied:Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ Battlefield | Destination$ Graveyard | Execute$ SandalsDestroyed | TriggerDescription$ When the targeted creature dies this turn, destroy Sandals of Abdallah.
 SVar:SandalsDestroyed:DB$ Destroy | Defined$ Imprinted | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile

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

@@ -5,7 +5,7 @@ Loyalty:4
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Defined$ You | SubAbility$ DBMana | Planeswalker$ True | SpellDescription$ Draw a card, then add one mana of any color.
 SVar:DBMana:DB$Mana | Produced$ Any | AILogic$ MostProminentInComputerHand
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | TokenAmount$ 1 | TokenScript$ r_4_4_dragon_flying | TokenOwner$ You | LegacyImage$ r 4 4 dragon flying dtk | Planeswalker$ True | SpellDescription$ Create a 4/4 red Dragon creature token with flying.
-A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Dragon | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescriptionFetch | SpellDescription$ Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Dragon | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | SpellDescription$ Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library.
 SVar:XFetch:Count$TypeInYourLibrary.Dragon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sarkhan_unbroken.jpg
 Oracle:[+1]: Draw a card, then add one mana of any color.\n[−2]: Create a 4/4 red Dragon creature token with flying.\n[−8]: Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library.

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

@@ -1,7 +1,7 @@
 Name:Savage Stomp
 ManaCost:2 G
 Types:Sorcery
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ TrueostReduction,CheckTgt | EffectZone$ All | Description$ This spell costs {2} less to cast if it targets a Dinosaur you control.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ True | EffectZone$ All | Description$ This spell costs {2} less to cast if it targets a Dinosaur you control.
 SVar:CostReduction:Count$Compare CheckTgt GE1.2.0
 SVar:CheckTgt:Targeted$Valid Creature.Dinosaur+YouCtrl
 A:SP$ PutCounter | Cost$ 2 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control.

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

@@ -4,8 +4,8 @@ Types:Creature Shapeshifter Spirit
 PT:1/1
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigAnimateBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, change CARDNAME's base power and toughness to that creature's power and toughness until end of turn.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigAnimateAttacker | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, change CARDNAME's base power and toughness to that creature's power and toughness until end of turn.
-SVar:TrigAnimateBlocker:DB$ Animate | Power$ W | Toughness$ X,X
+SVar:TrigAnimateBlocker:DB$ Animate | Power$ W | Toughness$ X
-SVar:TrigAnimateAttacker:DB$ Animate | Power$ Y | Toughness$ Z,Z
+SVar:TrigAnimateAttacker:DB$ Animate | Power$ Y | Toughness$ Z
 SVar:W:TriggeredAttacker$CardPower
 SVar:X:TriggeredAttacker$CardToughness
 SVar:Y:TriggeredBlocker$CardPower

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

@@ -2,8 +2,8 @@ Name:Silumgar's Scorn
 ManaCost:U U
 Types:Instant
 K:Presence:Dragon
-A:SP$ Counter | Cost$ U U | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | UnlessCost$ 1 | ConditionCheckSVar$ TotalPresence | ConditionSVarCompare$ EQ0otalPresence | StackDescription$ SpellDescription | SubAbility$ DBCounter | SpellDescription$ Counter target spell unless its controller pays {1}. If you revealed a Dragon card or controlled a Dragon as you cast this spell, counter that spell instead.
+A:SP$ Counter | Cost$ U U | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | UnlessCost$ 1 | ConditionCheckSVar$ TotalPresence | ConditionSVarCompare$ EQ0 | StackDescription$ SpellDescription | SubAbility$ DBCounter | SpellDescription$ Counter target spell unless its controller pays {1}. If you revealed a Dragon card or controlled a Dragon as you cast this spell, counter that spell instead.
-SVar:DBCounter:DB$ Counter | Defined$ TargetedotalPresence | ConditionCheckSVar$ TotalPresence | ConditionSVarCompare$ GE1 | StackDescription$ None
+SVar:DBCounter:DB$ Counter | Defined$ Targeted | ConditionCheckSVar$ TotalPresence | ConditionSVarCompare$ GE1 | StackDescription$ None
 SVar:TotalPresence:Count$Presence_Dragon.1.0
 DeckHints:Type$Dragon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/silumgars_scorn.jpg

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

@@ -2,7 +2,7 @@ Name:Siren's Ruse
 ManaCost:1 U
 Types:Instant
 A:SP$ Pump | Cost$ 1 U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | SubAbility$ DBRememberPirate | SpellDescription$ Exile target creature you control, then return that card to the battlefield under its owner's control. If a Pirate was exiled this way, draw a card. | StackDescription$ SpellDescription
-SVar:DBRememberPirate:DB$ StoreSVar | SVar$ WasPirate | Type$ Number | Expression$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card.Pirate | ConditionCompare$ EQ1 | SubAbility$ DBChangeZoneasPirate
+SVar:DBRememberPirate:DB$ StoreSVar | SVar$ WasPirate | Type$ Number | Expression$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card.Pirate | ConditionCompare$ EQ1 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ ParentTarget | Origin$ Battlefield | Destination$ Exile | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | GainControl$ True | SubAbility$ DBPirateDraw
 SVar:DBPirateDraw:DB$ Draw | NumCards$ 1 | ConditionCheckSVar$ WasPirate | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup

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

@@ -4,7 +4,7 @@ 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 | 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$ TruepawnsireX | SpellDescription$ Cast any number of Eldrazi spells from among cards you own outside the game without paying their mana costs.
+A:AB$ Play | Cost$ 20 | Valid$ Card.Eldrazi+YouOwn | ValidZone$ Sideboard | WithoutManaCost$ True | Amount$ SpawnsireX | Controller$ You | Optional$ True | SpellDescription$ Cast any number of Eldrazi spells from among cards you own outside the game without paying their mana costs.
 SVar:SpawnsireX:Count$TypeInYourSideboard.Eldrazi
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token

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

@@ -4,7 +4,7 @@ Types:Creature Human Cleric
 PT:1/1
 K:Vigilance
 K:Lifelink
-A:AB$ Token | Cost$ T | SorcerySpeed$ True | CheckSVar$ X | SVarCompare$ GEY,Y | TokenAmount$ 1 | TokenScript$ w_4_4_angel_flying | TokenOwner$ You | SpellDescription$ Create a 4/4 white Angel creature token with flying. Activate this ability only if you have at least 7 life more than your starting life total and only any time you could cast a sorcery.
+A:AB$ Token | Cost$ T | SorcerySpeed$ True | CheckSVar$ X | SVarCompare$ GEY | TokenAmount$ 1 | TokenScript$ w_4_4_angel_flying | TokenOwner$ You | SpellDescription$ Create a 4/4 white Angel creature token with flying. Activate this ability only if you have at least 7 life more than your starting life total and only any time you could cast a sorcery.
 SVar:X:Count$YourLifeTotal
 SVar:Y:Count$YourStartingLife/Plus.7
 DeckHints:Ability$LifeGain

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

@@ -2,7 +2,7 @@ Name:Talent of the Telepath
 ManaCost:2 U U
 Types:Sorcery
 A:SP$ Dig | Cost$ 2 U U | ValidTgts$ Player.Opponent | TgtPrompt$ Select target opponent | Reveal$ True | NoMove$ True | DigNum$ 7 | RememberRevealed$ True | SubAbility$ TelepathCast | SpellDescription$ Target opponent reveals the top seven cards of their library. You may cast an instant or sorcery spell from among them without paying its mana cost. Then that player puts the rest into their graveyard. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, you may cast up to two instant and/or sorcery spells from among the revealed cards instead of one.
-SVar:TelepathCast:DB$ Play | ValidZone$ Library | Valid$ Instant.IsRemembered,Sorcery.IsRemembered | Controller$ You | WithoutManaCost$ True | Optional$ True,Y | Amount$ X | SubAbility$ DBChangeZone
+SVar:TelepathCast:DB$ Play | ValidZone$ Library | Valid$ Instant.IsRemembered,Sorcery.IsRemembered | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ X | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | Defined$ Remembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Compare Y GE2.2.1

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

@@ -6,5 +6,5 @@ SVar:X:Count$Devotion.Blue
 SVar:Y:Count$InYourLibrary
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game.
 SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | DestinationZone$ Library | LibraryPosition$ 0 | RestRandomOrder$ True | SubAbility$ DBWin
-SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX,Y
+SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX
 Oracle:When Thassa's Oracle enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put up to one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.)

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

@@ -2,8 +2,8 @@ Name:Torgaar, Famine Incarnate
 ManaCost:6 B B
 Types:Legendary Creature Avatar
 PT:7/6
-A:SP$ PermanentCreature | Cost$ 6 B B Sac<X/Creature>,Y | AILogic$ SacToReduceCost
+A:SP$ PermanentCreature | Cost$ 6 B B Sac<X/Creature> | AILogic$ SacToReduceCost
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Y | EffectZone$ All,Y | Relative$ True | Description$ As an additional cost to cast this spell, you may sacrifice any number of creatures. This spell costs {2} less to cast for each creature sacrificed this way.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Y | EffectZone$ All | Relative$ True | Description$ As an additional cost to cast this spell, you may sacrifice any number of creatures. This spell costs {2} less to cast for each creature sacrificed this way.
 SVar:X:Count$xPaid
 SVar:Y:SVar$X/Times.2
 SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2

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

@@ -4,7 +4,7 @@ Types:Instant
 K:Kicker:8 R
 K:CARDNAME can't be countered.
 A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | SubAbility$ Kicked | SpellDescription$ CARDNAME deals 3 damage to any target. If this spell was kicked, instead it deals 10 damage to that permanent or player and the damage can't be prevented.
-SVar:Kicked:DB$ DealDamage | Defined$ Targeted | NumDmg$ 100 | NoPrevention$ True | Condition$ Kicked | ConditionDescription$ If Urza's Rage was kicked,
+SVar:Kicked:DB$ DealDamage | Defined$ Targeted | NumDmg$ 10 | NoPrevention$ True | Condition$ Kicked | ConditionDescription$ If Urza's Rage was kicked,
 SVar:X:Count$Kicked.0.3
 SVar:Y:Count$Kicked.10.0
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_rage.jpg

forge-gui/res/cardsfolder/w/weathered_wayfarer.txt

@@ -2,7 +2,7 @@ Name:Weathered Wayfarer
 ManaCost:W
 Types:Creature Human Nomad Cleric
 PT:1/1
-A:AB$ ChangeZone | Cost$ W T | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | CheckSVar$ X | SVarCompare$ GTY,Y | SpellDescription$ Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. Activate this ability only if an opponent controls more lands than you.
+A:AB$ ChangeZone | Cost$ W T | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | CheckSVar$ X | SVarCompare$ GTY | SpellDescription$ Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. Activate this ability only if an opponent controls more lands than you.
 SVar:X:PlayerCountOpponents$HighestValid Land.YouCtrl
 SVar:Y:Count$Valid Land.YouCtrl
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83311.jpg

forge-gui/res/cardsfolder/w/wheel_and_deal.txt

@@ -1,7 +1,7 @@
 Name:Wheel and Deal
 ManaCost:3 U
 Types:Instant
-A:SP$ Discard | Cost$ 3 U | ValidTgts$ Opponent | TargetMin$ 0 | TargetMax$ MaxTgtaxTgt | Mode$ Hand | SpellDescription$ Any number of target opponents each discard their hands, then draw seven cards. | SubAbility$ DBDrawOpp
+A:SP$ Discard | Cost$ 3 U | ValidTgts$ Opponent | TargetMin$ 0 | TargetMax$ MaxTgt | Mode$ Hand | SpellDescription$ Any number of target opponents each discard their hands, then draw seven cards. | SubAbility$ DBDrawOpp
 SVar:DBDrawOpp:DB$Draw | Defined$ Targeted | NumCards$ 7 | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:MaxTgt:PlayerCountPlayers$Amount