Merge pull request #1681 from tool4ever/cardcleanup13

Cleanup + Fixes

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

@@ -4,7 +4,7 @@ Types:Creature Demon
 PT:5/4
 K:Flying
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each opponent's end step, that player chooses up to two creature they control, then sacrifices the rest.
-SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ 2 | TargetControls$ True | Choices$ Creature | ChoiceTitle$ Choose up to two creatures | SubAbility$ DBSacrificeAll | RememberChosen$ True
-SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered | Controller$ TriggeredPlayer | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | MinAmount$ 0 | Amount$ 2 | TargetControls$ True | Choices$ Creature | ChoiceTitle$ Choose up to two creatures | SubAbility$ DBSacrificeAll
+SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.nonChosenCard | Controller$ TriggeredPlayer | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:Flying\nAt the beginning of each opponent's end step, that player chooses up to two creatures they control, then sacrifices the rest.

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:Block:DB$ Block | DefinedAttacker$ Remembered | DefinedBlocker$ ParentTarget | SpellDescription$ Then it blocks an attacking creature of your choice. Activate only during the declare blockers step. | StackDescription$ SpellDescription | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:ChooseAttacker:DB$ ChooseCard | Defined$ You | Choices$ Creature.attacking | ChoiceTitle$ Choose an attacker to block | Mandatory$ True | SubAbility$ Block | SpellDescriptions$ None | StackDescription$ None
+SVar:Block:DB$ Block | DefinedAttacker$ ChosenCard | DefinedBlocker$ ParentTarget | SpellDescription$ Then it blocks an attacking creature of your choice. Activate only during the declare blockers step. | StackDescription$ SpellDescription | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ 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 only during the declare blockers step.

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

@@ -4,11 +4,10 @@ Types:Creature Pegasus
 PT:2/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigChooseOpp | TriggerDescription$ When CARDNAME leaves the battlefield, choose an opponent who controls more lands than you. Search your library for a number of Plains cards equal to the difference, reveal those cards, put one of them onto the battlefield tapped and the rest into your hand, then shuffle.
-SVar:TrigChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent+withMoreLandsThanYou | RememberChosen$ True | SubAbility$ TrigSearchHand
+SVar:TrigChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent+withMoreLandsThanYou | SubAbility$ TrigSearchHand
 SVar:TrigSearchHand:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Plains.YouCtrl | ChangeNum$ Z | NoShuffle$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | StackDescription$ None | SubAbility$ TrigSearchPlay
-SVar:TrigSearchPlay:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains.YouCtrl | ChangeNum$ 1 | StackDescription$ None | NoLooking$ True | Tapped$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
-SVar:X:Count$Valid Land.RememberedPlayerCtrl/Minus.Y
+SVar:TrigSearchPlay:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains.YouCtrl | ChangeNum$ 1 | StackDescription$ None | NoLooking$ True | Tapped$ True
+SVar:X:Count$Valid Land.ChosenCtrl/Minus.Y
 SVar:Y:Count$Valid Land.YouCtrl
 SVar:Z:SVar$X/Minus.1
 Oracle:Flying\nWhen Boreas Charger leaves the battlefield, choose an opponent who controls more lands than you. Search your library for a number of Plains cards equal to the difference, reveal those cards, put one of them onto the battlefield tapped and the rest into your hand, then shuffle.

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

@@ -6,10 +6,10 @@ S:Mode$ Continuous | Affected$ Creature.token+YouCtrl | AddKeyword$ Haste | Desc
 SVar:PlayMain1:TRUE
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of combat on your turn, create a 2/1 blue Phyrexian Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_2_1_a_phyrexian_myr | TokenOwner$ You | SubAbility$ DBImprint
-SVar:DBImprint:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Card.token+YouCtrl | ChoiceTitle$ Choose token you control | RememberChosen$ True | SubAbility$ MassClone | StackDescription$ None | SpellDescription$ Each other token becomes a copy of target token.
-SVar:MassClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.token+IsNotRemembered+YouCtrl | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ Imprinted
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBImprint:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Card.token+YouCtrl | ChoiceTitle$ Choose token you control | SubAbility$ MassClone | StackDescription$ None | SpellDescription$ Each other token becomes a copy of target token.
+SVar:MassClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.token+nonChosenCard+YouCtrl | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup
+SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | CloneTarget$ Imprinted
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 DeckHints:Type$Token
 DeckHas:Type$Token
 Oracle:Creature tokens you control have haste.\nAt the beginning of combat on your turn, create a 2/1 blue Phyrexian Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token.

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

@@ -1,7 +1,7 @@
 Name:Celestial Judgment
 ManaCost:4 W W
 Types:Sorcery
-A:SP$ ChooseCard | Choices$ Creature | EachDifferentPower$ True | RememberChosen$ True | SubAbility$ DBDestroy | StackDescription$ SpellDescription | SpellDescription$ For each different power among creatures on the battlefield, choose a creature with that power. Destroy each creature not chosen this way.
-SVar:DBDestroy:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered | SubAbility$ DBCleanup | StackDescription$ None
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
+A:SP$ ChooseCard | Choices$ Creature | EachDifferentPower$ True | SubAbility$ DBDestroy | StackDescription$ SpellDescription | SpellDescription$ For each different power among creatures on the battlefield, choose a creature with that power. Destroy each creature not chosen this way.
+SVar:DBDestroy:DB$ DestroyAll | ValidCards$ Creature.nonChosenCard | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:For each different power among creatures on the battlefield, choose a creature with that power. Destroy each creature not chosen this way.

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

@@ -5,5 +5,5 @@ A:SP$ DealDamage | Cost$ R B W | Defined$ Player.Opponent | NumDmg$ 2 | SubAbili
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard | SubAbility$ DBSac
 SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | ChoiceTitle$ Choose a creature you control with the greatest power | Mandatory$ True | RememberChosen$ True
 SVar:DBSac:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup | StackDescription$ Each opponent sacrifices a creature with the greatest power among creatures they control.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Crackling Doom deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures that player controls.

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

@@ -3,6 +3,6 @@ ManaCost:3 B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may put a verse counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ VERSE | CounterNum$ 1
-A:AB$ Discard | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Opponent | Mode$ LookYouChoose | NumCards$ X | SpellDescription$ Look at target opponent's hand and choose up to X cards from it, where X is the number of verse counters on CARDNAME. That player discards those cards.
+A:AB$ Discard | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Opponent | Mode$ LookYouChoose | Optional$ True | NumCards$ X | SpellDescription$ Look at target opponent's hand and choose up to X cards from it, where X is the number of verse counters on CARDNAME. That player discards those cards.
 SVar:X:Count$CardCounters.VERSE
 Oracle:At the beginning of your upkeep, you may put a verse counter on Discordant Dirge.\n{B}, Sacrifice Discordant Dirge: Look at target opponent's hand and choose up to X cards from it, where X is the number of verse counters on Discordant Dirge. That player discards those cards.

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

@@ -4,8 +4,8 @@ Types:Legendary Creature Vampire Cleric
 PT:4/4
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks, defending player chooses a nonlegendary creature card in your graveyard. You return that card to the battlefield with an additional +1/+1 counter on it. The creature is a Vampire in addition to its other types.
-SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredDefendingPlayer | Choices$ Creature.YouOwn+nonLegendary | Mandatory$ True | ChoiceZone$ Graveyard | AILogic$ WorstCard | RememberChosen$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | SubAbility$ DBAnimate
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredDefendingPlayer | Choices$ Creature.YouOwn+nonLegendary | Mandatory$ True | ChoiceZone$ Graveyard | AILogic$ WorstCard | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | AnimateSubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | Types$ Vampire | Duration$ Permanent
 DeckHas:Ability$Graveyard|Counters
 DeckHints:Type$Vampire

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

@@ -1,7 +1,6 @@
 Name:Duneblast
 ManaCost:4 W B G
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 4 W G B | Defined$ You | Amount$ 1 | Choices$ Creature | ChoiceTitle$ Choose a creature | AILogic$ Duneblast | SubAbility$ DBDestroyAll | RememberChosen$ True | SpellDescription$ Choose up to one creature. Destroy the rest.
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChooseCard | Cost$ 4 W G B | Defined$ You | Amount$ 1 | Choices$ Creature | ChoiceTitle$ Choose a creature | AILogic$ Duneblast | SubAbility$ DBDestroyAll | SpellDescription$ Choose up to one creature. Destroy the rest.
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.nonChosenCard
 Oracle:Choose up to one creature. Destroy the rest.

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

@@ -1,8 +1,7 @@
 Name:Eunuchs' Intrigues
 ManaCost:2 R
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Mandatory$ True | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | RememberChosen$ True | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature they control. Other creatures they control can't block this turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.IsNotRemembered+TargetedPlayerCtrl | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Mandatory$ True | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature they control. Other creatures they control can't block this turn.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.nonChosenCard+TargetedPlayerCtrl | KW$ HIDDEN CARDNAME can't block.
 AI:RemoveDeck:All
 Oracle:Target opponent chooses a creature they control. Other creatures they control can't block this turn.

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

@@ -1,5 +1,5 @@
 Name:Extortion
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ Discard | Cost$ 3 B B | ValidTgts$ Opponent | Mode$ LookYouChoose | NumCards$ 2 | SpellDescription$ Look at target player's hand and choose up to two cards from it. That player discards those cards.
+A:SP$ Discard | Cost$ 3 B B | ValidTgts$ Opponent | Mode$ LookYouChoose | Optional$ True | NumCards$ 2 | SpellDescription$ Look at target player's hand and choose up to two cards from it. That player discards those cards.
 Oracle:Look at target player's hand and choose up to two cards from it. That player discards those cards.

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

@@ -3,8 +3,7 @@ ManaCost:R
 Types:Instant
 Text:Cast CARDNAME only during the declare blockers step.
 A:SP$ RemoveFromCombat | Cost$ R | ActivationPhases$ Declare Blockers | ValidTgts$ Creature.DefendingPlayerCtrl | TgtPrompt$ Select target creature defending player controls | Defined$ Targeted | UnblockCreaturesBlockedOnlyBy$ Targeted | SubAbility$ ChooseAttacker | SpellDescription$ Remove target creature defending player controls from combat. Creatures it was blocking that had become blocked by only that creature this combat become unblocked. | StackDescription$ SpellDescription
-SVar:ChooseAttacker:DB$ ChooseCard | Defined$ You | Choices$ Creature.attacking | RememberChosen$ True | MinAmount$ 0 | ChoiceTitle$ Choose an attacker to block | SubAbility$ Block
-SVar:Block:DB$ Block | DefinedAttacker$ Remembered | DefinedBlocker$ ParentTarget | SpellDescription$ You may have it block an attacking creature of your choice.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:ChooseAttacker:DB$ ChooseCard | Defined$ You | Choices$ Creature.attacking | MinAmount$ 0 | ChoiceTitle$ Choose an attacker to block | SubAbility$ Block
+SVar:Block:DB$ Block | DefinedAttacker$ ChosenCard | DefinedBlocker$ ParentTarget | SpellDescription$ You may have it block an attacking creature of your choice.
 AI:RemoveDeck:All
 Oracle:Cast this spell only during the declare blockers step.\nRemove target creature defending player controls from combat. Creatures it was blocking that had become blocked by only that creature this combat become unblocked. You may have it block an attacking creature of your choice.

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

@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Human Shaman
 PT:1/2
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
-R:Event$ Moved | ValidLKI$ Creature.DamagedBy | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by Frostwielder this turn would die, exile it instead.
+R:Event$ Moved | ValidLKI$ Creature.DamagedBy | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead.
 SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile
 SVar:NonCombatPriority:1
 Oracle:If a creature dealt damage by Frostwielder this turn would die, exile it instead.\n{T}: Frostwielder deals 1 damage to any target.

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

@@ -1,8 +1,7 @@
 Name:Goblin War Cry
 ManaCost:2 R
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Mandatory$ True | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | RememberChosen$ True | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature they control. Other creatures they control can't block this turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.IsNotRemembered+TargetedPlayerCtrl | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Mandatory$ True | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature they control. Other creatures they control can't block this turn.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.nonChosenCard+TargetedPlayerCtrl | KW$ HIDDEN CARDNAME can't block.
 AI:RemoveDeck:All
 Oracle:Target opponent chooses a creature they control. Other creatures they control can't block this turn.

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

@@ -1,7 +1,6 @@
 Name:Last One Standing
 ManaCost:1 B R
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 1 B R | Defined$ You | Amount$ 1 | Choices$ Creature | AtRandom$ True | SubAbility$ DBDestroyAll | RememberChosen$ True | SpellDescription$ Choose a creature at random, then destroy the rest.
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChooseCard | Cost$ 1 B R | Defined$ You | Amount$ 1 | Choices$ Creature | AtRandom$ True | SubAbility$ DBDestroyAll | SpellDescription$ Choose a creature at random, then destroy the rest.
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.nonChosenCard
 Oracle:Choose a creature at random, then destroy the rest.

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

@@ -1,9 +1,9 @@
 Name:Mirror of Fate
 ManaCost:5
 Types:Artifact
-A:AB$ ChooseCard | Cost$ T Sac<1/CARDNAME> | MinAmount$ 0 | Amount$ 7 | Choices$ Card.YouOwn+faceUp | SubAbility$ DBExile | RememberChosen$ True | ChoiceZone$ Exile | SpellDescription$ Choose up to seven face-up exiled cards you own. Exile all the cards from your library, then put the chosen cards on top of your library.
+A:AB$ ChooseCard | Cost$ T Sac<1/CARDNAME> | MinAmount$ 0 | Amount$ 7 | Choices$ Card.YouOwn+faceUp | SubAbility$ DBExile | ChoiceZone$ Exile | SpellDescription$ Choose up to seven face-up exiled cards you own. Exile all the cards from your library, then put the chosen cards on top of your library.
 SVar:DBExile:DB$ ChangeZoneAll | Origin$ Library | Destination$ Exile | Defined$ You | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Library | Defined$ You | ChangeType$ Card.IsRemembered
+SVar:DBReturn:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Library | Defined$ You | ChangeType$ Card.ChosenCard
 AI:RemoveDeck:Random
 AI:RemoveDeck:All
 Oracle:{T}, Sacrifice Mirror of Fate: Choose up to seven face-up exiled cards you own. Exile all the cards from your library, then put the chosen cards on top of your library.

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

@@ -3,9 +3,9 @@ ManaCost:3 U U
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Permanent | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Permanents don't untap during their controllers' untap steps.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player chooses a permanent for each card in their graveyard, then untaps those permanents.
-SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | Mandatory$ True | Choices$ Permanent.ActivePlayerCtrl | ChoiceTitle$ Choose a permanent to untap | RememberChosen$ True | AILogic$ Untap | SubAbility$ DBUntap
-SVar:DBUntap:DB$ UntapAll | ValidCards$ Permanent.IsRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | Mandatory$ True | Choices$ Permanent.ActivePlayerCtrl | ChoiceTitle$ Choose a permanent to untap | AILogic$ Untap | SubAbility$ DBUntap
+SVar:DBUntap:DB$ UntapAll | ValidCards$ Permanent.ChosenCard | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:Count$ValidGraveyard Card.ActivePlayerCtrl
 AI:RemoveDeck:Random
 SVar:NonStackingEffect:True

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

@@ -9,6 +9,6 @@ SVar:SacTopPower:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbil
 SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | ChoiceTitle$ Choose a creature you control with the greatest power | Mandatory$ True | RememberChosen$ True
 SVar:DBSacAll:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanupChosen:DB$ Cleanup | ClearChosenPlayer$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NeedsToPlay:Creature.OppCtrl
 Oracle:Roll a d20.\n1—9 | Choose an opponent. That player sacrifices a creature.\n10—19 | Each opponent sacrifices a creature.\n20 | Each opponent sacrifices a creature with the greatest power among creatures that player controls.

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

@@ -9,7 +9,7 @@ SVar:DBOppChoose:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Mandatory$ T
 SVar:DBReveal:DB$ Reveal | Defined$ You | RevealDefined$ Remembered | RememberRevealed$ True | SubAbility$ DBRevealOpp
 SVar:DBRevealOpp:DB$ Reveal | Defined$ Remembered | RevealDefined$ ChosenCard | RememberRevealed$ True | SubAbility$ DBSacrificeAll
 SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 T:Mode$ Sacrificed | ValidCard$ Creature.OppCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent sacrifices a creature, you create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 DeckHas:Ability$Token

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

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent chooses a creature they control, then sacrifices the rest.
 SVar:TrigChoose:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseCreature | SubAbility$ DBSacrificeAll
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature | RememberChosen$ True | Mandatory$ True
-SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered+OppCtrl | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:ChooseCreature:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature | Mandatory$ True
+SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.nonChosenCard+OppCtrl | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:When you set this scheme in motion, each opponent chooses a creature they control, then sacrifices the rest.

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

@@ -4,9 +4,9 @@ Types:Creature Zombie
 PT:5/5
 K:Indestructible
 K:ETBReplacement:Other:TrigChooseArtifact
-SVar:TrigChooseArtifact:DB$ ChooseCard | Choices$ Artifact.YouCtrl | Mandatory$ True | RememberChosen$ True | SubAbility$ DBPutCounter | AILogic$ Phylactery | SpellDescription$ As CARDNAME enters the battlefield, put a phylactery counter on an artifact you control.
-SVar:DBPutCounter:DB$ PutCounter | CounterType$ PHYLACTERY | CounterNum$ 1 | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigChooseArtifact:DB$ ChooseCard | Choices$ Artifact.YouCtrl | Mandatory$ True | SubAbility$ DBPutCounter | AILogic$ Phylactery | SpellDescription$ As CARDNAME enters the battlefield, put a phylactery counter on an artifact you control.
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ PHYLACTERY | CounterNum$ 1 | Defined$ ChosenCard | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.counters_GE1_PHYLACTERY+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no permanents with phylactery counters on them, sacrifice CARDNAME.
 SVar:TrigSac:DB$ Sacrifice | Defined$ Self
 AI:RemoveDeck:Random

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

@@ -21,8 +21,8 @@ S:Mode$ Continuous | Affected$ Creature.untapped+YouCtrl+Other | AddToughness$ 1
 T:Mode$ AttackersDeclared | Execute$ DBUnTapAll | CheckSVar$ OverwhelmInstinct | SVarCompare$ GE1 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack, untap each creature you control, then tap any number of creatures you control.
 SVar:OverwhelmInstinct:Count$Valid Creature.attacking
 SVar:DBUnTapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ DBChoose
-SVar:DBChoose:DB$ ChooseCard | Defined$ You | MinAmount$ 0 | Amount$ X | Choices$ Creature.untapped+YouCtrl | ChoiceTitle$ Choose any number of untapped creatures you control | ChoiceZone$ Battlefield | RememberChosen$ True | SubAbility$ DBTap | SpellDescription$ Tap any number of creatures you control.
-SVar:DBTap:DB$ Tap | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBChoose:DB$ ChooseCard | Defined$ You | MinAmount$ 0 | Amount$ X | Choices$ Creature.untapped+YouCtrl | ChoiceTitle$ Choose any number of untapped creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBTap | SpellDescription$ Tap any number of creatures you control.
+SVar:DBTap:DB$ Tap | Defined$ ChosenCard | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:Count$Valid Creature.untapped+YouCtrl
 Oracle:Other tapped creatures you control get +1/+0.\nOther untapped creatures you control get +0/+1.\nWhenever you attack, untap each creature you control, then tap any number of creatures you control.

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

@@ -10,7 +10,7 @@ SVar:DBDig:DB$ Dig | DigNum$ 3 | ChangeNum$ 1 | DestinationZone2$ Graveyard | St
 A:AB$ RepeatEach | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | RepeatPlayers$ Opponent | RepeatSubAbility$ DBChooseCard | SubAbility$ DBSac | SpellDescription$ Each opponent sacrifices a creature with the greatest power among creatures that player controls.
 SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | ChoiceTitle$ Choose a creature you control with the greatest power | Mandatory$ True | RememberChosen$ True
 SVar:DBSac:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup | StackDescription$ Each opponent sacrifices a creature with the greatest power among creatures they control.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 A:AB$ Repeat | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | RepeatSubAbility$ TrigDiscard | MaxRepeat$ 7 | StackDescription$ SpellDescription | SpellDescription$ Each opponent may discard a card. If they don't, they lose 3 life. Repeat this process six more times.
 SVar:TrigDiscard:DB$ Discard | Defined$ Player.Opponent | Mode$ TgtChoose | Optional$ True | RememberDiscardingPlayers$ True | AILogic$ UnlessAtLife.6 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent.IsNotRemembered | LifeAmount$ 3 | SubAbility$ DBCleanup

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

@@ -14,5 +14,5 @@ K:Aftermath
 A:SP$ RepeatEach | Cost$ 5 U U | AILogic$ OpponentHasCreatures | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseCreature | SubAbility$ StealChosen | SpellDescription$ Each opponent chooses a creature they control. You gain control of those creatures.
 SVar:ChooseCreature:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature to be stolen | AILogic$ WorstCard | RememberChosen$ True | Mandatory$ True
 SVar:StealChosen:DB$ GainControl | AllValid$ Permanent.IsRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Aftermath (Cast this spell only from your graveyard. Then exile it.)\nEach opponent chooses a creature they control. You gain control of those creatures.

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

@@ -1,7 +1,7 @@
 Name:Reap Intellect
 ManaCost:X 2 U B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X 2 U B | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ X | IsCurse$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBRepeat | SpellDescription$ Target opponent reveals their hand. You choose X nonland cards from among them. Search that player's library, hand and graveyard for cards with the same name as those cards and exile them. Then, that player shuffles their library.
+A:SP$ ChangeZone | Cost$ X 2 U B | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ X | IsCurse$ True | RememberChanged$ True | SubAbility$ DBRepeat | SpellDescription$ Target opponent reveals their hand. You choose up to X nonland cards from among them. Search that player's library, hand and graveyard for cards with the same name as those cards and exile them. Then, that player shuffles their library.
 SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.IsRemembered | Zone$ Exile | RepeatSubAbility$ ExileYard | SubAbility$ DBCleanup
 SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.sharesNameWith Imprinted | ChangeNum$ NumInYard | Chooser$ You | Hidden$ True | SubAbility$ ExileHand | StackDescription$ None
 SVar:ExileHand:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TargetedPlayer | ChangeType$ Card.sharesNameWith Imprinted | ChangeNum$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None

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

@@ -2,8 +2,7 @@ Name:Saji's Torrent
 ManaCost:1 U
 Types:Instant
 A:SP$ ChooseNumber | Min$ 0 | Max$ 5 | Defined$ You | Random$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Tap X creatures, where X is a number from 0 to 5 chosen at random.
-SVar:DBChoose:DB$ ChooseCard | Amount$ X | Choices$ Creature | RememberChosen$ True | SubAbility$ DBTapAll | StackDescription$ None
-SVar:DBTapAll:DB$ TapAll | ValidCards$ Creature.IsRemembered | StackDescription$ None | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBChoose:DB$ ChooseCard | Amount$ X | Choices$ Creature | SubAbility$ DBTapAll | StackDescription$ None
+SVar:DBTapAll:DB$ TapAll | ValidCards$ Creature.ChosenCard | StackDescription$ None
 SVar:X:Count$ChosenNumber
 Oracle:Tap X creatures, where X is a number from 0 to 5 chosen at random.

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

@@ -2,7 +2,7 @@ Name:Sakashima the Impostor Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/+1
-A:AB$ ChooseCard | Cost$ 2 | ActivationZone$ Command | Choices$ Creature.YouCtrl | Amount$ 1 | AILogic$ Clone | RememberChosen$ True | SubAbility$ DBClone | SpellDescription$ Choose a creature you control. It becomes a copy of target creature except for its name.
-SVar:DBClone:DB$ Clone | CloneTarget$ Remembered | ValidTgts$ Creature | TgtPrompt$ Select target creature to copy | KeepName$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChooseCard | Cost$ 2 | ActivationZone$ Command | Choices$ Creature.YouCtrl | Amount$ 1 | AILogic$ Clone | SubAbility$ DBClone | SpellDescription$ Choose a creature you control. It becomes a copy of target creature except for its name.
+SVar:DBClone:DB$ Clone | CloneTarget$ ChosenCard | ValidTgts$ Creature | TgtPrompt$ Select target creature to copy | KeepName$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:Hand +0, life +1\n{2}: Choose a creature you control. It becomes a copy of target creature except for its name.

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

@@ -4,10 +4,10 @@ Types:Sorcery
 A:SP$ Charm | Cost$ 3 U | MinCharmNum$ 1 | CharmNum$ X | Choices$ DBControl,DBImprint | AdditionalDescription$ If you control a commander as you cast this spell, you may choose both.
 SVar:DBControl:DB$ ChooseCard | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Mandatory$ True | Choices$ Creature.TargetedPlayerCtrl | ChoiceTitle$ Choose a creature you control | SubAbility$ DBGainControl | AILogic$ WorstCard | SpellDescription$ Target opponent chooses a creature they control. You gain control of it.
 SVar:DBGainControl:DB$ GainControl | Defined$ ChosenCard | NewController$ You | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
-SVar:DBImprint:DB$ ChooseCard | Defined$ You | Mandatory$ True | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | RememberChosen$ True | SubAbility$ MassClone | AILogic$ BestCard | SpellDescription$ Choose a creature you control. Each other creature you control becomes a copy of that creature until end of turn.
-SVar:MassClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.Creature+IsNotRemembered+YouCtrl | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ Imprinted | Duration$ UntilEndOfTurn
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+SVar:DBImprint:DB$ ChooseCard | Defined$ You | Mandatory$ True | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | SubAbility$ MassClone | AILogic$ BestCard | SpellDescription$ Choose a creature you control. Each other creature you control becomes a copy of that creature until end of turn.
+SVar:MassClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.Creature+nonChosenCard+YouCtrl | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup
+SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | CloneTarget$ Imprinted | Duration$ UntilEndOfTurn
 SVar:X:Count$Compare Y GE1.2.1
 SVar:Y:Count$Valid Card.IsCommander+YouCtrl
 SVar:PlayMain1:TRUE

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

@@ -11,7 +11,6 @@ ALTERNATE
 Name:Deadly Vanity
 ManaCost:5 B B B
 Types:Sorcery
-A:SP$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature,Planeswalker | ChoiceTitle$ Choose a creature or planeswalker | Mandatory$ True | ChoiceZone$ Battlefield | SubAbility$ DBDestroyAll | RememberChosen$ True | AILogic$ BestCard | StackDescription$ SpellDescription | SpellDescription$ Choose a creature or planeswalker,
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered,Planeswalker.IsNotRemembered | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ then destroy all other creatures and planeswalkers.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature,Planeswalker | ChoiceTitle$ Choose a creature or planeswalker | Mandatory$ True | ChoiceZone$ Battlefield | SubAbility$ DBDestroyAll | AILogic$ BestCard | StackDescription$ SpellDescription | SpellDescription$ Choose a creature or planeswalker,
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.nonChosenCard,Planeswalker.nonChosenCard | StackDescription$ SpellDescription | SpellDescription$ then destroy all other creatures and planeswalkers.
 Oracle:Choose a creature or planeswalker, then destroy all other creatures and planeswalkers.

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

@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChoose | SubAbility$ DBSac | StackDescription$ Each opponent | SpellDescription$ Each opponent sacrifices a creature or planeswalker with the highest mana value among creatures and planeswalkers they control.
 SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.RememberedPlayerCtrl+cmcEQX,Planeswalker.RememberedPlayerCtrl+cmcEQX | ChoiceTitle$ Choose a creature or planeswalker with the highest mana value to sacrifice | Mandatory$ True | RememberChosen$ True
 SVar:DBSac:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup | StackDescription$ sacrifices a creature or planeswalker with the highest mana value among creatures and planeswalkers they control.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:SVar$Y/LimitMin.Z
 SVar:Y:Count$Valid Creature.RememberedPlayerCtrl$GreatestCMC
 SVar:Z:Count$Valid Planeswalker.RememberedPlayerCtrl$GreatestCMC

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

@@ -8,4 +8,5 @@ SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 SVar:X:Remembered$CardManaCost
+AI:RemoveDeck:NonCommander
 Oracle:You draw X cards and you lose X life, where X is the mana value of a commander you own on the battlefield or in the command zone.

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

@@ -7,8 +7,8 @@ T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell.OppCtrl | Tr
 SVar:TrigChoose:DB$ Charm | Choices$ DBDamage,DBExilePlay
 SVar:DBDamage:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to each opponent.
 SVar:DBExilePlay:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBChoose | SpellDescription$ Exile the top two cards of your library. Choose one of them. Until the end of your next turn, you may play that card.
-SVar:DBChoose:DB$ ChooseCard | Choices$ Card.IsRemembered | ChoiceZone$ Exile | Defined$ You | RememberChosen$ True | SubAbility$ DBEffect
+SVar:DBChoose:DB$ ChooseCard | Choices$ Card.IsRemembered | ChoiceZone$ Exile | Defined$ You | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ ChosenCard | ForgetOnMoved$ Exile | StaticAbilities$ Play | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBCleanup
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play this card.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 Oracle:Whenever Tectonic Giant attacks or becomes the target of a spell an opponent controls, choose one —\n• Tectonic Giant deals 3 damage to each opponent.\n• Exile the top two cards of your library. Choose one of them. Until the end of your next turn, you may play that card.

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

@@ -10,7 +10,7 @@ SVar:MimeoChooseCopy:DB$ ChooseCard | ConditionCheckSVar$ MimeoNumRemembered | C
 # Order matters here, put counters first so clone doesn't have to add SVars
 SVar:MimeoAddCounters:DB$ PutCounter | ETB$ True | Defined$ Self | ConditionCheckSVar$ MimeoNumRemembered | ConditionSVarCompare$ EQ1 | CounterType$ P1P1 | CounterNum$ MimeoX | SubAbility$ MimeoCopyChosen
 SVar:MimeoCopyChosen:DB$ Clone | Defined$ ChosenCard | ConditionCheckSVar$ MimeoNumRemembered | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 SVar:MimeoInYard:Count$TypeInAllYards.Creature
 SVar:MimeoNumRemembered:Remembered$Amount
 SVar:MimeoX:Remembered$CardPower

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

@@ -2,9 +2,8 @@ Name:Urge to Feed
 ManaCost:B B
 Types:Instant
 A:SP$ Pump | Cost$ B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True | SubAbility$ GuestList | SpellDescription$ Target creature gets -3/-3 until end of turn. You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires.
-SVar:GuestList:DB$ ChooseCard | Defined$ You | MinAmount$ 0 | Amount$ AbleToFeedX | Choices$ Creature.Vampire+untapped+YouCtrl | ChoiceTitle$ Choose any number of untapped Vampire creature you control | ChoiceZone$ Battlefield | RememberChosen$ True | SubAbility$ VampiricUrge
-SVar:VampiricUrge:DB$ Tap | Defined$ Remembered | SubAbility$ VampiricFeed
-SVar:VampiricFeed:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:GuestList:DB$ ChooseCard | Defined$ You | MinAmount$ 0 | Amount$ AbleToFeedX | Choices$ Creature.Vampire+untapped+YouCtrl | ChoiceTitle$ Choose any number of untapped Vampire creature you control | ChoiceZone$ Battlefield | SubAbility$ VampiricUrge
+SVar:VampiricUrge:DB$ Tap | Defined$ ChosenCard | SubAbility$ VampiricFeed
+SVar:VampiricFeed:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ ChosenCard
 SVar:AbleToFeedX:Count$Valid Creature.Vampire+YouCtrl
 Oracle:Target creature gets -3/-3 until end of turn. You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires.

forge-gui/res/cardsfolder/upcoming/the_horus_heresy.txt

@@ -7,7 +7,7 @@ SVar:OneEach:PlayerCountOpponents$Amount
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SpellDescription$ Draw a card for each creature you control but don't own.
 SVar:X:Count$Valid Creature.YouDontOwn+YouCtrl
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | StartingWithActivator$ True | RepeatSubAbility$ DBChooseCreature | SubAbility$ DBDestroy | SpellDescription$ Starting with you, each player chooses a creature. Destroy each creature chosen this way.
-SVar:DBChooseCreature:DB$ ChooseCard | Defined$ Remembered | Choices$ Creature  | ChoiceTitle$ Choose a creature | Mandatory$ True | RememberChosen$ True
+SVar:DBChooseCreature:DB$ ChooseCard | Defined$ Remembered | Choices$ Creature | ChoiceTitle$ Choose a creature | Mandatory$ True | RememberChosen$ True
 SVar:DBDestroy:DB$ Destroy | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — For each opponent, gain control of up to one target nonlegendary creature that player controls for as long as The Horus Heresy remains on the battlefield.\nII — Draw a card for each creature you control but don't own.\nIII — Starting with you, each player chooses a creature. Destroy each creature chosen this way.

forge-gui/res/cardsfolder/upcoming/vodalian_tide_mage.txt

@@ -5,6 +5,6 @@ PT:3/3
 T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl+nonToken | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever one or more nontoken creatures you control deal combat damage to a player, choose one of those creatures. Conjure a copy of the chosen creature in your hand.
 SVar:TrigChoose:DB$ ChooseCard | DefinedCards$ TriggeredSources | Mandatory$ True | SubAbility$ DBConjure
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ ChosenCard | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearChosen$ True 
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True 
 SVar:PlayMain1:TRUE
 Oracle:Whenever one or more nontoken creatures you control deal combat damage to a player, choose one of those creatures. Conjure a copy of the chosen creature in your hand.

forge-gui/res/cardsfolder/v/vivien_on_the_hunt.txt

@@ -7,7 +7,7 @@ SVar:DBChangeZone:DB$ ChangeZone | ConditionDefined$ Remembered | ConditionPrese
 SVar:X:Remembered$CardManaCost/Plus.1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Mill | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ 5 | RememberMilled$ True | SubAbility$ DBChangeZone2 | SpellDescription$ Mill five cards, then put any number of creature cards milled this way into your hand.
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Hidden$ True | ChangeType$ Creature.IsRemembered | ChangeTypeDesc$ creature cards milled this way | ChangeNum$ Z | ChangeNumDesc$ any number of | SelectPrompt$ Select any number of creature cards milled this way | SubAbility$ DBCleanup
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Hand | Hidden$ True | ChangeType$ Creature.IsRemembered | ChangeTypeDesc$ creature cards milled this way | ChangeNum$ Z | ChangeNumDesc$ any number of | SelectPrompt$ Select any number of creature cards milled this way | SubAbility$ DBCleanup
 SVar:Z:Remembered$Valid Creature
 A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenScript$ g_4_4_rhino_warrior | SpellDescription$ Create a 4/4 green Rhino Warrior creature token.
 DeckHas:Ability$Sacrifice|Token|Mill|Graveyard & Type$Rhino

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

@@ -2,8 +2,7 @@ Name:Watchers of the Dead
 ManaCost:2
 Types:Artifact Creature Cat
 PT:2/2
-A:AB$ RepeatEach | Cost$ Exile<1/CARDNAME> | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseTwoGrave | AILogic$ Never | SpellDescription$ Each opponent chooses two cards in their graveyard and exiles the rest.
-SVar:ChooseTwoGrave:DB$ ChooseCard | Defined$ Remembered | Amount$ 2 | Choices$ Card.RememberedPlayerCtrl | ChoiceZone$ Graveyard | ChoiceTitle$ Choose two cards not to exile | RememberChosen$ True | Mandatory$ True | SubAbility$ ExileAllOthers
-SVar:ExileAllOthers:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.RememberedPlayerCtrl+IsNotRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+A:AB$ RepeatEach | Cost$ Exile<1/CARDNAME> | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseTwoGrave | AILogic$ Never | SubAbility$ ExileAllOthers | SpellDescription$ Each opponent chooses two cards in their graveyard and exiles the rest.
+SVar:ChooseTwoGrave:DB$ ChooseCard | Defined$ Remembered | Amount$ 2 | Choices$ Card.RememberedPlayerCtrl | ChoiceZone$ Graveyard | ChoiceTitle$ Choose two cards not to exile | RememberChosen$ True | Mandatory$ True
+SVar:ExileAllOthers:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.IsNotRemembered
 Oracle:Exile Watchers of the Dead: Each opponent chooses two cards in their graveyard and exiles the rest.

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

@@ -3,9 +3,8 @@ ManaCost:4 WU WU WU WU
 Types:Sorcery
 A:SP$ ChangeZoneAll | Cost$ 4 WU WU WU WU | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBRepeat | SpellDescription$ Return all permanents to their owners' hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Each player loses all unspent mana.
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose
-SVar:DBChoose:DB$ ChooseCard | Amount$ 7 | Defined$ Remembered | Choices$ Card.RememberedPlayerCtrl | ChoiceZone$ Hand | SubAbility$ DBReturn | RememberChosen$ True
-SVar:DBReturn:DB$ ChangeZone | Defined$ ValidHand Card.IsNotRemembered+RememberedPlayerCtrl | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ DBEmpty
-SVar:DBEmpty:DB$ DrainMana | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBChoose:DB$ ChooseCard | MinAmount$ 0 | Amount$ 7 | Defined$ Remembered | Choices$ Card.RememberedPlayerCtrl | ChoiceZone$ Hand | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ ValidHand Card.nonChosenCard+RememberedPlayerCtrl | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ DBEmpty
+SVar:DBEmpty:DB$ DrainMana | Defined$ Remembered
 AI:RemoveDeck:All
 Oracle:Return all permanents to their owners' hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Each player loses all unspent mana.