Negation cleanup: nonToken, part 3

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