From 29debff0ce5ab32c07c75fe628c7f9cb30f8be3a Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 25 Jan 2023 22:22:57 +0100
Subject: [PATCH] Update cards

---
 forge-gui/res/cardsfolder/a/ahn_crop_champion.txt     | 5 ++---
 forge-gui/res/cardsfolder/b/battlefield_scavenger.txt | 2 +-
 forge-gui/res/cardsfolder/b/bitterblade_warrior.txt   | 5 ++---
 forge-gui/res/cardsfolder/c/champion_of_rhonas.txt    | 5 ++---
 forge-gui/res/cardsfolder/c/combat_celebrant.txt      | 5 ++---
 forge-gui/res/cardsfolder/d/devoted_crop_mate.txt     | 5 ++---
 forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt    | 5 ++---
 forge-gui/res/cardsfolder/g/glory_bound_initiate.txt  | 5 ++---
 forge-gui/res/cardsfolder/g/gust_walker.txt           | 5 ++---
 forge-gui/res/cardsfolder/h/hooded_brawler.txt        | 5 ++---
 forge-gui/res/cardsfolder/k/khenra_scrapper.txt       | 5 ++---
 forge-gui/res/cardsfolder/n/nef_crop_entangler.txt    | 5 ++---
 forge-gui/res/cardsfolder/o/oketras_avenger.txt       | 5 ++---
 forge-gui/res/cardsfolder/r/resolute_survivors.txt    | 2 +-
 forge-gui/res/cardsfolder/r/rhet_crop_spearmaster.txt | 5 ++---
 forge-gui/res/cardsfolder/r/rhonass_stalwart.txt      | 5 ++---
 forge-gui/res/cardsfolder/t/tah_crop_elite.txt        | 5 ++---
 forge-gui/res/cardsfolder/t/trueheart_twins.txt       | 2 +-
 forge-gui/res/cardsfolder/v/vizier_of_the_true.txt    | 2 +-
 forge-gui/res/cardsfolder/w/watchful_naga.txt         | 5 ++---
 20 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/ahn_crop_champion.txt b/forge-gui/res/cardsfolder/a/ahn_crop_champion.txt
index ae5068526ca..79d8471020c 100644
--- a/forge-gui/res/cardsfolder/a/ahn_crop_champion.txt
+++ b/forge-gui/res/cardsfolder/a/ahn_crop_champion.txt
@@ -2,9 +2,8 @@ Name:Ahn-Crop Champion
 ManaCost:2 G W
 Types:Creature Human Warrior
 PT:4/4
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigUntapAll | TriggerDescription$ When you exert CARDNAME, untap all other creatures you control.
-SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl+Other
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigUntapAll | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, untap all other creatures you control.
+SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl+Other | SpellDescription$ When you do, untap all other creatures you control.
 SVar:AIExertCondition:NumCreats GE3
 SVar:NumCreats:Count$Valid Creature.YouCtrl+tapped
 Oracle:You may exert Ahn-Crop Champion as it attacks. When you do, untap all other creatures you control. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/b/battlefield_scavenger.txt b/forge-gui/res/cardsfolder/b/battlefield_scavenger.txt
index 9ee9b17dd0c..e2422154f59 100644
--- a/forge-gui/res/cardsfolder/b/battlefield_scavenger.txt
+++ b/forge-gui/res/cardsfolder/b/battlefield_scavenger.txt
@@ -2,7 +2,7 @@ Name:Battlefield Scavenger
 ManaCost:1 R
 Types:Creature Jackal Rogue
 PT:2/2
-K:You may exert CARDNAME as it attacks.
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. (It won't untap during your next untap step.)
 T:Mode$ Exerted | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever you exert a creature, you may discard a card. If you do, draw a card.
 // This code presumes that you are only ever allowed to exert creatures you control. If this is changed in the future, it will need an update.
 SVar:TrigDiscard:AB$ Draw | NumCards$ 1 | Cost$ Discard<1/Card>
diff --git a/forge-gui/res/cardsfolder/b/bitterblade_warrior.txt b/forge-gui/res/cardsfolder/b/bitterblade_warrior.txt
index 2886c38aed3..825ec56e07d 100644
--- a/forge-gui/res/cardsfolder/b/bitterblade_warrior.txt
+++ b/forge-gui/res/cardsfolder/b/bitterblade_warrior.txt
@@ -2,7 +2,6 @@ Name:Bitterblade Warrior
 ManaCost:1 G
 Types:Creature Jackal Warrior
 PT:2/2
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+0 and gains deathtouch until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | KW$ Deathtouch
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+0 and gains deathtouch until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | KW$ Deathtouch | SpellDescription$ When you do, it gets +1/+0 and gains deathtouch until end of turn.
 Oracle:You may exert Bitterblade Warrior as it attacks. When you do, it gets +1/+0 and gains deathtouch until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/c/champion_of_rhonas.txt b/forge-gui/res/cardsfolder/c/champion_of_rhonas.txt
index 1b0a85774b9..2c37e9258ba 100644
--- a/forge-gui/res/cardsfolder/c/champion_of_rhonas.txt
+++ b/forge-gui/res/cardsfolder/c/champion_of_rhonas.txt
@@ -2,7 +2,6 @@ Name:Champion of Rhonas
 ManaCost:3 G
 Types:Creature Jackal Warrior
 PT:3/3
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When you exert CARDNAME, you may put a creature card from your hand onto the battlefield.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ You may put a creature card from your hand onto the battlefield.
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigChangeZone | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, you may put a creature card from your hand onto the battlefield. (An exerted creature won't untap during your next untap step.)
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ When you do, you may put a creature card from your hand onto the battlefield.
 Oracle:You may exert Champion of Rhonas as it attacks. When you do, you may put a creature card from your hand onto the battlefield. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/c/combat_celebrant.txt b/forge-gui/res/cardsfolder/c/combat_celebrant.txt
index c185ae88da6..c776b3c635b 100644
--- a/forge-gui/res/cardsfolder/c/combat_celebrant.txt
+++ b/forge-gui/res/cardsfolder/c/combat_celebrant.txt
@@ -2,8 +2,7 @@ Name:Combat Celebrant
 ManaCost:2 R
 Types:Creature Human Warrior
 PT:4/1
-S:Mode$ Continuous | Affected$ Creature.Self+notExertedThisTurn | AddKeyword$ You may exert CARDNAME as it attacks. | Description$ If CARDNAME hasn't been exerted this turn, you may exert it as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigUntapAll | TriggerDescription$ When you exert CARDNAME, untap all other creatures you control and after this phase, there is an additional combat phase.
-SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl+Other | SubAbility$ DBAddCombat
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | IsPresent$ Creature.Self+notExertedThisTurn | Trigger$ TrigUntapAll | Cost$ Exert<1/CARDNAME> | Description$ If Combat Celebrant hasn't been exerted this turn, you may exert it as it attacks. When you do, untap all other creatures you control and after this phase, there is an additional combat phase. (An exerted creature won't untap during your next untap step.)
+SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl+Other | SubAbility$ DBAddCombat | SpellDescription$ When you do, untap all other creatures you control and after this phase, there is an additional combat phase.
 SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ Combat | AfterPhase$ EndCombat
 Oracle:If Combat Celebrant hasn't been exerted this turn, you may exert it as it attacks. When you do, untap all other creatures you control and after this phase, there is an additional combat phase. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/d/devoted_crop_mate.txt b/forge-gui/res/cardsfolder/d/devoted_crop_mate.txt
index d7161cadef4..60337a666d0 100644
--- a/forge-gui/res/cardsfolder/d/devoted_crop_mate.txt
+++ b/forge-gui/res/cardsfolder/d/devoted_crop_mate.txt
@@ -2,7 +2,6 @@ Name:Devoted Crop-Mate
 ManaCost:2 W
 Types:Creature Human Warrior
 PT:3/2
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When you exert CARDNAME, return target creature card with mana value 2 or less from your graveyard to the battlefield.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE2 | TgtPrompt$ Select target creature card with mana value 2 or less in your graveyard
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigChangeZone | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, return target creature card with mana value 2 or less from your graveyard to the battlefield. (An exerted creature won't untap during your next untap step.)
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE2 | TgtPrompt$ Select target creature card with mana value 2 or less in your graveyard | SpellDescription$ When you do, return target creature card with mana value 2 or less from your graveyard to the battlefield.
 Oracle:You may exert Devoted Crop-Mate as it attacks. When you do, return target creature card with mana value 2 or less from your graveyard to the battlefield. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt b/forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt
index 67d047a890a..9edaa5e76c2 100644
--- a/forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt
+++ b/forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt
@@ -2,7 +2,6 @@ Name:Emberhorn Minotaur
 ManaCost:3 R
 Types:Creature Minotaur Warrior
 PT:4/3
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+1 and gains menace until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Menace
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+1 and gains menace until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Menace | SpellDescription$ When you do, it gets +1/+1 and gains menace until end of turn.
 Oracle:You may exert Emberhorn Minotaur as it attacks. When you do, it gets +1/+1 and gains menace until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/g/glory_bound_initiate.txt b/forge-gui/res/cardsfolder/g/glory_bound_initiate.txt
index b3b8303e1a6..f717c545a1e 100644
--- a/forge-gui/res/cardsfolder/g/glory_bound_initiate.txt
+++ b/forge-gui/res/cardsfolder/g/glory_bound_initiate.txt
@@ -2,7 +2,6 @@ Name:Glory-Bound Initiate
 ManaCost:1 W
 Types:Creature Human Warrior
 PT:3/1
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+3 and gains lifelink until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 3 | KW$ Lifelink
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+3 and gains lifelink until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 3 | KW$ Lifelink | SpellDescription$ When you do, it gets +1/+3 and gains lifelink until end of turn.
 Oracle:You may exert Glory-Bound Initiate as it attacks. When you do, it gets +1/+3 and gains lifelink until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/g/gust_walker.txt b/forge-gui/res/cardsfolder/g/gust_walker.txt
index 3ebda713e00..7349d243bd3 100644
--- a/forge-gui/res/cardsfolder/g/gust_walker.txt
+++ b/forge-gui/res/cardsfolder/g/gust_walker.txt
@@ -2,7 +2,6 @@ Name:Gust Walker
 ManaCost:1 W
 Types:Creature Human Wizard
 PT:2/2
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+1 and gains flying until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+1 and gains flying until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Flying | SpellDescription$ When you do, it gets +1/+1 and gains flying until end of turn.
 Oracle:You may exert Gust Walker as it attacks. When you do, it gets +1/+1 and gains flying until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/h/hooded_brawler.txt b/forge-gui/res/cardsfolder/h/hooded_brawler.txt
index e0c8b4b6ceb..0ebaaa1b844 100644
--- a/forge-gui/res/cardsfolder/h/hooded_brawler.txt
+++ b/forge-gui/res/cardsfolder/h/hooded_brawler.txt
@@ -2,7 +2,6 @@ Name:Hooded Brawler
 ManaCost:2 G
 Types:Creature Naga Warrior
 PT:3/2
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +2/+2 until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ When you do, it gets +2/+2 until end of turn.
 Oracle:You may exert Hooded Brawler as it attacks. When you do, it gets +2/+2 until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/k/khenra_scrapper.txt b/forge-gui/res/cardsfolder/k/khenra_scrapper.txt
index 359d368747e..7a88f9e7d5d 100644
--- a/forge-gui/res/cardsfolder/k/khenra_scrapper.txt
+++ b/forge-gui/res/cardsfolder/k/khenra_scrapper.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Jackal Warrior
 PT:2/3
 K:Menace
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +2/+0 until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | SpellDescription$ When you do, it gets +2/+0 until end of turn.
 Oracle:Menace\nYou may exert Khenra Scrapper as it attacks. When you do, it gets +2/+0 until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/n/nef_crop_entangler.txt b/forge-gui/res/cardsfolder/n/nef_crop_entangler.txt
index d839659a650..e2dfd2c3133 100644
--- a/forge-gui/res/cardsfolder/n/nef_crop_entangler.txt
+++ b/forge-gui/res/cardsfolder/n/nef_crop_entangler.txt
@@ -3,7 +3,6 @@ ManaCost:1 R
 Types:Creature Human Warrior
 PT:2/1
 K:Trample
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 2
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+2 until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 2 | SpellDescription$ When you do, it gets +1/+2 until end of turn.
 Oracle:Trample\nYou may exert Nef-Crop Entangler as it attacks. When you do, it gets +1/+2 until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/o/oketras_avenger.txt b/forge-gui/res/cardsfolder/o/oketras_avenger.txt
index c36e22193de..d96f4515a47 100644
--- a/forge-gui/res/cardsfolder/o/oketras_avenger.txt
+++ b/forge-gui/res/cardsfolder/o/oketras_avenger.txt
@@ -2,7 +2,6 @@ Name:Oketra's Avenger
 ManaCost:1 W
 Types:Creature Human Warrior
 PT:3/1
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, prevent all combat damage that would be dealt to it this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Prevent all combat damage that would be dealt to CARDNAME.
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, prevent all combat damage that would be dealt to it this turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Prevent all combat damage that would be dealt to CARDNAME. | SpellDescription$ When you do, prevent all combat damage that would be dealt to it this turn.
 Oracle:You may exert Oketra's Avenger as it attacks. When you do, prevent all combat damage that would be dealt to it this turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/r/resolute_survivors.txt b/forge-gui/res/cardsfolder/r/resolute_survivors.txt
index eb53d16b3cd..658f1fde589 100644
--- a/forge-gui/res/cardsfolder/r/resolute_survivors.txt
+++ b/forge-gui/res/cardsfolder/r/resolute_survivors.txt
@@ -2,7 +2,7 @@ Name:Resolute Survivors
 ManaCost:1 R W
 Types:Creature Human Warrior
 PT:3/3
-K:You may exert CARDNAME as it attacks.
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. (It won't untap during your next untap step.)
 T:Mode$ Exerted | ValidCard$ Creature.YouCtrl | Execute$ TrigDamageAll | TriggerZones$ Battlefield | TriggerDescription$ Whenever you exert a creature, CARDNAME deals 1 damage to each opponent and you gain 1 life.
 // This code presumes that you are only ever allowed to exert creatures you control. If this is changed in the future, it will need an update.
 SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 1 | SubAbility$ DBGainLife
diff --git a/forge-gui/res/cardsfolder/r/rhet_crop_spearmaster.txt b/forge-gui/res/cardsfolder/r/rhet_crop_spearmaster.txt
index 5724dcdd088..c98a78b03a9 100644
--- a/forge-gui/res/cardsfolder/r/rhet_crop_spearmaster.txt
+++ b/forge-gui/res/cardsfolder/r/rhet_crop_spearmaster.txt
@@ -2,7 +2,6 @@ Name:Rhet-Crop Spearmaster
 ManaCost:2 W
 Types:Creature Human Warrior
 PT:3/1
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+0 and gains first strike until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | KW$ First Strike
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+0 and gains first strike until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | KW$ First Strike | SpellDescription$ When you do, it gets +1/+0 and gains first strike until end of turn.
 Oracle:You may exert Rhet-Crop Spearmaster as it attacks. When you do, it gets +1/+0 and gains first strike until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/r/rhonass_stalwart.txt b/forge-gui/res/cardsfolder/r/rhonass_stalwart.txt
index dff7248eed9..33313f0aa4e 100644
--- a/forge-gui/res/cardsfolder/r/rhonass_stalwart.txt
+++ b/forge-gui/res/cardsfolder/r/rhonass_stalwart.txt
@@ -2,9 +2,8 @@ Name:Rhonas's Stalwart
 ManaCost:1 G
 Types:Creature Human Warrior
 PT:2/2
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When you exert CARDNAME, it gets +1/+1 and can't be blocked by creatures with power 2 or less this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ TrigEffect
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigEffect | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+1 until end of turn and can't be blocked by creatures with power 2 or less this turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ TrigEffect | SpellDescription$ When you do, it gets +1/+1 until end of turn and can't be blocked by creatures with power 2 or less this turn.
 SVar:TrigEffect:DB$ Effect | Name$ Rhonas's Stalwart Effect | StaticAbilities$ KWPump
 SVar:KWPump:Mode$ CantBlockBy | ValidAttacker$ Creature.EffectSource | ValidBlocker$ Creature.powerLE2 | EffectZone$ Command | Description$ EFFECTSOURCE can't be blocked by creatures with power 2 or less this turn.
 Oracle:You may exert Rhonas's Stalwart as it attacks. When you do, it gets +1/+1 until end of turn and can't be blocked by creatures with power 2 or less this turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/t/tah_crop_elite.txt b/forge-gui/res/cardsfolder/t/tah_crop_elite.txt
index eb320d69c0b..e2d9568b6a5 100644
--- a/forge-gui/res/cardsfolder/t/tah_crop_elite.txt
+++ b/forge-gui/res/cardsfolder/t/tah_crop_elite.txt
@@ -3,7 +3,6 @@ ManaCost:3 W
 Types:Creature Bird Warrior
 PT:2/2
 K:Flying
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When you exert CARDNAME, creatures you control get +1/+1 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPumpAll | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, creatures you control get +1/+1 until end of turn. (An exerted creature won't untap during your next untap step.)
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ When you do, creatures you control get +1/+1 until end of turn.
 Oracle:Flying\nYou may exert Tah-Crop Elite as it attacks. When you do, creatures you control get +1/+1 until end of turn. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/t/trueheart_twins.txt b/forge-gui/res/cardsfolder/t/trueheart_twins.txt
index 75454b8932d..52cf03de74d 100644
--- a/forge-gui/res/cardsfolder/t/trueheart_twins.txt
+++ b/forge-gui/res/cardsfolder/t/trueheart_twins.txt
@@ -2,7 +2,7 @@ Name:Trueheart Twins
 ManaCost:4 R
 Types:Creature Jackal Warrior
 PT:4/4
-K:You may exert CARDNAME as it attacks.
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. (It won't untap during your next untap step.)
 T:Mode$ Exerted | ValidCard$ Creature.YouCtrl | Execute$ TrigPumpAll | TriggerZones$ Battlefield | TriggerDescription$ Whenever you exert a creature, creatures you control get +1/+0 until end of turn.
 // This code presumes that you are only ever allowed to exert creatures you control. If this is changed in the future, it will need an update.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1
diff --git a/forge-gui/res/cardsfolder/v/vizier_of_the_true.txt b/forge-gui/res/cardsfolder/v/vizier_of_the_true.txt
index 9be6a944b86..7f55c5f54ce 100644
--- a/forge-gui/res/cardsfolder/v/vizier_of_the_true.txt
+++ b/forge-gui/res/cardsfolder/v/vizier_of_the_true.txt
@@ -2,7 +2,7 @@ Name:Vizier of the True
 ManaCost:3 W
 Types:Creature Human Cleric
 PT:3/2
-K:You may exert CARDNAME as it attacks.
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. (It won't untap during your next untap step.)
 T:Mode$ Exerted | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you exert a creature, tap target creature an opponent controls.
 // This code presumes that you are only ever allowed to exert creatures you control. If this is changed in the future, it will need an update.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/w/watchful_naga.txt b/forge-gui/res/cardsfolder/w/watchful_naga.txt
index cb44e2baf0e..3348a5094d9 100644
--- a/forge-gui/res/cardsfolder/w/watchful_naga.txt
+++ b/forge-gui/res/cardsfolder/w/watchful_naga.txt
@@ -2,7 +2,6 @@ Name:Watchful Naga
 ManaCost:2 G
 Types:Creature Naga Wizard
 PT:2/2
-K:You may exert CARDNAME as it attacks.
-T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ DBDraw | TriggerDescription$ When you exert CARDNAME, draw a card.
-SVar:DBDraw:DB$ Draw | Defined$ TriggeredPlayer
+S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ DBDraw | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, draw a card. (An exerted creature won't untap during your next untap step.)
+SVar:DBDraw:DB$ Draw | SpellDescription$ When you do, draw a card.
 Oracle:You may exert Watchful Naga as it attacks. When you do, draw a card. (An exerted creature won't untap during your next untap step.)