Negation cleanup: nonToken, part 3 (#6952)

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

@@ -3,9 +3,9 @@ ManaCost:3 R W
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | AddKeyword$ Haste | Description$ Creatures you control get +1/+0 and have haste.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of your end step, exile any number of nontoken artifacts and/or creatures you control. Return those cards to the battlefield under their owner's control at the beginning of your next upkeep.
-SVar:TrigChangeZone:DB$ ChangeZone | ChangeNum$ X | ChangeType$ Creature.YouCtrl+nonToken,Artifact.YouCtrl+nonToken | Hidden$ True | SelectPrompt$ Choose any number of nontoken artifacts and creatures you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True
+SVar:TrigChangeZone:DB$ ChangeZone | ChangeNum$ X | ChangeType$ Creature.YouCtrl+!token,Artifact.YouCtrl+!token | Hidden$ True | SelectPrompt$ Choose any number of nontoken artifacts and creatures you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigReturn | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ At the beginning of your next upkeep, return that card to the battlefield under its owner's control.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Creature.YouCtrl+nonToken,Artifact.YouCtrl+nonToken
+SVar:X:Count$Valid Creature.YouCtrl+!token,Artifact.YouCtrl+!token
 Oracle:Creatures you control get +1/+0 and have haste.\nAt the beginning of your end step, exile any number of nontoken artifacts and/or creatures you control. Return those cards to the battlefield under their owner's control at the beginning of your next upkeep.

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

@@ -9,7 +9,7 @@ SVar:PayLife:AB$ StoreSVar | Cost$ Mandatory PayLife<X> | XMaxLimit$ Limit | SVa
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ LifePaidOnETB | SetToughness$ LifePaidOnETB | Description$ CARDNAME's power and toughness are each equal to the life paid as it entered.
 SVar:X:Count$xPaid
 SVar:Limit:SVar$Active/Plus.Buried
-SVar:Active:Count$Valid Permanent.White+nonToken+OppCtrl
+SVar:Active:Count$Valid Permanent.White+!token+OppCtrl
 SVar:Buried:Count$ValidGraveyard Card.White+OppCtrl
 SVar:LifePaidOnETB:Number$0
 AI:RemoveDeck:All

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

@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact Equipment
 K:Equip:3
 S:Mode$ Continuous | AddTrigger$ SacrificeStatic | Affected$ Creature.EquippedBy | AddKeyword$ Menace & Deathtouch & Annihilator:1 | Description$ Equipped creature has menace, deathtouch, annihilator 1, and "Whenever an opponent sacrifices a nontoken permanent, put that card onto the battlefield under your control unless that player pays 3 life." (Whenever a creature with annihilator 1 attacks, defending player sacrifices a permanent.)
-SVar:SacrificeStatic:Mode$ Sacrificed | ValidCard$ Permanent.nonToken+OppCtrl | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent sacrifices a nontoken permanent, put that card onto the battlefield under your control unless that player pays 3 life.
+SVar:SacrificeStatic:Mode$ Sacrificed | ValidCard$ Permanent.!token+OppCtrl | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent sacrifices a nontoken permanent, put that card onto the battlefield under your control unless that player pays 3 life.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard | UnlessCost$ PayLife<3> | UnlessPayer$ TriggeredCardController
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Sacrifice

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

@@ -1,7 +1,7 @@
 Name:Necroduality
 ManaCost:3 U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Zombie.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Zombie you control enters, create a token that's a copy of that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Zombie.!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Zombie you control enters, create a token that's a copy of that creature.
 SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy
 AI:RemoveDeck:Random
 DeckHas:Ability$Token

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

@@ -2,7 +2,7 @@ Name:Necrogen Communion
 ManaCost:1 B
 Types:Enchantment Aura
 K:Enchant creature you control
-A:SP$ Attach | ValidTgts$ Creature.YouCtrl | AITgts$ Card.nonToken | AILogic$ Pump
+A:SP$ Attach | ValidTgts$ Creature.YouCtrl | AITgts$ Card.!token | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Toxic:2 | Description$ Enchanted creature has toxic 2. (Players dealt combat damage by it also get two poison counters.)
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigReturn | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under your control.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Destination$ Battlefield | GainControl$ True

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

@@ -2,7 +2,7 @@ Name:Necromantic Selection
 ManaCost:4 B B B
 Types:Sorcery
 A:SP$ DestroyAll | ValidCards$ Creature | RememberDestroyed$ True | SubAbility$ DBReturn | SpellDescription$ Destroy all creatures, then return a creature card put into a graveyard this way to the battlefield under your control. It's a black Zombie in addition to its other colors and types. Exile CARDNAME.
-SVar:DBReturn:DB$ ChangeZone | ChangeType$ Creature.nonToken+IsRemembered | ChangeNum$ 1 | Hidden$ True | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | StaticEffect$ Animate | SubAbility$ DBCleanup
+SVar:DBReturn:DB$ ChangeZone | ChangeType$ Creature.!token+IsRemembered | ChangeNum$ 1 | Hidden$ True | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | StaticEffect$ Animate | SubAbility$ DBCleanup
 SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Zombie | AddColor$ Black
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBChange
 SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ None

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

@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Enchantment Creature Demon
 PT:4/4
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control dies, you may exile it. If you do, create a token that's a copy of that creature, except it's 1/1 and it's Nightmare in addition to its other types.
+T:Mode$ ChangesZone | ValidCard$ Creature.!token+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control dies, you may exile it. If you do, create a token that's a copy of that creature, except it's 1/1 and it's Nightmare in addition to its other types.
 SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ DBCopy
 SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | SetPower$ 1 | SetToughness$ 1 | AddTypes$ Nightmare | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

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

@@ -4,6 +4,6 @@ Types:Creature Horror
 PT:4/4
 K:Fear
 K:Suspend:7:1 B
-T:Mode$ ChangesZone | ValidCard$ Card.nonToken+OppOwn | Origin$ Any | Destination$ Graveyard | IsPresent$ Card.Self+suspended | PresentZone$ Exile | TriggerZones$ Exile | Execute$ TrigRemoveCounter | OptionalDecider$ You | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, if CARDNAME is suspended, you may remove a time counter from CARDNAME.
+T:Mode$ ChangesZone | ValidCard$ Card.!token+OppOwn | Origin$ Any | Destination$ Graveyard | IsPresent$ Card.Self+suspended | PresentZone$ Exile | TriggerZones$ Exile | Execute$ TrigRemoveCounter | OptionalDecider$ You | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, if CARDNAME is suspended, you may remove a time counter from CARDNAME.
 SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 1
 Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nSuspend 7—{1}{B} (Rather than cast this card from your hand, you may pay {1}{B} and exile it with seven time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, you may cast it without paying its mana cost. It has haste.)\nWhenever a card is put into an opponent's graveyard from anywhere, if Nihilith is suspended, you may remove a time counter from Nihilith.

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

@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip:4
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Intimidate | AddType$ Zombie | RemoveCreatureTypes$ True | SetColor$ Black | Description$ Equipped creature gets +2/+2, has intimidate, and is a black Zombie.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouOwn | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {4}. If you do, return that card to the battlefield and attach CARDNAME to it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+YouOwn | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {4}. If you do, return that card to the battlefield and attach CARDNAME to it.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 4 | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBAttach
 SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

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

@@ -7,7 +7,7 @@ SVar:DBToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenOwner$ ParentTarge
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever chaos ensues, create a 2/2 white Alien creature token. When you do, tap target nontoken creature an opponent controls. Put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
 SVar:TrigToken:DB$ Token | TokenScript$ w_2_2_alien | TokenOwner$ You | SubAbility$ DBImmediateTrig
 SVar:DBImmediateTrig:DB$ ImmediateTrigger | Execute$ TrigTap | TriggerDescription$ When you do, tap target nontoken creature an opponent controls. Put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.nonToken+OppCtrl | TgtPrompt$ Select target nontoken creature an opponent controls | SubAbility$ DBCounter
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.!token+OppCtrl | TgtPrompt$ Select target nontoken creature an opponent controls | SubAbility$ DBCounter
 SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
 DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure|Alien
 Oracle:At the beginning of your upkeep, target opponent draws a card and creates a Treasure token.\nWhenever chaos ensues, create a 2/2 white Alien creature token. When you do, tap target nontoken creature an opponent controls. Put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)

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

@@ -1,7 +1,7 @@
 Name:Nyx
 ManaCost:no cost
 Types:Plane Theros
-S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.nonToken | AddType$ Enchantment | Description$ Nontoken creatures are enchantments in addition to their other types.
+S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.!token | AddType$ Enchantment | Description$ Nontoken creatures are enchantments in addition to their other types.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Command | Execute$ TrigGainLife | TriggerDescription$ Constellation — Whenever an enchantment you control enters, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, choose a color. Add an amount of mana of that color equal to your devotion to that color.

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

@@ -2,7 +2,7 @@ Name:Ogre Slumlord
 ManaCost:3 B B
 Types:Creature Ogre Rogue
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+Other | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature dies, you may create a 1/1 black Rat creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+Other | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature dies, you may create a 1/1 black Rat creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_rat | TokenOwner$ You
 S:Mode$ Continuous | Affected$ Creature.Rat+YouCtrl | AddKeyword$ Deathtouch | Description$ Rats you control have deathtouch.
 DeckHas:Ability$Token

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

@@ -1,7 +1,7 @@
 Name:Open the Graves
 ManaCost:3 B B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black zombie creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black zombie creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You
 DeckHas:Ability$Token
 Oracle:Whenever a nontoken creature you control dies, create a 2/2 black Zombie creature token.

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

@@ -1,7 +1,7 @@
 Name:Overburden
 ManaCost:1 U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever a player puts a nontoken creature onto the battlefield, that player returns a land they control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever a player puts a nontoken creature onto the battlefield, that player returns a land they control to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | Mandatory$ True | DefinedPlayer$ TriggeredCardController | Chooser$ TriggeredCardController | Hidden$ True
 AI:RemoveDeck:Random
 Oracle:Whenever a player puts a nontoken creature onto the battlefield, that player returns a land they control to its owner's hand.

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

@@ -5,7 +5,7 @@ PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may destroy target creature.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Choose target creature.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenTapped$ True
 SVar:PlayMain1:TRUE
 Oracle:Flying\nWhen Overseer of the Damned enters, you may destroy target creature.\nWhenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.

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

@@ -1,9 +1,9 @@
 Name:Paradoxical Outcome
 ManaCost:3 U
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand+nonToken+YouCtrl | TgtPrompt$ Select target nonland, nontoken permanent you control | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | SubAbility$ DBDraw | SpellDescription$ Return any number of target nonland, nontoken permanents you control to their owners' hands. Draw a card for each card returned to your hand this way.
+A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand+!token+YouCtrl | TgtPrompt$ Select target nonland, nontoken permanent you control | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | SubAbility$ DBDraw | SpellDescription$ Return any number of target nonland, nontoken permanents you control to their owners' hands. Draw a card for each card returned to your hand this way.
 SVar:DBDraw:DB$ Draw | NumCards$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Permanent.nonLand+nonToken+YouCtrl
+SVar:X:Count$Valid Permanent.nonLand+!token+YouCtrl
 SVar:Y:Remembered$Valid Card.YouOwn
 Oracle:Return any number of target nonland, nontoken permanents you control to their owners' hands. Draw a card for each card returned to your hand this way.

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

@@ -3,7 +3,7 @@ ManaCost:W W
 Types:Instant
 K:Gift
 SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
-A:SP$ ChangeZone | ValidTgts$ Creature.nonToken | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken creature | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target nontoken creature. If the gift wasn't promised, return that creature to the battlefield under its owner's control with a +1/+1 counter on it at the beginning of the next end step.
+A:SP$ ChangeZone | ValidTgts$ Creature.!token | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken creature | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target nontoken creature. If the gift wasn't promised, return that creature to the battlefield under its owner's control with a +1/+1 counter on it at the beginning of the next end step.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ0 | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it. | SubAbility$ DBCleanup
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield | WithCountersType$ P1P1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

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

@@ -2,7 +2,7 @@ Name:Pawn of Ulamog
 ManaCost:1 B B
 Types:Creature Vampire Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl,Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+!token+YouCtrl,Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token

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

@@ -1,7 +1,7 @@
 Name:Pedantic Learning
 ManaCost:U U
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Land.nonToken+YouCtrl | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a land card is put into your graveyard from your library, you may pay {1}. If you do, draw a card.
+T:Mode$ ChangesZone | ValidCard$ Land.!token+YouCtrl | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a land card is put into your graveyard from your library, you may pay {1}. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 1 | NumCards$ 1
 AI:RemoveDeck:Random
 Oracle:Whenever a land card is put into your graveyard from your library, you may pay {1}. If you do, draw a card.

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

@@ -3,5 +3,5 @@ ManaCost:3 U U
 Types:Instant
 A:SP$ Charm | Choices$ DBBounceAllTokens,DBBounceAllNonTokens
 SVar:DBBounceAllTokens:DB$ ChangeZoneAll | ChangeType$ Creature.token | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all creature tokens to their owners' hands.
-SVar:DBBounceAllNonTokens:DB$ ChangeZoneAll | ChangeType$ Creature.nonToken | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all nontoken creatures to their owners' hands.
+SVar:DBBounceAllNonTokens:DB$ ChangeZoneAll | ChangeType$ Creature.!token | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all nontoken creatures to their owners' hands.
 Oracle:Choose one —\n• Return all creature tokens to their owners' hands.\n• Return all nontoken creatures to their owners' hands.

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

@@ -8,7 +8,7 @@ SVar:Believe:DB$ Pump | SpellDescription$ Believe
 SVar:Doubt:DB$ Pump | SpellDescription$ Doubt
 S:Mode$ Continuous | Affected$ Card.Self+ChosenModeBelieve | AddTrigger$ BelieveTrigger | Description$ • Believe — Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
 S:Mode$ Continuous | Affected$ Card.Self+ChosenModeDoubt | AddTrigger$ DoubtTrigger | Description$ • Doubt — At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
-SVar:BelieveTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
+SVar:BelieveTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_e_horror | TokenOwner$ You
 SVar:DoubtTrigger:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Permanent.nonLand+YouOwn | ChoiceOptional$ True | RememberChanged$ True | SubAbility$ DBDraw

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

@@ -3,7 +3,7 @@ ManaCost:6 U
 Types:Creature Phyrexian Beast
 PT:3/3
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters, you may exile target nontoken creature.
-SVar:TrigExile:DB$ ChangeZone | Imprint$ True | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | Origin$ Battlefield | Destination$ Exile
+SVar:TrigExile:DB$ ChangeZone | Imprint$ True | ValidTgts$ Creature.!token | TgtPrompt$ Select target nontoken creature | Origin$ Battlefield | Destination$ Exile
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigReset | Static$ True
 SVar:TrigReset:DB$ Cleanup | ClearImprinted$ True
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ Y | Description$ CARDNAME gets +X/+Y, where X is the exiled creature card's power and Y is its toughness.

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

@@ -1,7 +1,7 @@
 Name:Pia's Revolution
 ManaCost:2 R
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.YouOwn+nonToken | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever a nontoken artifact is put into your graveyard from the battlefield, return that card to your hand unless target opponent has CARDNAME deal 3 damage to them.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.YouOwn+!token | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever a nontoken artifact is put into your graveyard from the battlefield, return that card to your hand unless target opponent has CARDNAME deal 3 damage to them.
 SVar:TrigReturn:DB$ ChangeZone | ThisDefinedAndTgts$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Hand | UnlessCost$ DamageYou<3> | UnlessPayer$ Targeted | ValidTgts$ Opponent | IsCurse$ True
 SVar:BuffedBy:Permanent.White,Permanent.Black
 Oracle:Whenever a nontoken artifact is put into your graveyard from the battlefield, return that card to your hand unless target opponent has Pia's Revolution deal 3 damage to them.

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

@@ -1,7 +1,7 @@
 Name:Planar Void
 ManaCost:B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.nonToken+Other | Execute$ TrigChange | TriggerDescription$ Whenever another card is put into a graveyard from anywhere, exile that card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.!token+Other | Execute$ TrigChange | TriggerDescription$ Whenever another card is put into a graveyard from anywhere, exile that card.
 SVar:TrigChange:DB$ ChangeZone | Defined$ TriggeredCardLKICopy | Origin$ Graveyard | Destination$ Exile
 AI:RemoveDeck:Random
 SVar:NonStackingEffect:True

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

@@ -17,7 +17,7 @@ Types:Legendary Creature Phyrexian Hydra
 PT:6/6
 K:Reach
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Hydra.Other+nonToken+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Hydra you control dies, create a 3/3 green and white Phyrexian Hydra creature token with reach and a 3/3 green and white Phyrexian Hydra creature token with lifelink.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Hydra.Other+!token+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Hydra you control dies, create a 3/3 green and white Phyrexian Hydra creature token with reach and a 3/3 green and white Phyrexian Hydra creature token with lifelink.
 SVar:TrigToken:DB$ Token | TokenScript$ gw_3_3_phyrexian_hydra_reach,gw_3_3_phyrexian_hydra_lifelink
 DeckHas:Ability$Token|LifeGain
 DeckHints:Type$Hydra

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

@@ -2,7 +2,7 @@ Name:Preston, the Vanisher
 ManaCost:3 W
 Types:Legendary Creature Rabbit Wizard
 PT:2/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+nonToken+wasNotCast+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopyPermanent | TriggerDescription$ Whenever another nontoken creature you control enters, if it wasn't cast, create a token that's a copy of that creature except it's a 0/1 white Illusion.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+!token+wasNotCast+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopyPermanent | TriggerDescription$ Whenever another nontoken creature you control enters, if it wasn't cast, create a token that's a copy of that creature except it's a 0/1 white Illusion.
 SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | NumCopies$ 1 | SetColor$ White | SetCreatureTypes$ Illusion | SetPower$ 0 | SetToughness$ 1
 A:AB$ ChangeZone | Cost$ 1 W Sac<5/Illusion> | ValidTgts$ Permanent.nonLand | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nonland permanent | SpellDescription$ Exile target nonland permanent.
 DeckHas:Ability$Token|Sacrifice & Type$Illusion

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

@@ -1,6 +1,6 @@
 Name:Profane Memento
 ManaCost:1
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.nonToken+OppOwn | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.!token+OppOwn | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 Oracle:Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.

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

@@ -4,7 +4,7 @@ Types:Creature Shapeshifter
 PT:0/0
 K:ETBReplacement:Copy:DBCopy:Optional
 SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | AddTriggers$ ProgenitorTrig | AddSVars$ ProgenitorCopy,ProgenitorTrig | SpellDescription$ You may have CARDNAME enter as a copy of any creature on the battlefield, except it has "At the beginning of your upkeep, if this creature isn't a token, create a token that's a copy of this creature."
-SVar:ProgenitorTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ ProgenitorCopy | IsPresent$ Card.Self+nonToken | TriggerDescription$ At the beginning of your upkeep, if CARDNAME isn't a token, create a token that's a copy of CARDNAME."
+SVar:ProgenitorTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ ProgenitorCopy | IsPresent$ Card.Self+!token | TriggerDescription$ At the beginning of your upkeep, if CARDNAME isn't a token, create a token that's a copy of CARDNAME."
 SVar:ProgenitorCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1
 SVar:NeedsToPlay:Creature
 Oracle:You may have Progenitor Mimic enter as a copy of any creature on the battlefield, except it has "At the beginning of your upkeep, if this creature isn't a token, create a token that's a copy of this creature."

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

@@ -8,7 +8,7 @@ SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | Destination
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play that card.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile+nonToken | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Pact Boon — Whenever you play a card from exile, create a Treasure token.
+T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile+!token | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Pact Boon — Whenever you play a card from exile, create a Treasure token.
 T:Mode$ LandPlayed | Origin$ Exile | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Pact Boon — Whenever you play a card from exile, create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 DeckHas:Ability$Token

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

@@ -1,7 +1,7 @@
 Name:Prowess of the Fair
 ManaCost:1 B
 Types:Kindred Enchantment Elf
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Elf.nonToken+Other+YouOwn | TriggerZones$ Battlefield | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken Elf is put into your graveyard from the battlefield, you may create a 1/1 green Elf Warrior creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Elf.!token+Other+YouOwn | TriggerZones$ Battlefield | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken Elf is put into your graveyard from the battlefield, you may create a 1/1 green Elf Warrior creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You
 AI:RemoveDeck:Random
 Oracle:Whenever another nontoken Elf is put into your graveyard from the battlefield, you may create a 1/1 green Elf Warrior creature token.

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

@@ -5,7 +5,7 @@ K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters, choose a color. | AILogic$ MostProminentInHumanDeck
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is the number of nontoken permanents of the chosen color they control.
 SVar:TrigDamageOpp:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X
-SVar:X:Count$Valid Permanent.ActivePlayerCtrl+ChosenColor+nonToken
+SVar:X:Count$Valid Permanent.ActivePlayerCtrl+ChosenColor+!token
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ At the beginning of your upkeep, destroy CARDNAME unless you sacrifice two Islands.
 SVar:TrigDestroy:DB$ Destroy | Defined$ Self | UnlessPayer$ You | UnlessCost$ Sac<2/Island>
 AI:RemoveDeck:Random

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

@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Artifact Creature Necron Wizard
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Card.Self,Artifact.YouCtrl+Other+nonToken | Execute$ TrigLoseLife | TriggerDescription$ Harbinger of Despair — Whenever CARDNAME or another nontoken artifact you control is put into a graveyard from the battlefield or is put into exile from the battlefield, target opponent loses 1 life and you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Card.Self,Artifact.YouCtrl+Other+!token | Execute$ TrigLoseLife | TriggerDescription$ Harbinger of Despair — Whenever CARDNAME or another nontoken artifact you control is put into a graveyard from the battlefield or is put into exile from the battlefield, target opponent loses 1 life and you gain 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 DeckHas:Ability$LifeGain

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

@@ -1,7 +1,7 @@
 Name:Purgatory
 ManaCost:2 W B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouOwn | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature is put into your graveyard from the battlefield, exile that card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+YouOwn | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature is put into your graveyard from the battlefield, exile that card.
 SVar:TrigChangeZone:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, you may pay {4} and 2 life. If you do, return a card exiled with CARDNAME to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 4 PayLife<2> | ChangeType$ Card.ExiledWithSource | Mandatory$ True | Origin$ Exile | Destination$ Battlefield | Hidden$ True

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

@@ -2,7 +2,7 @@ Name:Quest for Ancient Secrets
 ManaCost:U
 Types:Enchantment
 A:AB$ ChangeZoneAll | Cost$ SubCounter<5/QUEST> Sac<1/CARDNAME> | TgtPrompt$ Select target player. | ValidTgts$ Player | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | Shuffle$ True | SpellDescription$ Target player shuffles their graveyard into their library.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.nonToken+YouOwn | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into your graveyard from anywhere, you may put a quest counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.!token+YouOwn | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into your graveyard from anywhere, you may put a quest counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
 SVar:MaxQuestEffect:5
 AI:RemoveDeck:Random

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

@@ -2,7 +2,7 @@ Name:Radagast the Brown
 ManaCost:2 G G
 Types:Legendary Creature Avatar Wizard
 PT:2/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+nonToken,Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control enters, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+!token,Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control enters, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.Creature+!sharesCreatureTypeWith Valid Creature.YouCtrl | DestinationZone$ Hand | DestinationZone2$ Library | RestRandomOrder$ True
 SVar:X:TriggeredCard$CardManaCost
 Oracle:Whenever Radagast the Brown or another nontoken creature you control enters, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.

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

@@ -4,7 +4,7 @@ Types:Creature Angel
 PT:3/6
 K:Flying
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.Other+nonToken+YouCtrl | Execute$ DBVenture | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control enters, venture into the dungeon. (Enter the first room or advance to the next room.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.Other+!token+YouCtrl | Execute$ DBVenture | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control enters, venture into the dungeon. (Enter the first room or advance to the next room.)
 SVar:DBVenture:DB$ Venture
 A:AB$ Venture | Cost$ W Discard<1/CARDNAME> | SubAbility$ DBGainLife | ActivationZone$ Hand | Defined$ You | SpellDescription$ Venture into the dungeon and you gain 3 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3 | StackDescription$ None

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

@@ -6,6 +6,6 @@ K:Flying
 K:Trample
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPump | TriggerDescription$ At the beginning of your end step, target opponent may sacrifice two nonland, nontoken permanents. If they don't, you draw two cards.
 SVar:TrigPump:DB$ Pump | IsCurse$ True | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | UnlessCost$ Sac<2/Permanent.nonLand+nonToken/nonland nontoken permanents> | UnlessPayer$ Targeted | NumCards$ 2 | Defined$ You
+SVar:DBDraw:DB$ Draw | UnlessCost$ Sac<2/Permanent.nonLand+!token/nonland nontoken permanents> | UnlessPayer$ Targeted | NumCards$ 2 | Defined$ You
 DeckHas:Ability$Sacrifice
 Oracle:Flying, trample\nAt the beginning of your end step, target opponent may sacrifice two nonland, nontoken permanents. If they don't, you draw two cards.

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

@@ -6,7 +6,7 @@ K:Flying
 S:Mode$ Continuous | Affected$ Demon.Other+YouCtrl,Devil.Other+YouCtrl,Imp.Other+YouCtrl,Tiefling.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | Description$ Other Demons, Devils, Imps, and Tieflings you control get +1/+1 and have lifelink.
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ X | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, if a creature card was put into your graveyard from anywhere this turn, create a 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."
 SVar:TrigToken:DB$ Token | TokenScript$ r_1_1_devil_burn
-SVar:X:Count$ThisTurnEntered_Graveyard_Creature.YouOwn+nonToken
+SVar:X:Count$ThisTurnEntered_Graveyard_Creature.YouOwn+!token
 DeckHas:Ability$LifeGain|Token
 DeckHints:Ability$Sacrifice & Type$Demon|Devil|Imp|Tiefling
 Oracle:Flying\nOther Demons, Devils, Imps, and Tieflings you control get +1/+1 and have lifelink.\nAt the beginning of each end step, if a creature card was put into your graveyard from anywhere this turn, create a 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."

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

@@ -23,7 +23,7 @@ Types:Legendary Artifact Vehicle
 PT:1/4
 K:Living metal
 K:Lifelink
-T:Mode$ ChangesZoneAll | ValidCards$ Artifact.YouCtrl+nonToken | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigConvert | TriggerDescription$ Whenever one or more nontoken artifacts you control are put into a graveyard from the battlefield, convert NICKNAME. This ability triggers only once each turn.
+T:Mode$ ChangesZoneAll | ValidCards$ Artifact.YouCtrl+!token | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigConvert | TriggerDescription$ Whenever one or more nontoken artifacts you control are put into a graveyard from the battlefield, convert NICKNAME. This ability triggers only once each turn.
 SVar:TrigConvert:DB$ SetState | Mode$ Transform
 DeckHas:Ability$LifeGain
 DeckHints:Type$Artifact

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

@@ -2,7 +2,7 @@ Name:Rayami, First of the Fallen
 ManaCost:1 B G U
 Types:Legendary Creature Vampire
 PT:5/4
-R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.nonToken | ReplaceWith$ Exile | Description$ If a nontoken creature would die, exile that card with a blood counter on it instead.
+R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.!token | ReplaceWith$ Exile | Description$ If a nontoken creature would die, exile that card with a blood counter on it instead.
 SVar:Exile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile | WithCountersType$ BLOOD | WithCountersAmount$ 1
 S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self | SharedKeywordsZone$ Exile | SharedRestrictions$ Creature.counters_GE1_BLOOD | AddKeyword$ Flying & First Strike & Double Strike & Deathtouch & Haste & Hexproof & Indestructible & Lifelink & Menace & Protection & Reach & Trample & Vigilance | Description$ As long as an exiled creature card with a blood counter on it has flying, CARDNAME has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance.
 Oracle:If a nontoken creature would die, exile that card with a blood counter on it instead.\nAs long as an exiled creature card with a blood counter on it has flying, Rayami, First of the Fallen has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance.

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

@@ -3,5 +3,5 @@ ManaCost:2 B
 Types:Creature Human Mercenary Rebel
 PT:1/2
 S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.White | Description$ CARDNAME can't be the target of white spells or abilities from white sources.
-A:AB$ ChangeZone | Cost$ 3 | ValidTgts$ Rebel.nonToken | IsCurse$ True | TgtPrompt$ Select target Rebel | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target nontoken Rebel on the bottom of its owner's library.
+A:AB$ ChangeZone | Cost$ 3 | ValidTgts$ Rebel.!token | IsCurse$ True | TgtPrompt$ Select target Rebel | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target nontoken Rebel on the bottom of its owner's library.
 Oracle:Rebel Informer can't be the target of white spells or abilities from white sources.\n{3}: Put target nontoken Rebel on the bottom of its owner's library.

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

@@ -1,6 +1,6 @@
 Name:Remembrance
 ManaCost:3 W
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Whenever a nontoken creature you control dies, you may search your library for a card with the same name as that creature, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Whenever a nontoken creature you control dies, you may search your library for a card with the same name as that creature, reveal it, put it into your hand, then shuffle.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Triggered.sameName | ShuffleNonMandatory$ True
 Oracle:Whenever a nontoken creature you control dies, you may search your library for a card with the same name as that creature, reveal it, put it into your hand, then shuffle.

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

@@ -1,7 +1,7 @@
 Name:Replicating Terror
 ManaCost:1 B
 Types:Instant
-A:SP$ Sacrifice | Defined$ Opponent | SacValid$ Creature.nonToken | RememberSacrificed$ True | SacMessage$ nontoken creature | SubAbility$ DBConjure | SpellDescription$ Each opponent sacrifices a nontoken creature. For each creature sacrificed this way, conjure a duplicate of it into your graveyard.
+A:SP$ Sacrifice | Defined$ Opponent | SacValid$ Creature.!token | RememberSacrificed$ True | SacMessage$ nontoken creature | SubAbility$ DBConjure | SpellDescription$ Each opponent sacrifices a nontoken creature. For each creature sacrificed this way, conjure a duplicate of it into your graveyard.
 SVar:DBConjure:DB$ MakeCard | DefinedName$ Remembered | Conjure$ True | Zone$ Graveyard | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Each opponent sacrifices a nontoken creature. For each creature sacrificed this way, conjure a duplicate of it into your graveyard.

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

@@ -3,7 +3,7 @@ ManaCost:4 U
 Types:Creature Moonfolk Artificer
 PT:3/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken artifact you control enters, you may pay {1}{U}. If you do, create a token that's a copy of that artifact.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken artifact you control enters, you may pay {1}{U}. If you do, create a token that's a copy of that artifact.
 SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 U | Defined$ TriggeredCardLKICopy
 DeckHas:Ability$Token
 DeckNeeds:Type$Artifact

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

@@ -2,7 +2,7 @@ Name:Rhythm of the Wild
 ManaCost:1 R G
 Types:Enchantment
 R:Event$ Counter | ValidSA$ Spell.Creature+YouCtrl | Layer$ CantHappen | ActiveZones$ Battlefield | Description$ Creature spells you control can't be countered.
-S:Mode$ Continuous | Affected$ Creature.nonToken+YouCtrl | AddKeyword$ Riot | Description$ Nontoken creatures you control have riot. (They enter with your choice of a +1/+1 counter or haste.)
+S:Mode$ Continuous | Affected$ Creature.!token+YouCtrl | AddKeyword$ Riot | Description$ Nontoken creatures you control have riot. (They enter with your choice of a +1/+1 counter or haste.)
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters
 Oracle:Creature spells you control can't be countered.\nNontoken creatures you control have riot. (They enter with your choice of a +1/+1 counter or haste.)

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

@@ -3,7 +3,7 @@ ManaCost:2 G U R
 Types:Legendary Creature Human Wizard
 PT:2/2
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopySpell | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may pay {U}{R}. If you do, copy that spell. You may choose new targets for the copy.
-T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control enters, you may pay {G}{U}. If you do, create a token that's a copy of that creature.
+T:Mode$ ChangesZone | ValidCard$ Creature.!token+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control enters, you may pay {G}{U}. If you do, create a token that's a copy of that creature.
 SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ U R | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 SVar:TrigCopy:AB$ CopyPermanent | Cost$ G U | Defined$ TriggeredCardLKICopy
 Oracle:Whenever you cast an instant or sorcery spell, you may pay {U}{R}. If you do, copy that spell. You may choose new targets for the copy.\nWhenever another nontoken creature you control enters, you may pay {G}{U}. If you do, create a token that's a copy of that creature.

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

@@ -2,7 +2,7 @@ Name:Rise of the Dread Marn
 ManaCost:2 B
 Types:Instant
 A:SP$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie_berserker | TokenOwner$ You | SpellDescription$ Create X 2/2 black Zombie Berserker creature tokens, where X is the number of nontoken creatures that died this turn.
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.!token
 K:Foretell:B
 DeckHas:Ability$Token
 Oracle:Create X 2/2 black Zombie Berserker creature tokens, where X is the number of nontoken creatures that died this turn.\nForetell {B} (During your turn, you may pay {2} and exile this card from your hand face down. Cast it on a later turn for its foretell cost.)

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

@@ -1,6 +1,6 @@
 Name:Rishadan Pawnshop
 ManaCost:2
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Permanent.nonToken+YouCtrl | TgtPrompt$ Select target nontoken permanent you control | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle target nontoken permanent you control into its owner's library.
+A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Permanent.!token+YouCtrl | TgtPrompt$ Select target nontoken permanent you control | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle target nontoken permanent you control into its owner's library.
 AI:RemoveDeck:Random
 Oracle:{2}, {T}: Shuffle target nontoken permanent you control into its owner's library.

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

@@ -1,7 +1,7 @@
 Name:Rooftop Bypass
 ManaCost:1 U B
 Types:Enchantment
-T:Mode$ DamageDoneOnce | ValidSource$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)
+T:Mode$ DamageDoneOnce | ValidSource$ Creature.!token+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)
 SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_assassin_menace
 DeckHas:Ability$Token
 Oracle:Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)

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

@@ -5,6 +5,6 @@ A:SP$ Charm | Choices$ DBPutCounter,DBCopy,DBToken,DBSacrifice | CharmNum$ 3 | C
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature.
 SVar:DBCopy:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl | TgtPrompt$ Select target token you control | SpellDescription$ Create a token that's a copy of target token you control.
 SVar:DBToken:DB$ Token | ValidTgts$ Player | TokenAmount$ 1 | TokenScript$ g_1_1_squirrel | StackDescription$ SpellDescription | SpellDescription$ Target player creates a 1/1 green Squirrel creature token.
-SVar:DBSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
+SVar:DBSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Artifact.!token | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
 DeckHas:Ability$Counters|Token
 Oracle:Choose three. You may choose the same mode more than once.\n• Put two +1/+1 counters on target creature.\n• Create a token that's a copy of target token you control.\n• Target player creates a 1/1 green Squirrel creature token.\n• Target opponent sacrifices a nontoken artifact.

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Human Wizard
 PT:3/3
 K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters, choose a creature type. | AILogic$ MostProminentInComputerDeck
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+nonToken,Sliver.YouCtrl | AffectedZone$ All | AddType$ ChosenType | Description$ Slivers you control and nontoken creatures you control are the chosen type in addition to their other creature types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+!token,Sliver.YouCtrl | AffectedZone$ All | AddType$ ChosenType | Description$ Slivers you control and nontoken creatures you control are the chosen type in addition to their other creature types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
 A:AB$ Token | Cost$ 3 T | TokenAmount$ 1 | TokenScript$ c_1_1_sliver | TokenOwner$ You | SpellDescription$ Create a 1/1 colorless Sliver creature token.
 SVar:HasAttackEffect:TRUE
 AI:RemoveDeck:Random

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

@@ -2,7 +2,7 @@ Name:Samwise Gamgee
 ManaCost:G W
 Types:Legendary Creature Halfling Citizen
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigFood | TriggerDescription$ Whenever another nontoken creature you control enters, create a Food token. (It's an artifact with "{2}, Sacrifice this artifact: You gain 3 life.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigFood | TriggerDescription$ Whenever another nontoken creature you control enters, create a Food token. (It's an artifact with "{2}, Sacrifice this artifact: You gain 3 life.")
 SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
 A:AB$ ChangeZone | Cost$ Sac<3/Food> | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Permanent.Historic+YouOwn | TgtPrompt$ Select target historic permanent in your graveyard | SpellDescription$ Return target historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
 DeckHas:Ability$Sacrifice|Token & Type$Food

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

@@ -4,7 +4,7 @@ Types:Creature Human Scout
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ When CARDNAME enters, if an opponent controls more lands than you, search your library for a Desert card, put it onto the battlefield tapped, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Desert | ChangeNum$ 1
-T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, create a 1/1 red, green, and white Sand Warrior creature token. This ability triggers only once each turn.
+T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, create a 1/1 red, green, and white Sand Warrior creature token. This ability triggers only once each turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ rgw_1_1_sand_warrior | TokenOwner$ You
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl

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

@@ -2,7 +2,7 @@ Name:Saradoc, Master of Buckland
 ManaCost:3 W
 Types:Legendary Creature Halfling Citizen
 PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.nonToken+powerLE2+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control with power 2 or less enters, create a 1/1 white Halfling creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.!token+powerLE2+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control with power 2 or less enters, create a 1/1 white Halfling creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_halfling
 A:AB$ Pump | Cost$ tapXType<2/Halfling.Other/other halflings> | NumAtt$ 2 | Defined$ Self | KW$ Lifelink | SpellDescription$ NICKNAME gets +2/+0 and gains lifelink until end of turn.
 DeckHints:Type$Halfling

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

@@ -3,7 +3,7 @@ ManaCost:U B
 Types:Legendary Creature Human Ninja Rogue
 PT:2/3
 K:Menace
-T:Mode$ ChangesZoneAll | Origin$ Any | Destination$ Battlefield | ValidCards$ Creature.YouCtrl+nonToken+wasNotCast,Creature.YouCtrl+nonToken+CastSa Spell.ManaSpent EQ0 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME and/or one or more other nontoken creatures you control enter, if none of them were cast or no mana was spent to cast them, draw a card.
+T:Mode$ ChangesZoneAll | Origin$ Any | Destination$ Battlefield | ValidCards$ Creature.YouCtrl+!token+wasNotCast,Creature.YouCtrl+!token+CastSa Spell.ManaSpent EQ0 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME and/or one or more other nontoken creatures you control enter, if none of them were cast or no mana was spent to cast them, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 DeckHints:Keyword$Cascade|Discover|Ninjutsu|Persist|Plot|Suspend|Undying|Unearth
 Oracle:Menace\nWhenever Satoru, the Infiltrator and/or one or more other nontoken creatures you control enter, if none of them were cast or no mana was spent to cast them, draw a card.

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

@@ -5,7 +5,7 @@ PT:3/5
 K:Menace
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, create a tapped and attacking token that's a copy of up to one other target nontoken creature you control. You get {E}{E} (two energy counters). At the beginning of the next end step, sacrifice that token unless you pay an amount of {E} equal to its mana value.
-SVar:TrigCopy:DB$ CopyPermanent | RememberTokens$ True | ValidTgts$ Creature.nonToken+YouCtrl+Other | TgtPrompt$ Select up to one other target nontoken you control | TargetMin$ 0 | TargetMax$ 1 | TokenTapped$ True | TokenAttacking$ True | SubAbility$ DBEnergy
+SVar:TrigCopy:DB$ CopyPermanent | RememberTokens$ True | ValidTgts$ Creature.!token+YouCtrl+Other | TgtPrompt$ Select up to one other target nontoken you control | TargetMin$ 0 | TargetMax$ 1 | TokenTapped$ True | TokenAttacking$ True | SubAbility$ DBEnergy
 SVar:DBEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2 | SubAbility$ DBDelayTrig
 SVar:DBDelayTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigSac | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ At the beginning of the next end step, sacrifice that token unless you pay an amount of {E} equal to its mana value.
 SVar:TrigSac:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI | Controller$ You | UnlessCost$ PayEnergy<X> | UnlessPayer$ You

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

@@ -7,7 +7,7 @@ K:Haste
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDiscover | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, discover X, where X is that damage.
 SVar:TrigDiscover:DB$ Discover | Num$ X
 SVar:X:TriggerCount$DamageAmount
-T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile+nonToken | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigConjure | TriggerDescription$ Whenever you play a card from exile, conjure a duplicate of it into your hand.
+T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile+!token | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigConjure | TriggerDescription$ Whenever you play a card from exile, conjure a duplicate of it into your hand.
 T:Mode$ LandPlayed | Origin$ Exile | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigConjure | Secondary$ True | TriggerDescription$ Whenever you play a card from exile, conjure a duplicate of it into your hand.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | DefinedName$ TriggeredCard | Zone$ Hand
 Oracle:Trample, Haste\nWhenever Scalesoul Gnome deals combat damage to a player, discover X, where X is that damage.\nWhenever you play a card from exile, conjure a duplicate of it into your hand.

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

@@ -2,7 +2,7 @@ Name:Scion of Opulence
 ManaCost:2 R
 Types:Creature Vampire Noble
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Vampire.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Vampire you control dies, create a Treasure token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Vampire.Other+!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Vampire you control dies, create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac
 A:AB$ Dig | Cost$ R Sac<2/Artifact> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Defined$ You | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play that card this turn.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ EffSModeContinuous | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup

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

@@ -4,6 +4,6 @@ Types:Sorcery
 A:SP$ Charm | Choices$ DBDraw,DBCopy,DBReturn | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
 SVar:DBDraw:DB$ Draw | Pawprint$ 1 | SpellDescription$ Draw a card.
 SVar:DBCopy:DB$ CopyPermanent | Pawprint$ 2 | Choices$ Artifact.YouCtrl,Creature.YouCtrl | SpellDescription$ Choose an artifact or creature you control. Create a token that's a copy of it.
-SVar:DBReturn:DB$ ChangeZoneAll | Pawprint$ 3 | ChangeType$ Permanent.nonLand+nonToken | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return each nonland, nontoken permanent to its owner's hand.
+SVar:DBReturn:DB$ ChangeZoneAll | Pawprint$ 3 | ChangeType$ Permanent.nonLand+!token | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return each nonland, nontoken permanent to its owner's hand.
 DeckHas:Ability$Token
 Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Draw a card.\n{P}{P} — Choose an artifact or creature you control. Create a token that's a copy of it.\n{P}{P}{P} — Return each nonland, nontoken permanent to its owner's hand.

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

@@ -2,7 +2,7 @@ Name:Sefris of the Hidden Ways
 ManaCost:W U B
 Types:Legendary Creature Human Wizard
 PT:2/3
-T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigVenture | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from anywhere, venture into the dungeon. This ability triggers only once each turn. (To venture into the dungeon, enter the first room or advance to the next room.)
+T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigVenture | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from anywhere, venture into the dungeon. This ability triggers only once each turn. (To venture into the dungeon, enter the first room or advance to the next room.)
 SVar:TrigVenture:DB$ Venture
 T:Mode$ DungeonCompleted | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ DBReturn | TriggerDescription$ Create Undead — Whenever you complete a dungeon, return target creature card from your graveyard to the battlefield.
 SVar:DBReturn:DB$ ChangeZone | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Battlefield

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

@@ -2,7 +2,7 @@ Name:Sek'Kuar, Deathkeeper
 ManaCost:2 B R G
 Types:Legendary Creature Orc Shaman
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 3/1 black and red Graveborn creature token with haste.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 3/1 black and red Graveborn creature token with haste.
 SVar:TrigToken:DB$ Token | TokenScript$ br_3_1_graveborn_haste
 DeckHas:Ability$Token
 Oracle:Whenever another nontoken creature you control dies, create a 3/1 black and red Graveborn creature token with haste.

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

@@ -2,7 +2,7 @@ Name:Semblance Scanner
 ManaCost:2 U
 Types:Artifact Creature Equipment Shapeshifter
 PT:3/2
-T:Mode$ DamageDone | ValidSource$ Card.Self+nonToken,Creature.EquippedBy+nonToken | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigConjure | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or equipped creature deals combat damage to a player, if it's not a token, conjure a duplicate of it into your hand.
+T:Mode$ DamageDone | ValidSource$ Card.Self+!token,Creature.EquippedBy+!token | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigConjure | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or equipped creature deals combat damage to a player, if it's not a token, conjure a duplicate of it into your hand.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | DefinedName$ TriggeredSource | Zone$ Hand
 K:Reconfigure:1
 Oracle:Whenever Semblance Scanner or equipped creature deals combat damage to a player, if it's not a token, conjure a duplicate of it into your hand.\nReconfigure {1}

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

@@ -2,7 +2,7 @@ Name:Sethron, Hurloon General
 ManaCost:3 R R
 Types:Legendary Creature Minotaur Warrior
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self,Minotaur.nonToken+Other+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Minotaur you control enters, create a 2/3 red Minotaur creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self,Minotaur.!token+Other+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Minotaur you control enters, create a 2/3 red Minotaur creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ r_2_3_minotaur
 A:AB$ PumpAll | Cost$ 2 BR | ValidCards$ Minotaur.YouCtrl | NumAtt$ +1 | KW$ Menace & Haste | SpellDescription$ Minotaurs you control get +1/+0 and gain menace and haste until end of turn.
 SVar:PlayMain1:TRUE

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

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

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

@@ -2,7 +2,7 @@ Name:Shelob, Dread Weaver
 ManaCost:3 B
 Types:Legendary Creature Spider Demon
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, exile it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, exile it.
 SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile
 A:AB$ PutCounter | Cost$ 2 B ExiledMoveToGrave<1/Creature.ExiledWithSource> | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ TrigDraw | SpellDescription$ Put two +1/+1 counters on NICKNAME.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Phyrexian Praetor
 PT:4/5
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, each opponent sacrifices a nontoken creature or planeswalker.
-SVar:DBSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.nonToken,Planeswalker.nonToken | SacMessage$ nontoken creature or planeswalker
+SVar:DBSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.!token,Planeswalker.!token | SacMessage$ nontoken creature or planeswalker
 A:AB$ ChangeZone | Cost$ 4 B | CheckSVar$ X | SVarCompare$ GE8 | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SorcerySpeed$ True | StackDescription$ SpellDescription | SpellDescription$ Exile CARDNAME, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery and only if an opponent has eight or more cards in their graveyard.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | ForgetOtherRemembered$ True | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

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

@@ -2,7 +2,7 @@ Name:Sheoldred's Edict
 ManaCost:1 B
 Types:Instant
 A:SP$ Charm | Choices$ SacNontoken,SacToken,SacPW | CharmNum$ 1
-SVar:SacNontoken:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.nonToken | SacMessage$ nontoken creature | SpellDescription$ Each opponent sacrifices a nontoken creature.
+SVar:SacNontoken:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.!token | SacMessage$ nontoken creature | SpellDescription$ Each opponent sacrifices a nontoken creature.
 SVar:SacToken:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.token | SacMessage$ creature token | SpellDescription$ Each opponent sacrifices a creature token.
 SVar:SacPW:DB$ Sacrifice | Defined$ Opponent | SacValid$ Planeswalker | SpellDescription$ Each opponent sacrifices a planeswalker.
 DeckHas:Ability$Sacrifice

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

@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 PT:2/2
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Soldier.Other+nonToken+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken Soldier you control dies, create a 1/1 colorless Soldier artifact creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Soldier.Other+!token+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken Soldier you control dies, create a 1/1 colorless Soldier artifact creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_a_soldier
 DeckHints:Type$Soldier
 DeckHas:Ability$Counters|Token

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

@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Eldrazi
 PT:4/3
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token

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

@@ -1,6 +1,6 @@
 Name:Sinister Reflections
 ManaCost:1 U
 Types:Instant
-A:SP$ RepeatEach | ValidTgts$ Creature.YouCtrl+nonToken | TgtPrompt$ Select up to two target nontoken creatures you control | TargetMin$ 0 | TargetMax$ 2 | RepeatSubAbility$ DBConjure | RepeatTargeted$ True | StackDescription$ SpellDescription | SpellDescription$ Conjure a duplicate of each of up to two target nontoken creatures you control into your hand.
+A:SP$ RepeatEach | ValidTgts$ Creature.YouCtrl+!token | TgtPrompt$ Select up to two target nontoken creatures you control | TargetMin$ 0 | TargetMax$ 2 | RepeatSubAbility$ DBConjure | RepeatTargeted$ True | StackDescription$ SpellDescription | SpellDescription$ Conjure a duplicate of each of up to two target nontoken creatures you control into your hand.
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ Remembered | Zone$ Hand
 Oracle:Conjure a duplicate of each of up to two target nontoken creatures you control into your hand.

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

@@ -2,7 +2,7 @@ Name:Skemfar Avenger
 ManaCost:1 B
 Types:Creature Elf Berserker
 PT:3/1
-T:Mode$ ChangesZone | ValidCard$ Elf.nonToken+Other+YouCtrl,Berserker.nonToken+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken Elf or Berserker you control dies, you draw a card and you lose 1 life.
+T:Mode$ ChangesZone | ValidCard$ Elf.!token+Other+YouCtrl,Berserker.!token+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken Elf or Berserker you control dies, you draw a card and you lose 1 life.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1
 DeckHints:Type$Elf|Berserker

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

@@ -4,7 +4,7 @@ Types:Creature Eldrazi Drone
 PT:3/3
 K:Devoid
 K:Menace
-T:Mode$ Sacrificed | ValidCard$ Permanent.nonToken+YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a nontoken permanent, create a 0/1 colorless Eldrazi Spawn creature token with "Sacrifice this creature: Add {C}."
+T:Mode$ Sacrificed | ValidCard$ Permanent.!token+YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a nontoken permanent, create a 0/1 colorless Eldrazi Spawn creature token with "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You
 DeckHas:Ability$Token|Sacrifice & Type$Spawn
 DeckHints:Ability$Sacrifice

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

@@ -2,7 +2,7 @@ Name:Skola Grovedancer
 ManaCost:1 G
 Types:Enchantment Creature Satyr Druid
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Land.nonToken+YouOwn | TriggerZones$ Battlefield | Execute$ DBGainLife | TriggerDescription$ Whenever a land card is put into your graveyard from anywhere, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Land.!token+YouOwn | TriggerZones$ Battlefield | Execute$ DBGainLife | TriggerDescription$ Whenever a land card is put into your graveyard from anywhere, you gain 1 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 A:AB$ Mill | Cost$ 2 G | Defined$ You | NumCards$ 1 | SpellDescription$ Mill a card.
 DeckHas:Ability$LifeGain|Graveyard

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

@@ -3,7 +3,7 @@ ManaCost:U B
 Types:Creature Zombie
 PT:2/2
 K:Exploit
-T:Mode$ Exploited | ValidCard$ Creature.nonToken | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a creature you control exploits a nontoken creature, create a 2/2 black Zombie creature token.
+T:Mode$ Exploited | ValidCard$ Creature.!token | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a creature you control exploits a nontoken creature, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie
 DeckHas:Ability$Token|Sacrifice
 DeckHints:Keyword$Exploit

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

@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Creature Kor Spirit
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile up to one target nonland, nontoken permanent you don't control with mana value 4 or less.
-SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+nonToken+YouDontCtrl+cmcLE4 | TgtPrompt$ Select target nonland, nontoken permanent you don't control with mana value 4 or less. | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SpellDescription$ Exile up to one target nonland, nontoken permanent you don't control with mana value 4 or less.
+SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+!token+YouDontCtrl+cmcLE4 | TgtPrompt$ Select target nonland, nontoken permanent you don't control with mana value 4 or less. | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SpellDescription$ Exile up to one target nonland, nontoken permanent you don't control with mana value 4 or less.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME leaves the battlefield, the exiled card's owner creates an X/X blue Illusion creature token, where X is the mana value of the exiled card.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_x_x_illusion | TokenOwner$ RememberedOwner | ConditionDefined$ Remembered | ConditionPresent$ Card.ExiledWithSource | TokenPower$ X | TokenToughness$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

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

@@ -1,7 +1,7 @@
 Name:Slagstone Refinery
 ManaCost:4
 Types:Artifact
-T:Mode$ ChangesZone | ValidCard$ Artifact.nonToken+YouCtrl+Other,Card.Self | Origin$ Battlefield | Destination$ Graveyard,Exile | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another nontoken artifact you control is put into a graveyard from the battlefield or is put into exile from the battlefield, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
+T:Mode$ ChangesZone | ValidCard$ Artifact.!token+YouCtrl+Other,Card.Self | Origin$ Battlefield | Destination$ Graveyard,Exile | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another nontoken artifact you control is put into a graveyard from the battlefield or is put into exile from the battlefield, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
 SVar:TrigToken:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone
 DeckHints:Type$Artifact
 DeckHas:Ability$Token

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

@@ -3,7 +3,7 @@ ManaCost:1 G U
 Types:Legendary Creature Ooze
 PT:3/3
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Land.nonToken+YouOwn | TriggerZones$ Battlefield | Execute$ DBPutCounter | TriggerDescription$ Whenever a land card is put into your graveyard from anywhere, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Land.!token+YouOwn | TriggerZones$ Battlefield | Execute$ DBPutCounter | TriggerDescription$ Whenever a land card is put into your graveyard from anywhere, put a +1/+1 counter on CARDNAME.
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ ChangeZone | Cost$ SubCounter<3/P1P1> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return it to its owner's hand.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ When NICKNAME leaves the battlefield, return up to three target land cards from your graveyard to your hand.

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

@@ -3,6 +3,6 @@ ManaCost:4 B
 Types:Creature Human Artificer
 PT:2/2
 K:Improvise
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.nonToken+YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken artifact you control is put into a graveyard from the battlefield, create a 1/1 colorless Servo artifact creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.!token+YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken artifact you control is put into a graveyard from the battlefield, create a 1/1 colorless Servo artifact creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_servo | TokenOwner$ You
 Oracle:Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)\nWhenever a nontoken artifact you control is put into a graveyard from the battlefield, create a 1/1 colorless Servo artifact creature token.

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

@@ -1,7 +1,7 @@
 Name:Snowborn Simulacra
 ManaCost:X U U
 Types:Sorcery
-A:SP$ MakeCard | Conjure$ True | ValidTgts$ Permanent.nonToken | TgtPrompt$ Select X target nontoken permanents | TargetMin$ X | TargetMax$ X | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate | StackDescription$ REP each of X target nontoken permanents_{c:Targeted} | SpellDescription$ Conjure a duplicate of each of X target nontoken permanents into your hand.
+A:SP$ MakeCard | Conjure$ True | ValidTgts$ Permanent.!token | TgtPrompt$ Select X target nontoken permanents | TargetMin$ X | TargetMax$ X | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate | StackDescription$ REP each of X target nontoken permanents_{c:Targeted} | SpellDescription$ Conjure a duplicate of each of X target nontoken permanents into your hand.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBPutFromHand | StackDescription$ SpellDescription | SpellDescription$ Those cards perpetually gain "You may spend mana as though it were mana of any color to cast this spell."
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBPutFromHand:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | Optional$ True | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ If X is 5 or more, you may put one of them from your hand onto the battlefield.

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

@@ -1,6 +1,6 @@
 Name:Soothing of Sméagol
 ManaCost:1 U
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ TrigTempt | SpellDescription$ Return target nontoken creature to its owner's hand. The Ring tempts you.
+A:SP$ ChangeZone | ValidTgts$ Creature.!token | TgtPrompt$ Select target nontoken creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ TrigTempt | SpellDescription$ Return target nontoken creature to its owner's hand. The Ring tempts you.
 SVar:TrigTempt:DB$ RingTemptsYou
 Oracle:Return target nontoken creature to its owner's hand. The Ring tempts you.

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

@@ -2,7 +2,7 @@ Name:Sosuke's Summons
 ManaCost:2 G
 Types:Sorcery
 A:SP$ Token | TokenAmount$ 2 | TokenScript$ g_1_1_snake | TokenOwner$ You | SpellDescription$ Create two 1/1 green Snake creature tokens.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Snake+nonToken+YouCtrl | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever a nontoken Snake you control enters, you may return CARDNAME from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Snake+!token+YouCtrl | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever a nontoken Snake you control enters, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand
 DeckHints:Type$Snake
 Oracle:Create two 1/1 green Snake creature tokens.\nWhenever a nontoken Snake you control enters, you may return Sosuke's Summons from your graveyard to your hand.

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

@@ -3,6 +3,6 @@ ManaCost:4 G G
 Types:Creature Elemental
 PT:6/6
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another nontoken creature you control enters, you may draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token+Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another nontoken creature you control enters, you may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Trample\nWhenever another nontoken creature you control enters, you may draw a card.

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

@@ -1,7 +1,7 @@
 Name:Soul Servitude
 ManaCost:2 B
 Types:Instant
-A:SP$ Sacrifice | ValidTgts$ Player | TgtPrompt$ Select target player | SacValid$ Creature.nonToken | SacMessage$ nontoken creature | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger | SpellDescription$ Target player sacrifices a nontoken creature.
+A:SP$ Sacrifice | ValidTgts$ Player | TgtPrompt$ Select target player | SacValid$ Creature.!token | SacMessage$ nontoken creature | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger | SpellDescription$ Target player sacrifices a nontoken creature.
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | RememberObjects$ Remembered | Execute$ TrigConjure | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ When they do, you may discard a card. If you do, conjure a duplicate of the sacrificed creature into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:TrigConjure:AB$ MakeCard | Cost$ Discard<1/Card> | Conjure$ True | DefinedName$ DelayTriggerRemembered | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup

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

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Artifact
 K:etbCounter:OMEN:3
 A:AB$ Dig | Cost$ 1 U T | DigNum$ 2 | DestinationZone$ Graveyard | NoReveal$ True | LibraryPosition2$ 0 | StackDescription$ {p:You} looks at the top two cards of their library, and puts one of them into their graveyard. | SpellDescription$ Look at the top two cards of your library. Put one of them into your graveyard.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.Creature+nonToken+YouOwn | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever a creature card is put into your graveyard from anywhere, remove an omen counter from CARDNAME. Then if it has no omen counters on it, transform it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.Creature+!token+YouOwn | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever a creature card is put into your graveyard from anywhere, remove an omen counter from CARDNAME. Then if it has no omen counters on it, transform it.
 SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ OMEN | CounterNum$ 1 | SubAbility$ DBTransform
 SVar:DBTransform:DB$ SetState | ConditionPresent$ Card.Self+counters_EQ0_OMEN | Defined$ Self | Mode$ Transform
 DeckHas:Ability$Counters|Graveyard|Discard

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

@@ -6,6 +6,6 @@ SVar:DBPut:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Defined$ I
 SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Phyrexian
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:X:Sacrificed$CardManaCost/Plus.1
-SVar:AIPreference:SacCost$Creature.nonToken
+SVar:AIPreference:SacCost$Creature.!token
 DeckHas:Ability$Sacrifice & Type$Phyrexian
-Oracle:{1}, {T}, Sacrifice a creature: Seek a creature card with mana value equal to 1 plus the sacrificed creature's mana value and put that card onto the battlefield. That creature is a Phyrexian in addition to its other types. Activate only as a sorcery.
+Oracle:{1}, {T}, Sacrifice a creature: Seek a creature card with mana value equal to 1 plus the sacrificed creature's mana value and put that card onto the battlefield. That creature is a Phyrexian in addition to its other types. Activate only as a sorcery.

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

@@ -2,6 +2,6 @@ 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$ StayTapped | IsPresent$ Permanent.Black+!token+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 | Duration$ Permanent
 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,6 +3,6 @@ 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$ StayTapped | IsPresent$ Permanent.Black+!token+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 | Duration$ Permanent
 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/spellweaver_helix.txt

@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigSpellweaverExile | OptionalDecider$ You | TriggerDescription$ Imprint — When CARDNAME enters, you may exile two target sorcery cards from a single graveyard.
 SVar:TrigSpellweaverExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetsFromSingleZone$ True | ValidTgts$ Card.Sorcery | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target sorcery cards from a single graveyard | Imprint$ True | SpellDescription$ Exile two sorcery cards from a single graveyard.
-T:Mode$ SpellCast | ValidCard$ Card.sharesNameWith Imprinted+nonToken | Execute$ TrigSpellweaverCopy | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a card, if it has the same name as one of the cards exiled with CARDNAME, you may copy the other. If you do, you may cast the copy without paying its mana cost.
+T:Mode$ SpellCast | ValidCard$ Card.sharesNameWith Imprinted+!token | Execute$ TrigSpellweaverCopy | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a card, if it has the same name as one of the cards exiled with CARDNAME, you may copy the other. If you do, you may cast the copy without paying its mana cost.
 SVar:TrigSpellweaverCopy:DB$ Play | Defined$ ValidExile Card.IsImprinted+!sharesNameWith TriggeredCard | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | CopyCard$ True | ConditionPresent$ Card.IsImprinted+sharesNameWith TriggeredCard | ConditionZone$ Exile | ConditionCompare$ EQ1 | SubAbility$ TrigSpellweaverCopySame
 SVar:TrigSpellweaverCopySame:DB$ Play | Defined$ ValidExile Card.IsImprinted | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | CopyCard$ True | ConditionPresent$ Card.IsImprinted+sharesNameWith TriggeredCard | ConditionZone$ Exile | ConditionCompare$ EQ2
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanImprinted | Static$ True

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

@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Spider Spirit
 PT:4/3
 K:Reach
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouCtrl+Other | Execute$ TrigDigUntil | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control dies, you may reveal cards from the top of your library until you reveal a creature card. Put that card into your hand and the rest on the bottom of your library in a random order.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+YouCtrl+Other | Execute$ TrigDigUntil | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control dies, you may reveal cards from the top of your library until you reveal a creature card. Put that card into your hand and the rest on the bottom of your library in a random order.
 SVar:TrigDigUntil:DB$ DigUntil | Valid$ Creature | ValidDescription$ creature that shares a creature type | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True
 Oracle:Reach\nWhenever another nontoken creature you control dies, you may reveal cards from the top of your library until you reveal a creature card. Put that card into your hand and the rest on the bottom of your library in a random order.

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

@@ -1,7 +1,7 @@
 Name:Spirit Bonds
 ManaCost:1 W
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control enters, you may pay {W}. If you do, create a 1/1 white Spirit creature token with flying.
+T:Mode$ ChangesZone | ValidCard$ Creature.!token+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control enters, you may pay {W}. If you do, create a 1/1 white Spirit creature token with flying.
 SVar:TrigToken:AB$ Token | Cost$ W | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You
 A:AB$ Pump | Cost$ 1 W Sac<1/Spirit> | ValidTgts$ Creature.nonSpirit+YouCtrl | TgtPrompt$ Select target non-Spirit creature you control | KW$ Indestructible | SpellDescription$ Target non-Spirit creature you control gains indestructible until end of turn.
 SVar:BuffedBy:Creature

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

@@ -2,7 +2,7 @@ Name:Sporogenesis
 ManaCost:3 G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a fungus counter on target nontoken creature.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | CounterType$ FUNGUS | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.!token | TgtPrompt$ Select target nontoken creature | CounterType$ FUNGUS | CounterNum$ 1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.counters_GE1_FUNGUS | Execute$ TrigToken | TriggerDescription$ Whenever a creature with a fungus counter on it dies, create a 1/1 green Saproling creature token for each fungus counter on that creature.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ g_1_1_saproling | TokenOwner$ You
 SVar:X:TriggeredCard$CardCounters.FUNGUS

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

@@ -3,7 +3,7 @@ ManaCost:G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 green Squirrel creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_squirrel
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever a nontoken creature you control dies, you may pay {1}. If you do, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever a nontoken creature you control dies, you may pay {1}. If you do, return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 DeckHas:Ability$Token
 Oracle:When Squirrel Sanctuary enters, create a 1/1 green Squirrel creature token.\nWhenever a nontoken creature you control dies, you may pay {1}. If you do, return Squirrel Sanctuary to its owner's hand.

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

@@ -4,6 +4,6 @@ Types:Sorcery
 K:Gift
 SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
 A:SP$ DestroyAll | ValidCards$ Creature | RememberDestroyed$ True | SubAbility$ DBReturn | SpellDescription$ Destroy all creatures. If the gift was promised, return a creature card put into your graveyard this way to the battlefield under your control.
-SVar:DBReturn:DB$ ChangeZone | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | ChangeType$ Creature.nonToken+IsRemembered+YouOwn | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBReturn:DB$ ChangeZone | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | ChangeType$ Creature.!token+IsRemembered+YouOwn | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nDestroy all creatures. If the gift was promised, return a creature card put into your graveyard this way to the battlefield under your control.

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

@@ -2,7 +2,7 @@ Name:Stonebinder's Familiar
 ManaCost:W
 Types:Creature Spirit Dog
 PT:1/1
-T:Mode$ ChangesZoneAll | ValidCards$ Card.nonToken+!copiedSpell | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutcounter | PlayerTurn$ True | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more cards are put into exile during your turn, put a +1/+1 counter on CARDNAME. This ability triggers only once each turn.
+T:Mode$ ChangesZoneAll | ValidCards$ Card.!token+!copiedSpell | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutcounter | PlayerTurn$ True | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more cards are put into exile during your turn, put a +1/+1 counter on CARDNAME. This ability triggers only once each turn.
 SVar:TrigPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:Whenever one or more cards are put into exile during your turn, put a +1/+1 counter on Stonebinder's Familiar. This ability triggers only once each turn.

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

@@ -8,5 +8,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 1 | AILogic$ NeverBounceItself
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange2 | TriggerDescription$ When CARDNAME enters, exile target card from a graveyard.
 SVar:TrigChange2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TgtPrompt$ Select target card from any graveyard
-SVar:NeedsToPlay:Creature.YouCtrl+nonToken
+SVar:NeedsToPlay:Creature.YouCtrl+!token
 Oracle:Flash\nFlying\nWhen Stonecloaker enters, return a creature you control to its owner's hand.\nWhen Stonecloaker enters, exile target card from a graveyard.

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

@@ -5,5 +5,5 @@ PT:3/2
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, return a creature you control to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouCtrl | AILogic$ NeverBounceItself
-SVar:NeedsToPlay:Creature.YouCtrl+nonToken
+SVar:NeedsToPlay:Creature.YouCtrl+!token
 Oracle:Storm Sculptor can't be blocked.\nWhen Storm Sculptor enters, return a creature you control to its owner's hand.

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

@@ -2,7 +2,7 @@ Name:Sunder the Gateway
 ManaCost:1 W
 Types:Sorcery
 A:SP$ Charm | Choices$ Destroy,Incubate
-SVar:Destroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl+nonToken,Enchantment.OppCtrl+nonToken | SubAbility$ DBIncubate | TgtPrompt$ Select target nontoken artifact or enchantment an opponent controls | StackDescription$ Destroy {c:Targeted}. | SpellDescription$ Destroy target nontoken artifact or enchantment an opponent controls. Incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
+SVar:Destroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl+!token,Enchantment.OppCtrl+!token | SubAbility$ DBIncubate | TgtPrompt$ Select target nontoken artifact or enchantment an opponent controls | StackDescription$ Destroy {c:Targeted}. | SpellDescription$ Destroy target nontoken artifact or enchantment an opponent controls. Incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
 SVar:DBIncubate:DB$ Incubate | Amount$ 2
 SVar:Incubate:DB$ Incubate | Amount$ 2 | SubAbility$ DBTransform | StackDescription$ SpellDescription | SpellDescription$ Incubate 2, then transform an Incubator token you control.
 SVar:DBTransform:DB$ SetState | Choices$ Incubator.token+YouCtrl | ChoiceTitle$ Choose an Incubator token you control | Mandatory$ True | Mode$ Transform | StackDescription$ None

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Human Bear
 PT:6/5
 K:Trample
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Trample | Description$ Other creatures you control have trample.
-T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another nontoken creature you control enters, put a +1/+1 counter on it. It gains haste until end of turn.
+T:Mode$ ChangesZone | ValidCard$ Creature.!token+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another nontoken creature you control enters, put a +1/+1 counter on it. It gains haste until end of turn.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | SubAbility$ DBHaste
 SVar:DBHaste:DB$ Pump | Defined$ TriggeredCardLKICopy | KW$ Haste
 SVar:PlayMain1:TRUE

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

@@ -2,7 +2,7 @@ Name:Sworn to the Legion
 ManaCost:4 W W
 Types:Enchantment
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, nontoken creatures you control perpetually gain double team.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl+nonToken | Duration$ Perpetual | KW$ Double team
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl+!token | Duration$ Perpetual | KW$ Double team
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCast | TriggerDescription$ Whenever you cast a creature spell, it perpetually gains double team.
 SVar:TrigCast:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | Duration$ Perpetual | KW$ Double team
 SVar:BuffedBy:Creature