Add files via upload

2025-11-14 01:38:13 +00:00 · 2024-07-31 19:53:11 +01:00
parent 691f500902
commit 32c89e9af1
60 changed files with 129 additions and 120 deletions
--- a/forge-gui/res/cardsfolder/c/creosote_heath.txt
+++ b/forge-gui/res/cardsfolder/c/creosote_heath.txt
@@ -1,8 +1,9 @@
 Name:Creosote Heath
 ManaCost:no cost
 Types:Land Desert
-K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target opponent.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters, it deals 1 damage to target opponent.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1
 A:AB$ Mana | Cost$ T | Produced$ Combo W G | SpellDescription$ Add {W} or {G}.
-Oracle:Creosote Heath enters the battlefield tapped.\nWhen Creosote Heath enters the battlefield, it deals 1 damage to target opponent.\n{T}:Add {W} or {G}.
+Oracle:Creosote Heath enters tapped.\nWhen Creosote Heath enters, it deals 1 damage to target opponent.\n{T}:Add {W} or {G}.
--- a/forge-gui/res/cardsfolder/c/crested_herdcaller.txt
+++ b/forge-gui/res/cardsfolder/c/crested_herdcaller.txt
@@ -3,8 +3,8 @@ ManaCost:3 G G
 Types:Creature Dinosaur
 PT:3/3
 K:Trample
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 3/3 green Dinosaur creature token with trample.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBToken | TriggerDescription$ When CARDNAME enters, create a 3/3 green Dinosaur creature token with trample.
 SVar:DBToken:DB$ Token | TokenOwner$ You | TokenScript$ g_3_3_dinosaur_trample | TokenAmount$ 1
 DeckHas:Ability$Token
 DeckHints:Type$Dinosaur
-Oracle:Trample\nWhen Crested Herdcaller enters the battlefield, create a 3/3 green Dinosaur creature token with trample.
+Oracle:Trample\nWhen Crested Herdcaller enters, create a 3/3 green Dinosaur creature token with trample.
--- a/forge-gui/res/cardsfolder/c/cresting_mosasaurus.txt
+++ b/forge-gui/res/cardsfolder/c/cresting_mosasaurus.txt
@@ -3,8 +3,8 @@ ManaCost:6 U U
 Types:Creature Dinosaur
 PT:4/8
 K:Emerge:6 U
-T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigBounceAll | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, return each non-Dinosaur creature to its owner's hand.
+T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigBounceAll | TriggerDescription$ When CARDNAME enters, if you cast it, return each non-Dinosaur creature to its owner's hand.
 SVar:TrigBounceAll:DB$ ChangeZoneAll | ChangeType$ Creature.nonDinosaur | Origin$ Battlefield | Destination$ Hand
 DeckHas:Ability$Sacrifice
 DeckHints:Type$Dinosaur
-Oracle:Emerge {6}{U} (You may cast this spell by sacrificing a creature and paying the emerge cost reduced by that creature's mana value.)\nWhen Cresting Mosasaurus enters the battlefield, if you cast it, return each non-Dinosaur creature to its owner's hand.
+Oracle:Emerge {6}{U} (You may cast this spell by sacrificing a creature and paying the emerge cost reduced by that creature's mana value.)\nWhen Cresting Mosasaurus enters, if you cast it, return each non-Dinosaur creature to its owner's hand.
--- a/forge-gui/res/cardsfolder/c/crew_captain.txt
+++ b/forge-gui/res/cardsfolder/c/crew_captain.txt
@@ -3,6 +3,6 @@ ManaCost:B R G
 Types:Creature Human Warrior
 PT:4/2
 K:Haste
-S:Mode$ Continuous | Affected$ Card.Self+ThisTurnEntered | AddKeyword$ Indestructible | Description$ CARDNAME has indestructible as long as it entered the battlefield this turn.
+S:Mode$ Continuous | Affected$ Card.Self+ThisTurnEntered | AddKeyword$ Indestructible | Description$ CARDNAME has indestructible as long as it entered this turn.
 SVar:PlayMain1:TRUE
-Oracle:Haste\nCrew Captain has indestructible as long as it entered the battlefield this turn.
+Oracle:Haste\nCrew Captain has indestructible as long as it entered this turn.
--- a/forge-gui/res/cardsfolder/c/crimestopper_sprite.txt
+++ b/forge-gui/res/cardsfolder/c/crimestopper_sprite.txt
@@ -4,7 +4,7 @@ Types:Creature Faerie Detective
 PT:2/2
 S:Mode$ OptionalCost | EffectZone$ All | ValidCard$ Card.Self | ValidSA$ Spell | Cost$ CollectEvidence<6> | Description$ As an additional cost to cast this spell, you may collect evidence 6. (Exile cards with total mana value 6 or greater from your graveyard.)
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature. If evidence was collected, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap target creature. If evidence was collected, 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 | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBStun
 SVar:DBStun:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1 | ConditionDefined$ CastSA>Collected | ConditionPresent$ Card
-Oracle:As an additional cost to cast this spell, you may collect evidence 6. (Exile cards with total mana value 6 or greater from your graveyard.)\nFlying\nWhen Crimestopper Sprite enters the battlefield, tap target creature. If evidence was collected, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+Oracle:As an additional cost to cast this spell, you may collect evidence 6. (Exile cards with total mana value 6 or greater from your graveyard.)\nFlying\nWhen Crimestopper Sprite enters, tap target creature. If evidence was collected, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
--- a/forge-gui/res/cardsfolder/c/crimson_fleet_commodore.txt
+++ b/forge-gui/res/cardsfolder/c/crimson_fleet_commodore.txt
@@ -3,6 +3,6 @@ ManaCost:3 R
 Types:Creature Ogre Pirate
 PT:5/2
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
-Oracle:Trample\nWhen Crimson Fleet Commodore enters the battlefield, you become the monarch.
+Oracle:Trample\nWhen Crimson Fleet Commodore enters, you become the monarch.
--- a/forge-gui/res/cardsfolder/c/crocanura.txt
+++ b/forge-gui/res/cardsfolder/c/crocanura.txt
@@ -5,4 +5,4 @@ PT:1/3
 K:Reach
 K:Evolve
 DeckHas:Ability$Counters
-Oracle:Reach (This creature can block creatures with flying.)\nEvolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
+Oracle:Reach (This creature can block creatures with flying.)\nEvolve (Whenever a creature you control enters, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
--- a/forge-gui/res/cardsfolder/c/crocodile_of_the_crossing.txt
+++ b/forge-gui/res/cardsfolder/c/crocodile_of_the_crossing.txt
@@ -3,6 +3,6 @@ ManaCost:3 G
 Types:Creature Crocodile
 PT:5/4
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a -1/-1 counter on target creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put a -1/-1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 1
-Oracle:Haste\nWhen Crocodile of the Crossing enters the battlefield, put a -1/-1 counter on target creature you control.
+Oracle:Haste\nWhen Crocodile of the Crossing enters, put a -1/-1 counter on target creature you control.
--- a/forge-gui/res/cardsfolder/c/crookclaw_transmuter.txt
+++ b/forge-gui/res/cardsfolder/c/crookclaw_transmuter.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Wizard
 PT:3/1
 K:Flash
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, switch target creature's power and toughness until end of turn.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, switch target creature's power and toughness until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched
 AI:RemoveDeck:All
-Oracle:Flash\nFlying\nWhen Crookclaw Transmuter enters the battlefield, switch target creature's power and toughness until end of turn.
+Oracle:Flash\nFlying\nWhen Crookclaw Transmuter enters, switch target creature's power and toughness until end of turn.
--- a/forge-gui/res/cardsfolder/c/crooked_custodian.txt
+++ b/forge-gui/res/cardsfolder/c/crooked_custodian.txt
@@ -2,5 +2,6 @@ Name:Crooked Custodian
 ManaCost:1 B
 Types:Creature Ogre Rogue
 PT:3/2
-K:CARDNAME enters the battlefield tapped.
-Oracle:Crooked Custodian 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
+Oracle:Crooked Custodian enters tapped.
--- a/forge-gui/res/cardsfolder/c/crosiss_catacombs.txt
+++ b/forge-gui/res/cardsfolder/c/crosiss_catacombs.txt
@@ -2,7 +2,7 @@ Name:Crosis's Catacombs
 ManaCost:no cost
 Types:Land Lair
 A:AB$ Mana | Cost$ T | Produced$ Combo U B R | SpellDescription$ Add {U}, {B}, or {R}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters, sacrifice it unless you return a non-Lair land you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.nonLair+YouCtrl
-Oracle:When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {U}, {B}, or {R}.
+Oracle:When Crosis's Catacombs enters, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {U}, {B}, or {R}.
--- a/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
+++ b/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
@@ -2,7 +2,7 @@ Name:Crossroads Candleguide
 ManaCost:4
 Types:Artifact Creature Scarecrow
 PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target card from a graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, exile up to one target card from a graveyard.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
 A:AB$ Mana | Cost$ 2 | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:When Crossroads Candleguide enters the battlefield, exile up to one target card from a graveyard.\n{2}: Add one mana of any color.
+Oracle:When Crossroads Candleguide enters, exile up to one target card from a graveyard.\n{2}: Add one mana of any color.
--- a/forge-gui/res/cardsfolder/c/crossway_vampire.txt
+++ b/forge-gui/res/cardsfolder/c/crossway_vampire.txt
@@ -2,7 +2,7 @@ Name:Crossway Vampire
 ManaCost:1 R R
 Types:Creature Vampire
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCanNotBlock | TriggerDescription$ When CARDNAME enters the battlefield, target creature can't block this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCanNotBlock | TriggerDescription$ When CARDNAME enters, target creature can't block this turn.
 SVar:TrigCanNotBlock:DB$ Pump | ValidTgts$ Creature | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
 SVar:PlayMain1:TRUE
-Oracle:When Crossway Vampire enters the battlefield, target creature can't block this turn.
+Oracle:When Crossway Vampire enters, target creature can't block this turn.
--- a/forge-gui/res/cardsfolder/c/crovax_the_cursed.txt
+++ b/forge-gui/res/cardsfolder/c/crovax_the_cursed.txt
@@ -11,4 +11,4 @@ SVar:DBSubCounter:DB$ RemoveCounter | CounterType$ P1P1 | CounterNum$ 1 | Condit
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
 DeckHas:Ability$Sacrifice|Counters
-Oracle:Crovax the Cursed enters the battlefield with four +1/+1 counters on it.\nAt the beginning of your upkeep, you may sacrifice a creature. If you do, put a +1/+1 counter on Crovax. If you don't, remove a +1/+1 counter from Crovax.\n{B}: Crovax gains flying until end of turn.
+Oracle:Crovax the Cursed enters with four +1/+1 counters on it.\nAt the beginning of your upkeep, you may sacrifice a creature. If you do, put a +1/+1 counter on Crovax. If you don't, remove a +1/+1 counter from Crovax.\n{B}: Crovax gains flying until end of turn.
--- a/forge-gui/res/cardsfolder/c/crow_of_dark_tidings.txt
+++ b/forge-gui/res/cardsfolder/c/crow_of_dark_tidings.txt
@@ -3,9 +3,9 @@ ManaCost:2 B
 Types:Creature Zombie Bird
 PT:2/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield or dies, mill two cards. (Put the top two cards of your library into your graveyard.)
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or dies, mill two cards. (Put the top two cards of your library into your graveyard.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters or dies, mill two cards. (Put the top two cards of your library into your graveyard.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ When CARDNAME enters or dies, mill two cards. (Put the top two cards of your library into your graveyard.)
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
 DeckHints:Ability$Delirium
 DeckHas:Ability$Graveyard
-Oracle:Flying\nWhen Crow of Dark Tidings enters the battlefield or dies, mill two cards. (Put the top two cards of your library into your graveyard.)
+Oracle:Flying\nWhen Crow of Dark Tidings enters or dies, mill two cards. (Put the top two cards of your library into your graveyard.)
--- a/forge-gui/res/cardsfolder/c/crowd_control_warden.txt
+++ b/forge-gui/res/cardsfolder/c/crowd_control_warden.txt
@@ -3,9 +3,9 @@ ManaCost:3 G W
 Types:Creature Centaur Soldier
 PT:4/4
 K:Disguise:3 GW GW
-K:etbCounter:P1P1:X:no Condition:As CARDNAME enters the battlefield or is turned face up, put X +1/+1 counters on it, where X is the number of other creatures you control.
-R:Event$ TurnFaceUp | ValidCard$ Card.Self | ReplaceWith$ AddCounters | ActiveZones$ Battlefield | Secondary$ True | Description$ As CARDNAME enters the battlefield or is turned face up, put X +1/+1 counters on it, where X is the number of other creatures you control.
+K:etbCounter:P1P1:X:no Condition:As CARDNAME enters or is turned face up, put X +1/+1 counters on it, where X is the number of other creatures you control.
+R:Event$ TurnFaceUp | ValidCard$ Card.Self | ReplaceWith$ AddCounters | ActiveZones$ Battlefield | Secondary$ True | Description$ As CARDNAME enters or is turned face up, put X +1/+1 counters on it, where X is the number of other creatures you control.
 SVar:AddCounters:DB$ PutCounter | Defined$ Self | CounterNum$ X | CounterType$ P1P1
 SVar:X:Count$Valid Creature.YouCtrl+Other
 DeckHas:Ability$Counters
-Oracle:As Crowd-Control Warden enters the battlefield or is turned face up, put X +1/+1 counters on it, where X is the number of other creatures you control.\nDisguise {3}{G/W}{G/W} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
+Oracle:As Crowd-Control Warden enters or is turned face up, put X +1/+1 counters on it, where X is the number of other creatures you control.\nDisguise {3}{G/W}{G/W} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
--- a/forge-gui/res/cardsfolder/c/crown_hunter_hireling.txt
+++ b/forge-gui/res/cardsfolder/c/crown_hunter_hireling.txt
@@ -2,7 +2,7 @@ Name:Crown-Hunter Hireling
 ManaCost:4 R
 Types:Creature Ogre Mercenary
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 S:Mode$ CantAttack | ValidCard$ Card.Self | UnlessDefender$ isMonarch | Description$ CARDNAME can't attack unless defending player is the monarch.
-Oracle:When Crown-Hunter Hireling enters the battlefield, you become the monarch.\nCrown-Hunter Hireling can't attack unless defending player is the monarch.
+Oracle:When Crown-Hunter Hireling enters, you become the monarch.\nCrown-Hunter Hireling can't attack unless defending player is the monarch.
--- a/forge-gui/res/cardsfolder/c/crown_of_gondor.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_gondor.txt
@@ -3,10 +3,10 @@ ManaCost:3
 Types:Legendary Artifact Equipment
 K:Equip:4:::ReduceCost$ Monarch:This ability costs {3} less to activate if you're the monarch
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each creature you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Legendary+YouCtrl | TriggerZones$ Battlefield | CheckSVar$ NoMonarch | SVarCompare$ EQ0 | Execute$ TrigMonarch | TriggerDescription$ When a legendary creature enters the battlefield under your control, if there is no monarch, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Legendary+YouCtrl | TriggerZones$ Battlefield | CheckSVar$ NoMonarch | SVarCompare$ EQ0 | Execute$ TrigMonarch | TriggerDescription$ When a legendary creature you control enters, if there is no monarch, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Monarch:Count$Monarch.3.0
 SVar:NoMonarch:PlayerCountPlayers$HasPropertyisMonarch
 DeckHints:Type$Creature & Type$Legendary
-Oracle:Equipped creature gets +1/+1 for each creature you control.\nWhen a legendary creature enters the battlefield under your control, if there is no monarch, you become the monarch.\nEquip {4}. This ability costs {3} less to activate if you're the monarch.
+Oracle:Equipped creature gets +1/+1 for each creature you control.\nWhen a legendary creature you control enters, if there is no monarch, you become the monarch.\nEquip {4}. This ability costs {3} less to activate if you're the monarch.
--- a/forge-gui/res/cardsfolder/c/cruel_grimnarch.txt
+++ b/forge-gui/res/cardsfolder/c/cruel_grimnarch.txt
@@ -3,11 +3,11 @@ ManaCost:5 B
 Types:Creature Phyrexian Cleric
 PT:5/5
 K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card. For each opponent who can't, you gain 4 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, each opponent discards a card. For each opponent who can't, you gain 4 life.
 SVar:TrigDiscard:DB$ Discard | Mode$ TgtChoose | Defined$ Opponent | RememberDiscarded$ True | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:SVar$Y/Times.4
 SVar:Y:PlayerCountOpponents$Amount/Minus.Remembered$Amount
 DeckHas:Ability$LifeGain
-Oracle:Deathtouch\nWhen Cruel Grimnarch enters the battlefield, each opponent discards a card. For each opponent who can't, you gain 4 life.
+Oracle:Deathtouch\nWhen Cruel Grimnarch enters, each opponent discards a card. For each opponent who can't, you gain 4 life.
--- a/forge-gui/res/cardsfolder/c/crumbling_necropolis.txt
+++ b/forge-gui/res/cardsfolder/c/crumbling_necropolis.txt
@@ -1,6 +1,7 @@
 Name:Crumbling Necropolis
 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 U B R | SpellDescription$ Add {U}, {B}, or {R}.
-Oracle:Crumbling Necropolis enters the battlefield tapped.\n{T}: Add {U}, {B}, or {R}.
+Oracle:Crumbling Necropolis enters tapped.\n{T}: Add {U}, {B}, or {R}.
--- a/forge-gui/res/cardsfolder/c/crumbling_vestige.txt
+++ b/forge-gui/res/cardsfolder/c/crumbling_vestige.txt
@@ -1,9 +1,10 @@
 Name:Crumbling Vestige
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add one mana of any color.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters, add one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 DeckHas:Ability$Mana.Colorless
-Oracle:Crumbling Vestige enters the battlefield tapped.\nWhen Crumbling Vestige enters the battlefield, add one mana of any color.\n{T}: Add {C}. ({C} represents colorless mana.)
+Oracle:Crumbling Vestige enters tapped.\nWhen Crumbling Vestige enters, add one mana of any color.\n{T}: Add {C}. ({C} represents colorless mana.)
--- a/forge-gui/res/cardsfolder/c/crypt_angel.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_angel.txt
@@ -4,7 +4,7 @@ Types:Creature Angel
 PT:3/3
 K:Flying
 K:Protection from white
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target blue or red creature card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return target blue or red creature card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Blue+YouCtrl,Creature.Red+YouCtrl
 DeckHints:Color$Blue|Red
-Oracle:Flying, protection from white\nWhen Crypt Angel enters the battlefield, return target blue or red creature card from your graveyard to your hand.
+Oracle:Flying, protection from white\nWhen Crypt Angel enters, return target blue or red creature card from your graveyard to your hand.
--- a/forge-gui/res/cardsfolder/c/crypt_champion.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_champion.txt
@@ -3,10 +3,10 @@ ManaCost:3 B
 Types:Creature Zombie
 PT:2/2
 K:Double Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, each player puts a creature card with mana value 3 or less from their graveyard onto the battlefield.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | ManaNotSpent$ R | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless {R} was spent to cast it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, each player puts a creature card with mana value 3 or less from their graveyard onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | ManaNotSpent$ R | TriggerDescription$ When CARDNAME enters, sacrifice it unless {R} was spent to cast it.
 SVar:TrigChangeZone:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.RememberedPlayerCtrl+cmcLE3 | ChangeNum$ 1 | Hidden$ True | DefinedPlayer$ Player.IsRemembered | Chooser$ Player.IsRemembered | Mandatory$ True
 SVar:TrigSac:DB$ Sacrifice
 SVar:ManaNeededToAvoidNegativeEffect:red
-Oracle:Double strike\nWhen Crypt Champion enters the battlefield, each player puts a creature card with mana value 3 or less from their graveyard onto the battlefield.\nWhen Crypt Champion enters the battlefield, sacrifice it unless {R} was spent to cast it.
+Oracle:Double strike\nWhen Crypt Champion enters, each player puts a creature card with mana value 3 or less from their graveyard onto the battlefield.\nWhen Crypt Champion enters, sacrifice it unless {R} was spent to cast it.
--- a/forge-gui/res/cardsfolder/c/crypt_lurker.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_lurker.txt
@@ -2,9 +2,9 @@ Name:Crypt Lurker
 ManaCost:3 B
 Types:Creature Horror
 PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoice | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may sacrifice a creature or discard a creature card. If you do, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoice | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may sacrifice a creature or discard a creature card. If you do, draw a card.
 SVar:TrigChoice:DB$ GenericChoice | Choices$ DBSacToDraw,DBDiscardToDraw
 SVar:DBSacToDraw:DB$ Draw | UnlessCost$ Sac<1/Creature> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ Sacrifice a creature: Draw a card.
 SVar:DBDiscardToDraw:DB$ Draw | UnlessCost$ Discard<1/Creature> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ Discard a creature card: Draw a card.
 DeckHas:Ability$Sacrifice|Graveyard|Discard
-Oracle:When Crypt Lurker enters the battlefield, you may sacrifice a creature or discard a creature card. If you do, draw a card.
+Oracle:When Crypt Lurker enters, you may sacrifice a creature or discard a creature card. If you do, draw a card.
--- a/forge-gui/res/cardsfolder/c/crypt_of_agadeem.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_of_agadeem.txt
@@ -1,9 +1,10 @@
 Name:Crypt of Agadeem
 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$ B | SpellDescription$ Add {B}.
 A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | SpellDescription$ Add {B} for each black creature card in your graveyard.
 SVar:X:Count$ValidGraveyard Creature.Black+YouCtrl
 AI:RemoveDeck:All
-Oracle:Crypt of Agadeem enters the battlefield tapped.\n{T}: Add {B}.\n{2}, {T}: Add {B} for each black creature card in your graveyard.
+Oracle:Crypt of Agadeem enters tapped.\n{T}: Add {B}.\n{2}, {T}: Add {B} for each black creature card in your graveyard.
--- a/forge-gui/res/cardsfolder/c/crypt_of_the_eternals.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_of_the_eternals.txt
@@ -1,8 +1,8 @@
 Name:Crypt of the Eternals
 ManaCost:no cost
 Types:Land
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBGainLife | TriggerDescription$ When CARDNAME enters, you gain 1 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ 1 T | Produced$ Combo U B R | SpellDescription$ Add {U}, {B}, or {R}.
-Oracle:When Crypt of the Eternals enters the battlefield, you gain 1 life.\n{T}: Add {C}.\n{1}, {T}: Add {U}, {B}, or {R}.
+Oracle:When Crypt of the Eternals enters, you gain 1 life.\n{T}: Add {C}.\n{1}, {T}: Add {U}, {B}, or {R}.
--- a/forge-gui/res/cardsfolder/c/cryptborn_horror.txt
+++ b/forge-gui/res/cardsfolder/c/cryptborn_horror.txt
@@ -3,7 +3,7 @@ ManaCost:1 BR BR
 Types:Creature Horror
 PT:0/0
 K:Trample
-K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total life lost by your opponents this turn.
+K:etbCounter:P1P1:X:no Condition:CARDNAME enters with X +1/+1 counters on it, where X is the total life lost by your opponents this turn.
 SVar:X:Count$LifeOppsLostThisTurn
 SVar:NeedsToPlayVar:X GE3
-Oracle:Trample\nCryptborn Horror enters the battlefield with X +1/+1 counters on it, where X is the total life lost by your opponents this turn.
+Oracle:Trample\nCryptborn Horror enters with X +1/+1 counters on it, where X is the total life lost by your opponents this turn.
--- a/forge-gui/res/cardsfolder/c/cryptic_annelid.txt
+++ b/forge-gui/res/cardsfolder/c/cryptic_annelid.txt
@@ -2,8 +2,8 @@ Name:Cryptic Annelid
 ManaCost:3 U
 Types:Creature Worm Beast
 PT:1/4
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1, then scry 2, then scry 3.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry 1, then scry 2, then scry 3.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1 | SubAbility$ DBScry2
 SVar:DBScry2:DB$ Scry | ScryNum$ 2 | SubAbility$ DBScry3
 SVar:DBScry3:DB$ Scry | ScryNum$ 3
-Oracle:When Cryptic Annelid enters the battlefield, scry 1, then scry 2, then scry 3. (To scry X, look at the top X cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+Oracle:When Cryptic Annelid enters, scry 1, then scry 2, then scry 3. (To scry X, look at the top X cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
--- a/forge-gui/res/cardsfolder/c/cryptic_coat.txt
+++ b/forge-gui/res/cardsfolder/c/cryptic_coat.txt
@@ -1,11 +1,11 @@
 Name:Cryptic Coat
 ManaCost:2 U
 Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCloak | TriggerDescription$ When CARDNAME enters the battlefield, cloak the top card of your library, then attach CARDNAME to it. (To cloak a card, put it onto the battlefield face down as a 2/2 creature with ward {2}. Turn it face up any time for its mana cost if it's a creature card.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCloak | TriggerDescription$ When CARDNAME enters, cloak the top card of your library, then attach CARDNAME to it. (To cloak a card, put it onto the battlefield face down as a 2/2 creature with ward {2}. Turn it face up any time for its mana cost if it's a creature card.)
 SVar:TrigCloak:DB$ Cloak | Defined$ TopOfLibrary | RememberCloaked$ True | SubAbility$ DBAttach
 SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0 and can't be blocked.
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.EquippedBy | Secondary$ True | Description$ Equipped creature gets +1/+0 and can't be blocked.
 A:AB$ ChangeZone | Cost$ 1 U | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to its owner's hand.
-Oracle:When Cryptic Coat enters the battlefield, cloak the top card of your library, then attach Cryptic Coat to it. (To cloak a card, put it onto the battlefield face down as a 2/2 creature with ward {2}. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature gets +1/+0 and can't be blocked.\n{1}{U}: Return Cryptic Coat to its owner's hand.
+Oracle:When Cryptic Coat enters, cloak the top card of your library, then attach Cryptic Coat to it. (To cloak a card, put it onto the battlefield face down as a 2/2 creature with ward {2}. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature gets +1/+0 and can't be blocked.\n{1}{U}: Return Cryptic Coat to its owner's hand.
--- a/forge-gui/res/cardsfolder/c/cryptic_spires.txt
+++ b/forge-gui/res/cardsfolder/c/cryptic_spires.txt
@@ -2,6 +2,7 @@ Name:Cryptic Spires
 ManaCost:no cost
 Types:Land
 Text:As you create your deck, circle two of the colors below.
-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 Chosen | SpellDescription$ Add mana of either of the circled colors.
-Oracle:As you create your deck, circle two of the colors below.\nCryptic Spires enters the battlefield tapped.\n{T}: Add one mana of either of the circled colors.
+Oracle:As you create your deck, circle two of the colors below.\nCryptic Spires enters tapped.\n{T}: Add one mana of either of the circled colors.
--- a/forge-gui/res/cardsfolder/c/cryptic_trilobite.txt
+++ b/forge-gui/res/cardsfolder/c/cryptic_trilobite.txt
@@ -7,4 +7,4 @@ SVar:X:Count$xPaid
 A:AB$ Mana | Cost$ SubCounter<1/P1P1> | Produced$ C | Amount$ 2 | RestrictValid$ Activated | SpellDescription$ Add {C}{C}. Spend this mana only to activate abilities.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 DeckHas:Ability$Counters
-Oracle:Cryptic Trilobite enters the battlefield with X +1/+1 counters on it.\nRemove a +1/+1 counter from Cryptic Trilobite: Add {C}{C}. Spend this mana only to activate abilities.\n{1}, {T}: Put a +1/+1 counter on Cryptic Trilobite.
+Oracle:Cryptic Trilobite enters with X +1/+1 counters on it.\nRemove a +1/+1 counter from Cryptic Trilobite: Add {C}{C}. Spend this mana only to activate abilities.\n{1}, {T}: Put a +1/+1 counter on Cryptic Trilobite.
--- a/forge-gui/res/cardsfolder/c/cryptolith_fragment_aurora_of_emrakul.txt
+++ b/forge-gui/res/cardsfolder/c/cryptolith_fragment_aurora_of_emrakul.txt
@@ -1,14 +1,15 @@
 Name:Cryptolith Fragment
 ManaCost:3
 Types: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$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color. Each player loses 1 life.
 SVar:DBPain:DB$ LoseLife | LifeAmount$ 1 | Defined$ Player
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ LE10 | Execute$ TrigTransform | TriggerDescription$ At the beginning of your upkeep, if each player has 10 or less life, transform CARDNAME.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 SVar:X:PlayerCountPlayers$HighestLifeTotal
 AlternateMode:DoubleFaced
-Oracle:Cryptolith Fragment enters the battlefield tapped.\n{T}: Add one mana of any color. Each player loses 1 life.\nAt the beginning of your upkeep, if each player has 10 or less life, transform Cryptolith Fragment.
+Oracle:Cryptolith Fragment enters tapped.\n{T}: Add one mana of any color. Each player loses 1 life.\nAt the beginning of your upkeep, if each player has 10 or less life, transform Cryptolith Fragment.

 ALTERNATE

--- a/forge-gui/res/cardsfolder/c/crystal_grotto.txt
+++ b/forge-gui/res/cardsfolder/c/crystal_grotto.txt
@@ -1,8 +1,8 @@
 Name:Crystal Grotto
 ManaCost:no cost
 Types:Land
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:When Crystal Grotto enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
+Oracle:When Crystal Grotto enters, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
--- a/forge-gui/res/cardsfolder/c/crystal_seer.txt
+++ b/forge-gui/res/cardsfolder/c/crystal_seer.txt
@@ -3,6 +3,6 @@ ManaCost:4 U
 Types:Creature Vedalken Wizard
 PT:2/2
 A:AB$ ChangeZone | Cost$ 4 U | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to it's owner's hand.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRearrange | TriggerDescription$ When CARDNAME enters the battlefield, look at the top four cards of your library, then put them back in any order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRearrange | TriggerDescription$ When CARDNAME enters, look at the top four cards of your library, then put them back in any order.
 SVar:TrigRearrange:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 4
-Oracle:When Crystal Seer enters the battlefield, look at the top four cards of your library, then put them back in any order.\n{4}{U}: Return Crystal Seer to its owner's hand.
+Oracle:When Crystal Seer enters, look at the top four cards of your library, then put them back in any order.\n{4}{U}: Return Crystal Seer to its owner's hand.
--- a/forge-gui/res/cardsfolder/c/crystalline_crawler.txt
+++ b/forge-gui/res/cardsfolder/c/crystalline_crawler.txt
@@ -2,9 +2,9 @@ Name:Crystalline Crawler
 ManaCost:4
 Types:Artifact Creature Construct
 PT:1/1
-K:etbCounter:P1P1:X:no Condition:Converge — CARDNAME enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.
+K:etbCounter:P1P1:X:no Condition:Converge — CARDNAME enters with a +1/+1 counter on it for each color of mana spent to cast it.
 SVar:X:Count$Converge
 A:AB$ Mana | Cost$ SubCounter<1/P1P1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ PutCounter | Cost$ T | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 DeckHas:Ability$Counters
-Oracle:Converge — Crystalline Crawler enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.\nRemove a +1/+1 counter from Crystalline Crawler: Add one mana of any color.\n{T}: Put a +1/+1 counter on Crystalline Crawler.
+Oracle:Converge — Crystalline Crawler enters with a +1/+1 counter on it for each color of mana spent to cast it.\nRemove a +1/+1 counter from Crystalline Crawler: Add one mana of any color.\n{T}: Put a +1/+1 counter on Crystalline Crawler.
--- a/forge-gui/res/cardsfolder/c/cult_conscript.txt
+++ b/forge-gui/res/cardsfolder/c/cult_conscript.txt
@@ -2,9 +2,10 @@ Name:Cult Conscript
 ManaCost:B
 Types:Creature Skeleton Warrior
 PT:2/1
-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$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | CheckSVar$ X | SVarCompare$ GT0 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl+nonSkeleton
 SVar:DiscardMe:1
 SVar:SacMe:1
-Oracle:Cult Conscript enters the battlefield tapped.\n{1}{B}: Return Cult Conscript from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
+Oracle:Cult Conscript enters tapped.\n{1}{B}: Return Cult Conscript from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
--- a/forge-gui/res/cardsfolder/c/cultbrand_cinder.txt
+++ b/forge-gui/res/cardsfolder/c/cultbrand_cinder.txt
@@ -2,7 +2,7 @@ Name:Cultbrand Cinder
 ManaCost:4 BR
 Types:Creature Elemental Shaman
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a -1/-1 counter on target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put a -1/-1 counter on target creature.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | IsCurse$ True
 SVar:PlayMain1:TRUE
-Oracle:When Cultbrand Cinder enters the battlefield, put a -1/-1 counter on target creature.
+Oracle:When Cultbrand Cinder enters, put a -1/-1 counter on target creature.
--- a/forge-gui/res/cardsfolder/c/cultivator_colossus.txt
+++ b/forge-gui/res/cardsfolder/c/cultivator_colossus.txt
@@ -5,11 +5,11 @@ PT:*/*
 K:Trample
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of lands you control.
 SVar:X:Count$Valid Land.YouCtrl
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeat | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put a land card from your hand onto the battlefield tapped. If you do, draw a card and repeat this process.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeat | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may put a land card from your hand onto the battlefield tapped. If you do, draw a card and repeat this process.
 SVar:TrigRepeat:DB$ Repeat | RepeatSubAbility$ DBClear | RepeatDefined$ Remembered | RepeatPresent$ Card | RepeatSVarCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBClear:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.YouOwn | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Land
-Oracle:Trample\nCultivator Colossus's power and toughness are each equal to the number of lands you control.\nWhen Cultivator Colossus enters the battlefield, you may put a land card from your hand onto the battlefield tapped. If you do, draw a card and repeat this process.
+Oracle:Trample\nCultivator Colossus's power and toughness are each equal to the number of lands you control.\nWhen Cultivator Colossus enters, you may put a land card from your hand onto the battlefield tapped. If you do, draw a card and repeat this process.
--- a/forge-gui/res/cardsfolder/c/cultivator_of_blades.txt
+++ b/forge-gui/res/cardsfolder/c/cultivator_of_blades.txt
@@ -7,4 +7,4 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAll | OptionalDecider$
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ X | NumDef$ X
 SVar:X:Count$CardPower
 DeckHas:Ability$Counters|Token
-Oracle:Fabricate 2 (When this creature enters the battlefield, put two +1/+1 counters on it or create two 1/1 colorless Servo artifact creature tokens.)\nWhenever Cultivator of Blades attacks, you may have other attacking creatures get +X/+X until end of turn, where X is Cultivator of Blades's power.
+Oracle:Fabricate 2 (When this creature enters, put two +1/+1 counters on it or create two 1/1 colorless Servo artifact creature tokens.)\nWhenever Cultivator of Blades attacks, you may have other attacking creatures get +X/+X until end of turn, where X is Cultivator of Blades's power.
--- a/forge-gui/res/cardsfolder/c/culvert_ambusher.txt
+++ b/forge-gui/res/cardsfolder/c/culvert_ambusher.txt
@@ -3,8 +3,8 @@ ManaCost:3 G G
 Types:Creature Wurm Horror
 PT:4/5
 K:Disguise:4 G
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigProvoke | TriggerDescription$ When CARDNAME enters the battlefield or is turned face up, target creature blocks this turn if able.
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigProvoke | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or is turned face up, target creature blocks this turn if able.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigProvoke | TriggerDescription$ When CARDNAME enters or is turned face up, target creature blocks this turn if able.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigProvoke | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ When CARDNAME enters or is turned face up, target creature blocks this turn if able.
 SVar:TrigProvoke:DB$ Effect | ValidTgts$ Creature | StaticAbilities$ MustBlock | RememberObjects$ Targeted | ExileOnMoved$ Battlefield
 SVar:MustBlock:Mode$ MustBlock | ValidCreature$ Card.IsRemembered | Description$ This creature blocks this turn if able.
-Oracle:When Culvert Ambusher enters the battlefield or is turned face up, target creature blocks this turn if able.\nDisguise {4}{G} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
+Oracle:When Culvert Ambusher enters or is turned face up, target creature blocks this turn if able.\nDisguise {4}{G} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
--- a/forge-gui/res/cardsfolder/c/cunning_coyote.txt
+++ b/forge-gui/res/cardsfolder/c/cunning_coyote.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Coyote
 PT:2/2
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target creature you control gets +1/+1 and gains haste until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, another target creature you control gets +1/+1 and gains haste until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | NumAtt$ +1 | NumDef$ +1 | KW$ Haste
 K:Plot:1 R
-Oracle:Haste\nWhen Cunning Coyote enters the battlefield, another target creature you control gets +1/+1 and gains haste until end of turn.\nPlot {1}{R} (You may pay {1}{R} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
+Oracle:Haste\nWhen Cunning Coyote enters, another target creature you control gets +1/+1 and gains haste until end of turn.\nPlot {1}{R} (You may pay {1}{R} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
--- a/forge-gui/res/cardsfolder/c/cunning_geysermage.txt
+++ b/forge-gui/res/cardsfolder/c/cunning_geysermage.txt
@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Creature Human Wizard
 PT:3/2
 K:Kicker:2 U
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, return up to one other target creature to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters, if it was kicked, return up to one other target creature to its owner's hand.
 SVar:TrigKicker:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | SpellDescription$ Return up to one other target creature to its owner's hand.
-Oracle:Kicker {2}{U} (You may pay an additional {2}{U} as you cast this spell.)\nWhen Cunning Geysermage enters the battlefield, if it was kicked, return up to one other target creature to its owner's hand.
+Oracle:Kicker {2}{U} (You may pay an additional {2}{U} as you cast this spell.)\nWhen Cunning Geysermage enters, if it was kicked, return up to one other target creature to its owner's hand.
--- a/forge-gui/res/cardsfolder/c/curse_of_marit_lage.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_marit_lage.txt
@@ -2,8 +2,8 @@ Name:Curse of Marit Lage
 ManaCost:3 R R
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Island | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Islands don't untap during their controllers' untap steps.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all Islands.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters, tap all Islands.
 SVar:TrigTapAll:DB$ TapAll | ValidCards$ Island
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
-Oracle:When Curse of Marit Lage enters the battlefield, tap all Islands.\nIslands don't untap during their controllers' untap steps.
+Oracle:When Curse of Marit Lage enters, tap all Islands.\nIslands don't untap during their controllers' untap steps.
--- a/forge-gui/res/cardsfolder/c/curse_of_silence.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_silence.txt
@@ -4,9 +4,9 @@ Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | ValidTgts$ Player | AILogic$ Curse
 K:ETBReplacement:Other:DBNameCard
-SVar:DBNameCard:DB$ NameCard | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a card name.
+SVar:DBNameCard:DB$ NameCard | Defined$ You | SpellDescription$ As CARDNAME enters, choose a card name.
 S:Mode$ RaiseCost | EffectZone$ Battlefield | ValidCard$ Card.NamedCard | Type$ Spell | Activator$ Player.EnchantedBy | Amount$ 2 | Description$ Spells with the chosen name enchanted player casts cost {2} more to cast.
 T:Mode$ SpellCast | ValidCard$ Card.NamedCard | ValidActivatingPlayer$ Player.EnchantedBy | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player casts a spell with the chosen name, you may sacrifice CARDNAME. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/CARDNAME> | NumCards$ 1
 DeckHas:Ability$Sacrifice
-Oracle:Enchant player\nAs Curse of Silence enters the battlefield, choose a card name.\nSpells with the chosen name enchanted player casts cost {2} more to cast.\nWhenever enchanted player casts a spell with the chosen name, you may sacrifice Curse of Silence. If you do, draw a card.
+Oracle:Enchant player\nAs Curse of Silence enters, choose a card name.\nSpells with the chosen name enchanted player casts cost {2} more to cast.\nWhenever enchanted player casts a spell with the chosen name, you may sacrifice Curse of Silence. If you do, draw a card.
--- a/forge-gui/res/cardsfolder/c/curse_of_the_restless_dead.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_the_restless_dead.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Player | AILogic$ Curse
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Land.EnchantedPlayerCtrl | Execute$ TrigToken | TriggerDescription$ Whenever a land enters the battlefield under enchanted player's control, you create a 2/2 black Zombie creature token with decayed. (It can't block. When it attacks, sacrifice it at end of combat.)
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Land.EnchantedPlayerCtrl | Execute$ TrigToken | TriggerDescription$ Whenever a land enters under enchanted player's control, you create a 2/2 black Zombie creature token with decayed. (It can't block. When it attacks, sacrifice it at end of combat.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie_decayed | TokenOwner$ You
 DeckHas:Ability$Token
-Oracle:Enchant player\nWhenever a land enters the battlefield under enchanted player's control, you create a 2/2 black Zombie creature token with decayed. (It can't block. When it attacks, sacrifice it at end of combat.)
+Oracle:Enchant player\nWhenever a land enters under enchanted player's control, you create a 2/2 black Zombie creature token with decayed. (It can't block. When it attacks, sacrifice it at end of combat.)
--- a/forge-gui/res/cardsfolder/c/curse_of_wizardry.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_wizardry.txt
@@ -2,8 +2,8 @@ Name:Curse of Wizardry
 ManaCost:2 B B
 Types:Enchantment
 K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInHumanDeck
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters, choose a color. | AILogic$ MostProminentInHumanDeck
 T:Mode$ SpellCast | ValidCard$ Card.ChosenColor | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a spell of the chosen color, that player loses 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredActivator | LifeAmount$ 1
 AI:RemoveDeck:Random
-Oracle:As Curse of Wizardry enters the battlefield, choose a color.\nWhenever a player casts a spell of the chosen color, that player loses 1 life.
+Oracle:As Curse of Wizardry enters, choose a color.\nWhenever a player casts a spell of the chosen color, that player loses 1 life.
--- a/forge-gui/res/cardsfolder/c/cursed_courtier.txt
+++ b/forge-gui/res/cardsfolder/c/cursed_courtier.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Noble
 PT:3/3
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ role_cursed | AttachedTo$ Self
 DeckHas:Ability$Token|LifeGain & Type$Aura|Enchantment|Role
-Oracle:Lifelink\nWhen Cursed Courtier enters the battlefield, create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
+Oracle:Lifelink\nWhen Cursed Courtier enters, create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
--- a/forge-gui/res/cardsfolder/c/cursed_mirror.txt
+++ b/forge-gui/res/cardsfolder/c/cursed_mirror.txt
@@ -3,5 +3,5 @@ ManaCost:2 R
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:ETBReplacement:Copy:DBCopy:Optional
-SVar:DBCopy:DB$ Clone | Choices$ Creature | AddKeywords$ Haste | Duration$ UntilEndOfTurn | SpellDescription$ As CARDNAME enters the battlefield, you may have it become a copy of any creature on the battlefield until end of turn, except it has haste.
-Oracle:{T}: Add {R}.\nAs Cursed Mirror enters the battlefield, you may have it become a copy of any creature on the battlefield until end of turn, except it has haste.
+SVar:DBCopy:DB$ Clone | Choices$ Creature | AddKeywords$ Haste | Duration$ UntilEndOfTurn | SpellDescription$ As CARDNAME enters, you may have it become a copy of any creature on the battlefield until end of turn, except it has haste.
+Oracle:{T}: Add {R}.\nAs Cursed Mirror enters, you may have it become a copy of any creature on the battlefield until end of turn, except it has haste.
--- a/forge-gui/res/cardsfolder/c/cursed_rack.txt
+++ b/forge-gui/res/cardsfolder/c/cursed_rack.txt
@@ -2,7 +2,7 @@ Name:Cursed Rack
 ManaCost:4
 Types:Artifact
 K:ETBReplacement:Other:ChooseP
-SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | AILogic$ MostCardsInHand | SpellDescription$ As CARDNAME enters the battlefield, choose an opponent.
+SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | AILogic$ MostCardsInHand | SpellDescription$ As CARDNAME enters, choose an opponent.
 S:Mode$ Continuous | Affected$ Player.Chosen | SetMaxHandSize$ 4 | Description$ The chosen player's maximum hand size is four.
 SVar:NonStackingEffect:True
-Oracle:As Cursed Rack enters the battlefield, choose an opponent.\nThe chosen player's maximum hand size is four.
+Oracle:As Cursed Rack enters, choose an opponent.\nThe chosen player's maximum hand size is four.
--- a/forge-gui/res/cardsfolder/c/custodi_lich.txt
+++ b/forge-gui/res/cardsfolder/c/custodi_lich.txt
@@ -2,8 +2,8 @@ Name:Custodi Lich
 ManaCost:3 B B
 Types:Creature Zombie Cleric
 PT:4/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 T:Mode$ BecomeMonarch | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever you become the monarch, target player sacrifices a creature.
 SVar:TrigSac:DB$ Sacrifice | ValidTgts$ Player | SacValid$ Creature | SacMessage$ Creature
-Oracle:When Custodi Lich enters the battlefield, you become the monarch.\nWhenever you become the monarch, target player sacrifices a creature.
+Oracle:When Custodi Lich enters, you become the monarch.\nWhenever you become the monarch, target player sacrifices a creature.
--- a/forge-gui/res/cardsfolder/c/custodi_soulbinders.txt
+++ b/forge-gui/res/cardsfolder/c/custodi_soulbinders.txt
@@ -2,9 +2,9 @@ Name:Custodi Soulbinders
 ManaCost:3 W
 Types:Creature Human Cleric
 PT:0/0
-K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the number of other creatures on the battlefield.
+K:etbCounter:P1P1:X:no Condition:CARDNAME enters with X +1/+1 counters on it, where X is the number of other creatures on the battlefield.
 SVar:X:Count$Valid Creature.Other
 A:AB$ Token | Cost$ 2 W SubCounter<1/P1P1> | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | SpellDescription$ Create a 1/1 white Spirit creature token with flying.
 SVar:NeedsToPlayVar:X GE3
 DeckHas:Ability$Token
-Oracle:Custodi Soulbinders enters the battlefield with X +1/+1 counters on it, where X is the number of other creatures on the battlefield.\n{2}{W}, Remove a +1/+1 counter from Custodi Soulbinders: Create a 1/1 white Spirit creature token with flying.
+Oracle:Custodi Soulbinders enters with X +1/+1 counters on it, where X is the number of other creatures on the battlefield.\n{2}{W}, Remove a +1/+1 counter from Custodi Soulbinders: Create a 1/1 white Spirit creature token with flying.
--- a/forge-gui/res/cardsfolder/c/custodi_squire.txt
+++ b/forge-gui/res/cardsfolder/c/custodi_squire.txt
@@ -3,7 +3,7 @@ ManaCost:4 W
 Types:Creature Spirit Cleric
 PT:3/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigVote | TriggerDescription$ Will of the Council — When CARDNAME enters the battlefield, starting with you, each player votes for an artifact, creature, or enchantment card in your graveyard. Return each card with the most votes or tied for the most votes to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigVote | TriggerDescription$ Will of the Council — When CARDNAME enters, starting with you, each player votes for an artifact, creature, or enchantment card in your graveyard. Return each card with the most votes or tied for the most votes to your hand.
 SVar:TrigVote:DB$ Vote | Defined$ Player | VoteSubAbility$ DBReturn | Zone$ Graveyard | VoteCard$ Creature.YouOwn,Enchantment.YouOwn,Arifact.YouOwn | VoteMessage$ for an artifact, creature, or enchantment card in your graveyard | AILogic$ Judgment
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Hand
-Oracle:Flying\nWill of the council — When Custodi Squire enters the battlefield, starting with you, each player votes for an artifact, creature, or enchantment card in your graveyard. Return each card with the most votes or tied for most votes to your hand.
+Oracle:Flying\nWill of the council — When Custodi Squire enters, starting with you, each player votes for an artifact, creature, or enchantment card in your graveyard. Return each card with the most votes or tied for most votes to your hand.
--- a/forge-gui/res/cardsfolder/c/custodian_of_the_trove.txt
+++ b/forge-gui/res/cardsfolder/c/custodian_of_the_trove.txt
@@ -3,5 +3,6 @@ ManaCost:3
 Types:Artifact Creature Golem
 PT:2/5
 K:Defender
-K:CARDNAME enters the battlefield tapped.
-Oracle:Defender\nCustodian of the Trove 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
+Oracle:Defender\nCustodian of the Trove enters tapped.
--- a/forge-gui/res/cardsfolder/c/cyberdrive_awakener.txt
+++ b/forge-gui/res/cardsfolder/c/cyberdrive_awakener.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Construct
 PT:4/4
 K:Flying
 S:Mode$ Continuous | Affected$ Artifact.Creature+YouCtrl+Other | AddKeyword$ Flying | Description$ Other artifact creatures you control have flying.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, until end of turn, each noncreature artifact you control becomes an artifact creature with base power and toughness 4/4.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters, until end of turn, each noncreature artifact you control becomes an artifact creature with base power and toughness 4/4.
 SVar:TrigAnimate:DB$ AnimateAll | ValidCards$ Artifact.nonCreature+YouCtrl | Types$ Artifact,Creature | Power$ 4 | Toughness$ 4
 DeckHints:Type$Artifact
-Oracle:Flying\nOther artifact creatures you control have flying.\nWhen Cyberdrive Awakener enters the battlefield, until end of turn, each noncreature artifact you control becomes an artifact creature with base power and toughness 4/4.
+Oracle:Flying\nOther artifact creatures you control have flying.\nWhen Cyberdrive Awakener enters, until end of turn, each noncreature artifact you control becomes an artifact creature with base power and toughness 4/4.
--- a/forge-gui/res/cardsfolder/c/cyclone_summoner.txt
+++ b/forge-gui/res/cardsfolder/c/cyclone_summoner.txt
@@ -2,7 +2,7 @@ Name:Cyclone Summoner
 ManaCost:5 U U
 Types:Creature Giant Wizard
 PT:7/7
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.wasCastFromYourHandByYou+Self | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, return all permanents to their owners' hands except for Giants, Wizards, and lands.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.wasCastFromYourHandByYou+Self | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME enters, if you cast it from your hand, return all permanents to their owners' hands except for Giants, Wizards, and lands.
 SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Permanent.nonLand+nonGiant+nonWizard | Origin$ Battlefield | Destination$ Hand
 DeckHints:Type$Giant|Wizard
-Oracle:When Cyclone Summoner enters the battlefield, if you cast it from your hand, return all permanents to their owners' hands except for Giants, Wizards, and lands.
+Oracle:When Cyclone Summoner enters, if you cast it from your hand, return all permanents to their owners' hands except for Giants, Wizards, and lands.
--- a/forge-gui/res/cardsfolder/c/cyclops_electromancer.txt
+++ b/forge-gui/res/cardsfolder/c/cyclops_electromancer.txt
@@ -2,7 +2,7 @@ Name:Cyclops Electromancer
 ManaCost:4 R
 Types:Creature Cyclops Wizard
 PT:4/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals X damage to target creature an opponent controls, where X is the number of instant and sorcery cards in your graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters, it deals X damage to target creature an opponent controls, where X is the number of instant and sorcery cards in your graveyard.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
-Oracle:When Cyclops Electromancer enters the battlefield, it deals X damage to target creature an opponent controls, where X is the number of instant and sorcery cards in your graveyard.
+Oracle:When Cyclops Electromancer enters, it deals X damage to target creature an opponent controls, where X is the number of instant and sorcery cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cyclops_superconductor.txt
+++ b/forge-gui/res/cardsfolder/c/cyclops_superconductor.txt
@@ -3,11 +3,11 @@ ManaCost:1 U R
 Types:Creature Cyclops Wizard
 PT:2/2
 K:Prowess
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters the battlefield, you get {E}{E}{E} (three energy counters).
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters, you get {E}{E}{E} (three energy counters).
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DBTrigger | TriggerDescription$ When CARDNAME dies, you may pay {E}{E}{E}. When you do, CARDNAME deals damage equal to its power to any target.
 SVar:DBTrigger:AB$ ImmediateTrigger | Cost$ PayEnergy<3> | Execute$ TrigDamage | TriggerDescription$ When you do, CARDNAME deals damage equal to its power to any target.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
 SVar:X:Count$CardPower
 DeckHints:Type$Instant|Sorcery
-Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nWhen Cyclops Superconductor enters the battlefield, you get {E}{E}{E} (three energy counters).\nWhen Cyclops Superconductor dies, you may pay {E}{E}{E}. When you do, Cyclops Superconductor deals damage equal to its power to any target.
+Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nWhen Cyclops Superconductor enters, you get {E}{E}{E} (three energy counters).\nWhen Cyclops Superconductor dies, you may pay {E}{E}{E}. When you do, Cyclops Superconductor deals damage equal to its power to any target.
--- a/forge-gui/res/cardsfolder/c/cytoplast_manipulator.txt
+++ b/forge-gui/res/cardsfolder/c/cytoplast_manipulator.txt
@@ -7,4 +7,4 @@ A:AB$ GainControl | Cost$ U T | ValidTgts$ Creature.counters_GE1_P1P1 | TgtPromp
 AI:RemoveDeck:All
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
-Oracle:Graft 2 (This creature enters the battlefield with two +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.)\n{U}, {T}: Gain control of target creature with a +1/+1 counter on it for as long as Cytoplast Manipulator remains on the battlefield.
+Oracle:Graft 2 (This creature enters with two +1/+1 counters on it. Whenever another creature enters, you may move a +1/+1 counter from this creature onto it.)\n{U}, {T}: Gain control of target creature with a +1/+1 counter on it for as long as Cytoplast Manipulator remains on the battlefield.
--- a/forge-gui/res/cardsfolder/c/cytoplast_root_kin.txt
+++ b/forge-gui/res/cardsfolder/c/cytoplast_root_kin.txt
@@ -3,9 +3,9 @@ ManaCost:2 G G
 Types:Creature Elemental Mutant
 PT:0/0
 K:Graft:4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each other creature you control with a +1/+1 counter on it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on each other creature you control with a +1/+1 counter on it.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.StrictlyOther+YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ MoveCounter | Cost$ 2 | Defined$ Self | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Move a +1/+1 counter from target creature you control onto CARDNAME.
 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.)\nWhen Cytoplast Root-Kin enters the battlefield, put a +1/+1 counter on each other creature you control with a +1/+1 counter on it.\n{2}: Move a +1/+1 counter from target creature you control onto Cytoplast Root-Kin.
+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.)\nWhen Cytoplast Root-Kin enters, put a +1/+1 counter on each other creature you control with a +1/+1 counter on it.\n{2}: Move a +1/+1 counter from target creature you control onto Cytoplast Root-Kin.
--- a/forge-gui/res/cardsfolder/c/cytospawn_shambler.txt
+++ b/forge-gui/res/cardsfolder/c/cytospawn_shambler.txt
@@ -7,4 +7,4 @@ A:AB$ Pump | Cost$ G | ValidTgts$ Creature.counters_GE1_P1P1 | TgtPrompt$ Select
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
 SVar:AIGraftPreference:DontMoveCounterIfLethal
-Oracle:Graft 6 (This creature enters the battlefield with six +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.)\n{G}: Target creature with a +1/+1 counter on it gains trample until end of turn.
+Oracle:Graft 6 (This creature enters with six +1/+1 counters on it. Whenever another creature enters, you may move a +1/+1 counter from this creature onto it.)\n{G}: Target creature with a +1/+1 counter on it gains trample until end of turn.