Merge pull request #5800 from dracontes/rb-etb-44

ETB update: Card folder 'n', part 2

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

@@ -6,10 +6,10 @@ K:Flash
 K:Flying
 K:Trample
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigNoLose | TriggerDescription$ When CARDNAME enters the battlefield, the next time you would lose the game this turn, instead draw three cards and your life total becomes 5.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigNoLose | TriggerDescription$ When CARDNAME enters, the next time you would lose the game this turn, instead draw three cards and your life total becomes 5.
 SVar:TrigNoLose:DB$ Effect | ReplacementEffects$ LoseReplace
 SVar:LoseReplace:Event$ GameLoss | ActiveZones$ Command | ValidPlayer$ You | ReplaceWith$ DrawSeven | Description$ The next time you would lose the game this turn, instead draw three cards and your life total becomes 5.
 SVar:DrawSeven:DB$ Draw | NumCards$ 3 | SubAbility$ DBSetLife
 SVar:DBSetLife:DB$ SetLife | Defined$ You | LifeAmount$ 5 | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-Oracle:Flash\nFlying, trample, haste\nWhen Nira, Hellkite Duelist enters the battlefield, the next time you would lose the game this turn, instead draw three cards and your life total becomes 5.
+Oracle:Flash\nFlying, trample, haste\nWhen Nira, Hellkite Duelist enters, the next time you would lose the game this turn, instead draw three cards and your life total becomes 5.

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

@@ -2,7 +2,7 @@ Name:Nissa of Shadowed Boughs
 ManaCost:2 B G
 Types:Legendary Planeswalker Nissa
 Loyalty:4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, put a loyalty counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Landfall — Whenever a land you control enters, put a loyalty counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ LOYALTY | CounterNum$ 1
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | SubAbility$ Animate | SpellDescription$ Untap target land you control. You may have it become a 3/3 Elemental creature with haste and menace until end of turn. It's still a land.
 SVar:Animate:DB$ Animate | Defined$ Targeted | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Keywords$ Haste & Menace | Optional$ True
@@ -10,4 +10,4 @@ A:AB$ ChangeZone | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$
 SVar:X:Count$Valid Land.YouCtrl
 DeckHas:Ability$Counters|Graveyard
 SVar:BuffedBy:Land
-Oracle:Landfall — Whenever a land enters the battlefield under your control, put a loyalty counter on Nissa of Shadowed Boughs.\n[+1]: Untap target land you control. You may have it become a 3/3 Elemental creature with haste and menace until end of turn. It's still a land.\n[-5]: You may put a creature card with mana value less than or equal to the number of lands you control onto the battlefield from your hand or graveyard with two +1/+1 counters on it.
+Oracle:Landfall — Whenever a land you control enters, put a loyalty counter on Nissa of Shadowed Boughs.\n[+1]: Untap target land you control. You may have it become a 3/3 Elemental creature with haste and menace until end of turn. It's still a land.\n[-5]: You may put a creature card with mana value less than or equal to the number of lands you control onto the battlefield from your hand or graveyard with two +1/+1 counters on it.

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

@@ -2,9 +2,9 @@ Name:Nissa, Resurgent Animist
 ManaCost:2 G
 Types:Legendary Creature Elf Scout
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, add one mana of any color. Then if this is the second time this ability has resolved this turn, reveal cards from the top of your library until you reveal an Elf or Elemental card. Put that card into your hand and the rest on the bottom of your library in a random order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Landfall — Whenever a land you control enters, add one mana of any color. Then if this is the second time this ability has resolved this turn, reveal cards from the top of your library until you reveal an Elf or Elemental card. Put that card into your hand and the rest on the bottom of your library in a random order.
 SVar:TrigMana:DB$ Mana | Produced$ Any | SubAbility$ RevealUntil
 SVar:RevealUntil:DB$ DigUntil | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | Valid$ Elf,Elemental | ValidDescription$ elf or elemental | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True
 SVar:X:Count$ResolvedThisTurn
 DeckHints:Type$Elemental|Elf
-Oracle:Landfall — Whenever a land enters the battlefield under your control, add one mana of any color. Then if this is the second time this ability has resolved this turn, reveal cards from the top of your library until you reveal an Elf or Elemental card. Put that card into your hand and the rest on the bottom of your library in a random order.
+Oracle:Landfall — Whenever a land you control enters, add one mana of any color. Then if this is the second time this ability has resolved this turn, reveal cards from the top of your library until you reveal an Elf or Elemental card. Put that card into your hand and the rest on the bottom of your library in a random order.

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

@@ -2,14 +2,14 @@ Name:Nissa, Vastwood Seer
 ManaCost:2 G
 Types:Legendary Creature Elf Scout
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Forest.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | IsPresent$ Land.YouCtrl | PresentCompare$ GE7 | Execute$ TrigExile | TriggerDescription$ Whenever a land enters the battlefield under your control, if you control seven or more lands, exile NICKNAME, then return her to the battlefield transformed under her owner's control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | IsPresent$ Land.YouCtrl | PresentCompare$ GE7 | Execute$ TrigExile | TriggerDescription$ Whenever a land you control enters, if you control seven or more lands, exile NICKNAME, then return her to the battlefield transformed under her owner's control.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | ForgetOtherRemembered$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AlternateMode:DoubleFaced
-Oracle:When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle.\nWhenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control.
+Oracle:When Nissa, Vastwood Seer enters, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle.\nWhenever a land you control enters, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control.
 
 ALTERNATE
 

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

@@ -5,7 +5,7 @@ Loyalty:5
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | SubAbility$ DBAnimate | SpellDescription$ Untap target land you control. Until your next turn, it becomes a 5/5 Elemental creature with haste. It's still a land.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 5 | Toughness$ 5 | Types$ Creature,Elemental | Duration$ UntilYourNextTurn | Keywords$ Haste
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouCtrl | SpellDescription$ Return target permanent card from your graveyard to your hand.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem — Nissa, Vital Force | Image$ emblem_nissa_vital_force | Triggers$ TrigDraw | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card."
-SVar:TrigDraw:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ DBDraw | OptionalDecider$ You | TriggerZones$ Command | TriggerDescription$ Whenever a land enters the battlefield under your control, you may draw a card.
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem — Nissa, Vital Force | Image$ emblem_nissa_vital_force | Triggers$ TrigDraw | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a land you control enters, you may draw a card."
+SVar:TrigDraw:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ DBDraw | OptionalDecider$ You | TriggerZones$ Command | TriggerDescription$ Whenever a land you control enters, you may draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:[+1]: Untap target land you control. Until your next turn, it becomes a 5/5 Elemental creature with haste. It's still a land.\n[-3]: Return target permanent card from your graveyard to your hand.\n[-6]: You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card."
+Oracle:[+1]: Untap target land you control. Until your next turn, it becomes a 5/5 Elemental creature with haste. It's still a land.\n[-3]: Return target permanent card from your graveyard to your hand.\n[-6]: You get an emblem with "Whenever a land you control enters, you may draw a card."

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

@@ -3,6 +3,6 @@ ManaCost:W U B R G
 Types:Legendary Creature Dragon Avatar
 PT:6/6
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top ten cards of your library. For each color pair, choose a card that's exactly those colors from among them. Put the chosen cards into your hand and the rest on the bottom of your library in a random order.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, reveal the top ten cards of your library. For each color pair, choose a card that's exactly those colors from among them. Put the chosen cards into your hand and the rest on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ 10 | Reveal$ True | ForEachColorPair$ True | RestRandomOrder$ True
-Oracle:Flying\nWhen Niv-Mizzet Reborn enters the battlefield, reveal the top ten cards of your library. For each color pair, choose a card that's exactly those colors from among them. Put the chosen cards into your hand and the rest on the bottom of your library in a random order.
+Oracle:Flying\nWhen Niv-Mizzet Reborn enters, reveal the top ten cards of your library. For each color pair, choose a card that's exactly those colors from among them. Put the chosen cards into your hand and the rest on the bottom of your library in a random order.

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

@@ -4,6 +4,6 @@ Types:Creature Illusion Wall
 PT:0/4
 K:Flash
 K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpCurse | TriggerDescription$ When CARDNAME enters the battlefield, target attacking creature gets -4/-0 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpCurse | TriggerDescription$ When CARDNAME enters, target attacking creature gets -4/-0 until end of turn.
 SVar:TrigPumpCurse:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | IsCurse$ True | NumAtt$ -4
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nDefender (This creature can't attack.)\nWhen Nivix Barrier enters the battlefield, target attacking creature gets -4/-0 until end of turn.
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nDefender (This creature can't attack.)\nWhen Nivix Barrier enters, target attacking creature gets -4/-0 until end of turn.

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

@@ -1,12 +1,12 @@
 Name:Noble Heritage
 ManaCost:1 W
 Types:Legendary Enchantment Background
-S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ ETB & Upkeep | Description$ Commander creatures you own have "When this creature enters the battlefield and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn." (You can't be targeted, dealt damage, or enchanted by anything controlled by that player.)
-SVar:ETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When this creature enters the battlefield and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn.
-SVar:Upkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ When this creature enters the battlefield and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn.
+S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ ETB & Upkeep | Description$ Commander creatures you own have "When this creature enters and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn." (You can't be targeted, dealt damage, or enchanted by anything controlled by that player.)
+SVar:ETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When this creature enters and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn.
+SVar:Upkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ When this creature enters and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn.
 SVar:TrigChoose:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoice | SubAbility$ DBPutCounter
 SVar:DBChoice:DB$ ChooseCard | Defined$ RememberedPlayer | Amount$ 1 | MinAmount$ 0 | Choices$ Creature.RememberedPlayerCtrl | RememberChosen$ True | AILogic$ OrzhovAdvokist
 SVar:DBPutCounter:DB$ PutCounterAll | Placer$ Controller | ValidCards$ Creature.IsRemembered | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ You | KW$ Protection:Player.PlayerUID_ChosenPlayerUID:ChosenPlayerName | DefinedKW$ RememberedController.Opponent | Duration$ UntilYourNextTurn | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
-Oracle:Commander creatures you own have "When this creature enters the battlefield and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn." (You can't be targeted, dealt damage, or enchanted by anything controlled by that player.)
+Oracle:Commander creatures you own have "When this creature enters and at the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. For each opponent who does, you gain protection from that player until your next turn." (You can't be targeted, dealt damage, or enchanted by anything controlled by that player.)

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

@@ -1,9 +1,9 @@
 Name:Noble's Purse
 ManaCost:2
 Types:Artifact
-K:ETBReplacement:Other:EntersTapped
-SVar:EntersTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped and with three coin counters on it.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ EntersTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped and with three coin counters on it.
+SVar:EntersTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | CounterType$ COIN | CounterNum$ 3
 A:AB$ Token | Cost$ T SubCounter<1/COIN> | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 DeckHas:Ability$Counters|Token|Sacrifice & Type$Artifact|Treasure
-Oracle:Noble's Purse enters the battlefield tapped and with three coin counters on it.\n{T}, Remove a coin counter from Noble's Purse: Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+Oracle:Noble's Purse enters tapped and with three coin counters on it.\n{T}, Remove a coin counter from Noble's Purse: Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")

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

@@ -2,6 +2,6 @@ Name:Noggle Bridgebreaker
 ManaCost:2 UR UR
 Types:Creature Noggle Rogue
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | SpellDescription$ Return a land you control to its owner's hand.
-Oracle:When Noggle Bridgebreaker enters the battlefield, return a land you control to its owner's hand.
+Oracle:When Noggle Bridgebreaker enters, return a land you control to its owner's hand.

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

@@ -2,8 +2,8 @@ Name:Noggle Hedge-Mage
 ManaCost:2 UR
 Types:Creature Noggle Wizard
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Islands, you may tap two target permanents.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE2 | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Mountains, you may have CARDNAME deal 2 damage to target player or planeswalker.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, if you control two or more Islands, you may tap two target permanents.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE2 | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, if you control two or more Mountains, you may have CARDNAME deal 2 damage to target player or planeswalker.
 SVar:TrigTap:DB$ Tap | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permanent
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2
-Oracle:When Noggle Hedge-Mage enters the battlefield, if you control two or more Islands, you may tap two target permanents.\nWhen Noggle Hedge-Mage enters the battlefield, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player or planeswalker.
+Oracle:When Noggle Hedge-Mage enters, if you control two or more Islands, you may tap two target permanents.\nWhen Noggle Hedge-Mage enters, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player or planeswalker.

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

@@ -2,7 +2,7 @@ Name:Noggle Ransacker
 ManaCost:2 UR
 Types:Creature Noggle Rogue
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, each player draws two cards, then discards a card at random.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, each player draws two cards, then discards a card at random.
 SVar:TrigDraw:DB$ Draw | Defined$ Player | NumCards$ 2 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ Player | Mode$ Random | NumCards$ 1
-Oracle:When Noggle Ransacker enters the battlefield, each player draws two cards, then discards a card at random.
+Oracle:When Noggle Ransacker enters, each player draws two cards, then discards a card at random.

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

@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Creature Astartes Warrior
 PT:3/2
 K:Cascade
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Sonic Blaster — When CARDNAME enters the battlefield, it deals damage equal to the number of spells you've cast this turn to any target.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Sonic Blaster — When CARDNAME enters, it deals damage equal to the number of spells you've cast this turn to any target.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
 SVar:X:Count$ThisTurnCast_Card.YouCtrl
-Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nSonic Blaster — When Noise Marine enters the battlefield, it deals damage equal to the number of spells you've cast this turn to any target.
+Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nSonic Blaster — When Noise Marine enters, it deals damage equal to the number of spells you've cast this turn to any target.

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

@@ -1,6 +1,7 @@
 Name:Nomad Outpost
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo R W B | SpellDescription$ Add {R}, {W}, or {B}.
-Oracle:Nomad Outpost enters the battlefield tapped.\n{T}: Add {R}, {W}, or {B}.
+Oracle:Nomad Outpost enters tapped.\n{T}: Add {R}, {W}, or {B}.

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

@@ -8,4 +8,4 @@ SVar:TrigRemoveCounter:DB$ RemoveCounter | CounterType$ P1P1 | CounterNum$ 1 | R
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You | ConditionCheckSVar$ CounterX | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:CounterX:Count$RememberedSize
-Oracle:Noosegraf Mob enters the battlefield with five +1/+1 counters on it.\nWhenever a player casts a spell, remove a +1/+1 counter from Noosegraf Mob. If you do, create a 2/2 black Zombie creature token.
+Oracle:Noosegraf Mob enters with five +1/+1 counters on it.\nWhenever a player casts a spell, remove a +1/+1 counter from Noosegraf Mob. If you do, create a 2/2 black Zombie creature token.

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

@@ -4,11 +4,11 @@ Types:Creature Phyrexian Angel
 PT:5/4
 K:Flying
 K:First Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.IsCommander+YouOwn | Execute$ TrigProliferate | TriggerDescription$ Whenever your commander enters the battlefield or attacks, proliferate (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)
-T:Mode$ Attacks | ValidCard$ Card.IsCommander+YouOwn | TriggerZones$ Battlefield | Execute$ TrigProliferate | Secondary$ True | TriggerDescription$ Whenever your commander enters the battlefield or attacks, proliferate (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.IsCommander+YouOwn | Execute$ TrigProliferate | TriggerDescription$ Whenever your commander enters or attacks, proliferate (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)
+T:Mode$ Attacks | ValidCard$ Card.IsCommander+YouOwn | TriggerZones$ Battlefield | Execute$ TrigProliferate | Secondary$ True | TriggerDescription$ Whenever your commander enters or attacks, proliferate (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)
 SVar:TrigProliferate:DB$ Proliferate
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Proliferate
 DeckHints:Ability$Counters|Planeswalker
 AI:RemoveDeck:NonCommander
-Oracle:Flying, first strike\nWhenever a commander you control enters the battlefield or attacks, proliferate. (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)
+Oracle:Flying, first strike\nWhenever a commander you control enters or attacks, proliferate. (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)

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

@@ -3,11 +3,11 @@ ManaCost:1 W
 Types:Creature Phyrexian Insect
 PT:1/1
 K:Toxic:1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBranch | TriggerDescription$ When CARDNAME enters the battlefield, conjure a card named Plains into your hand. If an opponent has three or more poison counters, you may seek a nonland card instead.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBranch | TriggerDescription$ When CARDNAME enters, conjure a card named Plains into your hand. If an opponent has three or more poison counters, you may seek a nonland card instead.
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE3 | TrueSubAbility$ DBGenericChoice | FalseSubAbility$ ConjurePlains
 SVar:DBGenericChoice:DB$ GenericChoice | Choices$ SeekNonLand,ConjurePlains
 SVar:SeekNonLand:DB$ Seek | Type$ Card.nonLand | StackDescription$ Seek a nonland card.
 SVar:ConjurePlains:DB$ MakeCard | Conjure$ True | Name$ Plains | Zone$ Hand | StackDescription$ Conjure a card named Plains into your hand.
 SVar:X:PlayerCountOpponents$HighestCounters.Poison
 DeckHints:Keyword$Toxic|Infect
-Oracle:Toxic 1\nCorrupted — When Norn's Fetchling enters the battlefield, conjure a card named Plains into your hand. If an opponent has three or more poison counters, you may seek a nonland card instead.
+Oracle:Toxic 1\nCorrupted — When Norn's Fetchling enters, conjure a card named Plains into your hand. If an opponent has three or more poison counters, you may seek a nonland card instead.

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

@@ -2,9 +2,9 @@ Name:Norn's Inquisitor
 ManaCost:1 W
 Types:Creature Phyrexian Knight
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters the battlefield, incubate 2.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters, incubate 2.
 SVar:TrigIncubate:DB$ Incubate | Amount$ 2
 T:Mode$ Transformed | ValidCard$ Phyrexian.YouCtrl+inZoneBattlefield | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent you control transforms into a Phyrexian, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ P1P1
 DeckHas:Ability$Token|Counters & Type$Artifact
-Oracle:When Norn's Inquisitor enters the battlefield, incubate 2.\nWhenever a permanent you control transforms into a Phyrexian, put a +1/+1 counter on it.
+Oracle:When Norn's Inquisitor enters, incubate 2.\nWhenever a permanent you control transforms into a Phyrexian, put a +1/+1 counter on it.

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

@@ -5,4 +5,4 @@ PT:10/2
 K:Trample
 K:Champion:Elemental
 AI:RemoveDeck:Random
-Oracle:Trample\nChampion an Elemental (When this enters the battlefield, sacrifice it unless you exile another Elemental you control. When this leaves the battlefield, that card returns to the battlefield.)
+Oracle:Trample\nChampion an Elemental (When this enters, sacrifice it unless you exile another Elemental you control. When this leaves the battlefield, that card returns to the battlefield.)

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

@@ -2,7 +2,7 @@ Name:Novice Inspector
 ManaCost:W
 Types:Creature Human Detective
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters the battlefield, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigInvestigate:DB$ Investigate
 DeckHas:Ability$Investigate|Token & Type$Clue|Artifact
-Oracle:When Novice Inspector enters the battlefield, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+Oracle:When Novice Inspector enters, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")

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

@@ -2,5 +2,5 @@ Name:Novijen, Heart of Progress
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ PutCounterAll | Cost$ G U T | CounterType$ P1P1 | CounterNum$ 1 | ValidCards$ Creature.ThisTurnEntered | SpellDescription$ Put a +1/+1 counter on each creature that entered the battlefield this turn.
-Oracle:{T}: Add {C}.\n{G}{U}, {T}: Put a +1/+1 counter on each creature that entered the battlefield this turn.
+A:AB$ PutCounterAll | Cost$ G U T | CounterType$ P1P1 | CounterNum$ 1 | ValidCards$ Creature.ThisTurnEntered | SpellDescription$ Put a +1/+1 counter on each creature that entered this turn.
+Oracle:{T}: Add {C}.\n{G}{U}, {T}: Put a +1/+1 counter on each creature that entered this turn.

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

@@ -6,4 +6,4 @@ K:Graft:4
 A:AB$ Draw | Cost$ 1 RemoveAnyCounter<2/P1P1/Creature.YouCtrl/among creatures you control> | NumCards$ 1 | SpellDescription$ Draw a card.
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
-Oracle:Graft 4 (This creature enters the battlefield with four +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.)\n{1}, Remove two +1/+1 counters from among creatures you control: Draw a card.
+Oracle:Graft 4 (This creature enters with four +1/+1 counters on it. Whenever another creature enters, you may move a +1/+1 counter from this creature onto it.)\n{1}, Remove two +1/+1 counters from among creatures you control: Draw a card.

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

@@ -3,10 +3,10 @@ ManaCost:4 B B
 Types:Artifact Creature Construct
 PT:5/4
 K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy another target creature. If a creature is destroyed this way, you gain life equal to its toughness.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may destroy another target creature. If a creature is destroyed this way, you gain life equal to its toughness.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | RememberLKI$ True | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:RememberedLKI$CardToughness
 DeckHas:Ability$LifeGain
-Oracle:Menace\nWhen Noxious Gearhulk enters the battlefield, you may destroy another target creature. If a creature is destroyed this way, you gain life equal to its toughness.
+Oracle:Menace\nWhen Noxious Gearhulk enters, you may destroy another target creature. If a creature is destroyed this way, you gain life equal to its toughness.

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

@@ -2,7 +2,7 @@ Name:Noxious Ghoul
 ManaCost:3 B B
 Types:Creature Zombie
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Zombie.Other | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Zombie enters the battlefield, all non-Zombie creatures get -1/-1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Zombie.Other | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Zombie enters, all non-Zombie creatures get -1/-1 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.nonZombie | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 SVar:PlayMain1:TRUE
-Oracle:Whenever Noxious Ghoul or another Zombie enters the battlefield, all non-Zombie creatures get -1/-1 until end of turn.
+Oracle:Whenever Noxious Ghoul or another Zombie enters, all non-Zombie creatures get -1/-1 until end of turn.

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

@@ -8,4 +8,4 @@ T:Mode$ SpellCast | ValidCard$ Card.Black | ValidActivatingPlayer$ You | Trigger
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a green spell, remove a -1/-1 counter from CARDNAME.
 SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1
 SVar:BuffedBy:Card.Black,Card.Green
-Oracle:Noxious Hatchling enters the battlefield with four -1/-1 counters on it.\nWither (This deals damage to creatures in the form of -1/-1 counters.)\nWhenever you cast a black spell, remove a -1/-1 counter from Noxious Hatchling.\nWhenever you cast a green spell, remove a -1/-1 counter from Noxious Hatchling.
+Oracle:Noxious Hatchling enters with four -1/-1 counters on it.\nWither (This deals damage to creatures in the form of -1/-1 counters.)\nWhenever you cast a black spell, remove a -1/-1 counter from Noxious Hatchling.\nWhenever you cast a green spell, remove a -1/-1 counter from Noxious Hatchling.

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

@@ -2,8 +2,8 @@ Name:Nucklavee
 ManaCost:4 UR UR
 Types:Creature Beast
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneRed | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target red sorcery card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneRed | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return target red sorcery card from your graveyard to your hand.
 SVar:TrigChangeZoneRed:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Sorcery.Red+YouCtrl
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneBlue | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target blue instant card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneBlue | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return target blue instant card from your graveyard to your hand.
 SVar:TrigChangeZoneBlue:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.Blue+YouCtrl
-Oracle:When Nucklavee enters the battlefield, you may return target red sorcery card from your graveyard to your hand.\nWhen Nucklavee enters the battlefield, you may return target blue instant card from your graveyard to your hand.
+Oracle:When Nucklavee enters, you may return target red sorcery card from your graveyard to your hand.\nWhen Nucklavee enters, you may return target blue instant card from your graveyard to your hand.

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

@@ -2,10 +2,10 @@ Name:Null Chamber
 ManaCost:3 W
 Types:World Enchantment
 K:ETBReplacement:Other:DBNameCard
-SVar:DBNameCard:DB$ NameCard | ValidCards$ Card.nonBasic | ValidDescription$ card other than a basic land | SubAbility$ ChooseP | SpellDescription$ As CARDNAME enters the battlefield, you and an opponent each choose a card name other than a basic land card name.
+SVar:DBNameCard:DB$ NameCard | ValidCards$ Card.nonBasic | ValidDescription$ card other than a basic land | SubAbility$ ChooseP | SpellDescription$ As CARDNAME enters, you and an opponent each choose a card name other than a basic land card name.
 SVar:ChooseP:DB$ ChoosePlayer | Choices$ Opponent | SubAbility$ NameOpp
 SVar:NameOpp:DB$ NameCard | Defined$ ChosenPlayer | ValidCards$ Card.nonBasic | ValidDescription$ a card name other than a basic land card name
 S:Mode$ CantBeCast | ValidCard$ Card.NamedCard | Description$ Spells with the chosen names can't be cast and lands with the chosen names can't be played.
 S:Mode$ CantPlayLand | ValidCard$ Land.NamedCard
 AI:RemoveDeck:Random
-Oracle:As Null Chamber enters the battlefield, you and an opponent each choose a card name other than a basic land card name.\nSpells with the chosen names can't be cast and lands with the chosen names can't be played.
+Oracle:As Null Chamber enters, you and an opponent each choose a card name other than a basic land card name.\nSpells with the chosen names can't be cast and lands with the chosen names can't be played.

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

@@ -7,4 +7,4 @@ SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2
 K:Flying
 K:Annihilator:1
 K:Evoke:2 U
-Oracle:When you cast this spell, draw two cards.\nFlying\nAnnihilator 1 (Whenever this creature attacks, defending player sacrifices a permanent.)\nEvoke {2}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
+Oracle:When you cast this spell, draw two cards.\nFlying\nAnnihilator 1 (Whenever this creature attacks, defending player sacrifices a permanent.)\nEvoke {2}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters.)

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

@@ -5,7 +5,7 @@ PT:2/1
 K:Kicker:3 B
 K:Menace
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, return target creature card from your graveyard to the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, if it was kicked, return target creature card from your graveyard to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature in your graveyard
 DeckHas:Ability$LifeGain|Graveyard
-Oracle:Kicker {3}{B}\nMenace, lifelink\nWhen Nullpriest of Oblivion enters the battlefield, if it was kicked, return target creature card from your graveyard to the battlefield.
+Oracle:Kicker {3}{B}\nMenace, lifelink\nWhen Nullpriest of Oblivion enters, if it was kicked, return target creature card from your graveyard to the battlefield.

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

@@ -2,7 +2,7 @@ Name:Nulltread Gargantuan
 ManaCost:1 G U
 Types:Creature Beast
 PT:5/6
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, put a creature you control on top of its owner's library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, put a creature you control on top of its owner's library.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Hidden$ True | ChangeType$ Creature.YouCtrl | Mandatory$ True
 SVar:NeedsToPlay:Creature.cmcLE2+YouCtrl
-Oracle:When Nulltread Gargantuan enters the battlefield, put a creature you control on top of its owner's library.
+Oracle:When Nulltread Gargantuan enters, put a creature you control on top of its owner's library.

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

@@ -2,7 +2,7 @@ Name:Numbing Jellyfish
 ManaCost:3 U
 Types:Host Creature Jellyfish
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRoll | Host$ True | TriggerDescription$ When this creature enters the battlefield, roll a six-sided die. Target player mills X cards, where X is the result.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRoll | Host$ True | TriggerDescription$ When this creature enters, roll a six-sided die. Target player mills X cards, where X is the result.
 SVar:TrigRoll:DB$ RollDice | ResultSVar$ Result | SubAbility$ DBMill
 SVar:DBMill:DB$ Mill | ValidTgts$ Player | NumCards$ Result
-Oracle:When this creature enters the battlefield, roll a six-sided die. Target player mills X cards, where X is the result.
+Oracle:When this creature enters, roll a six-sided die. Target player mills X cards, where X is the result.

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

@@ -2,8 +2,8 @@ Name:Nurturing Bristleback
 ManaCost:5 G G
 Types:Creature Dinosaur
 PT:5/5
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 3/3 green Dinosaur creature token.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 3/3 green Dinosaur creature token.
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenScript$ g_3_3_dinosaur | TokenAmount$ 1
 K:TypeCycling:Forest:2
 DeckHas:Ability$Token|Discard
-Oracle:When Nurturing Bristleback enters the battlefield, create a 3/3 green Dinosaur creature token.\nForestcycling {2} ({2}, Discard this card: Search your library for a Forest card, reveal it, put it into your hand, then shuffle.)
+Oracle:When Nurturing Bristleback enters, create a 3/3 green Dinosaur creature token.\nForestcycling {2} ({2}, Discard this card: Search your library for a Forest card, reveal it, put it into your hand, then shuffle.)

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

@@ -3,9 +3,9 @@ ManaCost:W
 Types:Creature Faerie Rogue
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return up to one target non-Faerie, nonland permanent you control to its owner's hand. If a permanent was returned this way, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return up to one target non-Faerie, nonland permanent you control to its owner's hand. If a permanent was returned this way, put a +1/+1 counter on CARDNAME.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonFaerie+nonLand+YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target non-Faerie, nonland permanent you control | RememberLKI$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ RememberedLKI | ConditionPresent$ Card.Permanent | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters
-Oracle:Flying\nWhen Nurturing Pixie enters the battlefield, return up to one target non-Faerie, nonland permanent you control to its owner's hand. If a permanent was returned this way, put a +1/+1 counter on Nurturing Pixie.
+Oracle:Flying\nWhen Nurturing Pixie enters, return up to one target non-Faerie, nonland permanent you control to its owner's hand. If a permanent was returned this way, put a +1/+1 counter on Nurturing Pixie.

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

@@ -3,11 +3,11 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddTrigger$ NurturingChangeZone | AddSVar$ NurturingPump | Description$ Enchanted creature has "Whenever a creature enters the battlefield under your control, this creature gets +1/+1 until end of turn."
-SVar:NurturingChangeZone:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ NurturingPump | TriggerDescription$ Whenever a creature enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddTrigger$ NurturingChangeZone | AddSVar$ NurturingPump | Description$ Enchanted creature has "Whenever a creature you control enters, this creature gets +1/+1 until end of turn."
+SVar:NurturingChangeZone:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ NurturingPump | TriggerDescription$ Whenever a creature you control enters, CARDNAME gets +1/+1 until end of turn.
 SVar:NurturingPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Spirit creature token with flying.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Spirit creature token with flying.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_spirit_flying
 SVar:BuffedBy:Creature
 DeckHas:Ability$Token
-Oracle:Enchant creature\nEnchanted creature has "Whenever a creature enters the battlefield under your control, this creature gets +1/+1 until end of turn."\nWhen Nurturing Presence enters the battlefield, create a 1/1 white Spirit creature token with flying.
+Oracle:Enchant creature\nEnchanted creature has "Whenever a creature you control enters, this creature gets +1/+1 until end of turn."\nWhen Nurturing Presence enters, create a 1/1 white Spirit creature token with flying.

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

@@ -2,6 +2,6 @@ Name:Nylea's Colossus
 ManaCost:6 G
 Types:Enchantment Creature Giant
 PT:6/6
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.Other+YouCtrl | Execute$ TrigPump | TriggerDescription$ Constellation Whenever CARDNAME or another enchantment enters the battlefield under your control, double target creature's power and toughness until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.Other+YouCtrl | Execute$ TrigPump | TriggerDescription$ Constellation Whenever CARDNAME or another enchantment you control enters, double target creature's power and toughness until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ Double | NumDef$ Double
-Oracle:Constellation — Whenever Nylea's Colossus or another enchantment enters the battlefield under your control, double target creature's power and toughness until end of turn.
+Oracle:Constellation — Whenever Nylea's Colossus or another enchantment you control enters, double target creature's power and toughness until end of turn.

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

@@ -2,7 +2,7 @@ Name:Nylea's Disciple
 ManaCost:2 G G
 Types:Creature Centaur Archer
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain life equal to your devotion to green.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain life equal to your devotion to green.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ X
 SVar:X:Count$Devotion.Green
-Oracle:When Nylea's Disciple enters the battlefield, you gain life equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
+Oracle:When Nylea's Disciple enters, you gain life equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)

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

@@ -2,7 +2,7 @@ Name:Nylea's Huntmaster
 ManaCost:3 G
 Types:Creature Centaur Shaman
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature you control gets +X/+0 until end of turn, where X is your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature you control gets +X/+0 until end of turn, where X is your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X
 SVar:X:Count$Devotion.Green
-Oracle:When Nylea's Huntmaster enters the battlefield, target creature you control gets +X/+0 until end of turn, where X is your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
+Oracle:When Nylea's Huntmaster enters, target creature you control gets +X/+0 until end of turn, where X is your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)

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

@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 S:Mode$ Continuous | Affected$ Land.EnchantedBy | AddType$ AllBasicLandType | Description$ Enchanted land is every basic land type in addition to its other types.
-Oracle:Enchant land\nWhen Nylea's Presence enters the battlefield, draw a card.\nEnchanted land is every basic land type in addition to its other types.
+Oracle:Enchant land\nWhen Nylea's Presence enters, draw a card.\nEnchanted land is every basic land type in addition to its other types.

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

@@ -2,7 +2,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.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Command | Execute$ TrigGainLife | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under your control, you gain 1 life.
+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.
 SVar:RolledChaos:DB$ ChooseColor | SubAbility$ DBMana | AILogic$ MostProminentComputerControls | AINoRecursiveCheck$ True
@@ -10,4 +10,4 @@ SVar:DBMana:DB$ Mana | Produced$ Chosen | Amount$ X
 SVar:X:Count$Devotion.Chosen
 DeckHas:Ability$LifeGain
 DeckHints:Type$Enchantment
-Oracle:Nontoken creatures are enchantments in addition to their other types.\nConstellation — Whenever an enchantment enters the battlefield under your control, you gain 1 life.\nWhenever chaos ensues, choose a color. Add an amount of mana of that color equal to your devotion to that color.
+Oracle:Nontoken creatures are enchantments in addition to their other types.\nConstellation — Whenever an enchantment you control enters, you gain 1 life.\nWhenever chaos ensues, choose a color. Add an amount of mana of that color equal to your devotion to that color.

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

@@ -1,9 +1,10 @@
 Name:Nyx Lotus
 ManaCost:4
 Types:Legendary Artifact
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ ChooseColor | Cost$ T | AILogic$ MostProminentInComputerDeck | SubAbility$ DBMana | SpellDescription$ Choose a color. Add an amount of mana of that color equal to your devotion to that color.
 SVar:DBMana:DB$ Mana | Produced$ Chosen | Amount$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenColor$ True
 SVar:X:Count$Devotion.Chosen
-Oracle:Nyx Lotus enters the battlefield tapped.\n{T}: Choose a color. Add an amount of mana of that color equal to your devotion to that color. (Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)
+Oracle:Nyx Lotus enters tapped.\n{T}: Choose a color. Add an amount of mana of that color equal to your devotion to that color. (Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)

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

@@ -3,9 +3,9 @@ ManaCost:1 B B
 Types:Creature Elemental
 PT:7/7
 K:ETBReplacement:Other:ChooseP
-SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose an opponent.
+SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters, choose an opponent.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -1/-1 for each card in the chosen player's hand.
 SVar:X:Count$InChosenHand
 SVar:NeedsToPlayVar:Z GE1
 SVar:Z:PlayerCountPropertyOpponents$HasPropertyHasCardsInHand_Card_LE5
-Oracle:As Nyxathid enters the battlefield, choose an opponent.\nNyxathid gets -1/-1 for each card in the chosen player's hand.
+Oracle:As Nyxathid enters, choose an opponent.\nNyxathid gets -1/-1 for each card in the chosen player's hand.

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

@@ -9,4 +9,4 @@ K:etbCounter:P1P1:X
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ Y | AddToughness$ Y | AddKeyword$ Reach & Trample | Description$ Enchanted creature gets +1/+1 for each +1/+1 counter on CARDNAME and has reach and trample.
 SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.P1P1
-Oracle:Bestow {X}{G}{G} (If you cast this card for its bestow cost, it's an Aura spell with enchant creature. It becomes a creature again if it's not attached.)\nReach, trample\nNyxborn Hydra enters the battlefield with X +1/+1 counters on it.\nEnchanted creature gets +1/+1 for each +1/+1 counter on Nyxborn Hydra and has reach and trample.
+Oracle:Bestow {X}{G}{G} (If you cast this card for its bestow cost, it's an Aura spell with enchant creature. It becomes a creature again if it's not attached.)\nReach, trample\nNyxborn Hydra enters with X +1/+1 counters on it.\nEnchanted creature gets +1/+1 for each +1/+1 counter on Nyxborn Hydra and has reach and trample.