AbilityUtils: add Precalc Option

J. Jonah Jameson (SPM) (#8506 )
Fix minor card render problems (#8478 )
2025-11-19 12:18:00 +00:00 · 2025-08-23 16:28:57 +02:00 · 2025-08-23 11:00:45 +02:00 · 2025-08-23 06:56:21 +03:00 · 2025-08-23 06:55:28 +03:00 · 2025-08-22 07:56:55 -05:00
134 changed files with 344 additions and 276 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,7 @@ forge-gui/tools/PerSetTrackingResults
 *.tiled-session
 /forge-gui/res/adventure/*.tiled-project
 /forge-gui/res/adventure/*.tiled-session
+
+# Ignore python temporaries
+__pycache__
+*.pyc
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -1328,6 +1328,12 @@ public class AbilityUtils {
            game.getTriggerHandler().resetActiveTriggers();
        }

+        if (sa.hasParam("Precalc")) {
+            for (String s : sa.getParam("Precalc").split(",")) {
+                sa.setSVar(s, String.valueOf(calculateAmount(sa.getHostCard(), s, sa)));
+            }
+        }
+
        resolvePreAbilities(sa, game);

        // count times ability resolves this turn
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -3219,6 +3219,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
            desc = TextUtil.fastReplace(desc, "EFFECTSOURCE", getEffectSource().getName());
        }

+        // Ensure no more escaped linebreak are present
+        desc = desc.replace("\\r", "\r")
+            .replace("\\n", "\n");
+
        return desc.trim();
    }

--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -938,7 +938,9 @@ public class CardView extends GameEntityView {
            sb.append("\r\n\r\nMerged Cards: ").append(mergedCards);
        }

-        return sb.toString().trim();
+        return sb.toString().trim()
+            .replace("\\r", "\r")
+            .replace("\\n", "\n");
    }

    public CardStateView getCurrentState() {
--- a/forge-game/src/main/java/forge/game/cost/CostExileFromStack.java
+++ b/forge-game/src/main/java/forge/game/cost/CostExileFromStack.java
@@ -67,7 +67,7 @@ public class CostExileFromStack extends CostPart {
        final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription();
        sb.append(Cost.convertAmountTypeToWords(i, this.getAmount(), desc));

-        sb.append("from stack");
+        sb.append(" from stack");

        return sb.toString();
    }
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
@@ -82,17 +82,11 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
        switch (this.gameType) {
            case Constructed:
                allSections.add(DeckSection.Avatar);
-                allSections.add(DeckSection.Schemes);
-                allSections.add(DeckSection.Planes);
                allSections.add(DeckSection.Conspiracy);
-                allSections.add(DeckSection.Dungeon);

                normalPool = FModel.getAllCardsNoAlt();
                avatarPool = FModel.getAvatarPool();
-                planePool = FModel.getPlanechaseCards();
-                schemePool = FModel.getArchenemyCards();
                conspiracyPool = FModel.getConspiracyPool();
-                dungeonPool = FModel.getDungeonPool();

                break;
            case Commander:
@@ -130,6 +124,14 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
            default:
        }

+        allSections.add(DeckSection.Planes);
+        allSections.add(DeckSection.Schemes);
+        allSections.add(DeckSection.Dungeon);
+
+        planePool = FModel.getPlanechaseCards();
+        schemePool = FModel.getArchenemyCards();
+        dungeonPool = FModel.getDungeonPool();
+
        allSections.add(DeckSection.Attractions);
        attractionPool = FModel.getAttractionPool();

--- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java
@@ -252,7 +252,9 @@ public class VStack extends FDropDown {
            stackInstance = stackInstance0;
            CardView card = stackInstance.getSourceCard();

-            text = stackInstance.getText();
+            text = stackInstance.getText()
+                .replace("\\r", "\r")
+                .replace("\\n", "\n");
            if (stackInstance.isOptionalTrigger() &&
                    stackInstance0.getActivatingPlayer().equals(MatchController.instance.getCurrentPlayer())) {
                text = "(OPTIONAL) " + text;
--- a/forge-gui/res/cardsfolder/a/aboshans_desire.txt
+++ b/forge-gui/res/cardsfolder/a/aboshans_desire.txt
@@ -4,5 +4,5 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold — Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
-Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold — Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold — Enchanted creature has shroud as long as there are seven or more cards in your graveyard. (It can't be the target of spells or abilities.)
+Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold — Enchanted creature has shroud as long as there are seven or more cards in your graveyard. (It can't be the target of spells or abilities.)
--- a/forge-gui/res/cardsfolder/a/anurid_barkripper.txt
+++ b/forge-gui/res/cardsfolder/a/anurid_barkripper.txt
@@ -2,5 +2,5 @@ Name:Anurid Barkripper
 ManaCost:1 G G
 Types:Creature Frog Beast
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +2/+2 as long as seven or more cards are in your graveyard.
-Oracle:Threshold — Anurid Barkripper gets +2/+2 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +2/+2 as long as there are seven or more cards in your graveyard.
+Oracle:Threshold — Anurid Barkripper gets +2/+2 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/a/arabella_abandoned_doll.txt
+++ b/forge-gui/res/cardsfolder/a/arabella_abandoned_doll.txt
@@ -3,7 +3,7 @@ ManaCost:R W
 Types:Legendary Artifact Creature Toy
 PT:1/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ Whenever CARDNAME attacks, it deals X damage to each opponent and you gain X life, where X is the number of creatures you control with power 2 or less.
-SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X | SubAbility$ DBGainLife
+SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X | Precalc$ X | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$Valid Creature.YouCtrl+powerLE2
 Oracle:Whenever Arabella, Abandoned Doll attacks, it deals X damage to each opponent and you gain X life, where X is the number of creatures you control with power 2 or less.
--- a/forge-gui/res/cardsfolder/a/aven_warcraft.txt
+++ b/forge-gui/res/cardsfolder/a/aven_warcraft.txt
@@ -1,7 +1,7 @@
 Name:Aven Warcraft
 ManaCost:2 W
 Types:Instant
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumDef$ +2 | SubAbility$ ChooseColor | SpellDescription$ Creatures you control get +0/+2 until end of turn. Threshold — If seven or more cards are in your graveyard, choose a color. Creatures you control also gain protection from the chosen color until end of turn.
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumDef$ +2 | SubAbility$ ChooseColor | SpellDescription$ Creatures you control get +0/+2 until end of turn. Threshold — If there are seven or more cards in your graveyard, choose a color. Creatures you control also gain protection from the chosen color until end of turn.
 SVar:ChooseColor:DB$ ProtectionAll | Condition$ Threshold | ValidCards$ Creature.YouCtrl | Gains$ Choice | Choices$ AnyColor
 DeckHints:Ability$Graveyard
-Oracle:Creatures you control get +0/+2 until end of turn.\nThreshold — If seven or more cards are in your graveyard, choose a color. Creatures you control also gain protection from the chosen color until end of turn.
+Oracle:Creatures you control get +0/+2 until end of turn.\nThreshold — If there are seven or more cards in your graveyard, choose a color. Creatures you control also gain protection from the chosen color until end of turn.
--- a/forge-gui/res/cardsfolder/b/barbarian_ring.txt
+++ b/forge-gui/res/cardsfolder/b/barbarian_ring.txt
@@ -2,7 +2,7 @@ Name:Barbarian Ring
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
-A:AB$ DealDamage | Cost$ R T Sac<1/CARDNAME> | ValidTgts$ Any | NumDmg$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ It deals 2 damage to any target. Activate only if seven or more cards are in your graveyard.
+A:AB$ DealDamage | Cost$ R T Sac<1/CARDNAME> | ValidTgts$ Any | NumDmg$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ It deals 2 damage to any target. Activate only if there are seven or more cards in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 DeckHas:Ability$Sacrifice
-Oracle:{T}: Add {R}. Barbarian Ring deals 1 damage to you.\nThreshold — {R}, {T}, Sacrifice Barbarian Ring: It deals 2 damage to any target. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {R}. Barbarian Ring deals 1 damage to you.\nThreshold — {R}, {T}, Sacrifice Barbarian Ring: It deals 2 damage to any target. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/b/battlefield_scrounger.txt
+++ b/forge-gui/res/cardsfolder/b/battlefield_scrounger.txt
@@ -2,5 +2,5 @@ Name:Battlefield Scrounger
 ManaCost:3 G G
 Types:Creature Centaur
 PT:3/3
-A:AB$ Pump | Cost$ PutCardToLibFromGrave<3/-1/Card> | Activation$ Threshold | ActivationLimit$ 1 | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME gets +3/+3 until end of turn. Activate only once each turn and only if seven or more cards are in your graveyard.
-Oracle:Threshold — Put three cards from your graveyard on the bottom of your library: Battlefield Scrounger gets +3/+3 until end of turn. Activate only once each turn and only if seven or more cards are in your graveyard.
+A:AB$ Pump | Cost$ PutCardToLibFromGrave<3/-1/Card> | Activation$ Threshold | ActivationLimit$ 1 | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME gets +3/+3 until end of turn. Activate only once each turn and only if there are seven or more cards in your graveyard.
+Oracle:Threshold — Put three cards from your graveyard on the bottom of your library: Battlefield Scrounger gets +3/+3 until end of turn. Activate only once each turn and only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/b/battlewise_aven.txt
+++ b/forge-gui/res/cardsfolder/b/battlewise_aven.txt
@@ -3,5 +3,5 @@ ManaCost:3 W
 Types:Creature Bird Soldier
 PT:2/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ First Strike | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has first strike.
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Battlewise Aven gets +1/+1 and has first strike.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ First Strike | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has first strike.
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Battlewise Aven gets +1/+1 and has first strike.
--- a/forge-gui/res/cardsfolder/b/bloodcurdler.txt
+++ b/forge-gui/res/cardsfolder/b/bloodcurdler.txt
@@ -5,9 +5,9 @@ PT:1/1
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of your upkeep, mill a card.
 SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ EndScream | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ EndScream | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard."
 SVar:EndScream:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ BloodExile | Secondary$ True | TriggerDescription$ At the beginning of your end step, exile two cards from your graveyard.
 SVar:BloodExile:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Card.YouCtrl | ChangeNum$ 2 | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Exile
 AI:RemoveDeck:Random
 DeckHints:Ability$Graveyard
-Oracle:Flying\nAt the beginning of your upkeep, mill a card.\nThreshold — As long as seven or more cards are in your graveyard, Bloodcurdler gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard."
+Oracle:Flying\nAt the beginning of your upkeep, mill a card.\nThreshold — As long as there are seven or more cards in your graveyard, Bloodcurdler gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard."
--- a/forge-gui/res/cardsfolder/b/boneshard_slasher.txt
+++ b/forge-gui/res/cardsfolder/b/boneshard_slasher.txt
@@ -3,8 +3,8 @@ ManaCost:1 B
 Types:Creature Horror
 PT:1/1
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ SpellTarget | AddSVar$ SlasherSac & SlasherTarget | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and has "When CARDNAME becomes the target of a spell or ability, sacrifice it."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ SpellTarget | AddSVar$ SlasherSac & SlasherTarget | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and has "When CARDNAME becomes the target of a spell or ability, sacrifice it."
 SVar:SpellTarget:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ SlasherSac | TriggerDescription$ When CARDNAME becomes the target of a spell or ability, sacrifice it.
 SVar:SlasherSac:DB$ Sacrifice
 SVar:SlasherTarget:Targeting:Dies
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Boneshard Slasher gets +2/+2 and has "When Boneshard Slasher becomes the target of a spell or ability, sacrifice it."
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Boneshard Slasher gets +2/+2 and has "When Boneshard Slasher becomes the target of a spell or ability, sacrifice it."
--- a/forge-gui/res/cardsfolder/c/cabal_initiate.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_initiate.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Creature Human Warlock
 PT:2/1
 A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Lifelink | SpellDescription$ CARDNAME gains lifelink until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+2 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+2 as long as there are seven or more cards in your graveyard.
 DeckHas:Ability$LifeGain|Discard
-Oracle:Discard a card: Cabal Initiate gains lifelink until end of turn.\nThreshold — Cabal Initiate gets +1/+2 as long as seven or more cards are in your graveyard.
+Oracle:Discard a card: Cabal Initiate gains lifelink until end of turn.\nThreshold — Cabal Initiate gets +1/+2 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cabal_inquisitor.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_inquisitor.txt
@@ -2,5 +2,5 @@ Name:Cabal Inquisitor
 ManaCost:1 B
 Types:Creature Human Minion
 PT:1/1
-A:AB$ Discard | Cost$ 1 B T ExileFromGrave<2/Card> | ValidTgts$ Player | Activation$ Threshold | PrecostDesc$ Threshold — | NumCards$ 1 | Mode$ TgtChoose | SorcerySpeed$ True | SpellDescription$ Target player discards a card. Activate only as a sorcery and only if seven or more cards are in your graveyard.
-Oracle:Threshold — {1}{B}, {T}, Exile two cards from your graveyard: Target player discards a card. Activate only as a sorcery and only if seven or more cards are in your graveyard.
+A:AB$ Discard | Cost$ 1 B T ExileFromGrave<2/Card> | ValidTgts$ Player | Activation$ Threshold | PrecostDesc$ Threshold — | NumCards$ 1 | Mode$ TgtChoose | SorcerySpeed$ True | SpellDescription$ Target player discards a card. Activate only as a sorcery and only if there are seven or more cards in your graveyard.
+Oracle:Threshold — {1}{B}, {T}, Exile two cards from your graveyard: Target player discards a card. Activate only as a sorcery and only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cabal_pit.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_pit.txt
@@ -2,6 +2,6 @@ Name:Cabal Pit
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
-A:AB$ Pump | Cost$ B T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets -2/-2 until end of turn. Activate only if seven or more cards are in your graveyard.
+A:AB$ Pump | Cost$ B T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets -2/-2 until end of turn. Activate only if there are seven or more cards in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
-Oracle:{T}: Add {B}. Cabal Pit deals 1 damage to you.\nThreshold — {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {B}. Cabal Pit deals 1 damage to you.\nThreshold — {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cabal_ritual.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_ritual.txt
@@ -1,7 +1,7 @@
 Name:Cabal Ritual
 ManaCost:1 B
 Types:Instant
-A:SP$ Mana | Produced$ B | Amount$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B}. Threshold — Add {B}{B}{B}{B}{B} instead if seven or more cards are in your graveyard.
+A:SP$ Mana | Produced$ B | Amount$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B}. Threshold — Add {B}{B}{B}{B}{B} instead if there are seven or more cards in your graveyard.
 SVar:X:Count$Threshold.5.3
 AI:RemoveDeck:Random
-Oracle:Add {B}{B}{B}.\nThreshold — Add {B}{B}{B}{B}{B} instead if seven or more cards are in your graveyard.
+Oracle:Add {B}{B}{B}.\nThreshold — Add {B}{B}{B}{B}{B} instead if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cabal_torturer.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_torturer.txt
@@ -3,5 +3,5 @@ ManaCost:1 B B
 Types:Creature Human Minion
 PT:1/1
 A:AB$ Pump | Cost$ B T | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets -1/-1 until end of turn.
-A:AB$ Pump | Cost$ 3 B B T | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets -2/-2 until end of turn. Activate only if seven or more cards are in your graveyard.
-Oracle:{B}, {T}: Target creature gets -1/-1 until end of turn.\nThreshold — {3}{B}{B}, {T}: Target creature gets -2/-2 until end of turn. Activate only if seven or more cards are in your graveyard.
+A:AB$ Pump | Cost$ 3 B B T | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets -2/-2 until end of turn. Activate only if there are seven or more cards in your graveyard.
+Oracle:{B}, {T}: Target creature gets -1/-1 until end of turn.\nThreshold — {3}{B}{B}, {T}: Target creature gets -2/-2 until end of turn. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/caged_sun.txt
+++ b/forge-gui/res/cardsfolder/c/caged_sun.txt
@@ -5,6 +5,6 @@ K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a color.
 S:Mode$ Continuous | Affected$ Creature.ChosenColor+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen color get +1/+1.
 T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.ManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
-T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.nonManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
+T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.nonManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add an additional one mana of that color.
 SVar:TrigMana:DB$ Mana | Produced$ Chosen | Amount$ 1
-Oracle:As Caged Sun enters, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
+Oracle:As Caged Sun enters, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability causes you to add one or more mana of the chosen color, add an additional one mana of that color.
--- a/forge-gui/res/cardsfolder/c/camaraderie.txt
+++ b/forge-gui/res/cardsfolder/c/camaraderie.txt
@@ -1,7 +1,7 @@
 Name:Camaraderie
 ManaCost:4 G W
 Types:Sorcery
-A:SP$ GainLife | Defined$ You | LifeAmount$ X | SubAbility$ DBDraw | SpellDescription$ You gain X life and draw X cards, where X is the number of creatures you control.
+A:SP$ GainLife | Defined$ You | LifeAmount$ X | Precalc$ X | SubAbility$ DBDraw | SpellDescription$ You gain X life and draw X cards, where X is the number of creatures you control.
 SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:X:Count$Valid Creature.YouCtrl
--- a/forge-gui/res/cardsfolder/c/celestial_colonnade.txt
+++ b/forge-gui/res/cardsfolder/c/celestial_colonnade.txt
@@ -1,8 +1,8 @@
 Name:Celestial Colonnade
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-A:AB$ Animate | Cost$ 3 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ White,Blue | OverwriteColors$ True | Keywords$ Flying & Vigilance | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
-Oracle:Celestial Colonnade enters tapped.\n{T}: Add {W} or {U}.\n{3}{W}{U}: Until end of turn, Celestial Colonnade becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
+A:AB$ Animate | Cost$ 3 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ White,Blue | OverwriteColors$ True | Keywords$ Flying & Vigilance | SpellDescription$ Until end of turn, this land becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {W} or {U}.\n{3}{W}{U}: Until end of turn, this land becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
--- a/forge-gui/res/cardsfolder/c/centaur_chieftain.txt
+++ b/forge-gui/res/cardsfolder/c/centaur_chieftain.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Centaur
 PT:3/3
 K:Haste
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters, creatures you control get +1/+1 and gain trample until end of turn."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "When CARDNAME enters, creatures you control get +1/+1 and gain trample until end of turn."
 SVar:TrigETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters, creatures you control get +1/+1 and gain trample until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
-Oracle:Haste\nThreshold — As long as seven or more cards are in your graveyard, Centaur Chieftain has "When Centaur Chieftain enters, creatures you control get +1/+1 and gain trample until end of turn."
+Oracle:Haste\nThreshold — As long as there are seven or more cards in your graveyard, Centaur Chieftain has "When Centaur Chieftain enters, creatures you control get +1/+1 and gain trample until end of turn."
--- a/forge-gui/res/cardsfolder/c/centaur_garden.txt
+++ b/forge-gui/res/cardsfolder/c/centaur_garden.txt
@@ -2,7 +2,7 @@ Name:Centaur Garden
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
-A:AB$ Pump | Cost$ G T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets +3/+3 until end of turn. Activate only if seven or more cards are in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
+A:AB$ Pump | Cost$ G T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets +3/+3 until end of turn. Activate only if there are seven or more cards in your graveyard.
 AI:RemoveDeck:Random
-Oracle:{T}: Add {G}. Centaur Garden deals 1 damage to you.\nThreshold — {G}, {T}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {G}. Centaur Garden deals 1 damage to you.\nThreshold — {G}, {T}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cephalid_coliseum.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_coliseum.txt
@@ -2,8 +2,8 @@ Name:Cephalid Coliseum
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
-A:AB$ Draw | Cost$ U T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target player draws three cards, then discards three cards. Activate only if seven or more cards are in your graveyard. | SubAbility$ DBDiscard
+A:AB$ Draw | Cost$ U T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 3 | Activation$ Threshold | PrecostDesc$ Threshold — | SubAbility$ DBDiscard | SpellDescription$ Target player draws three cards, then discards three cards. Activate only if there are seven or more cards in your graveyard.
 SVar:DBDiscard:DB$ Discard | NumCards$ 3 | Mode$ TgtChoose | Defined$ Targeted
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 AI:RemoveDeck:Random
-Oracle:{T}: Add {U}. Cephalid Coliseum deals 1 damage to you.\nThreshold — {U}, {T}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {U}. Cephalid Coliseum deals 1 damage to you.\nThreshold — {U}, {T}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/cephalid_sage.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_sage.txt
@@ -2,8 +2,8 @@ Name:Cephalid Sage
 ManaCost:3 U
 Types:Creature Octopus
 PT:2/3
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters, draw three cards, then discard two cards."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "When CARDNAME enters, draw three cards, then discard two cards."
 SVar:TrigETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw three cards, then discard two cards.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 3 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | Defined$ You
-Oracle:Threshold — As long as seven or more cards are in your graveyard, Cephalid Sage has "When Cephalid Sage enters, draw three cards, then discard two cards."
+Oracle:Threshold — As long as there are seven or more cards in your graveyard, Cephalid Sage has "When Cephalid Sage enters, draw three cards, then discard two cards."
--- a/forge-gui/res/cardsfolder/c/chainflinger.txt
+++ b/forge-gui/res/cardsfolder/c/chainflinger.txt
@@ -3,5 +3,5 @@ ManaCost:3 R
 Types:Creature Beast
 PT:2/2
 A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Any | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
-A:AB$ DealDamage | Cost$ 2 R T | ValidTgts$ Any | NumDmg$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME deals 2 damage to any target. Activate only if seven or more cards are in your graveyard.
-Oracle:{1}{R}, {T}: Chainflinger deals 1 damage to any target.\nThreshold — {2}{R}, {T}: Chainflinger deals 2 damage to any target. Activate only if seven or more cards are in your graveyard.
+A:AB$ DealDamage | Cost$ 2 R T | ValidTgts$ Any | NumDmg$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME deals 2 damage to any target. Activate only if there are seven or more cards in your graveyard.
+Oracle:{1}{R}, {T}: Chainflinger deals 1 damage to any target.\nThreshold — {2}{R}, {T}: Chainflinger deals 2 damage to any target. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/c/champion_of_dusk.txt
+++ b/forge-gui/res/cardsfolder/c/champion_of_dusk.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Creature Vampire Knight
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw X cards and you lose X life, where X is the number of Vampires you control.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBLoseLife
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | Precalc$ X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X
 SVar:X:Count$Valid Vampire.YouCtrl
 DeckHints:Type$Vampire
--- a/forge-gui/res/cardsfolder/c/childhood_horror.txt
+++ b/forge-gui/res/cardsfolder/c/childhood_horror.txt
@@ -3,6 +3,6 @@ ManaCost:3 B
 Types:Creature Horror
 PT:2/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and can't block.
-S:Mode$ CantBlock | ValidCard$ Card.Self | Condition$ Threshold | Secondary$ True | Description$ Enchanted Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and can't block.
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Childhood Horror gets +2/+2 and can't block.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and can't block.
+S:Mode$ CantBlock | ValidCard$ Card.Self | Condition$ Threshold | Secondary$ True | Description$ Enchanted Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and can't block.
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Childhood Horror gets +2/+2 and can't block.
--- a/forge-gui/res/cardsfolder/c/chlorophant.txt
+++ b/forge-gui/res/cardsfolder/c/chlorophant.txt
@@ -3,7 +3,7 @@ ManaCost:G G G
 Types:Creature Elemental
 PT:1/1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ GimmeSome | TriggerDescription$ At the beginning of your upkeep, you may put a +1/+1 counter on CARDNAME.
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigCounter | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "At the beginning of your upkeep, you may put another +1/+1 counter on CARDNAME."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigCounter | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "At the beginning of your upkeep, you may put another +1/+1 counter on CARDNAME."
 SVar:TrigCounter:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ GimmeSome | TriggerDescription$ At the beginning of your upkeep, you may put another +1/+1 counter on CARDNAME.
 SVar:GimmeSome:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-Oracle:At the beginning of your upkeep, you may put a +1/+1 counter on Chlorophant.\nThreshold — As long as seven or more cards are in your graveyard, Chlorophant has "At the beginning of your upkeep, you may put another +1/+1 counter on Chlorophant."
+Oracle:At the beginning of your upkeep, you may put a +1/+1 counter on Chlorophant.\nThreshold — As long as there are seven or more cards in your graveyard,, Chlorophant has "At the beginning of your upkeep, you may put another +1/+1 counter on Chlorophant."
--- a/forge-gui/res/cardsfolder/c/clandestine_meddler.txt
+++ b/forge-gui/res/cardsfolder/c/clandestine_meddler.txt
@@ -3,8 +3,9 @@ ManaCost:2 B
 Types:Creature Vampire Rogue
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSuspect | TriggerDescription$ When CARDNAME enters, suspect up to one other target creature you control. (A suspected creature has menace and can't block.)
-SVar:TrigSuspect:DB$ AlterAttribute | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl+Other | Defined$ Targeted | Attributes$ Suspected
+SVar:TrigSuspect:DB$ AlterAttribute | TgtPrompt$ Select up to one other target creature you control | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl+Other | Defined$ Targeted | Attributes$ Suspected
 T:Mode$ AttackersDeclared | ValidAttackers$ Creature.IsSuspected+YouCtrl | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more suspected creatures you control attack, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+SVar:PlayMain1:TRUE
 DeckHas:Ability$Graveyard
 Oracle:When Clandestine Meddler enters, suspect up to one other target creature you control. (A suspected creature has menace and can't block.)\nWhenever one or more suspected creatures you control attack, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
--- a/forge-gui/res/cardsfolder/c/cleansing_meditation.txt
+++ b/forge-gui/res/cardsfolder/c/cleansing_meditation.txt
@@ -7,4 +7,4 @@ SVar:ThreshDestruction:DB$ DestroyAll | ValidCards$ Enchantment | SubAbility$ Th
 SVar:ThreshReturn:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered+YouCtrl | Origin$ Graveyard | Destination$ Battlefield | StackDescription$ then return all cards in your graveyard destroyed this way to the battlefield. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$ValidGraveyard Card.YouCtrl
-Oracle:Destroy all enchantments.\nThreshold — If seven or more cards are in your graveyard, instead destroy all enchantments, then return all cards in your graveyard destroyed this way to the battlefield.
+Oracle:Destroy all enchantments.\nThreshold — If there are seven or more cards in your graveyard, instead destroy all enchantments, then return all cards in your graveyard destroyed this way to the battlefield.
--- a/forge-gui/res/cardsfolder/c/corpse_augur.txt
+++ b/forge-gui/res/cardsfolder/c/corpse_augur.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Zombie Wizard
 PT:4/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, you draw X cards and you lose X life, where X is the number of creature cards in target player's graveyard.
-SVar:TrigDraw:DB$ Draw | Defined$ TriggeredCardController | ValidTgts$ Player | TgtPrompt$ Choose target player | NumCards$ X | SubAbility$ DBLoseLife
+SVar:TrigDraw:DB$ Draw | Defined$ TriggeredCardController | ValidTgts$ Player | TgtPrompt$ Choose target player | NumCards$ X | Precalc$ X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ TriggeredCardController | LifeAmount$ X
 SVar:X:TargetedPlayer$ValidGraveyard Creature.YouOwn
 AI:RemoveDeck:All
--- a/forge-gui/res/cardsfolder/c/cosmogoyf.txt
+++ b/forge-gui/res/cardsfolder/c/cosmogoyf.txt
@@ -2,7 +2,7 @@ Name:Cosmogoyf
 ManaCost:B G
 Types:Creature Elemental Lhurgoyf
 PT:*/1+*
-S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ This creature's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
+S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ CARDNAME's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
 SVar:X:Count$ValidExile Card.YouOwn
 SVar:Y:Count$ValidExile Card.YouOwn/Plus.1
-Oracle:This creature's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
+Oracle:Cosmogoyf's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
--- a/forge-gui/res/cardsfolder/c/crashing_centaur.txt
+++ b/forge-gui/res/cardsfolder/c/crashing_centaur.txt
@@ -3,5 +3,5 @@ ManaCost:4 G G
 Types:Creature Centaur
 PT:3/4
 A:AB$ Pump | Cost$ G Discard<1/Card> | Defined$ Self | KW$ Trample | SpellDescription$ CARDNAME gains trample until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and has shroud. (It can't be the target of spells or abilities.)
-Oracle:{G}, Discard a card: Crashing Centaur gains trample until end of turn.\nThreshold — As long as seven or more cards are in your graveyard, Crashing Centaur gets +2/+2 and has shroud. (It can't be the target of spells or abilities.)
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and has shroud. (It can't be the target of spells or abilities.)
+Oracle:{G}, Discard a card: Crashing Centaur gains trample until end of turn.\nThreshold — As long as there are seven or more cards in your graveyard, Crashing Centaur gets +2/+2 and has shroud. (It can't be the target of spells or abilities.)
--- a/forge-gui/res/cardsfolder/c/creeping_tar_pit.txt
+++ b/forge-gui/res/cardsfolder/c/creeping_tar_pit.txt
@@ -1,11 +1,11 @@
 Name:Creeping Tar Pit
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
-A:AB$ Animate | Cost$ 1 U B | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Blue,Black | OverwriteColors$ True | SubAbility$ DBUnblockable | SpellDescription$ CARDNAME becomes a 3/2 blue and black Elemental creature until end of turn and can't be blocked this turn. It's still a land.
+A:AB$ Animate | Cost$ 1 U B | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Blue,Black | OverwriteColors$ True | SubAbility$ DBUnblockable | SpellDescription$ Until end of turn, this land becomes a 3/2 blue and black Elemental creature. It's still a land. It can't be blocked this turn.
 SVar:DBUnblockable:DB$ Effect | ExileOnMoved$ Battlefield | RememberObjects$ Self | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 DeckHas:Type$Elemental
-Oracle:Creeping Tar Pit enters tapped.\n{T}: Add {U} or {B}.\n{1}{U}{B}: Creeping Tar Pit becomes a 3/2 blue and black Elemental creature until end of turn and can't be blocked this turn. It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {U} or {B}.\n{1}{U}{B}: Until end of turn, this land becomes a 3/2 blue and black Elemental creature. It's still a land. It can't be blocked this turn.
--- a/forge-gui/res/cardsfolder/c/crown_of_ascension.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_ascension.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
-A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed | KW$ Flying | SubAbility$ DBPumpAll | SpellDescription$ Enchanted creature and other creatures that share a creature type with it gain flying until end of turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.NotDefinedAttachedBy Sacrificed+sharesCreatureTypeWith AttachedBy Sacrificed | KW$ Flying
+A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed & Valid Creature.sharesCreatureTypeWith AttachedBy Sacrificed | KW$ Flying | SpellDescription$ Enchanted creature and other creatures that share a creature type with it gain flying until end of turn.
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature has flying.\nSacrifice Crown of Ascension: Enchanted creature and other creatures that share a creature type with it gain flying until end of turn.
--- a/forge-gui/res/cardsfolder/c/crown_of_awe.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_awe.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection from black & Protection from red | Description$ Enchanted creature has protection from black and from red.
-A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed | KW$ Protection from black & Protection from red | SubAbility$ DBPumpAll | SpellDescription$ Enchanted creature and other creatures that share a creature type with it gain protection from black and from red until end of turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.NotDefinedAttachedBy Sacrificed+sharesCreatureTypeWith AttachedBy Sacrificed | KW$ Protection from black & Protection from red
+A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed & Valid Creature.sharesCreatureTypeWith AttachedBy Sacrificed | KW$ Protection from black & Protection from red | SpellDescription$ Enchanted creature and other creatures that share a creature type with it gain protection from black and from red until end of turn.
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature has protection from black and from red.\nSacrifice Crown of Awe: Enchanted creature and other creatures that share a creature type with it gain protection from black and from red until end of turn.
--- a/forge-gui/res/cardsfolder/c/crown_of_fury.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_fury.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ First Strike | Description$ Enchanted creature gets +1/+0 and has first strike.
-A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed | NumAtt$ +1 | KW$ First Strike | SubAbility$ DBPumpAll | SpellDescription$ Enchanted creature and other creatures that share a creature type with it get +1/+0 and gain first strike until end of turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.NotDefinedAttachedBy Sacrificed+sharesCreatureTypeWith AttachedBy Sacrificed | NumAtt$ +1 | KW$ First Strike
+A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed & Valid Creature.sharesCreatureTypeWith AttachedBy Sacrificed | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Enchanted creature and other creatures that share a creature type with it get +1/+0 and gain first strike until end of turn.
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature gets +1/+0 and has first strike.\nSacrifice Crown of Fury: Enchanted creature and other creatures that share a creature type with it get +1/+0 and gain first strike until end of turn.
--- a/forge-gui/res/cardsfolder/c/crown_of_suspicion.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_suspicion.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ -1 | Description$ Enchanted creature gets +2/-1.
-A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed | NumAtt$ +2 | NumDef$ -1 | SubAbility$ DBPumpAll | SpellDescription$ Enchanted creature and other creatures that share a creature type with it get +2/-1 until end of turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.NotDefinedAttachedBy Sacrificed+sharesCreatureTypeWith AttachedBy Sacrificed | NumAtt$ +2 | NumDef$ -1
+A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed & Valid Creature.sharesCreatureTypeWith AttachedBy Sacrificed | NumAtt$ +2 | NumDef$ -1 | SpellDescription$ Enchanted creature and other creatures that share a creature type with it get +2/-1 until end of turn.
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature gets +2/-1.\nSacrifice Crown of Suspicion: Enchanted creature and other creatures that share a creature type with it get +2/-1 until end of turn.
--- a/forge-gui/res/cardsfolder/c/crown_of_vigor.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_vigor.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
-A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBPumpAll | SpellDescription$ Enchanted creature and other creatures that share a creature type with it get +1/+1 until end of turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.NotDefinedAttachedBy Sacrificed+sharesCreatureTypeWith AttachedBy Sacrificed | NumAtt$ +1 | NumDef$ +1
+A:AB$ Pump | Cost$ Sac<1/CARDNAME> | Defined$ AttachedBy Sacrificed & Valid Creature.sharesCreatureTypeWith AttachedBy Sacrificed | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Enchanted creature and other creatures that share a creature type with it get +1/+1 until end of turn.
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature gets +1/+1.\nSacrifice Crown of Vigor: Enchanted creature and other creatures that share a creature type with it get +1/+1 until end of turn.
--- 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, 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 this creature enters, each noncreature artifact you control becomes a 4/4 artifact creature until end of turn.
 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, 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 this creature enters, each noncreature artifact you control becomes a 4/4 artifact creature until end of turn.
--- a/forge-gui/res/cardsfolder/d/decaying_soil.txt
+++ b/forge-gui/res/cardsfolder/d/decaying_soil.txt
@@ -3,8 +3,8 @@ ManaCost:1 B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile a card from your graveyard.
 SVar:TrigExile:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Card | ChangeNum$ 1 | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Exile
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigDies | AddAbility$ TrigReturn | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigDies | AddAbility$ TrigReturn | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand."
 SVar:TrigDies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+YouOwn | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Hand
 AI:RemoveDeck:All
-Oracle:At the beginning of your upkeep, exile a card from your graveyard.\nThreshold — As long as seven or more cards are in your graveyard, Decaying Soil has "Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand."
+Oracle:At the beginning of your upkeep, exile a card from your graveyard.\nThreshold — As long as there are seven or more cards in your graveyard, Decaying Soil has "Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand."
--- a/forge-gui/res/cardsfolder/d/demoralize.txt
+++ b/forge-gui/res/cardsfolder/d/demoralize.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Instant
 A:SP$ PumpAll | ValidCards$ Creature | KW$ Menace | SubAbility$ DBEffect2 | SpellDescription$ All creatures gain menace until end of turn.
 SVar:DBEffect2:DB$ Effect | StaticAbilities$ KWPump2 | Condition$ Threshold | SpellDescription$ Threshold — If seven or more cards are in your graveyard, creatures can't block this turn.
-SVar:KWPump2:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't block. | Description$ Threshold — If seven or more cards are in your graveyard, creatures can't block this turn.
+SVar:KWPump2:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't block. | Description$ Threshold — If there are seven or more cards in your graveyard, creatures can't block this turn.
 AI:RemoveDeck:All
-Oracle:All creatures gain menace until end of turn. (They can't be blocked except by two or more creatures.)\nThreshold — If seven or more cards are in your graveyard, creatures can't block this turn.
+Oracle:All creatures gain menace until end of turn. (They can't be blocked except by two or more creatures.)\nThreshold — If there are seven or more cards in your graveyard, creatures can't block this turn.
--- a/forge-gui/res/cardsfolder/d/dirty_wererat.txt
+++ b/forge-gui/res/cardsfolder/d/dirty_wererat.txt
@@ -3,5 +3,6 @@ ManaCost:3 B
 Types:Creature Human Rat Minion
 PT:2/3
 A:AB$ Regenerate | Cost$ B Discard<1/Card> | SpellDescription$ Regenerate CARDNAME.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ CARDNAME can't block. | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and can't block.
-Oracle:{B}, Discard a card: Regenerate Dirty Wererat.\nThreshold — As long as seven or more cards are in your graveyard, Dirty Wererat gets +2/+2 and can't block.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and can't block.
+S:Mode$ CantBlock | ValidCard$ Card.Self | Condition$ Threshold | Secondary$ True | Description$ Enchanted Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and can't block.
+Oracle:{B}, Discard a card: Regenerate Dirty Wererat.\nThreshold — As long as there are seven or more cards in your graveyard, Dirty Wererat gets +2/+2 and can't block.
--- a/forge-gui/res/cardsfolder/d/divine_sacrament.txt
+++ b/forge-gui/res/cardsfolder/d/divine_sacrament.txt
@@ -2,6 +2,6 @@ Name:Divine Sacrament
 ManaCost:1 W W
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 1 | AddToughness$ 1 | Description$ White creatures get +1/+1.
-S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold — White creatures get an additional +1/+1 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold — White creatures get an additional +1/+1 as long as there are seven or more cards in your graveyard.
 SVar:PlayMain1:TRUE
-Oracle:White creatures get +1/+1.\nThreshold — White creatures get an additional +1/+1 as long as seven or more cards are in your graveyard.
+Oracle:White creatures get +1/+1.\nThreshold — White creatures get an additional +1/+1 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/e/epicenter.txt
+++ b/forge-gui/res/cardsfolder/e/epicenter.txt
@@ -1,8 +1,8 @@
 Name:Epicenter
 ManaCost:4 R
 Types:Sorcery
-A:SP$ Branch | ValidTgts$ Player | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ ThreshWaste | FalseSubAbility$ WasteLand | SpellDescription$ Target player sacrifices a land. Threshold — Each player sacrifices all lands they control instead if seven or more cards are in your graveyard.
+A:SP$ Branch | ValidTgts$ Player | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ ThreshWaste | FalseSubAbility$ WasteLand | SpellDescription$ Target player sacrifices a land. Threshold — Each player sacrifices all lands they control instead if there are seven or more cards in your graveyard.
 SVar:WasteLand:DB$ Sacrifice | Defined$ Targeted | SacValid$ Land | SacMessage$ Land
 SVar:ThreshWaste:DB$ SacrificeAll | ValidCards$ Land
 SVar:X:Count$ValidGraveyard Card.YouOwn
-Oracle:Target player sacrifices a land.\nThreshold — Each player sacrifices all lands they control instead if seven or more cards are in your graveyard.
+Oracle:Target player sacrifices a land.\nThreshold — Each player sacrifices all lands they control instead if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/e/excavating_anurid.txt
+++ b/forge-gui/res/cardsfolder/e/excavating_anurid.txt
@@ -4,5 +4,5 @@ Types:Creature Frog Beast
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you may sacrifice a land. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Land> | Defined$ You | NumCards$ 1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has vigilance.
-Oracle:When Excavating Anurid enters, you may sacrifice a land. If you do, draw a card.\nThreshold — As long as seven or more cards are in your graveyard, Excavating Anurid gets +1/+1 and has vigilance.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has vigilance.
+Oracle:When Excavating Anurid enters, you may sacrifice a land. If you do, draw a card.\nThreshold — As long as there are seven or more cards in your graveyard, Excavating Anurid gets +1/+1 and has vigilance.
--- a/forge-gui/res/cardsfolder/f/far_wanderings.txt
+++ b/forge-gui/res/cardsfolder/f/far_wanderings.txt
@@ -1,6 +1,6 @@
 Name:Far Wanderings
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Threshold — If seven or more cards are in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Threshold — If there are seven or more cards in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
 SVar:X:Count$Threshold.3.1
-Oracle:Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.\nThreshold — If seven or more cards are in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
+Oracle:Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.\nThreshold — If there are seven or more cards in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
--- a/forge-gui/res/cardsfolder/f/fledgling_dragon.txt
+++ b/forge-gui/res/cardsfolder/f/fledgling_dragon.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R
 Types:Creature Dragon
 PT:2/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddAbility$ Pump | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +3/+3 and has "{R}: CARDNAME gets +1/+0 until end of turn."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddAbility$ Pump | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +3/+3 and has "{R}: CARDNAME gets +1/+0 until end of turn."
 SVar:Pump:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Fledgling Dragon gets +3/+3 and has "{R}: Fledgling Dragon gets +1/+0 until end of turn."
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Fledgling Dragon gets +3/+3 and has "{R}: Fledgling Dragon gets +1/+0 until end of turn."
--- a/forge-gui/res/cardsfolder/f/frightcrawler.txt
+++ b/forge-gui/res/cardsfolder/f/frightcrawler.txt
@@ -3,5 +3,6 @@ ManaCost:1 B
 Types:Creature Horror
 PT:1/1
 K:Fear
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ CARDNAME can't block. | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and can't block.
-Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nThreshold — As long as seven or more cards are in your graveyard, Frightcrawler gets +2/+2 and can't block.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and can't block.
+S:Mode$ CantBlock | ValidCard$ Card.Self | Condition$ Threshold | Secondary$ True | Description$ Enchanted Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +2/+2 and can't block.
+Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nThreshold — As long as there are seven or more cards in your graveyard, Frightcrawler gets +2/+2 and can't block.
--- a/forge-gui/res/cardsfolder/g/gloomdrifter.txt
+++ b/forge-gui/res/cardsfolder/g/gloomdrifter.txt
@@ -3,8 +3,8 @@ ManaCost:3 B
 Types:Creature Zombie Minion
 PT:2/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters, nonblack creatures get -2/-2 until end of turn."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "When CARDNAME enters, nonblack creatures get -2/-2 until end of turn."
 SVar:TrigETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters, nonblack creatures get -2/-2 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.nonBlack | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True
 SVar:PlayMain1:TRUE
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Gloomdrifter has "When Gloomdrifter enters, nonblack creatures get -2/-2 until end of turn."
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Gloomdrifter has "When Gloomdrifter enters, nonblack creatures get -2/-2 until end of turn."
--- a/forge-gui/res/cardsfolder/g/grizzly_fate.txt
+++ b/forge-gui/res/cardsfolder/g/grizzly_fate.txt
@@ -2,6 +2,6 @@ Name:Grizzly Fate
 ManaCost:3 G G
 Types:Sorcery
 K:Flashback:5 G G
-A:SP$ Token | TokenAmount$ X | TokenScript$ g_2_2_bear | TokenOwner$ You | SpellDescription$ Create two 2/2 green Bear creature tokens. Threshold — Create four 2/2 green Bear creature tokens instead if seven or more cards are in your graveyard.
+A:SP$ Token | TokenAmount$ X | TokenScript$ g_2_2_bear | TokenOwner$ You | SpellDescription$ Create two 2/2 green Bear creature tokens. Threshold — Create four 2/2 green Bear creature tokens instead if there are seven or more cards in your graveyard.
 SVar:X:Count$Threshold.4.2
-Oracle:Create two 2/2 green Bear creature tokens.\nThreshold — Create four 2/2 green Bear creature tokens instead if seven or more cards are in your graveyard.\nFlashback {5}{G}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:Create two 2/2 green Bear creature tokens.\nThreshold — Create four 2/2 green Bear creature tokens instead if there are seven or more cards in your graveyard.\nFlashback {5}{G}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
--- a/forge-gui/res/cardsfolder/h/hallowed_healer.txt
+++ b/forge-gui/res/cardsfolder/h/hallowed_healer.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Human Cleric
 PT:1/1
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Any | Amount$ 2 | SpellDescription$ Prevent the next 2 damage that would be dealt to any target this turn.
-A:AB$ PreventDamage | Cost$ T | ValidTgts$ Any | Amount$ 4 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Prevent the next 4 damage that would be dealt to any target this turn. Activate only if seven or more cards are in your graveyard.
+A:AB$ PreventDamage | Cost$ T | ValidTgts$ Any | Amount$ 4 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Prevent the next 4 damage that would be dealt to any target this turn. Activate only if there are seven or more cards in your graveyard.
 SVar:NonCombatPriority:3
-Oracle:{T}: Prevent the next 2 damage that would be dealt to any target this turn.\nThreshold — {T}: Prevent the next 4 damage that would be dealt to any target this turn. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Prevent the next 2 damage that would be dealt to any target this turn.\nThreshold — {T}: Prevent the next 4 damage that would be dealt to any target this turn. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/h/harmonious_grovestrider.txt
+++ b/forge-gui/res/cardsfolder/h/harmonious_grovestrider.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Beast
 PT:*/*
 K:Ward:2
-S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ This creature's power and toughness are each equal to the number of lands you control.
+S:Mode$ Continuous | 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
 SVar:BuffedBy:Land
-Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nThis creature's power and toughness are each equal to the number of lands you control.
+Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nHarmonious Grovestrider's power and toughness are each equal to the number of lands you control.
--- a/forge-gui/res/cardsfolder/h/hissing_quagmire.txt
+++ b/forge-gui/res/cardsfolder/h/hissing_quagmire.txt
@@ -1,8 +1,8 @@
 Name:Hissing Quagmire
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo B G | SpellDescription$ Add {B} or {G}.
-A:AB$ Animate | Cost$ 1 B G | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Green | OverwriteColors$ True | Keywords$ Deathtouch | SpellDescription$ CARDNAME becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land.
-Oracle:Hissing Quagmire enters tapped.\n{T}: Add {B} or {G}.\n{1}{B}{G}: Hissing Quagmire becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 B G | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Green | OverwriteColors$ True | Keywords$ Deathtouch | SpellDescription$ Until end of turn, this land becomes a 2/2 black and green Elemental creature with deathtouch. It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {B} or {G}.\n{1}{B}{G}: Until end of turn, this land becomes a 2/2 black and green Elemental creature with deathtouch. It's still a land.
--- a/forge-gui/res/cardsfolder/h/hunting_grounds.txt
+++ b/forge-gui/res/cardsfolder/h/hunting_grounds.txt
@@ -1,7 +1,7 @@
 Name:Hunting Grounds
 ManaCost:G W
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigCast | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigCast | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield."
 SVar:TrigCast:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield.
 SVar:TrigChangeZone:DB$ ChangeZone | ChangeType$ Creature | ChangeNum$ 1 | Origin$ Hand | Destination$ Battlefield
-Oracle:Threshold — As long as seven or more cards are in your graveyard, Hunting Grounds has "Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield."
+Oracle:Threshold — As long as there are seven or more cards in your graveyard, Hunting Grounds has "Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield."
--- a/forge-gui/res/cardsfolder/i/infected_vermin.txt
+++ b/forge-gui/res/cardsfolder/i/infected_vermin.txt
@@ -3,5 +3,5 @@ ManaCost:2 B
 Types:Creature Rat
 PT:1/1
 A:AB$ DamageAll | Cost$ 2 B | ValidCards$ Creature | ValidPlayers$ Player | NumDmg$ 1 | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player.
-A:AB$ DamageAll | Cost$ 3 B | ValidCards$ Creature | ValidPlayers$ Player | NumDmg$ 3 | ValidDescription$ each creature and each player. | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME deals 3 damage to each creature and each player. Activate only if seven or more cards are in your graveyard.
-Oracle:{2}{B}: Infected Vermin deals 1 damage to each creature and each player.\nThreshold — {3}{B}: Infected Vermin deals 3 damage to each creature and each player. Activate only if seven or more cards are in your graveyard.
+A:AB$ DamageAll | Cost$ 3 B | ValidCards$ Creature | ValidPlayers$ Player | NumDmg$ 3 | ValidDescription$ each creature and each player. | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME deals 3 damage to each creature and each player. Activate only if there are seven or more cards in your graveyard.
+Oracle:{2}{B}: Infected Vermin deals 1 damage to each creature and each player.\nThreshold — {3}{B}: Infected Vermin deals 3 damage to each creature and each player. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/k/kamahls_desire.txt
+++ b/forge-gui/res/cardsfolder/k/kamahls_desire.txt
@@ -4,5 +4,5 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ First Strike | Description$ Enchanted creature has first strike.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | Condition$ Threshold | Description$ Threshold — Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard.
-Oracle:Enchant creature\nEnchanted creature has first strike.\nThreshold — Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | Condition$ Threshold | Description$ Threshold — Enchanted creature gets +3/+0 as long as there are seven or more cards in your graveyard.
+Oracle:Enchant creature\nEnchanted creature has first strike.\nThreshold — Enchanted creature gets +3/+0 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/k/kamahls_sledge.txt
+++ b/forge-gui/res/cardsfolder/k/kamahls_sledge.txt
@@ -1,7 +1,7 @@
 Name:Kamahl's Sledge
 ManaCost:5 R R
 Types:Sorcery
-A:SP$ DealDamage | NumDmg$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals 4 damage to target creature. Threshold — If seven or more cards are in your graveyard, instead CARDNAME deals 4 damage to that creature and 4 damage to that creature's controller.
+A:SP$ DealDamage | NumDmg$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals 4 damage to target creature. Threshold — If there are seven or more cards in your graveyard, instead CARDNAME deals 4 damage to that creature and 4 damage to that creature's controller.
 SVar:DBDamage:DB$ DealDamage | NumDmg$ 4 | Condition$ Threshold | Defined$ TargetedController | SubAbility$ DBDamageResolve
 SVar:DBDamageResolve:DB$ DamageResolve
-Oracle:Kamahl's Sledge deals 4 damage to target creature.\nThreshold — If seven or more cards are in your graveyard, instead Kamahl's Sledge deals 4 damage to that creature and 4 damage to that creature's controller.
+Oracle:Kamahl's Sledge deals 4 damage to target creature.\nThreshold — If there are seven or more cards in your graveyard, instead Kamahl's Sledge deals 4 damage to that creature and 4 damage to that creature's controller.
--- a/forge-gui/res/cardsfolder/k/kirtars_desire.txt
+++ b/forge-gui/res/cardsfolder/k/kirtars_desire.txt
@@ -4,5 +4,5 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Curse
 S:Mode$ CantAttack | ValidCard$ Creature.EnchantedBy | Description$ Enchanted creature can't attack.
-S:Mode$ CantBlock | ValidCard$ Creature.EnchantedBy | Condition$ Threshold | Description$ Threshold — Enchanted creature can't block as long as seven or more cards are in your graveyard.
-Oracle:Enchant creature\nEnchanted creature can't attack.\nThreshold — Enchanted creature can't block as long as seven or more cards are in your graveyard.
+S:Mode$ CantBlock | ValidCard$ Creature.EnchantedBy | Condition$ Threshold | Description$ Threshold — Enchanted creature can't block as long as there are seven or more cards in your graveyard.
+Oracle:Enchant creature\nEnchanted creature can't attack.\nThreshold — Enchanted creature can't block as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/k/kirtars_wrath.txt
+++ b/forge-gui/res/cardsfolder/k/kirtars_wrath.txt
@@ -1,10 +1,10 @@
 Name:Kirtar's Wrath
 ManaCost:4 W W
 Types:Sorcery
-A:SP$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ ThreshDestruction | FalseSubAbility$ Destruction | SpellDescription$ Destroy all creatures. They can't be regenerated. Threshold — If seven or more cards are in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated.
+A:SP$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ ThreshDestruction | FalseSubAbility$ Destruction | SpellDescription$ Destroy all creatures. They can't be regenerated. Threshold — If there are seven or more cards in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated.
 SVar:Destruction:DB$ DestroyAll | ValidCards$ Creature | NoRegen$ True
 SVar:ThreshDestruction:DB$ DestroyAll | ValidCards$ Creature | NoRegen$ True | SubAbility$ ThreshToken
 SVar:ThreshToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You
 SVar:X:Count$ValidGraveyard Card.YouOwn
 DeckHas:Ability$Token
-Oracle:Destroy all creatures. They can't be regenerated.\nThreshold — If seven or more cards are in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated.
+Oracle:Destroy all creatures. They can't be regenerated.\nThreshold — If there are seven or more cards in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated.
--- a/forge-gui/res/cardsfolder/k/krosan_avenger.txt
+++ b/forge-gui/res/cardsfolder/k/krosan_avenger.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Human Druid
 PT:3/1
 K:Trample
-A:AB$ Regenerate | Cost$ 1 G | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Regenerate CARDNAME. Activate only if seven or more cards are in your graveyard.
-Oracle:Trample\nThreshold — {1}{G}: Regenerate Krosan Avenger. Activate only if seven or more cards are in your graveyard.
+A:AB$ Regenerate | Cost$ 1 G | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Regenerate CARDNAME. Activate only if there are seven or more cards in your graveyard.
+Oracle:Trample\nThreshold — {1}{G}: Regenerate Krosan Avenger. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/k/krosan_beast.txt
+++ b/forge-gui/res/cardsfolder/k/krosan_beast.txt
@@ -2,5 +2,5 @@ Name:Krosan Beast
 ManaCost:3 G
 Types:Creature Squirrel Beast
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 7 | AddToughness$ 7 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +7/+7 as long as seven or more cards are in your graveyard.
-Oracle:Threshold — Krosan Beast gets +7/+7 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 7 | AddToughness$ 7 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +7/+7 as long as there are seven or more cards in your graveyard.
+Oracle:Threshold — Krosan Beast gets +7/+7 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/k/krosan_restorer.txt
+++ b/forge-gui/res/cardsfolder/k/krosan_restorer.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Human Druid
 PT:1/2
 A:AB$ Untap | Cost$ T | ValidTgts$ Land | TgtPrompt$ Choose target land | SpellDescription$ Untap target land.
-A:AB$ Untap | Cost$ T | ValidTgts$ Land | TgtPrompt$ Choose target land | TargetMin$ 0 | TargetMax$ 3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Untap up to three target lands. Activate only if seven or more cards are in your graveyard.
+A:AB$ Untap | Cost$ T | ValidTgts$ Land | TgtPrompt$ Choose target land | TargetMin$ 0 | TargetMax$ 3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Untap up to three target lands. Activate only if there are seven or more cards in your graveyard.
 AI:RemoveDeck:All
-Oracle:{T}: Untap target land.\nThreshold — {T}: Untap up to three target lands. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Untap target land.\nThreshold — {T}: Untap up to three target lands. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/l/lavaclaw_reaches.txt
+++ b/forge-gui/res/cardsfolder/l/lavaclaw_reaches.txt
@@ -1,10 +1,10 @@
 Name:Lavaclaw Reaches
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
-A:AB$ Animate | Cost$ 1 B R | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Red | OverwriteColors$ True | Abilities$ ABPump | SpellDescription$ Until end of turn, CARDNAME becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
+A:AB$ Animate | Cost$ 1 B R | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Red | OverwriteColors$ True | Abilities$ ABPump | SpellDescription$ Until end of turn, this land becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
 SVar:ABPump:AB$ Pump | Cost$ X | Defined$ Self | NumAtt$ +X | SpellDescription$ This creature gets +X/+0 until end of turn.
 SVar:X:Count$xPaid
-Oracle:Lavaclaw Reaches enters tapped.\n{T}: Add {B} or {R}.\n{1}{B}{R}: Until end of turn, Lavaclaw Reaches becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {B} or {R}.\n{1}{B}{R}: Until end of turn, this land becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
--- a/forge-gui/res/cardsfolder/l/lightning_surge.txt
+++ b/forge-gui/res/cardsfolder/l/lightning_surge.txt
@@ -3,6 +3,6 @@ ManaCost:3 R R
 Types:Sorcery
 K:Flashback:5 R R
 A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 4 | SubAbility$ DBDamage | ConditionCheckSVar$ X | ConditionSVarCompare$ LT7 | SpellDescription$ CARDNAME deals 4 damage to any target.
-SVar:DBDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 6 | NoPrevention$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | SpellDescription$ Threshold — If seven or more cards are in your graveyard, instead CARDNAME deals 6 damage to that permanent or player and the damage can't be prevented.
+SVar:DBDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 6 | NoPrevention$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | SpellDescription$ Threshold — If there are seven or more cards in your graveyard, instead CARDNAME deals 6 damage to that permanent or player and the damage can't be prevented.
 SVar:X:Count$ValidGraveyard Card.YouOwn
-Oracle:Lightning Surge deals 4 damage to any target.\nThreshold — If seven or more cards are in your graveyard, instead Lightning Surge deals 6 damage to that permanent or player and the damage can't be prevented.\nFlashback {5}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:Lightning Surge deals 4 damage to any target.\nThreshold — If there are seven or more cards in your graveyard, instead Lightning Surge deals 6 damage to that permanent or player and the damage can't be prevented.\nFlashback {5}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
--- a/forge-gui/res/cardsfolder/l/lumbering_falls.txt
+++ b/forge-gui/res/cardsfolder/l/lumbering_falls.txt
@@ -1,8 +1,8 @@
 Name:Lumbering Falls
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo G U | SpellDescription$ Add {G} or {U}.
-A:AB$ Animate | Cost$ 2 G U | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Green,Blue | OverwriteColors$ True | Keywords$ Hexproof | SpellDescription$ CARDNAME becomes a 3/3 green and blue Elemental creature with hexproof until end of turn. It's still a land.
-Oracle:Lumbering Falls enters tapped.\n{T}: Add {G} or {U}.\n{2}{G}{U}: Lumbering Falls becomes a 3/3 green and blue Elemental creature with hexproof until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 2 G U | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Green,Blue | OverwriteColors$ True | Keywords$ Hexproof | SpellDescription$ Until end of turn, this land becomes a 3/3 green and blue Elemental creature with hexproof. It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {G} or {U}.\n{2}{G}{U}: Until end of turn, this land becomes a 3/3 green and blue Elemental creature with hexproof. It's still a land.
--- a/forge-gui/res/cardsfolder/m/masked_gorgon.txt
+++ b/forge-gui/res/cardsfolder/m/masked_gorgon.txt
@@ -3,5 +3,5 @@ ManaCost:4 B
 Types:Creature Gorgon
 PT:5/5
 S:Mode$ Continuous | Affected$ Creature.Green,Creature.White | AddKeyword$ Protection:Gorgon | Description$ Green creatures and white creatures have protection from Gorgons.
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Protection from green & Protection from white | Condition$ Threshold | Description$ Threshold — CARDNAME has protection from green and from white as long as seven or more cards are in your graveyard.
-Oracle:Green creatures and white creatures have protection from Gorgons.\nThreshold — Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Protection from green & Protection from white | Condition$ Threshold | Description$ Threshold — CARDNAME has protection from green and from white as long as there are seven or more cards in your graveyard.
+Oracle:Green creatures and white creatures have protection from Gorgons.\nThreshold — Masked Gorgon has protection from green and from white as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/m/metamorphic_wurm.txt
+++ b/forge-gui/res/cardsfolder/m/metamorphic_wurm.txt
@@ -2,5 +2,5 @@ Name:Metamorphic Wurm
 ManaCost:3 G G
 Types:Creature Elephant Wurm
 PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +4/+4 as long as seven or more cards are in your graveyard.
-Oracle:Threshold — Metamorphic Wurm gets +4/+4 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +4/+4 as long as there are seven or more cards in your graveyard.
+Oracle:Threshold — Metamorphic Wurm gets +4/+4 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/m/mind_drill_assailant.txt
+++ b/forge-gui/res/cardsfolder/m/mind_drill_assailant.txt
@@ -2,6 +2,6 @@ Name:Mind Drill Assailant
 ManaCost:2 UB UB
 Types:Creature Rat Warlock
 PT:2/5
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +3/+0.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +3/+0.
 A:AB$ Surveil | Cost$ 2 UB | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
-Oracle:Threshold — As long as seven or more cards are in your graveyard, Mind Drill Assailant gets +3/+0.\n{2}{U/B}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:Threshold — As long as there are seven or more cards in your graveyard, Mind Drill Assailant gets +3/+0.\n{2}{U/B}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
--- a/forge-gui/res/cardsfolder/m/mindwhisker.txt
+++ b/forge-gui/res/cardsfolder/m/mindwhisker.txt
@@ -4,8 +4,8 @@ Types:Creature Rat Wizard
 PT:3/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
-S:Mode$ Continuous | Affected$ Creature.OppCtrl | Condition$ Threshold | AddPower$ -1 | Description$ Threshold — As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
+S:Mode$ Continuous | Affected$ Creature.OppCtrl | Condition$ Threshold | AddPower$ -1 | Description$ Threshold — As long as there are seven or more cards in your graveyard, creatures your opponents control get -1/-0.
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Graveyard|Surveil
 DeckHints:Ability$Graveyard
-Oracle:At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nThreshold — As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
+Oracle:At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nThreshold — As long as there are seven or more cards in your graveyard, creatures your opponents control get -1/-0.
--- a/forge-gui/res/cardsfolder/m/mystic_crusader.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_crusader.txt
@@ -4,5 +4,5 @@ Types:Creature Human Nomad Mystic
 PT:2/1
 K:Protection from black
 K:Protection from red
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has flying.
-Oracle:Protection from black and from red\nThreshold — As long as seven or more cards are in your graveyard, Mystic Crusader gets +1/+1 and has flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has flying.
+Oracle:Protection from black and from red\nThreshold — As long as there are seven or more cards in your graveyard, Mystic Crusader gets +1/+1 and has flying.
--- a/forge-gui/res/cardsfolder/m/mystic_enforcer.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_enforcer.txt
@@ -3,5 +3,5 @@ ManaCost:2 G W
 Types:Creature Human Nomad Mystic
 PT:3/3
 K:Protection from black
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +3/+3 and has flying.
-Oracle:Protection from black\nThreshold — As long as seven or more cards are in your graveyard, Mystic Enforcer gets +3/+3 and has flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +3/+3 and has flying.
+Oracle:Protection from black\nThreshold — As long as there are seven or more cards in your graveyard, Mystic Enforcer gets +3/+3 and has flying.
--- a/forge-gui/res/cardsfolder/m/mystic_familiar.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_familiar.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Bird
 PT:1/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Protection from black | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has protection from black.
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Mystic Familiar gets +1/+1 and has protection from black.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Protection from black | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has protection from black.
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Mystic Familiar gets +1/+1 and has protection from black.
--- a/forge-gui/res/cardsfolder/m/mystic_penitent.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_penitent.txt
@@ -3,5 +3,5 @@ ManaCost:W
 Types:Creature Human Nomad Mystic
 PT:1/1
 K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has flying.
-Oracle:Vigilance\nThreshold — As long as seven or more cards are in your graveyard, Mystic Penitent gets +1/+1 and has flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has flying.
+Oracle:Vigilance\nThreshold — As long as there are seven or more cards in your graveyard, Mystic Penitent gets +1/+1 and has flying.
--- a/forge-gui/res/cardsfolder/m/mystic_visionary.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_visionary.txt
@@ -2,5 +2,5 @@ Name:Mystic Visionary
 ManaCost:1 W
 Types:Creature Human Nomad Mystic
 PT:2/1
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — CARDNAME has flying as long as seven or more cards are in your graveyard.
-Oracle:Threshold — Mystic Visionary has flying as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — CARDNAME has flying as long as there are seven or more cards in your graveyard.
+Oracle:Threshold — Mystic Visionary has flying as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/m/mystic_zealot.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_zealot.txt
@@ -2,5 +2,5 @@ Name:Mystic Zealot
 ManaCost:3 W
 Types:Creature Human Nomad Mystic
 PT:2/4
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has flying.
-Oracle:Threshold — As long as seven or more cards are in your graveyard, Mystic Zealot gets +1/+1 and has flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and has flying.
+Oracle:Threshold — As long as there are seven or more cards in your graveyard, Mystic Zealot gets +1/+1 and has flying.
--- a/forge-gui/res/cardsfolder/n/nantuko_blightcutter.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_blightcutter.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Insect Druid
 PT:2/2
 K:Protection from black
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+1 for each black permanent your opponents control as long as there are seven or more cards in your graveyard.
 SVar:X:Count$Valid Permanent.Black+OppCtrl
-Oracle:Protection from black\nThreshold — Nantuko Blightcutter gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard.
+Oracle:Protection from black\nThreshold — Nantuko Blightcutter gets +1/+1 for each black permanent your opponents control as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/nantuko_calmer.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_calmer.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G
 Types:Creature Insect Druid
 PT:2/3
 A:AB$ Destroy | Cost$ G T Sac<1/CARDNAME> | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | AILogic$ AtEOTIfNotAttacking | SpellDescription$ Destroy target enchantment.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+1 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+1 as long as there are seven or more cards in your graveyard.
 DeckHints:Ability$Graveyard
-Oracle:{G}, {T}, Sacrifice Nantuko Calmer: Destroy target enchantment.\nThreshold — Nantuko Calmer gets +1/+1 as long as seven or more cards are in your graveyard.
+Oracle:{G}, {T}, Sacrifice Nantuko Calmer: Destroy target enchantment.\nThreshold — Nantuko Calmer gets +1/+1 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/nantuko_monastery.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_monastery.txt
@@ -2,6 +2,6 @@ Name:Nantuko Monastery
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ G W | Activation$ Threshold | PrecostDesc$ Threshold — | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Insect,Monk | Colors$ Green,White | OverwriteColors$ True | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate only if seven or more cards are in your graveyard.
+A:AB$ Animate | Cost$ G W | Activation$ Threshold | PrecostDesc$ Threshold — | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Insect,Monk | Colors$ Green,White | OverwriteColors$ True | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate only if there are seven or more cards in your graveyard.
 AI:RemoveDeck:Random
-Oracle:{T}: Add {C}.\nThreshold — {G}{W}: Nantuko Monastery becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {C}.\nThreshold — {G}{W}: Nantuko Monastery becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/needle_spires.txt
+++ b/forge-gui/res/cardsfolder/n/needle_spires.txt
@@ -1,8 +1,8 @@
 Name:Needle Spires
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo R W | SpellDescription$ Add {R} or {W}.
-A:AB$ Animate | Cost$ 2 R W | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Elemental | Colors$ Red,White | OverwriteColors$ True | Keywords$ Double Strike | SpellDescription$ CARDNAME becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
-Oracle:Needle Spires enters tapped.\n{T}: Add {R} or {W}.\n{2}{R}{W}: Needle Spires becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 2 R W | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Elemental | Colors$ Red,White | OverwriteColors$ True | Keywords$ Double Strike | SpellDescription$ Until end of turn, this land becomes a 2/1 red and white Elemental creature with double strike. It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {R} or {W}.\n{2}{R}{W}: Until end of turn, this land becomes a 2/1 red and white Elemental creature with double strike. It's still a land.
--- a/forge-gui/res/cardsfolder/n/nightwhorl_hermit.txt
+++ b/forge-gui/res/cardsfolder/n/nightwhorl_hermit.txt
@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Creature Rat Rogue
 PT:1/4
 K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+0 and can't be blocked.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+0 and can't be blocked.
 S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Condition$ Threshold
-Oracle:Vigilance\nThreshold — As long as seven or more cards are in your graveyard, Nightwhorl Hermit gets +1/+0 and can't be blocked.
+Oracle:Vigilance\nThreshold — As long as there are seven or more cards in your graveyard, Nightwhorl Hermit gets +1/+0 and can't be blocked.
--- a/forge-gui/res/cardsfolder/n/nim_mongoose.txt
+++ b/forge-gui/res/cardsfolder/n/nim_mongoose.txt
@@ -5,7 +5,7 @@ PT:2/1
 K:Shroud
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters the battlefield tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+0 for each artifact you control as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Condition$ Threshold | Description$ Threshold — CARDNAME gets +1/+0 for each artifact you control as long as there are seven or more cards in your graveyard.
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:BuffedBy:Artifact
-Oracle:Shroud\nNim Mongoose enters the battlefield tapped.\nThreshold — Nim Mongoose gets +1/+0 for each artifact you control as long as seven or more cards are in your graveyard.
+Oracle:Shroud\nNim Mongoose enters the battlefield tapped.\nThreshold — Nim Mongoose gets +1/+0 for each artifact you control as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/nimble_mongoose.txt
+++ b/forge-gui/res/cardsfolder/n/nimble_mongoose.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Mongoose
 PT:1/1
 K:Shroud
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +2/+2 as long as seven or more cards are in your graveyard.
-Oracle:Shroud (This creature can't be the target of spells or abilities.)\nThreshold — Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +2/+2 as long as there are seven or more cards in your graveyard.
+Oracle:Shroud (This creature can't be the target of spells or abilities.)\nThreshold — Nimble Mongoose gets +2/+2 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/nomad_decoy.txt
+++ b/forge-gui/res/cardsfolder/n/nomad_decoy.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Human Nomad
 PT:1/2
 A:AB$ Tap | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
-A:AB$ Tap | Cost$ W W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 2 | TargetMax$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Tap two target creatures. Activate only if seven or more cards are in your graveyard.
+A:AB$ Tap | Cost$ W W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 2 | TargetMax$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Tap two target creatures. Activate only if there are seven or more cards in your graveyard.
 SVar:NonCombatPriority:1
-Oracle:{W}, {T}: Tap target creature.\nThreshold — {W}{W}, {T}: Tap two target creatures. Activate only if seven or more cards are in your graveyard.
+Oracle:{W}, {T}: Tap target creature.\nThreshold — {W}{W}, {T}: Tap two target creatures. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/nomad_stadium.txt
+++ b/forge-gui/res/cardsfolder/n/nomad_stadium.txt
@@ -2,7 +2,7 @@ Name:Nomad Stadium
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
-A:AB$ GainLife | Cost$ W T Sac<1/CARDNAME> | LifeAmount$ 4 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ You gain 4 life. Activate only if seven or more cards are in your graveyard.
+A:AB$ GainLife | Cost$ W T Sac<1/CARDNAME> | LifeAmount$ 4 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ You gain 4 life. Activate only if there are seven or more cards in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 AI:RemoveDeck:All
-Oracle:{T}: Add {W}. Nomad Stadium deals 1 damage to you.\nThreshold — {W}, {T}, Sacrifice Nomad Stadium: You gain 4 life. Activate only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {W}. Nomad Stadium deals 1 damage to you.\nThreshold — {W}, {T}, Sacrifice Nomad Stadium: You gain 4 life. Activate only if there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/n/nut_collector.txt
+++ b/forge-gui/res/cardsfolder/n/nut_collector.txt
@@ -2,7 +2,7 @@ Name:Nut Collector
 ManaCost:5 G
 Types:Creature Human Druid
 PT:1/1
-S:Mode$ Continuous | Affected$ Creature.Squirrel | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may create a 1/1 green Squirrel creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_squirrel | TokenOwner$ You
-Oracle:At the beginning of your upkeep, you may create a 1/1 green Squirrel creature token.\nThreshold — Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Creature.Squirrel | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold — Squirrel creatures get +2/+2 as long as there are seven or more cards in your graveyard.
+Oracle:At the beginning of your upkeep, you may create a 1/1 green Squirrel creature token.\nThreshold — Squirrel creatures get +2/+2 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/o/otarian_juggernaut.txt
+++ b/forge-gui/res/cardsfolder/o/otarian_juggernaut.txt
@@ -3,6 +3,6 @@ ManaCost:4
 Types:Artifact Creature Juggernaut
 PT:2/3
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.Wall | Description$ CARDNAME can't be blocked by Walls.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +3/+0 and attacks each combat if able.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +3/+0 and attacks each combat if able.
 S:Mode$ MustAttack | ValidCreature$ Card.Self | Condition$ Threshold | Secondary$ True
-Oracle:Otarian Juggernaut can't be blocked by Walls.\nThreshold — As long as seven or more cards are in your graveyard, Otarian Juggernaut gets +3/+0 and attacks each combat if able.
+Oracle:Otarian Juggernaut can't be blocked by Walls.\nThreshold — As long as there are seven or more cards in your graveyard, Otarian Juggernaut gets +3/+0 and attacks each combat if able.
--- a/forge-gui/res/cardsfolder/p/pardic_arsonist.txt
+++ b/forge-gui/res/cardsfolder/p/pardic_arsonist.txt
@@ -2,7 +2,7 @@ Name:Pardic Arsonist
 ManaCost:2 R R
 Types:Creature Human Barbarian
 PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters, it deals 3 damage to any target."
+S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigETB | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "When CARDNAME enters, it deals 3 damage to any target."
 SVar:TrigETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters, it deals 3 damage to any target.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
-Oracle:Threshold — As long as seven or more cards are in your graveyard, Pardic Arsonist has "When Pardic Arsonist enters, it deals 3 damage to any target."
+Oracle:Threshold — As long as there are seven or more cards in your graveyard, Pardic Arsonist has "When Pardic Arsonist enters, it deals 3 damage to any target."
--- a/forge-gui/res/cardsfolder/p/patriarchs_desire.txt
+++ b/forge-gui/res/cardsfolder/p/patriarchs_desire.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ -X | Description$ Enchanted creature gets +2/-2. Threshold — Enchanted creature gets an additional +2/-2 as long as seven or more cards are in your graveyard.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ -X | Description$ Enchanted creature gets +2/-2. Threshold — Enchanted creature gets an additional +2/-2 as long as there are seven or more cards in your graveyard.
 SVar:X:Count$Threshold.4.2
 AI:RemoveDeck:All
-Oracle:Enchant creature\nEnchanted creature gets +2/-2.\nThreshold — Enchanted creature gets an additional +2/-2 as long as seven or more cards are in your graveyard.
+Oracle:Enchant creature\nEnchanted creature gets +2/-2.\nThreshold — Enchanted creature gets an additional +2/-2 as long as there are seven or more cards in your graveyard.
--- a/forge-gui/res/cardsfolder/p/possessed_aven.txt
+++ b/forge-gui/res/cardsfolder/p/possessed_aven.txt
@@ -3,6 +3,6 @@ ManaCost:2 U U
 Types:Creature Bird Soldier Horror
 PT:3/3
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target blue creature."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target blue creature."
 SVar:Destroy:AB$ Destroy | Cost$ 2 B T | ValidTgts$ Creature.Blue | TgtPrompt$ Select target blue creature | SpellDescription$ Destroy target blue creature.
-Oracle:Flying\nThreshold — As long as seven or more cards are in your graveyard, Possessed Aven gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target blue creature."
+Oracle:Flying\nThreshold — As long as there are seven or more cards in your graveyard, Possessed Aven gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target blue creature."
--- a/forge-gui/res/cardsfolder/p/possessed_barbarian.txt
+++ b/forge-gui/res/cardsfolder/p/possessed_barbarian.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R
 Types:Creature Human Barbarian Horror
 PT:3/3
 K:First Strike
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target red creature."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target red creature."
 SVar:Destroy:AB$ Destroy | Cost$ 2 B T | ValidTgts$ Creature.Red | TgtPrompt$ Select target red creature | SpellDescription$ Destroy target red creature.
-Oracle:First strike\nThreshold — As long as seven or more cards are in your graveyard, Possessed Barbarian gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target red creature."
+Oracle:First strike\nThreshold — As long as there are seven or more cards in your graveyard, Possessed Barbarian gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target red creature."
--- a/forge-gui/res/cardsfolder/p/possessed_centaur.txt
+++ b/forge-gui/res/cardsfolder/p/possessed_centaur.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G
 Types:Creature Centaur Horror
 PT:3/3
 K:Trample
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target green creature."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target green creature."
 SVar:Destroy:AB$ Destroy | Cost$ 2 B T | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | SpellDescription$ Destroy target green creature.
-Oracle:Trample\nThreshold — As long as seven or more cards are in your graveyard, Possessed Centaur gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target green creature."
+Oracle:Trample\nThreshold — As long as there are seven or more cards in your graveyard, Possessed Centaur gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target green creature."
--- a/forge-gui/res/cardsfolder/p/possessed_nomad.txt
+++ b/forge-gui/res/cardsfolder/p/possessed_nomad.txt
@@ -3,6 +3,6 @@ ManaCost:2 W W
 Types:Creature Human Nomad Horror
 PT:3/3
 K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target white creature."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | SetColor$ Black | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target white creature."
 SVar:Destroy:AB$ Destroy | Cost$ 2 B T | ValidTgts$ Creature.White | TgtPrompt$ Select target white creature | SpellDescription$ Destroy target white creature.
-Oracle:Vigilance\nThreshold — As long as seven or more cards are in your graveyard, Possessed Nomad gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target white creature."
+Oracle:Vigilance\nThreshold — As long as there are seven or more cards in your graveyard, Possessed Nomad gets +1/+1, is black, and has "{2}{B}, {T}: Destroy target white creature."
--- a/forge-gui/res/cardsfolder/p/putrid_imp.txt
+++ b/forge-gui/res/cardsfolder/p/putrid_imp.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Zombie Imp
 PT:1/1
 A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and can't block.
-S:Mode$ CantBlock | ValidCard$ Card.Self | Condition$ Threshold | Secondary$ True | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and can't block.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and can't block.
+S:Mode$ CantBlock | ValidCard$ Card.Self | Condition$ Threshold | Secondary$ True | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME gets +1/+1 and can't block.
 AI:RemoveDeck:All
-Oracle:Discard a card: Putrid Imp gains flying until end of turn.\nThreshold — As long as seven or more cards are in your graveyard, Putrid Imp gets +1/+1 and can't block.
+Oracle:Discard a card: Putrid Imp gains flying until end of turn.\nThreshold — As long as there are seven or more cards in your graveyard, Putrid Imp gets +1/+1 and can't block.
--- a/forge-gui/res/cardsfolder/r/raging_ravine.txt
+++ b/forge-gui/res/cardsfolder/r/raging_ravine.txt
@@ -1,10 +1,10 @@
 Name:Raging Ravine
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
-A:AB$ Animate | Cost$ 2 R G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Red,Green | OverwriteColors$ True | Triggers$ TrigAttack | SpellDescription$ Until end of turn, CARDNAME becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
-SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it.
+A:AB$ Animate | Cost$ 2 R G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Red,Green | OverwriteColors$ True | Triggers$ TrigAttack | SpellDescription$ Until end of turn, this land becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature attacks, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-Oracle:Raging Ravine enters tapped.\n{T}: Add {R} or {G}.\n{2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
+Oracle:This land enters tapped.\n{T}: Add {R} or {G}.\n{2}{R}{G}: Until end of turn, this land becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
--- a/forge-gui/res/cardsfolder/r/rampaging_baloths.txt
+++ b/forge-gui/res/cardsfolder/r/rampaging_baloths.txt
@@ -3,6 +3,6 @@ ManaCost:4 G G
 Types:Creature Beast
 PT:6/6
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Landfall — Whenever a land you control enters, you may create a 4/4 green Beast creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Landfall — Whenever a land you control enters, create a 4/4 green Beast creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_beast | TokenOwner$ You
-Oracle:Trample\nLandfall — Whenever a land you control enters, you may create a 4/4 green Beast creature token.
+Oracle:Trample\nLandfall — Whenever a land you control enters, create a 4/4 green Beast creature token.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hans Mackowiak	0f3a9cd22e	AbilityUtils: add Precalc Option	2025-08-23 16:28:57 +02:00
Fulgur14	6657602b80	J. Jonah Jameson (SPM) (#8506 )	2025-08-23 11:00:45 +02:00
Eradev	eeca33855d	Fix minor card render problems (#8478 ) * Missing space * Unescape line breaks in card descriptions	2025-08-23 06:56:21 +03:00
Matthew Scott Krafczyk	cdc63f35bb	Add python specific entries to .gitignore (#8390 )	2025-08-23 06:55:28 +03:00
Jetz72	5a9ea8d260	Merge pull request #8344 from verifiedtm/deck-editor-sections Add other deck sections for other formats	2025-08-22 07:56:55 -05:00
Fulgur14	5a363922bd	Oracle updates - EOE (#8496 )	2025-08-22 12:57:01 +02:00
TRT	c878401197	Script cleanup	2025-08-22 10:03:27 +02:00
Tim Miller	e4d58a0a88	Add other deck sections for other formats	2025-08-10 17:03:30 -04:00