cards: update cards with can't untap controller next untap phase

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

@@ -9,6 +9,6 @@ SVar:BuffedBy:Permanent.Snow
 SVar:NoZeroToughnessAI:True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 Oracle:Trample\nAbominable Treefolk's power and toughness are each equal to the number of snow permanents you control.\nWhen Abominable Treefolk enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Instant
 K:Devoid
 A:SP$ Tap | Cost$ 3 U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures.
-SVar:TrigPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBToken | SpellDescription$ Those creatures don't untap during their controller's next untap step.
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted | SubAbility$ DBToken | SpellDescription$ Those creatures don't untap during their controller's next untap step.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You | LegacyImage$ c 1 1 eldrazi scion sac bfz | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token

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

@@ -2,7 +2,7 @@ Name:Ajani Vengeant
 ManaCost:2 R W
 Types:Legendary Planeswalker Ajani
 Loyalty:3
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | KW$ HIDDEN This card doesn't untap during your next untap step. | ValidTgts$ Permanent | Permanent$ True | IsCurse$ True | SpellDescription$ Target permanent doesn't untap during its controller's next untap step.
+A:AB$ CantUntapTurn | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent | SpellDescription$ Target permanent doesn't untap during its controller's next untap step.
 A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to any target and you gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 A:AB$ DestroyAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | SpellDescription$ Destroy all lands target player controls.

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

@@ -2,7 +2,7 @@ Name:Apes of Rath
 ManaCost:2 G G
 Types:Creature Ape
 PT:5/4
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | TriggerDescription$ Whenever CARDNAME attacks, it doesn't untap during its controller's next untap step.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DBPump | TriggerDescription$ Whenever CARDNAME attacks, it doesn't untap during its controller's next untap step.
-SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apes_of_rath.jpg
 Oracle:Whenever Apes of Rath attacks, it doesn't untap during its controller's next untap step.

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

@@ -2,7 +2,10 @@ Name:Arbalest Elite
 ManaCost:2 W W
 Types:Creature Human Archer
 PT:2/3
-A:AB$ DealDamage | Cost$ 2 W T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 3 | SubAbility$ DBStayTapped | SpellDescription$ CARDNAME deals 3 damage to target attacking or blocking creature. CARDNAME doesn't untap during your next untap step.
+A:AB$ DealDamage | Cost$ 2 W T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 3 | SubAbility$ DBEffect | SpellDescription$ CARDNAME deals 3 damage to target attacking or blocking creature. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arbalest_elite.jpg
 Oracle:{2}{W}, {T}: Arbalest Elite deals 3 damage to target attacking or blocking creature. Arbalest Elite doesn't untap during your next untap step.

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

@@ -1,7 +1,7 @@
 Name:Barl's Cage
 ManaCost:4
 Types:Artifact
-A:AB$ Pump | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
+A:AB$ CantUntapTurn | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barls_cage.jpg
 Oracle:{3}: Target creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SubAbility$ DBTapLand | SpellDescription$ CARDNAME deals 4 damage to target creature. Tap target land. That land doesn't untap during its controller's next untap step.
 SVar:DBTapLand:DB$ Tap | ValidTgts$ Land | TgtPrompt$ Choose target land | RememberTapped$ True | AlwaysRemember$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBCleanup
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandras_revolution.jpg
 Oracle:Chandra's Revolution deals 4 damage to target creature. Tap target land. That land doesn't untap during its controller's next untap step.

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

@@ -5,6 +5,6 @@ PT:3/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. It doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 Oracle:Flying\nWhen Chillbringer enters the battlefield, tap target creature an opponent controls. It doesn't untap during its controller's next untap step.

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

@@ -2,7 +2,7 @@ Name:Chilling Grasp
 ManaCost:2 U
 Types:Instant
 A:SP$ Tap | Cost$ 2 U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
-SVar:TrigPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted
 K:Madness:3 U
 DeckHints:Ability$Discard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chilling_grasp.jpg

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

@@ -4,6 +4,6 @@ Types:Instant
 A:SP$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -4/-0 until end of turn.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card. | SubAbility$ DBAddendum
 SVar:DBAddendum:DB$ Tap | Defined$ Targeted | ConditionPlayerTurn$ True | ConditionPhases$ Main1,Main2 | ConditionDefined$ Self | ConditionPresent$ Card.wasCast | SubAbility$ DBPump | SpellDescription$ Addendum - If you cast this spell during your main phase, tap that creature and it doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | ConditionPlayerTurn$ True | ConditionPhases$ Main1,Main2 | ConditionDefined$ Self | ConditionPresent$ Card.wasCast | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | ConditionPlayerTurn$ True | ConditionPhases$ Main1,Main2 | ConditionDefined$ Self | ConditionPresent$ Card.wasCast
 SVar:PlayMain1:TRUE
 Oracle:Target creature gets -4/-0 until end of turn.\nDraw a card.\nAddendum — If you cast this spell during your main phase, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -2,7 +2,7 @@ Name:Crippling Chill
 ManaCost:2 U
 Types:Instant
 A:SP$ Tap | Cost$ 2 U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBDraw
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crippling_chill.jpg
 Oracle:Tap target creature. It doesn't untap during its controller's next untap step.\nDraw a card.

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

@@ -2,6 +2,6 @@ Name:Decision Paralysis
 ManaCost:3 U
 Types:Instant
 A:SP$ Tap | Cost$ 3 U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
-SVar:TrigPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/decision_paralysis.jpg
 Oracle:Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.

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

@@ -5,7 +5,10 @@ PT:6/6
 K:Trample
 K:UpkeepCost:Mill<2>
 A:AB$ Pump | Cost$ U | Defined$ Self | KW$ Shroud | SubAbility$ DBPump | SpellDescription$ CARDNAME gains shroud until end of turn and doesn't untap during your next untap step. Tap CARDNAME. (A permanent with shroud can't be the target of spells or abilities.)
-SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBTap
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect | SubAbility$ DBTap
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:DBTap:DB$ Tap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deep_spawn.jpg
 Oracle:Trample\nAt the beginning of your upkeep, sacrifice Deep Spawn unless you put the top two cards of your library into your graveyard.\n{U}: Deep Spawn gains shroud until end of turn and doesn't untap during your next untap step. Tap Deep Spawn. (A creature with shroud can't be the target of spells or abilities.)

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

@@ -5,7 +5,7 @@ Loyalty:5
 A:AB$ GainLife | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | LifeAmount$ 2 | SubAbility$ DBDraw | SpellDescription$ You gain 2 life and draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 A:AB$ Tap | Cost$ SubCounter<1/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Choose target creature to tap. | Planeswalker$ True | SubAbility$ DovinPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step.
-SVar:DovinPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:DovinPump:DB$ CantUntapTurn | Defined$ Targeted
 A:AB$ TapAll | Cost$ SubCounter<9/LOYALTY> | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ValidCards$ Permanent | Planeswalker$ True | Ultimate$ True | SubAbility$ NoUntap | SpellDescription$ Tap all permanents target opponent controls. That player skips their next untap step.
 SVar:NoUntap:DB$ Pump | Defined$ TargetedPlayer | IsCurse$ True | KW$ Skip your next untap step. | Permanent$ True 
 Oracle:+1: You gain 2 life and draw a card.\n−1: Tap target creature. It doesn't untap during its controller’s next untap step.\n−9: Tap all permanents target opponent controls. That player skips their next untap step.

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

@@ -2,6 +2,6 @@ Name:Elvish Hunter
 ManaCost:1 G
 Types:Creature Elf Archer
 PT:1/1
-A:AB$ Pump | Cost$ 1 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
+A:AB$ CantUntapTurn | Cost$ 1 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_hunter.jpg
 Oracle:{1}{G}, {T}: Target creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Enchantment
 T:Mode$ Clashed | ValidPlayer$ You | Won$ True | TriggerZones$ Battlefield | Execute$ TrigTapW | TriggerDescription$ Whenever you clash, tap target creature an opponent controls. If you won, that creature doesn't untap during its controller's next untap step. (This ability triggers after the clash ends.)
 SVar:TrigTapW:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ TrigTapW2
-SVar:TrigTapW2:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigTapW2:DB$ CantUntapTurn | Defined$ Targeted
 T:Mode$ Clashed | ValidPlayer$ You | Won$ False | TriggerZones$ Battlefield | Execute$ TrigTapL | Secondary$ True | TriggerDescription$ Whenever you clash, tap target creature an opponent controls. If you won, that creature doesn't untap during its controller's next untap step. (This ability triggers after the clash ends.)
 SVar:TrigTapL:DB$ Tap | ValidTgts$ Creature.OppCtrl
 AI:RemoveDeck:Random

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

@@ -4,7 +4,7 @@ Types:Creature Spirit
 PT:1/3
 K:Skulk
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fogwalker.jpg
 Oracle:Skulk (This creature can't be blocked by creatures with greater power.)\nWhen Fogwalker enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.

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

@@ -2,6 +2,6 @@ Name:Frost Breath
 ManaCost:2 U
 Types:Instant
 A:SP$ Tap | Cost$ 2 U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
-SVar:TrigPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_breath.jpg
 Oracle:Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Elemental Cat
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_lynx.jpg
 Oracle:When Frost Lynx enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -6,7 +6,7 @@ T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Card.Self | Tri
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, tap target permanent. It doesn't untap during its controller's next untap step.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, tap target permanent. It doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Permanent | TgtPrompt$ Choose target permanent. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ 2 | UnlessPayer$ TriggeredSourceSAController
 SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_titan.jpg

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

@@ -5,6 +5,6 @@ A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 1 S | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Creature,Artifact,Construct | SpellDescription$ Until end of turn, CARDNAME becomes a 2/3 Construct artifact creature. It's still a land. ({S} can be paid with one mana from a snow permanent.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 Oracle:{T}: Add {C}.\n{1}{S}: Until end of turn, Frostwalk Bastion becomes a 2/3 Construct artifact creature. It's still a land. ({S} can be paid with one mana from a snow permanent.)\nWhenever Frostwalk Bastion deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Instant
 K:Surge:1 U
 A:SP$ Tap | Cost$ 2 U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBDraw
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grip_of_the_roil.jpg
 Oracle:Surge {1}{U} (You may cast this spell for its surge cost if you or a teammate has cast another spell this turn.)\nTap target creature. It doesn't untap during its controller's next untap step.\nDraw a card.

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

@@ -5,7 +5,7 @@ PT:4/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, tap target creature an opponent controls. If that land is an Island, that creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | ConditionDefined$ TriggeredCard | ConditionPresent$ Island
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | ConditionDefined$ TriggeredCard | ConditionPresent$ Island
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/guardian_of_tazeem.jpg
 Oracle:Landfall — Whenever a land enters the battlefield under your control, tap target creature an opponent controls. If that land is an Island, that creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Sorcery
 K:Cipher
 A:SP$ Tap | Cost$ 1 U | ValidTgts$ Creature.OppCtrl | SubAbility$ DBPump | References$ DBPump | SpellDescription$ Tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ Cipher
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | SubAbility$ Cipher
 SVar:Cipher:DB$ Encode | Defined$ Self
 DeckNeeds:Type$Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hands_of_binding.jpg

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

@@ -2,8 +2,11 @@ Name:Homarid Warrior
 ManaCost:4 U
 Types:Creature Homarid Warrior
 PT:3/3
-A:AB$ Pump | Cost$ U | Defined$ Self | KW$ Shroud | SubAbility$ DBPumpNoUntap | SpellDescription$ CARDNAME gains shroud until end of turn and doesn't untap during your next untap step. Tap CARDNAME. (A permanent with shroud can't be the target of spells or abilities.)
+A:AB$ Pump | Cost$ U | Defined$ Self | KW$ Shroud | SubAbility$ DBEffect | SpellDescription$ CARDNAME gains shroud until end of turn and doesn't untap during your next untap step. Tap CARDNAME. (A permanent with shroud can't be the target of spells or abilities.)
-SVar:DBPumpNoUntap:DB$Pump | Defined$ Self | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBTap
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect | SubAbility$ DBTap
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:DBTap:DB$ Tap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/homarid_warrior.jpg
 Oracle:{U}: Homarid Warrior gains shroud until end of turn and doesn't untap during your next untap step. Tap Homarid Warrior. (A creature with shroud can't be the target of spells or abilities.)

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

@@ -2,7 +2,7 @@ Name:House Guildmage
 ManaCost:U B
 Types:Creature Human Wizard
 PT:2/2
-A:AB$ Pump | Cost$ 1 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
+A:AB$ CantUntapTurn | Cost$ 1 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
 A:AB$ Surveil | Cost$ 2 B T | Amount$ 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:{1}{U}, {T}: Target creature doesn't untap during its controller's next untap step.\n{2}{B}, {T}: Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)

forge-gui/res/cardsfolder/i/icy_blast.txt

@@ -2,7 +2,7 @@ Name:Icy Blast
 ManaCost:X U
 Types:Instant
 A:SP$ Tap | Cost$ X U | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | SubAbility$ DBPump | SpellDescription$ Tap X target creatures. Ferocious — If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step. | ConditionPresent$ Creature.YouCtrl+powerGE4 | ConditionCompare$ GE1
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | ConditionPresent$ Creature.YouCtrl+powerGE4 | ConditionCompare$ GE1
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icy_blast.jpg

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

@@ -5,7 +5,7 @@ PT:2/3
 S:Mode$ Continuous | Affected$ Snake.Legendary+YouCtrl | AddKeyword$ Shroud | Description$ Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kashi_tribe_elite.jpg
 Oracle:Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.)\nWhenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Snake Warrior
 PT:3/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 A:AB$ Regenerate | Cost$ 1 G | SpellDescription$ Regenerate CARDNAME.
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kashi_tribe_reaver.jpg

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

@@ -4,7 +4,7 @@ Types:Creature Snake Warrior
 PT:2/4
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kashi_tribe_warriors.jpg
 Oracle:Whenever Kashi-Tribe Warriors deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:3
 Types:Legendary Artifact
 S:Mode$ ReduceCost | ValidCard$ Creature.Blue | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Blue creature spells you cast cost {1} less to cast.
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell, target creature an opponent controls doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls
 DeckNeeds:Color$Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kefnets_monument.jpg
 Oracle:Blue creature spells you cast cost {1} less to cast.\nWhenever you cast a creature spell, target creature an opponent controls doesn't untap during its controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Kor Soldier
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_hookmaster.jpg
 Oracle:When Kor Hookmaster enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Minotaur
 PT:1/4
 T:Mode$ AttackerBlocked | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature, that creature doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ TriggeredAttacker
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/labyrinth_minotaur.jpg
 Oracle:Whenever Labyrinth Minotaur blocks a creature, that creature doesn't untap during its controller's next untap step.

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

@@ -3,6 +3,6 @@ ManaCost:5
 Types:Artifact Creature Golem
 PT:3/5
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | TriggerDescription$ Whenever CARDNAME attacks, it doesn't untap during its controller's next untap step.
-SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:StayTapped:DB$ CantUntapTurn | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lead_golem.jpg
 Oracle:Whenever Lead Golem attacks, it doesn't untap during its controller's next untap step.

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

@@ -4,6 +4,6 @@ Types:Legendary Creature Octopus
 PT:8/8
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may pay {8}. If you do, tap up to eight target permanents. Those permanents don't untap during their controllers' next untap steps.
 SVar:TrigTap:AB$ Tap | Cost$ 8 | ValidTgts$ Permanent | TargetMin$ 0 | TargetMax$ 8 | TgtPrompt$ Select target permanent | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lorthos_the_tidemaker.jpg
 Oracle:Whenever Lorthos, the Tidemaker attacks, you may pay {8}. If you do, tap up to eight target permanents. Those permanents don't untap during their controllers' next untap steps.

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

@@ -5,6 +5,6 @@ PT:2/2
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TapTarget | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, tap target land that player controls. That land doesn't untap during its controller's next untap step.
 SVar:TapTarget:DB$ Tap | ValidTgts$ Land | TargetsWithDefinedController$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_skimmer.jpg
 Oracle:Flying\nWhenever Mana Skimmer deals damage to a player, tap target land that player controls. That land doesn't untap during its controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Snake Warrior Archer
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 A:AB$ Pump | Cost$ G | KW$ Reach | Defined$ Self | SpellDescription$ CARDNAME gains reach until end of turn. (It can block creatures with flying.)
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/matsu_tribe_birdstalker.jpg

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

@@ -5,7 +5,7 @@ PT:1/3
 A:AB$ MustBlock | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ AllowNonLethal | SpellDescription$ Target creature blocks CARDNAME this turn if able.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/matsu_tribe_decoy.jpg
 Oracle:{2}{G}: Target creature blocks Matsu-Tribe Decoy this turn if able.\nWhenever Matsu-Tribe Decoy deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -5,7 +5,7 @@ PT:1/1
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/matsu_tribe_sniper.jpg
 Oracle:{T}: Matsu-Tribe Sniper deals 1 damage to target creature with flying.\nWhenever Matsu-Tribe Sniper deals damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -5,7 +5,7 @@ PT:2/2
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mercurial_kite.jpg
 Oracle:Flying\nWhenever Mercurial Kite deals combat damage to a creature, tap that creature. That creature doesn't untap during its controller's next untap step.

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

@@ -6,7 +6,7 @@ K:Flying
 K:Prowess
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you cast an instant or sorcery spell, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:BuffedBy:Instant,Sorcery
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niblis_of_frost.jpg
 Oracle:Flying\nProwess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nWhenever you cast an instant or sorcery spell, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -6,7 +6,7 @@ K:Flying
 K:Vigilance
 T:Mode$ Attacks | ValidCard$ Dragon.YouCtrl | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Dragon you control attacks, tap target nonland permanent an opponent controls. It doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Choose target permanent. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Dragon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ojutai_soul_of_winter.jpg

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

@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Instant
 K:Rebound
 A:SP$ Tap | Cost$ 2 U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ojutais_breath.jpg
 Oracle:Tap target creature. It doesn't untap during its controller's next untap step.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)

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

@@ -4,7 +4,7 @@ Types:Creature Snake Warrior
 PT:2/1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orochi_ranger.jpg
 Oracle:Whenever Orochi Ranger deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:2 U U
 Types:Instant Trap
 A:SP$Tap | Cost$ 2 U U | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
 A:SP$Tap | Cost$ U | CheckSVar$ GreenCreats | References$ GreenCreats | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPump | SpellDescription$ If an opponent had a green creature enter the battlefield under their control this turn, you may pay {U} rather than pay CARDNAME's mana cost.
-SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:GreenCreats:Count$ThisTurnEntered_Battlefield_Creature.Green+OppCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/permafrost_trap.jpg
 Oracle:If an opponent had a green creature enter the battlefield under their control this turn, you may pay {U} rather than pay Permafrost Trap's mana cost.\nTap up to two target creatures. Those creatures don't untap during their controller's next untap step.

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

@@ -2,7 +2,7 @@ Name:Press for Answers
 ManaCost:1 U
 Types:Sorcery
 A:SP$ Tap | Cost$ 1 U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step. Investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBToken
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_clue_draw | TokenOwner$ You | LegacyImage$ c a clue draw soi
 DeckHas:Ability$Investigate
 SVar:Picture:http://www.wizards.com/global/images/magic/general/press_for_answers.jpg

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

@@ -4,7 +4,7 @@ Types:Creature Human Noble Wizard
 PT:2/3
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature. It doesn't untap during its controller's next upkeep.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredTarget
 SVar:HasCombatEffect:TRUE
 Oracle:Whenever Queen of Ice deals combat damage to a creature, tap that creature. It doesn't untap during its controller's next upkeep.
 AlternateMode:Adventure
@@ -15,5 +15,5 @@ Name:Rage of Winter
 ManaCost:1 U
 Types:Sorcery Adventure
 A:SP$ Tap | Cost$ 1 U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its contller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 Oracle:Tap target creature. It doesn't untap during its contller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ Whenever you cast a noncreature spell, you may pay {1}. If you do, tap target creature an opponent controls. It doesn't untap during its controller's next untap step.
 SVar:TrigTap:AB$ Tap | Cost$ 1 | ValidTgts$ Creature.OppCtrl | SubAbility$ DBPump | TgtPrompt$ Select target creature an opponent controls.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:BuffedBy:Card.nonCreature+nonLand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quiet_contemplation.jpg
 Oracle:Whenever you cast a noncreature spell, you may pay {1}. If you do, tap target creature an opponent controls and it doesn't untap during its controller's next untap step.

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

@@ -12,5 +12,5 @@ Name:Rubble
 ManaCost:2 R
 Types:Sorcery
 K:Aftermath
-A:SP$ Pump | Cost$ 2 R | ValidTgts$ Land | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Select target land | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Up to three target lands don't untap during their controller's next untap step.
+A:SP$ CantUntapTurn | Cost$ 2 R | ValidTgts$ Land | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Select target land | SpellDescription$ Up to three target lands don't untap during their controller's next untap step.
 Oracle:Aftermath (Cast this spell only from your graveyard. Then exile it.)\nUp to three target lands don't untap during their controller's next untap step.

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

@@ -2,7 +2,10 @@ Name:Reveka, Wizard Savant
 ManaCost:2 U U
 Types:Legendary Creature Dwarf Wizard
 PT:0/1
-A:AB$ DealDamage | Cost$ T | NumDmg$ 2 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | SubAbility$ DBPump | SpellDescription$ CARDNAME deals 2 damage to any target and doesn't untap during your next untap step.
+A:AB$ DealDamage | Cost$ T | NumDmg$ 2 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | SubAbility$ DBEffect | SpellDescription$ CARDNAME deals 2 damage to any target and doesn't untap during your next untap step.
-SVar:DBPump:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reveka_wizard_savant.jpg
 Oracle:{T}: Reveka, Wizard Savant deals 2 damage to any target and doesn't untap during your next untap step.

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

@@ -2,7 +2,7 @@ Name:Rush of Ice
 ManaCost:U
 Types:Sorcery
 A:SP$ Tap | Cost$ U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 K:Awaken:3:4 U
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rush_of_ice.jpg
 Oracle:Tap target creature. It doesn't untap during its controller's next untap step.\nAwaken 3—{4}{U} (If you cast this spell for {4}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)

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

@@ -3,7 +3,10 @@ ManaCost:3 W
 Types:Creature Human Cleric
 PT:0/2
 A:AB$ PreventDamage | Cost$ W W T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Amount$ 4 | SubAbility$ DBTap | SpellDescription$ Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
-SVar:DBTap:DB$Tap | Defined$ Targeted | SubAbility$ DBStayTapped
+SVar:DBTap:DB$Tap | Defined$ Targeted | SubAbility$ DBEffect
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Targeted | Permanent$ True | IsCurse$ True
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/samite_alchemist.jpg
 Oracle:{W}{W}, {T}: Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.

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

@@ -2,7 +2,7 @@ Name:Send to Sleep
 ManaCost:1 U
 Types:Instant
 A:SP$ Tap | Cost$ 1 U | TgtPrompt$ Select up to two target creatures | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 2 | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures. Spell mastery — If there are two or more instand and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.
-SVar:TrigPump:DB$ Pump | Defined$ Targeted | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | References$ X | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | References$ X
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/send_to_sleep.jpg
 Oracle:Tap up to two target creatures.\n Spell mastery — If there are two or more instand and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.

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

@@ -6,6 +6,6 @@ K:Adapt:1:2 G U
 DeckHas:Ability$Counters
 T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ TrigTap | TriggerDescription$ Whenever one or more +1/+1 counter are put on CARDNAME, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:HasAttackEffect:TRUE
 Oracle:{2}{G}{U}: Adapt 1. (If this creature has no +1/+1 counters on it, put a +1/+1 counter on it.)\nWhenever one or more +1/+1 counter are put on Sharktocrab, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -4,6 +4,6 @@ Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Equipped creature gets +0/+2 and has vigilance.
 T:Mode$ AttackerBlocked | ValidBlocker$ Card.EquippedBy | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature blocks a creature, that creature doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ TriggeredAttacker
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_righteous.jpg
 Oracle:Equipped creature gets +0/+2 and has vigilance.\nWhenever equipped creature blocks a creature, that creature doesn't untap during its controller's next untap step.\nEquip {2}

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

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skyline_cascade.jpg
 Oracle:Skyline Cascade enters the battlefield tapped.\nWhen Skyline Cascade enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.\n{T}: Add {U}.

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

@@ -2,7 +2,10 @@ Name:Spectral Bears
 ManaCost:1 G
 Types:Creature Bear Spirit
 PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | IsPresent$ Permanent.Black+nonToken+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DBEffect | IsPresent$ Permanent.Black+nonToken+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.
-SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_bears.jpg
 Oracle:Whenever Spectral Bears attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.

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

@@ -3,7 +3,10 @@ ManaCost:3 G G
 Types:Creature Elemental Spirit
 PT:8/8
 K:Trample
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | IsPresent$ Permanent.Black+nonToken+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DBEffect | IsPresent$ Permanent.Black+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.
-SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE don't untap during your next untap step.
+SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_force.jpg
 Oracle:Trample\nWhenever Spectral Force attacks, if defending player controls no black permanents, it doesn't untap during your next untap step.

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

@@ -5,7 +5,7 @@ PT:3/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spire_patrol.jpg
 Oracle:Flying\nWhen Spire Patrol enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Vampire
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, enters the battlefield, tap target land an opponent controls. That land doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Land.OppCtrl | TgtPrompt$ Choose target land an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stensia_innkeeper.jpg
 Oracle:When Stensia Innkeeper enters the battlefield, tap target land an opponent controls. That land doesn't untap during its controller's next untap step.

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

@@ -5,7 +5,7 @@ PT:2/3
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stitched_mangler.jpg
 Oracle:Stitched Mangler enters the battlefield tapped.\nWhen Stitched Mangler enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Equipped creature gets +3/+3.
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ StayTapped | TriggerDescription$ Whenever equipped creature attacks, it doesn't untap during its controller's next untap step.
-SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ TriggeredAttacker | Permanent$ True
+SVar:StayTapped:DB$ CantUntapTurn | Defined$ TriggeredAttacker
 T:Mode$ Unattach | ValidAttachment$ Card.Self | ValidObject$ Permanent | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME becomes unattached from a permanent, sacrifice that permanent.
 SVar:TrigSac:DB$Sacrifice | Defined$ You | SacValid$ TriggeredObject
 K:Equip:2

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

@@ -2,7 +2,7 @@ Name:Sudden Storm
 ManaCost:3 U
 Types:Instant
 A:SP$ Tap | Cost$ 3 U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap steps. Scry 1.
-SVar:TrigPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBScry
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted | SubAbility$ DBScry
 SVar:DBScry:DB$ Scry | ScryNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sudden_storm.jpg
 Oracle:Tap up to two target creatures. Those creatures don't untap during their controllers' next untap steps. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)

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

@@ -2,6 +2,6 @@ Name:Take into Custody
 ManaCost:U
 Types:Instant
 A:SP$ Tap | Cost$ U | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. It doesn't untap during its controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/take_into_custody.jpg
 Oracle:Tap target creature. It doesn't untap during its controller's next untap step.

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

@@ -8,7 +8,7 @@ SVar:TrigDrawCard:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:TrigChange:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ TrigForget
 SVar:TrigForget:DB$ Pump | ForgetObjects$ TriggeredCard
 A:AB$ Tap | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent.nonLand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target nonland permanent | SubAbility$ DBPump | SpellDescription$ Tap up to two target nonland permanents. They don't untap during their controller's next untap step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Tamiyo, Field Researcher | Image $ emblem_tamiyo_field_researcher | StaticAbilities$ Omniscience | Stackable$ False | Duration$ Permanent | AILogic$ Always | SubAbility$ DBDraw | SpellDescription$ Draw three cards. You get an emblem with "You may cast spells from your hand without paying their mana costs."
 SVar:Omniscience:Mode$ Continuous | EffectZone$ Command | Affected$ Card.nonLand+YouOwn | MayPlay$ True | MayPlayWithoutManaCost$ True | AffectedZone$ Hand | Description$ You may cast spells from your hand without paying their mana costs.
 SVar:DBDraw:DB$Draw | NumCards$ 3

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

@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Legendary Planeswalker Tamiyo
 Loyalty:4
 A:AB$ Tap | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Permanent | TgtPrompt$ Choose target permanent. | Planeswalker$ True | SubAbility$ TamiyoPump | SpellDescription$ Tap target permanent. It doesn't untap during its controller's next untap step.
-SVar:TamiyoPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:TamiyoPump:DB$ CantUntapTurn | Defined$ Targeted
 A:AB$ Draw | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | Defined$ You | NumCards$ X | References$ X | Planeswalker$ True | SpellDescription$ Draw a card for each tapped creature target player controls.
 SVar:X:Count$Valid Creature.tapped+TargetedPlayerCtrl
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Tamiyo, the Moon Sage | Image$ emblem_tamiyo_the_moon_sage | StaticAbilities$ UnlimitedHand | Triggers$ TamiyoCardToGrave | SVars$ TamiyoReturn | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "You have no maximum hand size" and "Whenever a card is put into your graveyard from anywhere, you may return it to your hand."

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

@@ -3,6 +3,6 @@ ManaCost:U U
 Types:Instant
 A:SP$ Tap | Cost$ U U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. Prevent all combat damage that would be dealt by that creature this turn. It doesn't untap during its controller's next two untap steps.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Prevent all combat damage that would be dealt by CARDNAME. | SubAbility$ DBPump2
-SVar:DBPump2:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next two untap steps. | Permanent$ True
+SVar:DBPump2:DB$ CantUntapTurn | Defined$ Targeted | Turns$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/telekinesis.jpg
 Oracle:Tap target creature. Prevent all combat damage that would be dealt by that creature this turn. It doesn't untap during its controller's next two untap steps.

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

@@ -5,7 +5,7 @@ PT:0/3
 K:Defender
 T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredAttacker | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredAttacker
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vertigo_spawn.jpg
 Oracle:Defender\nWhenever Vertigo Spawn blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step.

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

@@ -6,6 +6,6 @@ K:Trample
 T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana of any type that land produced.
 SVar:TrigMana:DB$ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ You
 T:Mode$ TapsForMana | ValidCard$ Land.OppCtrl | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$Pump | Defined$ TriggeredCard | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ TriggeredCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vorinclex_voice_of_hunger.jpg
 Oracle:Trample\nWhenever you tap a land for mana, add one mana of any type that land produced.\nWhenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Wall
 PT:0/7
 K:Defender
 T:Mode$ AttackerBlocked | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature, that creature doesn't untap during its controller's next untap step.
-SVar:TrigPump:DB$Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ TriggeredAttacker
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_frost.jpg
 Oracle:Defender\nWhenever Wall of Frost blocks a creature, that creature doesn't untap during its controller's next untap step.

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

@@ -4,7 +4,7 @@ Types:Creature Merfolk Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/watertrap_weaver.jpg
 Oracle:When Watertrap Weaver enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -4,6 +4,6 @@ Types:Creature Merfolk Wizard
 PT:1/4
 T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Heroic — Whenever you cast a spell that targets CARDNAME, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:DBPump:DB$ CantUntapTurn | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wavecrash_triton.jpg
 Oracle:Heroic — Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:4 U U
 Types:Instant
 K:Delve
 A:SP$ Tap | Cost$ 4 U U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
-SVar:TrigPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:TrigPump:DB$ CantUntapTurn | Defined$ Targeted
 DeckHints:Ability$Graveyard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_breath.jpg
 Oracle:Delve (Each card you exile from your graveyard while casting this spell pays for {1}.)\nTap up to two target creatures. Those creatures don't untap during their controller's next untap step.

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

@@ -3,7 +3,7 @@ ManaCost:R G W
 Types:World Enchantment
 T:Mode$ TapsForMana | ValidCard$ Land.Snow | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a snow land for mana, that player adds one mana of any type that land produced. That land doesn't untap during its controller's next untap step.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredCard | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
+SVar:DBPump:DB$ CantUntapTurn | Defined$ TriggeredCard
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/winters_night.jpg