Wave 3 of perpetual rework + Pump double P or T rework (#4423)

2025-11-11 16:26:22 +00:00 · 2024-01-09 03:31:02 -05:00
parent fc23a8d9e3
commit acb5151a82
84 changed files with 228 additions and 267 deletions
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -75,6 +75,11 @@ public class AbilityUtils {
            player = hostCard.getController();
        }

+        if (defined.contains("AndSelf")) {
+            cards.add(hostCard);
+            defined = defined.replace("AndSelf", "");
+        }
+        
        if (defined.equals("Self")) {
            c = hostCard;
        } else if (defined.equals("CorrectedSelf")) {
--- a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
@@ -310,8 +310,15 @@ public class PumpEffect extends SpellAbilityEffect {
                    Localizer.getInstance().getMessage("lblChooseKeyword"), tgtCards.get(0));
            keywords.add(chosen);
        }
-        final int a = AbilityUtils.calculateAmount(host, sa.getParam("NumAtt"), sa, !sa.hasParam("Double"));
-        final int d = AbilityUtils.calculateAmount(host, sa.getParam("NumDef"), sa, !sa.hasParam("Double"));
+        
+        int a = 0;
+        int d = 0;
+        if (sa.hasParam("NumAtt") && !sa.getParam("NumAtt").equals("Double")) {
+            a = AbilityUtils.calculateAmount(host, sa.getParam("NumAtt"), sa, true);
+        }
+        if (sa.hasParam("NumDef") && !sa.getParam("NumDef").equals("Double")) {
+            d = AbilityUtils.calculateAmount(host, sa.getParam("NumDef"), sa, true);
+        }

        if (sa.hasParam("SharedKeywordsZone")) {
            List<ZoneType> zones = ZoneType.listValueOf(sa.getParam("SharedKeywordsZone"));
@@ -502,6 +509,13 @@ public class PumpEffect extends SpellAbilityEffect {
                });
            }

+            if (sa.hasParam("NumAtt") && sa.getParam("NumAtt").equals("Double")) {
+                a = tgtC.getNetPower();
+            }
+            if (sa.hasParam("NumDef") && sa.getParam("NumDef").equals("Double")) {
+                d = tgtC.getNetToughness();
+            }
+
            applyPump(sa, tgtC, a, d, affectedKeywords, timestamp);
        }

--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -4404,8 +4404,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
            addPTBoost((Integer) p.get("Power"), (Integer) p.get("Toughness"), (long) 
                p.get("Timestamp"), (long) 0);
        } else if (category.equals("Keywords")) {
-            addChangedCardKeywords((List<String>) p.get("AddKeywords"), Lists.newArrayList(), 
-                (boolean) p.getOrDefault("RemoveAll", false), (long) p.get("Timestamp"), (long) 0);        
+            boolean removeAll = p.containsKey("RemoveAll") && (boolean) p.get("RemoveAll") == true;
+            addChangedCardKeywords((List<String>) p.get("AddKeywords"), Lists.newArrayList(), removeAll, 
+                (long) p.get("Timestamp"), (long) 0);
        } else if (category.equals("Types")) {
            addChangedCardTypes((CardType) p.get("AddTypes"), (CardType) p.get("RemoveTypes"), 
                false, (Set<RemoveType>) p.get("RemoveXTypes"), 
--- a/forge-gui/res/cardsfolder/a/against_all_odds.txt
+++ b/forge-gui/res/cardsfolder/a/against_all_odds.txt
@@ -7,4 +7,4 @@ SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DBReturnArtifact:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Artifact.YouCtrl+cmcLE3,Creature.YouCtrl+cmcLE3 | TgtPrompt$ Select target artifact or creature to return from your graveyard | SpellDescription$ Return target artifact or creature card with mana value 3 or less from your graveyard to the battlefield.
 DeckHas:Ability$Graveyard
-Oracle:Choose one or both —\n• Exile target artifact or creature you control, then return it to the battlefield under its owner's control.\n• Return target artifact or creature card with mana value 3 or less from your graveyard to the battlefield.
+Oracle:Choose one or both —\n• Exile target artifact or creature you control, then return it to the battlefield under its owner's control.\n• Return target artifact or creature card with mana value 3 or less from your graveyard to the battlefield.
--- a/forge-gui/res/cardsfolder/a/alaborn_zealot.txt
+++ b/forge-gui/res/cardsfolder/a/alaborn_zealot.txt
@@ -3,6 +3,5 @@ ManaCost:W
 Types:Creature Human Soldier
 PT:1/1
 T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME.
-SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredAttackerLKICopy | SubAbility$ DestroySelf
-SVar:DestroySelf:DB$ Destroy | Defined$ Self
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredAttackerLKICopyAndSelf
 Oracle:When Alaborn Zealot blocks a creature, destroy that creature and Alaborn Zealot.
--- a/forge-gui/res/cardsfolder/b/bronzehide_lion.txt
+++ b/forge-gui/res/cardsfolder/b/bronzehide_lion.txt
@@ -3,7 +3,7 @@ ManaCost:G W
 Types:Creature Cat
 PT:3/3
 A:AB$ Pump | Cost$ G W | KW$ Indestructible | Defined$ Self | SpellDescription$ CARDNAME gains indestructible until end of turn.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, return it to the battlefield. It's an Aura enchantment with enchant creature you control and CARDNAME has "{G}{W}: Enchanted creature gains indestructible until end of turn," and it loses all other abilities.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, return it to the battlefield. It's an Aura enchantment with enchant creature you control and "{G}{W}: Enchanted creature gains indestructible until end of turn," and it loses all other abilities.
 SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment,Aura | RemoveCardTypes$ True | RemoveAllAbilities$ True | Keywords$ Enchant creature you control | Abilities$ SPAttach,ABPump | Duration$ Permanent
 SVar:SPAttach:SP$ Attach | Cost$ 0 | ValidTgts$ Creature.YouCtrl | AILogic$ Pump
--- a/forge-gui/res/cardsfolder/c/choose_your_weapon.txt
+++ b/forge-gui/res/cardsfolder/c/choose_your_weapon.txt
@@ -1,9 +1,7 @@
 Name:Choose Your Weapon
 ManaCost:2 G
 Types:Instant
-A:SP$ Charm | Cost$ 2 G | Choices$ DBPump,DBDamage
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ +Y | Double$ True | SpellDescription$ Two-Weapon Fighting — Double target creature's power and toughness until end of turn.
-SVar:X:Targeted$CardPower
-SVar:Y:Targeted$CardToughness
+A:SP$ Charm | Choices$ DBPump,DBDamage
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ Double | NumDef$ Double | StackDescription$ REP target creature_{c:Targeted} | SpellDescription$ Two-Weapon Fighting — Double target creature's power and toughness until end of turn.
 SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 5 | SpellDescription$ Archery — This spell deals 5 damage to target creature with flying.
 Oracle:Choose one —\n• Two-Weapon Fighting — Double target creature's power and toughness until end of turn.\n• Archery — This spell deals 5 damage to target creature with flying.
--- a/forge-gui/res/cardsfolder/c/contempt.txt
+++ b/forge-gui/res/cardsfolder/c/contempt.txt
@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
 T:Mode$ Attacks | ValidCard$ Card.EnchantedBy | Execute$ DelBounce | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature attacks, return it and CARDNAME to their owners' hands at end of combat.
 SVar:DelBounce:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ BounceCritter | TriggerDescription$ Return enchanted creature and CARDNAME to their owners' hands.
-SVar:BounceCritter:DB$ ChangeZone | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ BounceSelf
-SVar:BounceSelf:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
+SVar:BounceCritter:DB$ ChangeZone | Defined$ EnchantedAndSelf | Origin$ Battlefield | Destination$ Hand
 SVar:NonStackingAttachEffect:True
 Oracle:Enchant creature\nWhen enchanted creature attacks, return it and Contempt to their owners' hands at end of combat.
--- a/forge-gui/res/cardsfolder/d/darigaazs_whelp.txt
+++ b/forge-gui/res/cardsfolder/d/darigaazs_whelp.txt
@@ -4,14 +4,12 @@ Types:Creature Dragon
 PT:2/1
 K:Kicker:1 R
 K:Flying
-T:Mode$ Drawn | ValidCard$ Card.YouOwn+Dragon | TriggerZones$ Battlefield | Execute$ DBEffect | TriggerDescription$ Whenever you draw a Dragon card, it perpetually gets +1/+1.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualP1P1 | RememberObjects$ TriggeredCard | Name$ Darigaaz's Whelp's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This card perpetually gets +1/+1.
+T:Mode$ Drawn | ValidCard$ Card.YouOwn+Dragon | TriggerZones$ Battlefield | Execute$ DBPump | TriggerDescription$ Whenever you draw a Dragon card, it perpetually gets +1/+1.
+SVar:DBPump:DB$ Pump | PumpZone$ Hand | Defined$ TriggeredCard | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigSeek | TriggerDescription$ When this creature enters the battlefield, if it was kicked, seek a Dragon card. CARDNAME and that Dragon card each perpetually get +1/+1.
-SVar:TrigSeek:DB$ Seek | RememberFound$ True | Type$ Card.Dragon | SubAbility$ DBEffectBis
-SVar:DBEffectBis:DB$ Effect | StaticAbilities$ PerpetualP1P1Bis | RememberObjects$ Remembered | Name$ Darigaaz's Whelp's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualP1P1Bis:Mode$ Continuous | Affected$ Card.IsRemembered,Card.EffectSource | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ CARDNAME and the conjured Dragon card each perpetually get +1/+1.
+SVar:TrigSeek:DB$ Seek | RememberFound$ True | Type$ Card.Dragon | SubAbility$ DBPump2
+SVar:DBPump2:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ RememberedAndSelf | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True 
 DeckNeeds:Type$Dragon
-DeckHas:Color$Red
+DeckHints:Color$Red
 Oracle:Kicker {1}{R}\nFlying\nWhenever you draw a Dragon card, it perpetually gets +1/+1.\nWhen Darigaaz's Whelp enters the battlefield, if it was kicked, seek a Dragon card. Darigaaz's Whelp and that Dragon card each perpetually get +1/+1.
--- a/forge-gui/res/cardsfolder/d/davriel_soul_broker.txt
+++ b/forge-gui/res/cardsfolder/d/davriel_soul_broker.txt
@@ -10,8 +10,7 @@ A:AB$ GenericChoice | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ChoiceP
 SVar:Draw3:DB$ Draw | NumCards$ 3 | SpellDescription$ Draw three cards.
 SVar:Conjure:DB$ MakeCard | Conjure$ True | Name$ Manor Guardian | Zone$ Hand | SpellDescription$ Conjure a Manor Guardian card into your hand.
 SVar:Return2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouOwn | ChangeNum$ 2 | RememberChanged$ True | Hidden$ True | Mandatory$ True | AtRandom$ True | SubAbility$ DBEffect | SpellDescription$ Return two random creature cards from your graveyard to your hand. They perpetually gain +1/+1.
-SVar:DBEffect:DB$ Effect | Name$ Davriel, Soul Broker's Perpetual -2 Effect (Offer 4) | StaticAbilities$ PerpetualBuff | RememberObjects$ Remembered | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualBuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ These cards perpetually gain +1/+1.
+SVar:DBEffect:DB$ Pump | PumpZone$ Hand | Defined$ Remembered | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:ReturnBig:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.cmcEQV | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | AtRandom$ True | SpellDescription$ Return a random creature card with the highest mana value from among cards in your graveyard to the battlefield.
 SVar:V:Count$ValidGraveyard Creature.YouOwn$GreatestCMC
 SVar:EmblemBuff:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Offer 5) | StaticAbilities$ YoursP2Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get +2/+0."
@@ -27,12 +26,11 @@ SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 SVar:DBCondition:DB$ GenericChoice | ChoicePrompt$ Choose a condition | NumRandomChoices$ 3 | Choices$ Lose6,Exile2,Sac2,PerpetualBuffTheirs,EmblemDebuff,EmblemRaiseCost,EmblemDrawExile,EmblemUpkeepLose | StackDescription$ None
 SVar:Lose6:DB$ LoseLife | Defined$ You | LifeAmount$ 6 | SpellDescription$ You lose 6 life.
 SVar:Exile2:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | ChangeType$ Card.YouOwn | ChangeNum$ 2 | RememberChanged$ True | Hidden$ True | Mandatory$ True | SubAbility$ DBDraw | SpellDescription$ Exile two cards from your hand. If fewer than two cards were exiled this way, each opponent draws cards equal to the difference.
-SVar:DBDraw:DB$ Draw | Defined$ Player.Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ LT2 | NumCards$ Y | SubAbility$ DBCleanup
+SVar:DBDraw:DB$ Draw | Defined$ Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ LT2 | NumCards$ Y | SubAbility$ DBCleanup
 SVar:X:Remembered$Amount
 SVar:Y:Number$2/Minus.X
 SVar:Sac2:DB$ Sacrifice | Amount$ 2 | SacValid$ Permanent | Defined$ You | SpellDescription$ Sacrifice two permanents.
-SVar:PerpetualBuffTheirs:DB$ Effect | Name$ Davriel, Soul Broker's Perpetual -2 Effect (Condition 4) | StaticAbilities$ PerpetualBuffCreatYouDontCtrl | Duration$ Permanent | SpellDescription$ Each creature you don't control perpetually gains +1/+1.
-SVar:PerpetualBuffCreatYouDontCtrl:Mode$ Continuous | Affected$ Card.Creature+YouDontCtrl | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Each creature you don't control perpetually gains +1/+1.
+SVar:PerpetualBuffTheirs:DB$ PumpAll | ValidCards$ Creature.YouDontCtrl | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SpellDescription$ Each creature you don't control perpetually gains +1/+1.
 SVar:EmblemDebuff:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 5) | StaticAbilities$ YoursM1Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get -1/-0."
 SVar:YoursM1Pow:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ -1 | EffectZone$ Command | AffectedZone$ Battlefield | Description$ Creatures you control get -1/-0.
 SVar:EmblemRaiseCost:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 6) | StaticAbilities$ CostBMore | Duration$ Permanent | SpellDescription$ You get an emblem with "Spells you cast cost {B} more to cast."
@@ -42,10 +40,8 @@ SVar:DrawTrig:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Command | Ex
 SVar:TrigDig:DB$ Dig | Defined$ TriggeredPlayer | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile
 SVar:EmblemUpkeepLose:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 8) | Triggers$ UpkeepLoseTrig | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of your upkeep, you lose 1 life for each creature you control."
 SVar:UpkeepLoseTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLose | TriggerZones$ Command | TriggerDescription$ At the beginning of your upkeep, you lose 1 life for each creature you control.
-SVar:TrigLose:DB$ LoseLife | Defined$ You | LifeAmount$ Z
-SVar:Z:Count$TypeYouCtrl.Creature
+SVar:TrigLose:DB$ LoseLife | Defined$ You | LifeAmount$ Count$TypeYouCtrl.Creature
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ Effect | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | StaticAbilities$ PerpetualDebuff | RememberObjects$ Targeted | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | Name$ Davriel, Soul Broker's Perpetual -3 Effect | Duration$ Permanent | SpellDescription$ Target creature an opponent controls perpetually gets -3/-3.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -3 | AddToughness$ -3 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This card perpetually gets -3/-3.
+A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | NumAtt$ -3 | NumDef$ -3 | Duration$ Perpetual | StackDescription$ REP Target creature an opponend controls_{c:Targeted} | SpellDescription$ Target creature an opponent controls perpetually gets -3/-3.
 DeckHas:Ability$LifeGain|Graveyard|Sacrifice|LifeGain
 Oracle:[+1]: Until your next turn, whenever an opponent attacks you and/or planeswalkers you control, they discard a card. If they can't, they sacrifice an attacking creature.\n[-2]: Accept one of Davriel's offers, then accept one of Davriel's conditions.\n[-3]: Target creature an opponent controls perpetually gets -3/-3.
--- a/forge-gui/res/cardsfolder/d/davriels_withering.txt
+++ b/forge-gui/res/cardsfolder/d/davriels_withering.txt
@@ -1,6 +1,5 @@
 Name:Davriel's Withering
 ManaCost:B
 Types:Instant
-A:SP$ Effect | StaticAbilities$ PerpetualDebuff | RememberObjects$ Targeted | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | Name$ Davriel's Withering's Perpetual Effect | Duration$ Permanent | SpellDescription$ Target creature an opponent controls perpetually gets -1/-2.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -1 | AddToughness$ -2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -1/-2.
+A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -1 | NumDef$ -2 | IsCurse$ True | Duration$ Perpetual | StackDescription$ {c:Targeted} perpetually gets -1/-2. | SpellDescription$ Target creature an opponent controls perpetually gets -1/-2.
 Oracle:Target creature an opponent controls perpetually gets -1/-2.
--- a/forge-gui/res/cardsfolder/d/death_kiss.txt
+++ b/forge-gui/res/cardsfolder/d/death_kiss.txt
@@ -3,8 +3,7 @@ ManaCost:5 R
 Types:Creature Beholder
 PT:5/5
 T:Mode$ Attacks | ValidCard$ Creature.OppCtrl | Attacked$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature an opponent controls attacks one of your opponents, double its power until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +Y | Double$ True
-SVar:Y:TriggeredAttacker$CardPower
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ Double
 K:Monstrosity:X:X X R
 SVar:X:Count$xPaid
 T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGoad | TriggerDescription$ When CARDNAME becomes monstrous, goad up to X target creatures your opponents control.
--- a/forge-gui/res/cardsfolder/d/devilish_valet.txt
+++ b/forge-gui/res/cardsfolder/d/devilish_valet.txt
@@ -5,7 +5,6 @@ PT:1/3
 K:Trample
 K:Haste
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, double CARDNAME's power until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | Double$ True
-SVar:X:Count$CardPower
+SVar:TrigPump:DB$ Pump | NumAtt$ Double
 SVar:BuffedBy:Creature
 Oracle:Trample, haste\nAlliance — Whenever another creature enters the battlefield under your control, double Devilish Valet's power until end of turn.
--- a/forge-gui/res/cardsfolder/d/diminished_returner.txt
+++ b/forge-gui/res/cardsfolder/d/diminished_returner.txt
@@ -3,9 +3,8 @@ ManaCost:1 B B
 Types:Creature Phyrexian Skeleton
 PT:4/3
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Effect | Cost$ B B | IsPresent$ Card.Self+toughnessGE2 | PresentZone$ Graveyard | ActivationZone$ Graveyard | StaticAbilities$ PerpetualDebuff | Name$ Dimished Returner's Perpetual Effect | SubAbility$ DBChangeZone | Duration$ Permanent | SpellDescription$ CARDNAME perpetually gets -1/-1, then return it to the battlefield. Activate only if CARDNAME is in your graveyard and its toughness is 2 or greater.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ -1 | AddToughness$ -1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -1/-1.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self
+A:AB$ Pump | Cost$ B B | IsPresent$ Card.Self+toughnessGE2 | PresentZone$ Graveyard | ActivationZone$ Graveyard | PumpZone$ Graveyard | NumAtt$ -1 | NumDef$ -1 | SubAbility$ DBChangeZone | Duration$ Perpetual | StackDescription$ SpellDescription | SpellDescription$ CARDNAME perpetually gets -1/-1,
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | StackDescription$ then return it to the battlefield. | SpellDescription$ then return it to the battlefield. Activate only if CARDNAME is in your graveyard and its toughness is 2 or greater.
 SVar:DiscardMe:2
 SVar:SacMe:1
 DeckHas:Ability$Graveyard
--- a/forge-gui/res/cardsfolder/d/disappear.txt
+++ b/forge-gui/res/cardsfolder/d/disappear.txt
@@ -3,7 +3,6 @@ ManaCost:2 U U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U U | ValidTgts$ Creature | AILogic$ Curse
-A:AB$ ChangeZone | Cost$ U | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBBounce | SpellDescription$ Return enchanted creature and CARDNAME to their owners' hands.
-SVar:DBBounce:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
+A:AB$ ChangeZone | Cost$ U | Defined$ EnchantedAndSelf | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBBounce | SpellDescription$ Return enchanted creature and CARDNAME to their owners' hands.
 SVar:NonStackingAttachEffect:True
 Oracle:Enchant creature\n{U}: Return enchanted creature and Disappear to their owners' hands.
--- a/forge-gui/res/cardsfolder/d/dragonborn_immolator.txt
+++ b/forge-gui/res/cardsfolder/d/dragonborn_immolator.txt
@@ -9,6 +9,5 @@ SVar:NotedPower:Number$0
 SVar:X:Count$CardPower
 SVar:DBEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SetChosenNumber$ NotedPower
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Flaming Fist Duskguard's Boon's Perpetual Effect
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ Count$ChosenNumber | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +X/+0, where X is the noted number.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ Count$ChosenNumber | Duration$ Perpetual
 Oracle:{2}{R}: Dragonborn Immolator gets +2/+0 until end of turn.\nGift of Tiamat — When Dragonborn Immolator dies, if its power is greater than 0, note its power. You get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
--- a/forge-gui/res/cardsfolder/e/exponential_growth.txt
+++ b/forge-gui/res/cardsfolder/e/exponential_growth.txt
@@ -1,9 +1,8 @@
 Name:Exponential Growth
 ManaCost:X X G G
 Types:Sorcery
-A:SP$ Repeat | Cost$ X X G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | RepeatSubAbility$ DBPump | MaxRepeat$ X | StackDescription$ SpellDescription | SpellDescription$ Until end of turn, double target creature's power X times.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | NumAtt$ +Y | Double$ True | SpellDescription$ Double the power of target creature X times until end of turn.
+A:SP$ Repeat | ValidTgts$ Creature | RepeatSubAbility$ DBPump | MaxRepeat$ X | StackDescription$ REP target creature_{c:Targeted} | SpellDescription$ Until end of turn, double target creature's power X times.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | NumAtt$ Double | StackDescription$ None
 SVar:X:Count$xPaid
-SVar:Y:Targeted$CardPower
 AI:RemoveDeck:All
 Oracle:Until end of turn, double target creature's power X times.
--- a/forge-gui/res/cardsfolder/f/flaming_fist_duskguard.txt
+++ b/forge-gui/res/cardsfolder/f/flaming_fist_duskguard.txt
@@ -5,6 +5,5 @@ PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBoon | TriggerDescription$ When CARDNAME enters the battlefield, you get a boon with "When you cast your next creature spell, it perpetually gets +1/+0."
 SVar:TrigBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +1/+0.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Flaming Fist Duskguard's Boon's Perpetual Effect
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+0.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ 1 | Duration$ Perpetual
 Oracle:When Flaming Fist Duskguard enters the battlefield, you get a boon with "When you cast your next creature spell, it perpetually gets +1/+0."
--- a/forge-gui/res/cardsfolder/f/forgefire_automaton.txt
+++ b/forge-gui/res/cardsfolder/f/forgefire_automaton.txt
@@ -4,10 +4,9 @@ Types:Artifact Creature Construct
 PT:8/5
 K:Prototype:2 B:3:2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, return target creature card with power less than CARDNAME's power from your graveyard to the battlefield. Its base power perpetually becomes equal to CARDNAME's power.
-SVar:TrigReturn:DB$ ChangeZone |  ValidTgts$ Creature.powerLTX+YouOwn | RememberChanged$ True | TgtPrompt$ Select target creature card with lesser power | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | Name$ Forgefire Automaton's Perpetual Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualStatic | ImprintCards$ Self | Duration$ Permanent
-SVar:PerpetualStatic:Mode$ Continuous | Affected$ Card.IsRemembered | SetPower$ Y | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The base power of this card perpetually becomes equal to Forgefire Automaton's power.
+SVar:TrigReturn:DB$ ChangeZone |  ValidTgts$ Creature.powerLTX+YouOwn | RememberChanged$ True | TgtPrompt$ Select target creature card with power less than CARDNAME's power | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ X | Duration$ Perpetual
 SVar:X:Count$CardPower
-SVar:Y:Imprinted$CardPower
 DeckHints:Ability$Graveyard|Discard|Mill & Color$Black
+DeckHas:Ability$Graveyard
 Oracle:Prototype {2}{B} — 3/2\nAt the beginning of your upkeep, return target creature card with power less than Forgefire Automaton's power from your graveyard to the battlefield. Its base power perpetually becomes equal to Forgefire Automaton's power.
--- a/forge-gui/res/cardsfolder/f/foundry_beetle.txt
+++ b/forge-gui/res/cardsfolder/f/foundry_beetle.txt
@@ -6,10 +6,9 @@ K:First Strike
 K:Reconfigure:R
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike | Description$ Equipped creature has first strike.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRandom | TriggerDescription$ At the beginning of your upkeep, a random artifact card in your hand perpetually gains "This spell costs {1} less to cast."
-SVar:TrigRandom:DB$ ChooseCard | Defined$ You | Choices$ Artifact.YouOwn | ChoiceZone$ Hand | AtRandom$ True | Amount$ 1 | SubAbility$ DBEffect | StackDescription$ None
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualEffect | Name$ Foundry Beetle's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualEffect:Mode$ Continuous | Affected$ Card.ChosenCard | AddStaticAbility$ ArtifactReduceCost | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The randomly chosen artifact card perpetually gains "This spell costs {1} less to cast."
-SVar:ArtifactReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
+SVar:TrigRandom:DB$ ChooseCard | Defined$ You | Choices$ Artifact.YouOwn | ChoiceZone$ Hand | AtRandom$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | staticAbilities$ ReduceCost | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 DeckHints:Type$Artifact
 Oracle:First strike\nEquipped creature has first strike.\nAt the beginning of your upkeep, a random artifact card in your hand perpetually gains "This spell costs {1} less to cast."\nReconfigure {R}
--- a/forge-gui/res/cardsfolder/f/freyalise_skyshroud_partisan.txt
+++ b/forge-gui/res/cardsfolder/f/freyalise_skyshroud_partisan.txt
@@ -2,12 +2,11 @@ Name:Freyalise, Skyshroud Partisan
 ManaCost:1 G G
 Types:Legendary Planeswalker Freyalise
 Loyalty:4
-A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Elf | TgtPrompt$ Select up to one target Elf | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBRandom | StackDescription$ SpellDescription | SpellDescription$ Choose up to one target Elf. Untap it. It and a random Elf creature card in your hand each perpetually gets +1/+1.
-SVar:DBRandom:DB$ ChooseCard | Defined$ You | Choices$ Elf.YouOwn | ChoiceZone$ Hand | AtRandom$ True | Amount$ 1 | SubAbility$ DBEffect | StackDescription$ None
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ PerpetualP1P1 | Name$ Freyalise, Skyshroud Partisan's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered,Card.ChosenCard | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The target Elf and randomly chosen card perpetually get +1/+1.
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Elf | TgtPrompt$ Select up to one target Elf | TargetMin$ 0 | TargetMax$ 1 | RememberTargets$ True | SubAbility$ DBRandom | StackDescription$ REP up to one target Elf_{c:Targeted} | SpellDescription$ Untap up to one target Elf. That Elf and a random Elf creature card in your hand perpetually get +1/+1.
+SVar:DBRandom:DB$ ChooseCard | Defined$ You | Choices$ Elf.YouOwn | ChoiceZone$ Hand | AtRandom$ True | RememberChosen$ True | SubAbility$ DBPump | StackDescription$ None
+SVar:DBPump:DB$ Pump | Defined$ Remembered | PumpZone$ Battlefield, Hand | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
 A:AB$ Seek | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Type$ Card.Elf | StackDescription$ REP Seek_{p:You} seeks | SpellDescription$ Seek an Elf card.
-A:AB$ MakeCard | Conjure$ True | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Regal Force | Zone$ Battlefield | SpellDescription$ Conjure a Regal Force card onto the battlefield.
+A:AB$ MakeCard | Conjure$ True | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Regal Force | Zone$ Battlefield | SpellDescription$ Conjure a card named Regal Force onto the battlefield.
 DeckNeeds:Type$Elf
-Oracle:[+1]: Choose up to one target Elf. Untap it. It and a random Elf creature card in your hand each perpetually gets +1/+1.\n[-1]: Seek an Elf card.\n[-6]: Conjure a Regal Force card onto the battlefield.
+Oracle:[+1]: Untap up to one target Elf. That Elf and a random Elf creature card in your hand perpetually get +1/+1.\n[-1]: Seek an Elf card.\n[-6]: Conjure a card named Regal Force onto the battlefield.
--- a/forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt
@@ -2,9 +2,9 @@ Name:Garruk, Wrath of the Wilds
 ManaCost:2 G G
 Types:Legendary Planeswalker Garruk
 Loyalty:4
-A:AB$ ChooseCard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose up to one creature card in your hand | Amount$ 1 | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ Choose a creature card in your hand. It perpetually gets +1/+1 and perpetually gains "This spell costs {1} less to cast."
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Garruk, Wrath of the Wilds's Perpetual Effect | SubAbility$ DBCleanup
-SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ 1 | AddToughness$ 1 | AddStaticAbility$ ReduceCost | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +1/+1 and perpetually gains "This spell costs {1} less to cast."
+A:AB$ ChooseCard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose a creature card in your hand | Mandatory$ True | SubAbility$ DBPump | StackDescription$ SpellDescription | SpellDescription$ Choose a creature card in your hand. It perpetually gets +1/+1 and perpetually gains "This spell costs {1} less to cast."
+SVar:DBPump:DB$ Pump | PumpZone$ Hand | Defined$ ChosenCard | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | staticAbilities$ ReduceCost | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
 SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 A:AB$ Draft | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Spellbook$ Mosscoat Goriak,Sylvan Brushstrider,Murasa Rootgrazer,Dire Wolf Prowler,Ferocious Pup,Pestilent Wolf,Garruk's Uprising,Dawntreader Elk,Nessian Hornbeetle,Territorial Scythecat,Trufflesnout,Wary Okapi,Scurrid Colony,Barkhide Troll,Underdark Basilisk | Zone$ Battlefield | SpellDescription$ Draft a card from CARDNAME's spellbook and put it onto the battlefield.
--- a/forge-gui/res/cardsfolder/g/geistchanneler.txt
+++ b/forge-gui/res/cardsfolder/g/geistchanneler.txt
@@ -3,12 +3,11 @@ ManaCost:1 U
 Types:Creature Human Wizard
 PT:1/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, choose an instant or sorcery card in your hand with mana value 3 or greater. It perpetually gains "This spell costs {2} less to cast."
-SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Instant.YouOwn+cmcGE3,Sorcery.YouOwn+cmcGE3 | ChoiceTitle$ Choose an instant or sorcery card in your hand with mana value 3 or greater | Amount$ 1 | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualAbility | Name$ Geistchanneler's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.ChosenCard | AddStaticAbility$ PerpetualReduce | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gains "This spell costs {2} less to cast."
-SVar:PerpetualReduce:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} less to cast.
+SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Instant.YouOwn+cmcGE3,Sorcery.YouOwn+cmcGE3 | ChoiceTitle$ Choose an instant or sorcery card in your hand with mana value 3 or greater | Mandatory$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | staticAbilities$ ReduceCost | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} less to cast.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-DeckHints:Type$Instant|Sorcery
+DeckNeeds:Type$Instant|Sorcery
 SVar:NeedsToPlayVar:X GE1
 SVar:X:Count$ValidHand Instant.YouOwn+cmcGE3,Sorcery.YouOwn+cmcGE3
 Oracle:When Geistchanneler enters the battlefield, choose an instant or sorcery card in your hand with mana value 3 or greater. It perpetually gains "This spell costs {2} less to cast."
--- a/forge-gui/res/cardsfolder/g/giant_regrowth.txt
+++ b/forge-gui/res/cardsfolder/g/giant_regrowth.txt
@@ -1,8 +1,8 @@
 Name:Giant Regrowth
 ManaCost:1 G G
 Types:Instant
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target card in your graveyard | ValidTgts$ Card.YouOwn | SubAbility$ DBEffect | RememberObjects$ Targeted | SpellDescription$ Return target card from your graveyard to your hand. If it's a creature card, it perpetually gets +3/+3.
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | StaticAbilities$ PerpetualP3P3 | ChosenName$ Giant Regrowth's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualP3P3:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 3 | AddToughness$ 3 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +3/+3.
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target card in your graveyard | ValidTgts$ Card.YouOwn | SubAbility$ DBEffect | RememberChanged$ True | SpellDescription$ Return target card from your graveyard to your hand.
+SVar:DBEffect:DB$ Pump | ConditionDefined$ Targeted | ConditionPresent$ Creature | PumpZone$ Hand | Defined$ Remembered | NumAtt$ 3 | NumDef$ 3 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ If it's a creature card, it perpetually gets +3/+3.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard
 Oracle:Return target card from your graveyard to your hand. If it's a creature card, it perpetually gets +3/+3.
--- a/forge-gui/res/cardsfolder/g/god_eternal_rhonas.txt
+++ b/forge-gui/res/cardsfolder/g/god_eternal_rhonas.txt
@@ -4,10 +4,7 @@ Types:Legendary Creature Zombie God
 PT:5/5
 K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDoublePower | TriggerDescription$ When CARDNAME enters the battlefield, double the power of each other creature you control until end of turn. Those creatures gain vigilance until end of turn.
-SVar:TrigDoublePower:DB$ RepeatEach | RepeatCards$ Creature.YouCtrl+Other | RepeatSubAbility$ DBPump | SubAbility$ DBPumpAll
-SVar:DBPump:DB$ Pump | Defined$ Remembered | NumAtt$ X | Double$ True
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl+StrictlyOther | KW$ Vigilance
-SVar:X:Remembered$CardPower
+SVar:TrigDoublePower:DB$ Pump | Defined$ Valid Creature.YouCtrl+StrictlyOther | NumAtt$ Double | KW$ Vigilance
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Card.Self | Execute$ TriReturn | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies or is put into exile from the battlefield, you may put it into its owner's library third from the top.
 SVar:TriReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Destination$ Library | LibraryPosition$ 2
 SVar:PlayMain1:TRUE
--- a/forge-gui/res/cardsfolder/g/grave_choice.txt
+++ b/forge-gui/res/cardsfolder/g/grave_choice.txt
@@ -1,10 +1,9 @@
 Name:Grave Choice
 ManaCost:2 B
 Types:Instant
-A:SP$ Sacrifice | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SacValid$ Creature.nonToken | SacMessage$ nontoken creature | RememberSacrificed$ True | SubAbility$ TrigConjure | SpellDescription$ Target opponent sacrifices a nontoken creature. If that creature had mana value 2 or less, conjure a duplicate of it into your hand. That duplicate perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
-SVar:TrigConjure:DB$ MakeCard | Conjure$ True | ConditionDefined$ Remembered | ConditionPresent$ Creature.cmcLE2 | DefinedName$ Remembered | Zone$ Hand | RememberMade$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Grave Choice's Perpetual Effect
-SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+A:SP$ Sacrifice | ValidTgts$ Opponent | SacValid$ Creature.nonToken | SacMessage$ nontoken creature | RememberSacrificed$ True | SubAbility$ TrigConjure | SpellDescription$ Target opponent sacrifices a nontoken creature.
+SVar:TrigConjure:DB$ MakeCard | Conjure$ True | ConditionDefined$ Remembered | ConditionPresent$ Creature.cmcLE2 | DefinedName$ Remembered | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate | SpellDescription$ If that creature had mana value 2 or less, conjure a duplicate of it into your hand.
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ That duplicate perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Target opponent sacrifices a nontoken creature. If that creature had mana value 2 or less, conjure a duplicate of it into your hand. That duplicate perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
--- a/forge-gui/res/cardsfolder/g/grow_old_together.txt
+++ b/forge-gui/res/cardsfolder/g/grow_old_together.txt
@@ -1,8 +1,7 @@
 Name:Grow Old Together
 ManaCost:1 G U
 Types:Instant
-A:SP$ Seek | DefinedCards$ Top_10_OfLibrary | Num$ 2 | Type$ Creature | SubAbility$ Shuffle | SpellDescription$ Seek two creature cards from among the top ten cards of your library, then shuffle. Creature cards in your hand perpetually get +1/+1.
-SVar:Shuffle:DB$ Shuffle | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ ValidHand Creature.YouOwn | StaticAbilities$ PerpetualP1P1 | Duration$ Permanent | Name$ Grow Old Together Perpetual Effect | SpellDescription$ Creature cards in your hand perpetually get +1/+1.
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Creature cards in your hand perpetually get +1/+1.
-Oracle:Seek two creature cards from among the top ten cards of your library, then shuffle. Creature cards in your hand perpetually get +1/+1.
+A:SP$ Seek | DefinedCards$ Top_10_OfLibrary | Num$ 2 | Type$ Creature | SubAbility$ Shuffle | SpellDescription$ Seek two creature cards from among the top ten cards of your library,
+SVar:Shuffle:DB$ Shuffle | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ then shuffle.
+SVar:DBEffect:DB$ PumpAll | ValidCards$ Creature.YouOwn | PumpZone$ Hand | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SpellDescription$ Creature cards in your hand perpetually get +1/+1.
+Oracle:Seek two creature cards from among the top ten cards of your library, then shuffle. Creature cards in your hand perpetually get +1/+1.
--- a/forge-gui/res/cardsfolder/g/grunn_the_lonely_king.txt
+++ b/forge-gui/res/cardsfolder/g/grunn_the_lonely_king.txt
@@ -6,8 +6,6 @@ K:Kicker:3
 K:etbCounter:P1P1:5:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with five +1/+1 counters on it.
 SVar:WasKicked:Count$Kicked.1.0
 T:Mode$ Attacks | ValidCard$ Card.Self | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME attacks alone, double its power and toughness until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | NumDef$ +Y | Double$ True
-SVar:X:Count$CardPower
-SVar:Y:Count$CardToughness
+SVar:TrigPump:DB$ Pump | NumAtt$ Double | NumDef$ Double
 DeckHas:Ability$Counters
 Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nIf Grunn, the Lonely King was kicked, it enters the battlefield with five +1/+1 counters on it.\nWhenever Grunn attacks alone, double its power and toughness until end of turn.
--- a/forge-gui/res/cardsfolder/g/gyox_brutal_carnivora.txt
+++ b/forge-gui/res/cardsfolder/g/gyox_brutal_carnivora.txt
@@ -6,12 +6,10 @@ T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefiel
 SVar:TrigPutCounter:DB$ PutCounter | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | CounterType$ OIL
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken+counters_GE1_OIL | TriggerZones$ Battlefield | Execute$ TrigConjure | TriggerDescription$ Whenever a nontoken creature you control with one or more oil counters on it dies, conjure X duplicates of it into exile, where X is the number of oil counters on it. Those duplicates perpetually get +X/+X. Then shuffle those duplicates into your library.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | DefinedName$ TriggeredCardLKICopy | Amount$ X | Zone$ Exile | RememberMade$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualPXPX | Name$ Gyox, Brutal Carnivora's Perpetual Effect | SetChosenNumber$ X | Duration$ Permanent | SubAbility$ DBShuffle
-SVar:PerpetualPXPX:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ Num | AddToughness$ Num | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Those duplicates perpetually get +X/+X.
+SVar:DBEffect:DB$ Pump | PumpZone$ Exile | Defined$ Remembered | NumAtt$ X | NumDef$ X | Duration$ Perpetual | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Library | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:TriggeredCard$CardCounters.OIL
-SVar:Num:Count$ChosenNumber
 DeckHints:Ability$Sacrifice|Counters
 DeckHas:Ability$Counters
 Oracle:At the beginning of your end step, put an oil counter on up to one target creature.\nWhenever a nontoken creature you control with one or more oil counters on it dies, conjure X duplicates of it into exile, where X is the number of oil counters on it. Those duplicates perpetually get +X/+X. Then shuffle those duplicates into your library.
--- a/forge-gui/res/cardsfolder/h/hex_kellans_companion.txt
+++ b/forge-gui/res/cardsfolder/h/hex_kellans_companion.txt
@@ -3,12 +3,11 @@ ManaCost:1 G
 Types:Legendary Creature Dog
 PT:1/1
 K:Haste
-T:Mode$ SpellCast | ValidCard$ Card.Adventure | ValidActivatingPlayer$ You | TriggerZones$ Battlefield,Exile | Execute$ TrigEffect | TriggerDescription$ Whenever you cast an Adventure spell, if CARDNAME is on the battlefield or in exile, it perpetually gets +1/+1.
-SVar:TrigEffect:DB$ Effect | StaticAbilities$ PerpetualBuff | RememberObjects$ Self | Name$ Hex, Kellan's Companion's Perpetual Effect | Duration$ Permanent | SubAbility$ DBChange
-SVar:PerpetualBuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+1
-SVar:DBChange:DB$ ChangeZone | ConditionPresent$ Card.Self | ConditionZone$ Battlefield | Origin$ Battlefield  | Destination$ Exile | WithCountersType$ FETCH | SpellDescription$  Then if it's on the battlefield, exile it with a fetch counter on it. 
+T:Mode$ SpellCast | ValidCard$ Card.Adventure | ValidActivatingPlayer$ You | TriggerZones$ Battlefield,Exile | Execute$ TrigEffect | TriggerDescription$ Whenever you cast an Adventure spell, if CARDNAME is on the battlefield or in exile, it perpetually gets +1/+1. Then if it's on the battlefield, exile it with a fetch counter on it.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Battlefield,Exile | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBChange
+SVar:DBChange:DB$ ChangeZone | ConditionPresent$ Card.Self | ConditionZone$ Battlefield | Origin$ Battlefield  | Destination$ Exile | WithCountersType$ FETCH 
 T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile | ValidActivatingPlayer$ You | Execute$ TrigReturn | TriggerZones$ Exile | IsPresent$ Card.Self+counters_EQ1_FETCH | PresentZone$ Exile | TriggerDescription$ Whenever you cast a spell from exile, if NICKNAME is in exile with a fetch counter on it, put it onto the battlefield.
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile  | Destination$ Battlefield
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield
 DeckHints:Type$Adventure
 DeckHas:Ability$Counters
-Oracle:Haste\nWhenever you cast an Adventure spell, if Hex, Kellan's Companion is on the battlefield or in exile, it perpetually gets +1/+1. Then if it's on the battlefield, exile it with a fetch counter on it.\nWhenever you cast a spell from exile, if Hex is in exile with a fetch counter on it, put it onto the battlefield.
+Oracle:Haste\nWhenever you cast an Adventure spell, if Hex, Kellan's Companion is on the battlefield or in exile, it perpetually gets +1/+1. Then if it's on the battlefield, exile it with a fetch counter on it.\nWhenever you cast a spell from exile, if Hex is in exile with a fetch counter on it, put it onto the battlefield.
--- a/forge-gui/res/cardsfolder/h/hook_horror.txt
+++ b/forge-gui/res/cardsfolder/h/hook_horror.txt
@@ -3,8 +3,7 @@ ManaCost:4 B
 Types:Creature Horror
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Molting Exoskeleton — Whenever CARDNAME dies, it perpetually gets -1/-1. Then if that card's toughness is 1 or greater, return it to the battlefield under its owner's control.
-SVar:TrigEffect:DB$ Effect | StaticAbilities$ PerpetualDebuff | RememberObjects$ Self | Name$ Hook Horror's Perpetual Effect | Duration$ Permanent | SubAbility$ DBReturn
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -1 | AddToughness$ -1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -1/-1.
+SVar:TrigEffect:DB$ Pump | Defined$ TriggeredNewCardLKICopy | PumpZone$ Graveyard | NumAtt$ -1 | NumDef$ -1 | Duration$ Perpetual | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | ConditionDefined$ TriggeredNewCardLKICopy | ConditionPresent$ Creature.toughnessGE1 | Origin$ Graveyard | Destination$ Battlefield
 DeckHas:Ability$Sacrifice
 Oracle:Molting Exoskeleton — Whenever Hook Horror dies, it perpetually gets -1/-1. Then if that card's toughness is 1 or greater, return it to the battlefield under its owner's control.
--- a/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
+++ b/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
@@ -5,10 +5,9 @@ PT:1/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a tapped Powerstone token.
 SVar:TrigToken:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ Whenever CARDNAME attacks, you may pay {3}. If you do, CARDNAME can't be blocked this turn and it perpetually gets +2/+0.
-SVar:TrigUnblockable:AB$ Effect | Cost$ 3 | StaticAbilities$ Unblockable | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Hurkyl's Prodigy's Perpetual Effect
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ This creature can't be blocked.
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ 2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +2/+0.
+SVar:TrigUnblockable:AB$ Effect | Cost$ 3 | StaticAbilities$ Unblockable | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | NumAtt$ 2 | Duration$ Perpetual
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ EFFECTSOURCE can't be blocked this turn.
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Token & Type$Artifact|Powerstone
-Oracle:When Hurkyl's Prodigy enter the battlefield, create a tapped Powerstone token.\nWhenever Hurkyl's Prodigy attacks, you may pay {3}. If you do, Hurkyl's Prodigy can't be blocked this turn and it perpetually gets +2/+0.
+Oracle:When Hurkyl's Prodigy enter the battlefield, create a tapped Powerstone token.\nWhenever Hurkyl's Prodigy attacks, you may pay {3}. If you do, Hurkyl's Prodigy can't be blocked this turn and it perpetually gets +2/+0.
--- a/forge-gui/res/cardsfolder/h/hypnotic_pattern.txt
+++ b/forge-gui/res/cardsfolder/h/hypnotic_pattern.txt
@@ -1,8 +1,6 @@
 Name:Hypnotic Pattern
 ManaCost:U
 Types:Instant
-A:SP$ Effect | ValidTgts$ Creature | StaticAbilities$ PerpetualDebuff | RememberObjects$ Targeted | Name$ Hypnotic Pattern's Perpetual Effect | Duration$ Permanent | SubAbility$ DBPump | SpellDescription$ Target creature perpetually gets -2/-0.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -2/-0.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-0 until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (perpetual) | NumAtt$ -2 | IsCurse$ True | Duration$ Perpetual | SubAbility$ DBPump | StackDescription$ REP Target creature_{c:ThisTargetedCard} | SpellDescription$ Target creature perpetually gets -2/-0.,,,,,,
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (until end of turn) | NumAtt$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-0 until end of turn.
 Oracle:Target creature perpetually gets -2/-0.\nTarget creature gets -2/-0 until end of turn.
--- a/forge-gui/res/cardsfolder/i/ichor_aberration.txt
+++ b/forge-gui/res/cardsfolder/i/ichor_aberration.txt
@@ -7,8 +7,7 @@ K:Defender
 S:Mode$ CanAttackDefender | ValidCard$ Card.Self+powerGE7 | Description$ As long as CARDNAME's power is 7 or greater, it can attack as though it didn't have defender. 
 T:Mode$ Proliferate | ValidPlayer$ You | TriggerZones$ Battlefield | TriggerZones$ Battlefield | IsPresent$ Card.Self | PresentZone$ Battlefield | Execute$ TrigPerpetualBuff | TriggerDescription$ Whenever you proliferate, if CARDNAME is in your graveyard or on the battlefield, CARDNAME perpetually gets +1/+1. You may cast it from your graveyard this turn.
 T:Mode$ Proliferate | ValidPlayer$ You | TriggerZones$ Battlefield | TriggerZones$ Graveyard | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | Secondary$ True | Execute$ TrigPerpetualBuff | TriggerDescription$ Whenever you proliferate, if CARDNAME is in your graveyard or on the battlefield, CARDNAME perpetually gets +1/+1. You may cast it from your graveyard this turn.
-SVar:TrigPerpetualBuff:DB$ Effect | StaticAbilities$ PerpetualPump | RememberObjects$ Self | Duration$ Permanent | Name$ Ichor Aberration's Perpetual Effect | SubAbility$ ReanimateSelf
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+1.
+SVar:TrigPerpetualBuff:DB$ Pump | PumpZone$ Battlefield,Graveyard | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ ReanimateSelf
 SVar:ReanimateSelf:DB$ Effect | StaticAbilities$ MayPlay | RememberObjects$ Self
 SVar:MayPlay:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may cast EFFECTSOURCE from your graveyard this turn.
 DeckHints:Ability$Proliferate
--- a/forge-gui/res/cardsfolder/j/jaheira_harper_emissary.txt
+++ b/forge-gui/res/cardsfolder/j/jaheira_harper_emissary.txt
@@ -60,8 +60,7 @@ T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescr
 SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select up to one target artifact or enchantment | SubAbility$ DBBoon
 SVar:DBBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +1/+0 and gains haste.
-SVar:TrigEffect:DB$ Effect | Name$ Jaheira, Stirring Harper's Boon's Perpetual Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualAbility | Duration$ Permanent
-SVar:PerpetualAbility:Mode$ Continuous | AddPower$ 1 | AddKeyword$ Haste | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+0 and gains haste.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ 1 | KW$ Haste | Duration$ Perpetual
 Oracle:Hexproof from artifacts and enchantments\nWhen this creature specializes, destroy up to one target artifact or enchantment. You get a boon with "When you cast your next creature spell, it perpetually gets +1/+0 and gains haste."

 SPECIALIZE:GREEN
--- a/forge-gui/res/cardsfolder/l/laezel_githyanki_warrior.txt
+++ b/forge-gui/res/cardsfolder/l/laezel_githyanki_warrior.txt
@@ -75,5 +75,5 @@ PT:3/6
 K:Double Strike
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When this creature enters the battlefield or specializes, other creatures you control and creature cards in your hand perpetually get +1/+1.
 T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ When this creature enters the battlefield or specializes, other creatures you control and creature cards in your hand perpetually get +1/+1.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | PumpZone$ Battlefield,Hand | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl+Other | PumpZone$ Battlefield,Hand | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
 Oracle:Double strike\nWhen this creature enters the battlefield or specializes, other creatures you control and creature cards in your hand perpetually get +1/+1.
--- a/forge-gui/res/cardsfolder/l/legion_of_clay.txt
+++ b/forge-gui/res/cardsfolder/l/legion_of_clay.txt
@@ -3,8 +3,6 @@ ManaCost:3 G
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Trample | Description$ Creatures you control have trample.
 T:Mode$ ChangesZoneAll | ValidCards$ Artifact.YouCtrl+nonToken | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Whenever one or more nontoken artifacts enter the battlefield under your control, creatures you control perpetually get +1/+1.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ Valid Creature.YouCtrl | StaticAbilities$ PerpetualP1P1 | Duration$ Permanent | SubAbility$ DBCleanup | Name$ Legion of Clay's Perpetual Effect
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Creatures you control perpetually get +1/+1.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigEffect:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
 DeckHints:Type$Artifact|Golem|Construct|Thopter|Assembly-Worker|Myr|Necron|Juggernaut|Scarecrow
 Oracle:Creatures you control have trample.\nWhenever one or more nontoken artifacts enter the battlefield under your control, creatures you control perpetually get +1/+1.
--- a/forge-gui/res/cardsfolder/l/longtusk_stalker.txt
+++ b/forge-gui/res/cardsfolder/l/longtusk_stalker.txt
@@ -5,10 +5,8 @@ PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you get {E}.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEnergy | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you get {E}.
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
-A:AB$ Effect | Cost$ PayEnergy<2> | StaticAbilities$ SelfPerpetualP1P0 | Name$ Longtusk Stalker's Perpetual Effect | Duration$ Permanent | SubAbility$ DBChooseCard | SpellDescription$ CARDNAME perpetually gets +1/+0. You may choose a creature card in your hand. If you do, that card perpetually gets +1/+0.
-SVar:SelfPerpetualP1P0:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +1/+0.
-SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose up to one creature card in your hand | MinAmount$ 0 | Amount$ 1 | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ConditionDefined$ ChosenCard | ConditionPresent$ Card | StaticAbilities$ PerpetualP1P0 | Name$ Longtusk Stalker's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualP1P0:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +1/+0.
+A:AB$ Pump | Cost$ PayEnergy<2> | NumAtt$ 1 | Duration$ Perpetual | SubAbility$ DBChooseCard | StackDescription$ SpellDescription | SpellDescription$ CARDNAME perpetually gets +1/+0.
+SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ You may choose a creature card in your hand | MinAmount$ 0 | Amount$ 1 | SubAbility$ DBEffect | SpellDescription$ You may choose a creature card in your hand.
+SVar:DBEffect:DB$ Pump | ConditionDefined$ ChosenCard | ConditionPresent$ Card | Defined$ ChosenCard | PumpZone$ Hand | NumAtt$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ If you do, that card perpetually gets +1/+0.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:Whenever Longtusk Stalker enters the battlefield or attacks, you get {E}.\nPay {E}{E}: Longtusk Stalker perpetually gets +1/+0. You may choose a creature card in your hand. If you do, that card perpetually gets +1/+0.
--- a/forge-gui/res/cardsfolder/l/loyal_sentry.txt
+++ b/forge-gui/res/cardsfolder/l/loyal_sentry.txt
@@ -3,6 +3,5 @@ ManaCost:W
 Types:Creature Human Soldier
 PT:1/1
 T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME.
-SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredAttackerLKICopy | SubAbility$ DestroySelf
-SVar:DestroySelf:DB$ Destroy | Defined$ Self
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredAttackerLKICopyAndSelf
 Oracle:When Loyal Sentry blocks a creature, destroy that creature and Loyal Sentry.
--- a/forge-gui/res/cardsfolder/m/mace_of_disruption.txt
+++ b/forge-gui/res/cardsfolder/m/mace_of_disruption.txt
@@ -3,8 +3,7 @@ ManaCost:1 W
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 2 | AddKeyword$ Protection:Demon & Protection:Devil | Description$ Equipped creature gets +0/+2 and has protection from Demons and from Devils.
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigEffect | TriggerDescription$ Whenever equipped creature attacks, it perpetually gets +1/+0 if it has the same name as another creature you control or a creature card in your graveyard.
-SVar:TrigEffect:DB$ Effect | ConditionCheckSVar$ X | RememberObjects$ Equipped | Name$ Mace of Disruption's Perpetual Effect | Duration$ Permanent | StaticAbilities$ PerpetualP1P0
-SVar:PerpetualP1P0:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+0.
+SVar:TrigEffect:DB$ Pump | ConditionCheckSVar$ X | Defined$ Equipped | NumAtt$ 1 | Duration$ Perpetual
 K:Equip:1
 SVar:X:Count$Valid Creature.!EquippedBy+YouCtrl+sharesNameWith Equipped/Plus.Y
 SVar:Y:Count$ValidGraveyard Creature.YouOwn+sharesNameWith Equipped
--- a/forge-gui/res/cardsfolder/m/managorger_phoenix.txt
+++ b/forge-gui/res/cardsfolder/m/managorger_phoenix.txt
@@ -7,8 +7,7 @@ K:CARDNAME can't block.
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | NoResolvingCheck$ True | TriggerZones$ Graveyard | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a spell, if CARDNAME is in your graveyard, put a flame counter on CARDNAME for each {R} in that spell's mana cost. If CARDNAME has five or more flame counters on it, return it to the battlefield and it perpetually gets +1/+1.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ FLAME | CounterNum$ X | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | ConditionDefined$ Self | ConditionPresent$ Card.counters_GE5_FLAME | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | StaticAbilities$ PerpetualP1P1 | Name$ Managorger Phoenix's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +1/+1.
+SVar:DBEffect:DB$ Pump | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$TriggeredManaCostDevotion.Red
 SVar:SacMe:3
--- a/forge-gui/res/cardsfolder/m/mephidross_slime.txt
+++ b/forge-gui/res/cardsfolder/m/mephidross_slime.txt
@@ -3,12 +3,10 @@ ManaCost:1 B G
 Types:Creature Phyrexian Ooze
 PT:3/3
 K:Trample
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard  | Execute$ TrigConjure | TriggerDescription$ Whenever CARDNAME dies, conjure a card named Mephidross Slime into your graveyard. Perpetually double the power and toughness of CARDNAME and that card. then shuffle them into their owner's library.
-SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Mephidross Slime | Amount$ 1 | Zone$ Graveyard | RememberMade$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | Name$ Mephidross Slime's Perpetual Effect | RememberObjects$ Remembered | ImprintCards$ TriggeredCard | StaticAbilities$ PerpetualDouble | Duration$ Permanent | SubAbility$ ShuffleIntoLibrary 
-SVar:PerpetualDouble:Mode$ Continuous | Affected$ Card.IsRemembered,Card.IsImprinted | AddPower$ AffectedX | AddToughness$ AffectedY | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Perpetually double the power and toughness of this creature.
-SVar:ShuffleIntoLibrary:DB$ ChangeZoneAll | Origin$ Graveyard | Shuffle$ True | Destination$ Library | ChangeType$ Card.Self,Card.IsRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
-SVar:AffectedX:Count$CardPower
-SVar:AffectedY:Count$CardToughness
-Oracle:Trample\nWhenever Mephidross Slime dies, conjure a card named Mephidross Slime into your graveyard. Perpetually double the power and toughness of Mephidross Slime and that card. then shuffle them into their owner's library.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard  | Execute$ TrigConjure | TriggerDescription$ Whenever CARDNAME dies, conjure a card named Mephidross Slime into your graveyard. Perpetually double the power and toughness of CARDNAME and that card, then shuffle them into their owner's library.
+SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Mephidross Slime | Amount$ 1 | Zone$ Graveyard | RememberMade$ True | SubAbility$ DBRemember
+SVar:DBRemember:DB$ Pump | RememberObjects$ TriggeredCardLKICopy | SubAbility$ DBDouble
+SVar:DBDouble:DB$ Pump | PumpZone$ Graveyard | Defined$ Remembered | NumAtt$ Double | NumDef$ Double | Duration$ Perpetual | SubAbility$ DBShuffle
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Graveyard | Shuffle$ True | Destination$ Library | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Trample\nWhenever Mephidross Slime dies, conjure a card named Mephidross Slime into your graveyard. Perpetually double the power and toughness of Mephidross Slime and that card, then shuffle them into their owner's library.
--- a/forge-gui/res/cardsfolder/m/mephits_enthusiasm.txt
+++ b/forge-gui/res/cardsfolder/m/mephits_enthusiasm.txt
@@ -2,8 +2,7 @@ Name:Mephit's Enthusiasm
 ManaCost:1 R
 Types:Sorcery
 A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 4 | ExcessSVar$ Excess | SubAbility$ DBEffect | SpellDescription$ CARDNAME deals 4 damage to target creature or planeswalker.
-SVar:DBEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SetChosenNumber$ Excess | SpellDescription$ If excess damage was dealt this way, note that excess damage, then you get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
+SVar:DBEffect:DB$ Effect | ConditionCheckSVar$ Excess | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SetChosenNumber$ Excess | SpellDescription$ If excess damage was dealt this way, note that excess damage, then you get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Mephit's Enthusiasm's Boon's Perpetual Effect
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ Count$ChosenNumber | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +X/+0, where X is the noted number.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ Count$ChosenNumber | Duration$ Perpetual
 Oracle:Mephit's Enthusiasm deals 4 damage to target creature or planeswalker. If excess damage was dealt this way, note that excess damage, then you get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
--- a/forge-gui/res/cardsfolder/m/mr_orfeo_the_boulder.txt
+++ b/forge-gui/res/cardsfolder/m/mr_orfeo_the_boulder.txt
@@ -3,7 +3,6 @@ ManaCost:1 B R G
 Types:Legendary Creature Rhino Warrior
 PT:2/4
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, double target creature's power until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | Double$ True
-SVar:X:Targeted$CardPower
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ Double
 SVar:PlayMain1:TRUE
 Oracle:Whenever you attack, double target creature's power until end of turn.
--- a/forge-gui/res/cardsfolder/n/nantuko_slicer.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_slicer.txt
@@ -3,12 +3,11 @@ ManaCost:2 G G
 Types:Creature Insect
 PT:3/2
 K:Kicker:B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains: "You may spend mana as though it were mana of any color to cast this spell." 
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouOwn | SubAbility$ DBConjure
-SVar:DBConjure:DB$ MakeCard | Condition$ Kicked | Conjure$ True | TgtPrompt$ Select target creature card in an opponent's graveyard | ValidTgts$ Creature.OppOwn+inZoneGraveyard | TgtZone$ Graveyard | DefinedName$ ThisTargetedCard | Zone$ Hand | RememberMade$ True | SubAbility$ DBEffect 
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | Condition$ Kicked | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Nantuko Slicer's Perpetual Effect | SubAbility$ DBCleanup
-SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains: "You may spend mana as though it were mana of any color to cast this spell." 
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouOwn | TgtPrompt$ Select target card from your graveyard | SubAbility$ DBConjure
+SVar:DBConjure:DB$ MakeCard | Condition$ Kicked | Conjure$ True | TgtPrompt$ Select target creature card in an opponent's graveyard | ValidTgts$ Creature.OppOwn | TgtZone$ Graveyard | DefinedName$ ThisTargetedCard | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate 
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard
-Oracle:Kicker{B}\nWhen Nantuko Slicer enters the battlefield return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell." 
+Oracle:Kicker{B}\nWhen Nantuko Slicer enters the battlefield, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell." 
--- a/forge-gui/res/cardsfolder/n/neyith_of_the_dire_hunt.txt
+++ b/forge-gui/res/cardsfolder/n/neyith_of_the_dire_hunt.txt
@@ -6,6 +6,5 @@ T:Mode$ FightOnce | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Ex
 T:Mode$ AttackerBlockedOnce | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever one or more creatures you control fight or become blocked, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, you may pay {2}{R/G}. If you do, double target creature's power until end of turn. That creature must be blocked this combat if able.
-SVar:TrigPump:AB$ Pump | Cost$ 2 RG | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | Double$ True | KW$ HIDDEN CARDNAME must be blocked if able.
-SVar:X:Targeted$CardPower
+SVar:TrigPump:AB$ Pump | Cost$ 2 RG | ValidTgts$ Creature | NumAtt$ Double | KW$ HIDDEN CARDNAME must be blocked if able.
 Oracle:Whenever one or more creatures you control fight or become blocked, draw a card.\nAt the beginning of combat on your turn, you may pay {2}{R/G}. If you do, double target creature's power until end of turn. That creature must be blocked this combat if able. ({R/G} can be paid with either {R} or {G}.)
--- a/forge-gui/res/cardsfolder/n/nightclub_bouncer.txt
+++ b/forge-gui/res/cardsfolder/n/nightclub_bouncer.txt
@@ -4,7 +4,8 @@ Types:Creature Human Rogue
 PT:2/3
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return target nonland permanent an opponent controls to its owner's hand. It perpetually gains "This spell costs {2} more to cast."
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Choose target nonland permanent an opponent controls | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Name$ Nightclub Bouncer's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualAbility:Mode$ RaiseCost | ValidCard$ Card.IsRemembered | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} more to cast.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Select target nonland permanent an opponent controls | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ RaiseCost | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:RaiseCost:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} more to cast.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Flash\nWhen Nightclub Bouncer enters the battlefield, return target nonland permanent an opponent controls to its owner's hand. It perpetually gains "This spell costs {2} more to cast."
--- a/forge-gui/res/cardsfolder/n/nyleas_colossus.txt
+++ b/forge-gui/res/cardsfolder/n/nyleas_colossus.txt
@@ -3,7 +3,5 @@ ManaCost:6 G
 Types:Enchantment Creature Giant
 PT:6/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.Other+YouCtrl | Execute$ TrigPump | TriggerDescription$ Constellation Whenever CARDNAME or another enchantment enters the battlefield under your control, double target creature's power and toughness until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ +Y | Double$ True
-SVar:X:Targeted$CardPower
-SVar:Y:Targeted$CardToughness
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ Double | NumDef$ Double
 Oracle:Constellation — Whenever Nylea's Colossus or another enchantment enters the battlefield under your control, double target creature's power and toughness until end of turn.
--- a/forge-gui/res/cardsfolder/o/okaun_eye_of_chaos.txt
+++ b/forge-gui/res/cardsfolder/o/okaun_eye_of_chaos.txt
@@ -6,7 +6,5 @@ K:Partner:Zndrsplt, Eye of Wisdom:Zndrsplt
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigFlip | TriggerDescription$ At the beginning of combat on your turn, flip a coin until you lose a flip.
 SVar:TrigFlip:DB$ FlipACoin | FlipUntilYouLose$ True
 T:Mode$ FlippedCoin | ValidResult$ Win | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player wins a coin flip, double NICKNAME's power and toughness until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | NumDef$ +Y | Double$ True
-SVar:X:Count$CardPower
-SVar:Y:Count$CardToughness
+SVar:TrigPump:DB$ Pump | NumAtt$ Double | NumDef$ Double
 Oracle:Partner with Zndrsplt, Eye of Wisdom (When this creature enters the battlefield, target player may put Zndrsplt into their hand from their library, then shuffle.)\nAt the beginning of combat on your turn, flip a coin until you lose a flip.\nWhenever a player wins a coin flip, double Okaun's power and toughness until end of turn.
--- a/forge-gui/res/cardsfolder/p/paths_of_tuinvale.txt
+++ b/forge-gui/res/cardsfolder/p/paths_of_tuinvale.txt
@@ -1,11 +1,12 @@
 Name:Paths of Tuinvale
 ManaCost:1 U
 Types:Instant
-A:SP$ Charm | Choices$ DBDecrease,DBIncrease | MinCharmNum$ 1 | CharmNum$ 2 | SpellDescription$ Choose one or both
-SVar:DBDecrease:DB$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Hand | Imprint$ True | TgtPrompt$ Choose target creature you control | SubAbility$ DBEffect | SpellDescription$ Return target creature you control to its owner's hand. That card perpetually gains "This spell costs {1} less to cast."
-SVar:DBEffect:DB$ Effect | RememberObjects$ Imprinted | StaticAbilities$ PerpetualAbility | Name$ Paths of Tuinvale's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualAbility:Mode$ ReduceCost | ValidCard$ Card.IsRemembered | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell perpetually costs {1} less to cast.
-SVar:DBIncrease:DB$ ChangeZone | ValidTgts$ Creature.YouDontCtrl | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Choose target creature you don't control | SubAbility$ DBEffectTwo | SpellDescription$ Return target creature you don't control to its owner's hand. That card perpetually gains "This spell costs {1} more to cast."
-SVar:DBEffectTwo:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbilityTwo | Name$ Paths of Tuinvale's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualAbilityTwo:Mode$ RaiseCost | ValidCard$ Card.IsRemembered | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell perpetually costs {1} more to cast.
-Oracle:Choose one or both —\n• Return target creature you control to its owner's hand. That card perpetually gains "This spell costs {1} less to cast."\n• Return target creature you don't control to its owner's hand. That card perpetually gains "This spell costs {1} more to cast."
+A:SP$ Charm | Choices$ DBDecrease,DBIncrease | MinCharmNum$ 1 | CharmNum$ 2
+SVar:DBDecrease:DB$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Select target creature you control | SubAbility$ DBAnimate | SpellDescription$ Return target creature you control to its owner's hand. That card perpetually gains "This spell costs {1} less to cast."
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ ReduceCost | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
+SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
+SVar:DBIncrease:DB$ ChangeZone | ValidTgts$ Creature.YouDontCtrl | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Select target creature you don't control | SubAbility$ DBAnimate2 | SpellDescription$ Return target creature you don't control to its owner's hand. That card perpetually gains "This spell costs {1} more to cast."
+SVar:DBAnimate2:DB$ Animate | Defined$ Remembered | staticAbilities$ RaiseCost | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
+SVar:RaiseCost:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} more to cast.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Choose one or both —\n• Return target creature you control to its owner's hand. That card perpetually gains "This spell costs {1} less to cast."\n• Return target creature you don't control to its owner's hand. That card perpetually gains "This spell costs {1} more to cast."
--- a/forge-gui/res/cardsfolder/p/penregon_besieged.txt
+++ b/forge-gui/res/cardsfolder/p/penregon_besieged.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
 Types:Enchantment
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of your end step, choose a creature with the least toughness among creatures your opponents control. It perpetually gets -1/-1.
 SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.leastToughnessControlledByOpponent | ChoiceTitle$ Choose a creature with the least toughness among creatures your opponents control | Mandatory$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualDebuff | Name$ Penregon Besieged's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ -1 | AddToughness$ -1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -1/-1.
+SVar:DBEffect:DB$ Pump | Defined$ ChosenCard | NumAtt$ -1 | NumDef$ -1 | Duration$ Perpetual
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Creature.OppCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When your opponents control no creatures, sacrifice CARDNAME.
 SVar:TrigSac:DB$ Sacrifice
 DeckHas:Ability$Sacrifice
--- a/forge-gui/res/cardsfolder/r/rasaad_yn_bashir.txt
+++ b/forge-gui/res/cardsfolder/r/rasaad_yn_bashir.txt
@@ -4,9 +4,7 @@ Types:Legendary Creature Human Monk
 PT:0/3
 S:Mode$ CombatDamageToughness | ValidCard$ Creature.YouCtrl | Description$ Each creature you control assigns combat damage equal to its toughness rather than its power.
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDoubleToughness | CheckDefinedPlayer$ You.hasInitiative | TriggerDescription$ Whenever CARDNAME attacks, if you have the initiative, double the toughness of each creature you control until end of turn.
-SVar:TrigDoubleToughness:DB$ RepeatEach | RepeatCards$ Creature.YouCtrl | RepeatSubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Remembered | NumDef$ X | Double$ True
-SVar:X:Remembered$CardToughness
+SVar:TrigDoubleToughness:DB$ Pump | Defined$ Valid Creature.YouCtrl | NumDef$ Double
 K:Choose a Background
 SVar:HasAttackEffect:TRUE
 Oracle:Each creature you control assigns combat damage equal to its toughness rather than its power.\nWhenever Rasaad yn Bashir attacks, if you have the initiative, double the toughness of each creature you control until end of turn.\nChoose a Background (You can have a Background as a second commander.)
--- a/forge-gui/res/cardsfolder/r/ravenous_pursuit.txt
+++ b/forge-gui/res/cardsfolder/r/ravenous_pursuit.txt
@@ -2,11 +2,8 @@ Name:Ravenous Pursuit
 ManaCost:1 G
 Types:Sorcery
 A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature.
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | AILogic$ PowerDmg | NumDmg$ Y | ExcessSVar$ Excess | DamageSource$ ParentTarget | SubAbility$ DBChooseCard
-SVar:Y:ParentTargeted$CardPower
-SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Creature.YouOwn | ChoiceTitle$ Choose a creature card in your hand | Amount$ 1 | SubAbility$ DBEffect | SpellDescription$ Choose a creature card in your hand. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPXPX | SetChosenNumber$ Excess | Name$ Ravenous Pursuit's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup | SpellDescription$ It perpetually gets +X/+X, where X is the amount of excess damage dealt this way.
-SVar:PerpetualPXPX:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ X | AddToughness$ X | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +X/+X, where X is the amount of excess damage dealt.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | AILogic$ PowerDmg | NumDmg$ ParentTargeted$CardPower | ExcessSVar$ Excess | DamageSource$ ParentTarget | SubAbility$ DBChooseCard
+SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Creature.YouOwn | ChoiceTitle$ Choose a creature card in your hand | Madatory$ True | SubAbility$ DBEffect | SpellDescription$ Choose a creature card in your hand. | StackDescription$ SpellDescription
+SVar:DBEffect:DB$ Pump | Defined$ ChosenCard | PumpZone$ Hand | NumAtt$ Excess | NumDef$ Excess | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ It perpetually gets +X/+X, where X is the amount of excess damage dealt this way.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-SVar:X:Count$ChosenNumber
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control. Choose a creature card in your hand. It perpetually gets +X/+X, where X is the amount of excess damage dealt this way.
--- a/forge-gui/res/cardsfolder/r/reckless_amplimancer.txt
+++ b/forge-gui/res/cardsfolder/r/reckless_amplimancer.txt
@@ -2,7 +2,5 @@ Name:Reckless Amplimancer
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:2/2
-A:AB$ Pump | Cost$ 4 G | NumAtt$ +X | NumDef$ +Y | Double$ True | StackDescription$ SpellDescription | SpellDescription$ Double CARDNAME's power and toughness until end of turn.
-SVar:X:Count$CardPower
-SVar:Y:Count$CardToughness
+A:AB$ Pump | Cost$ 4 G | NumAtt$ Double | NumDef$ Double | StackDescription$ SpellDescription | SpellDescription$ Double CARDNAME's power and toughness until end of turn.
 Oracle:{4}{G}: Double Reckless Amplimancer's power and toughness until end of turn.
--- a/forge-gui/res/cardsfolder/r/richlau_headmaster.txt
+++ b/forge-gui/res/cardsfolder/r/richlau_headmaster.txt
@@ -4,11 +4,11 @@ Types:Legendary Creature Human Advisor
 PT:2/4
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ At the beginning of your end step, you may pay {1}. When you do, target artifact card in your graveyard perpetually gains "This spell costs {1} less to cast." If it's a creature or Vehicle card, it perpetually gets +2/+2. Put it into your library second from the top.
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigPump | TriggerDescription$ When you do, target artifact card in your graveyard perpetually gains "This spell costs {1} less to cast." If it's a creature or Vehicle card, it perpetually gets +2/+2. Put it into your library second from the top.
-SVar:TrigPump:DB$ Effect | TgtZone$ Graveyard | ValidTgts$ Artifact.YouOwn | TgtPrompt$ Select target artifact card in your graveyard | StaticAbilities$ CostReduction | RememberObjects$ Targeted | Name$ Richlau, Headmaster's Perpetual Effect | Duration$ Permanent | SubAbility$ PumpVehicle
-SVar:CostReduction:Mode$ Continuous | Affected$ Card.IsRemembered | AddStaticAbility$ PerpetualReduce | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The card perpetually gains "This spell costs {1} less to cast."
-SVar:PerpetualReduce:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
-SVar:PumpVehicle:DB$ Effect | ConditionDefined$ Targeted | ConditionPresent$ Vehicle,Creature | RememberObjects$ Targeted | Duration$ Permanent | StaticAbilities$ PerpetualPump | SubAbility$ DBChangeZone
-SVar:PerpetualPump:Mode$ Continuous | AddPower$ 2 | AddToughness$ 2 | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ If it's a creature or Vehicle card, it perpetually gets +2/+2.
+SVar:TrigPump:DB$ Animate | TgtZone$ Graveyard | ValidTgts$ Artifact.YouOwn | TgtPrompt$ Select target artifact card in your graveyard | staticAbilities$ ReduceCost | Duration$ Perpetual | SubAbility$ PumpVehicle
+SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
+SVar:PumpVehicle:DB$ Pump | Defined$ Targeted | PumpZone$ Graveyard | ConditionDefined$ Targeted | ConditionPresent$ Vehicle,Creature | NumAtt$ 2 | NumDef$ 2 | Duration$ Perpetual | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 1 | Defined$ Targeted
-DeckHints:Ability$Graveyard & Type$Vehicle
+DeckNeeds:Type$Artifact
+DeckHints:Ability$Discard|Sacrifice & Type$Vehicle
+DeckHas:Ability$Graveyard
 Oracle:At the beginning of your end step, you may pay {1}. When you do, target artifact card in your graveyard perpetually gains "This spell costs {1} less to cast." If it's a creature or Vehicle card, it perpetually gets +2/+2. Put it into your library second from the top.
--- a/forge-gui/res/cardsfolder/r/rothga_bonded_engulfer.txt
+++ b/forge-gui/res/cardsfolder/r/rothga_bonded_engulfer.txt
@@ -5,8 +5,7 @@ PT:4/4
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters the battlefield, you get a boon with "When you cast your next creature spell, it perpetually gets +X/+X, where X is its power."
 SVar:TrigEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast
-SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffectBis | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+X, where X is it's power.
-SVar:TrigEffectBis:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Rothga, Bonded Engulfer's Boon
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ X | AddToughness$ X | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +X/+X, where X is it's power.
-SVar:X:Remembered$CardPower
-Oracle:Trample\nWhen Rothga, Bonded Engulfer enters the battlefield, you get a boon with "When you cast your next creature spell, it perpetually gets +X/+X, where X is its power."
+SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffectBis | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+X, where X is its power.
+SVar:TrigEffectBis:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ X | NumDef$ X | Duration$ Perpetual
+SVar:X:TriggeredStackInstance$CardPower
+Oracle:Trample\nWhen Rothga, Bonded Engulfer enters the battlefield, you get a boon with "When you cast your next creature spell, it perpetually gets +X/+X, where X is its power."
--- a/forge-gui/res/cardsfolder/rebalanced/a-mr_orfeo_the_boulder.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-mr_orfeo_the_boulder.txt
@@ -3,7 +3,6 @@ ManaCost:1 B R G
 Types:Legendary Creature Rhino Warrior
 PT:3/4
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, double target creature's power until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | Double$ True
-SVar:X:Targeted$CardPower
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ Double
 SVar:PlayMain1:TRUE
 Oracle:Whenever you attack, double target creature's power until end of turn.
--- a/forge-gui/res/cardsfolder/s/sap_vitality.txt
+++ b/forge-gui/res/cardsfolder/s/sap_vitality.txt
@@ -2,8 +2,7 @@ Name:Sap Vitality
 ManaCost:B B
 Types:Instant
 A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 3 | SubAbility$ DBChooseCard | SpellDescription$ CARDNAME deals 3 damage to target creature or planeswalker.
-SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose a creature card in your hand | Amount$ 1 | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ConditionDefined$ ChosenCard | ConditionPresent$ Card | StaticAbilities$ PerpetualP3P0 | Name$ Sap Vitality's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualP3P0:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ 3 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +3/+0.
+SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose a creature card in your hand | ChoiceDesc$ creature | Mandatory$ True | SubAbility$ DBEffect | SpellDescription$ Choose a creature card in your hand.
+SVar:DBEffect:DB$ Pump | PumpZone$ Hand | Defined$ ChosenCard | NumAtt$ 3 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ It perpetually gets +3/+0.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:Sap Vitality deals 3 damage to target creature or planeswalker. Choose a creature card in your hand. It perpetually gets +3/+0.
--- a/forge-gui/res/cardsfolder/s/scion_of_shiv.txt
+++ b/forge-gui/res/cardsfolder/s/scion_of_shiv.txt
@@ -3,6 +3,5 @@ ManaCost:2 R R
 Types:Creature Dragon
 PT:3/3
 K:Flying
-A:AB$ Effect | Cost$ 2 R | StaticAbilities$ PerpetualPump | RememberObjects$ Self | Name$ Scion of Shiv's Perpetual Effect | Duration$ Permanent | SpellDescription$ CARDNAME perpetually gets +1/+0.
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +1/+0.
+A:AB$ Pump | Cost$ 2 R | NumAtt$ 1 | Duration$ Perpetual | StackDescription$ SpellDescription | SpellDescription$ CARDNAME perpetually gets +1/+0.
 Oracle:Flying\n{2}{R}: Scion of Shiv perpetually gets +1/+0.
--- a/forge-gui/res/cardsfolder/s/shattering_finale.txt
+++ b/forge-gui/res/cardsfolder/s/shattering_finale.txt
@@ -2,8 +2,6 @@ Name:Shattering Finale
 ManaCost:1 B
 Types:Sorcery
 K:Casualty:1
-A:SP$ Effect | StaticAbilities$ PerpetualDebuff | RememberObjects$ Targeted | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | Name$ Shattering Finale's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup | SpellDescription$ Target creature an opponent controls perpetually gets -0/-3.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddToughness$ -3 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -0/-3.
-SVar:DBCleanup:DB$ Cleanup | ClearRembered$ True
+A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | NumDef$ -3 | Duration$ Perpetual | StackDescription$ {c:Targeted} perpetually gets -0/-3. | SpellDescription$ Target creature an opponent controls perpetually gets -0/-3.
 DeckHas:Ability$Sacrifice
-Oracle:Casualty 1\nTarget creature an opponent controls perpetually gets -0/-3.
+Oracle:Casualty 1\nTarget creature an opponent controls perpetually gets -0/-3.
--- a/forge-gui/res/cardsfolder/s/soul_servitude.txt
+++ b/forge-gui/res/cardsfolder/s/soul_servitude.txt
@@ -3,9 +3,8 @@ ManaCost:2 B
 Types:Instant
 A:SP$ Sacrifice | ValidTgts$ Player | TgtPrompt$ Select target player | SacValid$ Creature.nonToken | SacMessage$ nontoken creature | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger | SpellDescription$ Target player sacrifices a nontoken creature.
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | RememberObjects$ Remembered | Execute$ TrigConjure | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ When they do, you may discard a card. If you do, conjure a duplicate of the sacrificed creature into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
-SVar:TrigConjure:AB$ MakeCard | Cost$ Discard<1/Card> | Conjure$ True | DefinedName$ DelayTriggerRemembered | Zone$ Hand | RememberMade$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Soul Servitude's Perpetual Effect
-SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+SVar:TrigConjure:AB$ MakeCard | Cost$ Discard<1/Card> | Conjure$ True | DefinedName$ DelayTriggerRemembered | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|Discard
--- a/forge-gui/res/cardsfolder/s/steady_tortoise_harried_dash.txt
+++ b/forge-gui/res/cardsfolder/s/steady_tortoise_harried_dash.txt
@@ -4,8 +4,7 @@ Types:Creature Turtle
 PT:3/3
 K:Ward:2
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield,Exile | TriggerDescription$ Whenever you attack, CARDNAME perpetually gets +1/+1. This ability also triggers if CARDNAME is in exile.
-SVar:TrigEffect:DB$ Effect | StaticAbilities$ PerpetualBuff | RememberObjects$ Self | Name$ Steady Tortoise's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualBuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+1.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Battlefield,Exile | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
 DeckHas:Ability$Token & Type$Rabbit
 AlternateMode:Adventure
 Oracle:Ward {2}\nWhenever you attack, Steady Tortoise perpetually gets +1/+1. This ability also triggers if Steady Tortoise is in exile.
--- a/forge-gui/res/cardsfolder/t/talions_throneguard.txt
+++ b/forge-gui/res/cardsfolder/t/talions_throneguard.txt
@@ -6,9 +6,9 @@ K:Flash
 K:Bargain
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return up to one target spell or nonland permanent to its owner's hand. If CARDNAME was bargained, that card perpetually gains "This spell costs {2} more to cast."
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.nonLand,Card.inZoneStack | TgtZone$ Stack,Battlefield | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield,Stack | Fizzle$ True | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Choose up to one target spell or nonland permanent | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | ConditionDefined$ Self | ConditionPresent$ Card.bargained | StaticAbilities$ PerpetualAbility | Name$ Talion's Throneguard's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualAbility:Mode$ RaiseCost | ValidCard$ Card.IsRemembered | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} more to cast.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.nonLand,Card.inZoneStack | TgtZone$ Stack,Battlefield | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield,Stack | Fizzle$ True | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Select up to one target spell or nonland permanent | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | ConditionDefined$ Self | ConditionPresent$ Card.bargained | staticAbilities$ RaiseCost | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:RaiseCost:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} more to cast.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered
 DeckHints:Type$Artifact|Enchantment & Ability$Token
 DeckHas:Ability$Sacrifice
--- a/forge-gui/res/cardsfolder/t/targ_nar_demon_fang_gnoll.txt
+++ b/forge-gui/res/cardsfolder/t/targ_nar_demon_fang_gnoll.txt
@@ -3,9 +3,7 @@ ManaCost:R G
 Types:Legendary Creature Gnoll
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, attacking creatures get +1/+0 until end of turn.
-A:AB$ Pump | Cost$ 2 R G | NumAtt$ +X | NumDef$ +Y | Double$ True | SpellDescription$ Double NICKNAME's power and toughness until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking | NumAtt$ 1
-SVar:X:Count$CardPower
-SVar:Y:Count$CardToughness
 SVar:PackTactics:Count$SumPower_Creature.attacking
+A:AB$ Pump | Cost$ 2 R G | NumAtt$ Double | NumDef$ Double | StackDescription$ SpellDescription | SpellDescription$ Double NICKNAME's power and toughness until end of turn.
 Oracle:Pack tactics — Whenever Targ Nar, Demon-Fang Gnoll attacks, if you attacked with creatures with total power 6 or greater this combat, attacking creatures get +1/+0 until end of turn.\n{2}{R}{G}: Double Targ Nar's power and toughness until end of turn.
--- a/forge-gui/res/cardsfolder/t/tawnos_endures.txt
+++ b/forge-gui/res/cardsfolder/t/tawnos_endures.txt
@@ -1,12 +1,10 @@
 Name:Tawnos Endures
 ManaCost:W
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBEffect | SpellDescription$ Exile target creature. It gains "At the beginning of your upkeep, if this card is exiled, it perpetually gets +1/+1, then you may put it onto the battlefield."
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | Duration$ Permanent | StaticAbilities$ PerpetualEffect | Name$ Tawnos Endures's Perpetual Effect | SubAbility$ DBCleanup
-SVar:PerpetualEffect:Mode$ Continuous | Affected$ Card.IsRemembered | AddTrigger$ UpkeepTrig | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ At the beginning of your upkeep, if this card is exiled, it perpetually gets +1/+1, then you may put it onto the battlefield.
+A:SP$ ChangeZone | ValidTgts$ Creature | RememberTargets$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBAnimate | SpellDescription$ Exile target creature. 
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Duration$ Permanent | Triggers$ UpkeepTrig | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ It gains "At the beginning of your upkeep, if this card is exiled, it perpetually gets +1/+1, then you may put it onto the battlefield."
 SVar:UpkeepTrig:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Exile | Execute$ TrigPerpetual | ValidPlayer$ You | TriggerDescription$ At the beginning of your upkeep, if this card is exiled, it perpetually gets +1/+1, then you may put it onto the battlefield.
-SVar:TrigPerpetual:DB$ Effect | StaticAbilities$ PerpetualBuff | Name$ Tawnos Endures's Perpetual Effect | Duration$ Permanent | SubAbility$ DBReturn
+SVar:TrigPerpetual:DB$ Pump | PumpZone$ Exile | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Exile | Destination$ Battlefield | Optional$ True
-SVar:PerpetualBuff:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ +1 | AddToughness$ +1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Exile target creature. It gains "At the beginning of your upkeep, if this card is exiled, it perpetually gets +1/+1, then you may put it onto the battlefield."
--- a/forge-gui/res/cardsfolder/t/the_skullspore_nexus.txt
+++ b/forge-gui/res/cardsfolder/t/the_skullspore_nexus.txt
@@ -6,7 +6,6 @@ SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
 T:Mode$ ChangesZoneAll | ValidCards$ Creature.nonToken+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control die, create a green Fungus Dinosaur creature token with base power and toughness each equal to the total power of those creatures.
 SVar:TrigToken:DB$ Token | TokenScript$ g_x_x_fungus_dinosaur | TokenPower$ Z | TokenToughness$ Z
 SVar:Z:TriggerObjectsCards$CardPower
-A:AB$ Pump | Cost$ 2 T | NumAtt$ Y | Double$ True | ValidTgts$ Creature | SpellDescription$ Double target creature's power until end of turn.
-SVar:Y:Targeted$CardPower
+A:AB$ Pump | Cost$ 2 T | NumAtt$ Double | ValidTgts$ Creature | StackDescription$ REP target creature_{c:Targeted} | SpellDescription$ Double target creature's power until end of turn.
 DeckHas:Ability$Token & Type$Fungus|Dinosaur
-Oracle:This spell costs {X} less to cast, where X is the greatest power among creatures you control.\nWhenever one or more nontoken creatures you control die, create a green Fungus Dinosaur creature token with base power and toughness each equal to the total power of those creatures.\n{2}, {T}: Double target creature's power until end of turn.
+Oracle:This spell costs {X} less to cast, where X is the greatest power among creatures you control.\nWhenever one or more nontoken creatures you control die, create a green Fungus Dinosaur creature token with base power and toughness each equal to the total power of those creatures.\n{2}, {T}: Double target creature's power until end of turn.
--- a/forge-gui/res/cardsfolder/t/thrakkus_the_butcher.txt
+++ b/forge-gui/res/cardsfolder/t/thrakkus_the_butcher.txt
@@ -4,9 +4,7 @@ Types:Legendary Creature Dragon Peasant
 PT:3/4
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDoublePower | TriggerDescription$ Whenever CARDNAME attacks, double the power of each Dragon you control until end of turn.
-SVar:TrigDoublePower:DB$ RepeatEach | RepeatCards$ Dragon.YouCtrl | RepeatSubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Remembered | NumAtt$ X | Double$ True
-SVar:X:Remembered$CardPower
+SVar:TrigDoublePower:DB$ Pump | Defined$ Valid Dragon.YouCtrl | NumAtt$ Double
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Dragon
 Oracle:Trample\nWhenever Thrakkus the Butcher attacks, double the power of each Dragon you control until end of turn.
--- a/forge-gui/res/cardsfolder/t/tiana_angelic_mechanic.txt
+++ b/forge-gui/res/cardsfolder/t/tiana_angelic_mechanic.txt
@@ -4,8 +4,7 @@ Types:Legendary Creature Angel Artificer
 PT:3/2
 K:Flying
 T:Mode$ Crewed | ValidCrew$ Card.Self,Creature.Legendary+Other+YouCtrl | Execute$ TrigEffect | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME or another legendary creature you control crews a Vehicle, that Vehicle perpetually gets +1/+0.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredVehicle | StaticAbilities$ PerpetualP1P1 | Name$ Tiana, Angelic Mechanic's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This Vehicle perpetually gains +1/+0.
+SVar:TrigEffect:DB$ Pump | Defined$ TriggeredVehicle | NumAtt$ 1 | Duration$ Perpetual
 DeckHints:Type$Legendary
 DeckNeeds:Type$Vehicle
 Oracle:Flying\nWhen Tiana, Angelic Mechanic or another legendary creature you control crews a Vehicle, that Vehicle perpetually gets +1/+0.
--- a/forge-gui/res/cardsfolder/t/tomakul_phoenix.txt
+++ b/forge-gui/res/cardsfolder/t/tomakul_phoenix.txt
@@ -5,12 +5,11 @@ PT:2/2
 K:Flying
 K:Haste
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME dies, it perpetually gets +2/+2.
-SVar:TrigEffect:DB$ Effect | StaticAbilities$ PerpetualBuff | RememberObjects$ Self | Name$ Tomakul Phoenix's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualBuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 2 | AddToughness$ 2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +2/+2.
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of combat on your turn, you may pay {X}{R}, where X is CARDNAME's power. If you do, return it from you graveyard to the battlefield.
+SVar:TrigEffect:DB$ Pump | Defined$ TriggeredNewCardLKICopy | PumpZone$ Graveyard | NumAtt$ 2 | NumDef$ 2 | Duration$ Perpetual
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of combat on your turn, you may pay {X}{R}, where X is CARDNAME's power. If you do, return it from your graveyard to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ X R | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:X:Count$CardPower
 DeckHas:Ability$Graveyard
 SVar:SacMe:1
 SVar:DiscardMe:1
-Oracle:Flying, haste\nWhen Tomakul Phoenix dies, it perpetually gets +2/+2.\nAt the beginning of combat on your turn, you may pay {X}{R}, where X is Tomakul Phoenix's power. If you do, return it from you graveyard to the battlefield.
+Oracle:Flying, haste\nWhen Tomakul Phoenix dies, it perpetually gets +2/+2.\nAt the beginning of combat on your turn, you may pay {X}{R}, where X is Tomakul Phoenix's power. If you do, return it from your graveyard to the battlefield.
--- a/forge-gui/res/cardsfolder/t/two_handed_axe_sweeping_cleave.txt
+++ b/forge-gui/res/cardsfolder/t/two_handed_axe_sweeping_cleave.txt
@@ -2,8 +2,7 @@ Name:Two-Handed Axe
 ManaCost:2 R
 Types:Artifact Equipment
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature attacks, double its power until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +Y | Double$ True
-SVar:Y:TriggeredAttacker$CardPower
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ Double
 K:Equip:1 R
 AlternateMode:Adventure
 Oracle:Whenever equipped creature attacks, double its power until end of turn.\nEquip {1}{R}
--- a/forge-gui/res/cardsfolder/u/undersimplify.txt
+++ b/forge-gui/res/cardsfolder/u/undersimplify.txt
@@ -2,7 +2,6 @@ Name:Undersimplify
 ManaCost:1 U
 Types:Instant
 A:SP$ Pump | TargetType$ Spell | TgtZone$ Stack | ValidTgts$ Card | SubAbility$ DBEffect | StackDescription$ {p:You} chooses {s:Targeted}. | SpellDescription$ Choose target spell.
-SVar:DBEffect:DB$ Effect | ConditionDefined$ Targeted | ConditionPresent$ Spell.Creature | ConditionZone$ Stack | StaticAbilities$ PerpetualDebuff | RememberObjects$ TargetedSource | Name$ Undersimplify's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCounter | SpellDescription$ If it's a creature spell, it perpetually gets -2/-0.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -2/-0.
+SVar:DBEffect:DB$ Pump | ConditionDefined$ Targeted | ConditionPresent$ Spell.Creature | ConditionZone$ Stack | Defined$ TargetedSource | PumpZone$ Stack | NumAtt$ -2 | Duration$ Perpetual | SubAbility$ DBCounter | StackDescription$ SpellDescription | SpellDescription$ If it's a creature spell, it perpetually gets -2/-0.
 SVar:DBCounter:DB$ Counter | Defined$ Targeted | UnlessCost$ 2 | UnlessPayer$ TargetedController | SpellDescription$ Counter that spell unless its controller pays {2}.
 Oracle:Choose target spell. If it's a creature spell, it perpetually gets -2/-0. Counter that spell unless its controller pays {2}.
--- a/forge-gui/res/cardsfolder/u/unleash_fury.txt
+++ b/forge-gui/res/cardsfolder/u/unleash_fury.txt
@@ -1,6 +1,5 @@
 Name:Unleash Fury
 ManaCost:1 R
 Types:Instant
-A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | Double$ True | SpellDescription$ Double the power of target creature until end of turn.
-SVar:X:Targeted$CardPower
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ Double | StackDescription$ REP target creature_{c:Targeted} | SpellDescription$ Double the power of target creature until end of turn.
 Oracle:Double the power of target creature until end of turn.
--- a/forge-gui/res/cardsfolder/u/unnatural_growth.txt
+++ b/forge-gui/res/cardsfolder/u/unnatural_growth.txt
@@ -2,9 +2,6 @@ Name:Unnatural Growth
 ManaCost:1 G G G G
 Types:Enchantment
 T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ TrigDouble | TriggerDescription$ At the beginning of each combat, double the power and toughness of each creature you control until end of turn.
-SVar:TrigDouble:DB$ RepeatEach | RepeatCards$ Creature.YouCtrl | RepeatSubAbility$ DBDouble
-SVar:DBDouble:DB$ Pump | Defined$ Remembered | NumAtt$ X | NumDef$ Y | Double$ True
-SVar:X:Remembered$CardPower
-SVar:Y:Remembered$CardToughness
+SVar:TrigDouble:DB$ Pump | Defined$ Valid Creature.YouCtrl | NumAtt$ Double | NumDef$ Double
 SVar:PlayMain1:TRUE
 Oracle:At the beginning of each combat, double the power and toughness of each creature you control until end of turn.
--- a/forge-gui/res/cardsfolder/upcoming/mycoid_resurrection.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mycoid_resurrection.txt
@@ -0,0 +1,9 @@
+Name:Mycoid Resurrection
+ManaCost:4 B G
+Types:Sorcery
+A:SP$ PumpAll | ValidCards$ Creature.YouOwn | PumpZone$ Graveyard | NumAtt$ X | NumDef$ X | SubAbility$ DBReturn | SpellDescription$ Fathomless descent — Each creature card in your graveyard perpetually gets +X/+X, where X is the number of permanent cards in your graveyard.
+SVar:X:Count$ValidGraveyard Permanent.YouOwn
+SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouOwn | PrimaryPrompt$ Choose a creature card to return to the battlefield | ChangeTypeDesc$ creature | SpellDescription$ Then return a creature card from your graveyard to the battlefield.
+DeckHas:Ability$Graveyard
+DeckHints:Ability$Discard|Sacrifice
+Oracle:Fathomless descent — Each creature card in your graveyard perpetually gets +X/+X, where X is the number of permanent cards in your graveyard. Then return a creature card from your graveyard to the battlefield.
--- a/forge-gui/res/cardsfolder/upcoming/plunderers_prize.txt
+++ b/forge-gui/res/cardsfolder/upcoming/plunderers_prize.txt
@@ -0,0 +1,14 @@
+Name:Plunderer's Prize
+ManaCost:X U
+Types:Sorcery
+A:SP$ Seek | Type$ Artifact.nonLand+cmcLEX | RememberFound$ True | SubAbility$ DBPut | SpellDescription$ Seek a nonland artifact card with mana value X or less
+SVar:DBPut:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Defined$ Remembered | StackDescription$ None | SubAbility$ DBBranch | StackDescription$ SpellDescription | SpellDescription$ and put it onto the battlefield.
+SVar:DBBranch:DB$ Branch | BranchConditionSVar$ Remembered$CardManaCost | BranchConditionSVarCompare$ LTX | TrueSubAbility$ DBAnimate | FalseSubAbility$ DBCleanup | SpellDescription$ If a card with mana value less than X is put onto the battlefield this way, this spell perpetually gains "This spell costs {1} more to cast," then return this spell to its owner's hand.
+SVar:DBAnimate:DB$ Animate | staticAbilities$ RaiseCost | Duration$ Perpetual | SubAbility$ DBReturn
+SVar:RaiseCost:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} more to cast.
+SVar:DBReturn:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+DeckNeeds:Type$Artifact
+AI:RemoveDeck:Random
+Oracle:Seek a nonland artifact card with mana value X or less and put it onto the battlefield. If a card with mana value less than X is put onto the battlefield this way, this spell perpetually gains "This spell costs {1} more to cast," then return this spell to its owner's hand.
--- a/forge-gui/res/cardsfolder/upcoming/stalwart_speartail.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stalwart_speartail.txt
@@ -0,0 +1,12 @@
+Name:Stalwart Speartail
+ManaCost:1 R G
+Types:Creature Dinosaur
+PT:4/4
+T:Mode$ DamageDoneOnce | Execute$ TrigPump | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, other Dinosaurs you control and Dinosaur cards in your hand and library perpetually get +1/+1.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Dinosaur.YouCtrl+Other | PumpZone$ Battlefield,Hand,Library | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTrigger | TriggerDescription$ Whenever CARDNAME attacks, you may pay {3}. When you do, CARDNAME deals 1 damage to each creature and each planeswalker.
+SVar:TrigTrigger:AB$ ImmediateTrigger | Cost$ 3 | Execute$ TrigDamage | TriggerDescription$ When you do, CARDNAME deals 1 damage to each creature and each planeswalker.
+SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature,Planeswalker | NumDmg$ 1
+DeckNeeds:Type$Dinosaur
+SVar:HasAttackEffect:TRUE
+Oracle:Enrage — Whenever Stalwart Speartail is dealt damage, other Dinosaurs you control and Dinosaur cards in your hand and library perpetually get +1/+1.\nWhenever Stalwart Speartail attacks, you may pay {3}. When you do, Stalwart Speartail deals 1 damage to each creature and each planeswalker.
--- a/forge-gui/res/cardsfolder/v/valiant_farewell.txt
+++ b/forge-gui/res/cardsfolder/v/valiant_farewell.txt
@@ -1,13 +1,12 @@
 Name:Valiant Farewell
 ManaCost:1 W
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ +2 | SubAbility$ BoonEffect | SpellDescription$ Target creature you control gets +2/+0 until end of turn. When that creature leaves the battlefield this turn, you get a boon with "When you cast your next creature spell, it perpetually gets +2/+0." Draw a card.
-SVar:BoonEffect:DB$ Effect | RememberObjects$ Targeted | Duration$ End of Turn | Triggers$ ChangesZone | SubAbility$ DBDraw | SpellDescription$ When that creature leaves the battlefield this turn, you get a boon with "When you cast your next creature spell, it perpetually gets +2/+0."
-SVar:DBDraw:DB$ Draw
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +2 | SubAbility$ BoonEffect | SpellDescription$ Target creature you control gets +2/+0 until end of turn.
+SVar:BoonEffect:DB$ Effect | RememberObjects$ Targeted | Duration$ End of Turn | Triggers$ ChangesZone | SubAbility$ DBDraw | StackDescription$ SpellDescription | SpellDescription$ When that creature leaves the battlefield this turn, you get a boon with "When you cast your next creature spell, it perpetually gets +2/+0.",,,,,,
+SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
 SVar:ChangesZone:Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ Battlefield | Destination$ Any | Execute$ TrigBoon | TriggerDescription$ When that creature leaves the battlefield this turn, you get a boon with "When you cast your next creature spell, it perpetually gets +2/+0."
 SVar:TrigBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +2/+0.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Valiant Farewell's Boon's Perpetual Effect
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +2/+0.
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ 2 | Duration$ Perpetual
 DeckNeeds:Type$Creature
 Oracle:Target creature you control gets +2/+0 until end of turn. When that creature leaves the battlefield this turn, you get a boon with "When you cast your next creature spell, it perpetually gets +2/+0."\nDraw a card.
--- a/forge-gui/res/cardsfolder/v/veteran_charger.txt
+++ b/forge-gui/res/cardsfolder/v/veteran_charger.txt
@@ -3,8 +3,7 @@ ManaCost:2 G
 Types:Creature Centaur Soldier
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, choose a creature card in your hand. It perpetually gets +2/+2.
-SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose a creature card in your hand | Amount$ 1 | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualP2P2 | Name$ Veteran Charger's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:PerpetualP2P2:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ 2 | AddToughness$ 2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +2/+2.
+SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose a creature card in your hand | Mandatory$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Pump | PumpZone$ Hand | Defined$ ChosenCard | NumAtt$ 2 | NumDef$ 2 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:When Veteran Charger enters the battlefield, choose a creature card in your hand. It perpetually gets +2/+2.
--- a/forge-gui/res/cardsfolder/v/vladimir_and_godfrey.txt
+++ b/forge-gui/res/cardsfolder/v/vladimir_and_godfrey.txt
@@ -2,9 +2,8 @@ Name:Vladimir and Godfrey
 ManaCost:2 W
 Types:Legendary Creature Zombie Knight
 PT:3/2
-A:AB$ ChangeZone | Cost$ 2 W | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | ActivationZone$ Graveyard | IsPresent$ Creature.YouCtrl+powerEQ1+toughnessEQ1 | Tapped$ True | SubAbility$ DBEffect | PrecostDesc$ Rejuvenation — | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped. It perpetually gets +1/+1. Activate only if you control a 1/1 creature.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPump | RememberObjects$ Self | Name$ Vladimir and Godfrey's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +1/+1.
+A:AB$ ChangeZone | Cost$ 2 W | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | ActivationZone$ Graveyard | IsPresent$ Creature.YouCtrl+powerEQ1+toughnessEQ1 | Tapped$ True | SubAbility$ DBEffect | PrecostDesc$ Rejuvenation — | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped.
+SVar:DBEffect:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | StackDescription$ It perpetually gets +1/+1. | SpellDescription$ It perpetually gets +1/+1. Activate only if you control a 1/1 creature.
 SVar:SacMe:3
 SVar:DiscardMe:3
 DeckHas:Ability$Graveyard
--- a/forge-gui/res/cardsfolder/w/war_trained_slasher.txt
+++ b/forge-gui/res/cardsfolder/w/war_trained_slasher.txt
@@ -4,6 +4,5 @@ Types:Creature Wolverine Dinosaur
 PT:4/3
 K:Menace
 T:Mode$ Attacks | ValidCard$ Card.Self | Attacked$ Battle | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks a battle, double its power until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +Y | Double$ True
-SVar:Y:TriggeredAttacker$CardPower
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ Double
 Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever War-Trained Slasher attacks a battle, double its power until end of turn.
--- a/forge-gui/res/cardsfolder/w/warzone_duplicator.txt
+++ b/forge-gui/res/cardsfolder/w/warzone_duplicator.txt
@@ -4,12 +4,11 @@ Types:Artifact Creature Construct
 PT:6/6
 K:Prototype:3 U:3:3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return target creature an opponentcontrols with power less than CARDNAME's power to it's owner's hand. If that creature wasn't a token, conjure a duplicate of it into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.OppCtrl+powerLTX | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Choose target creature an opponent controls with power less than Warzone Duplicator's power. | SubAbility$ DBConjure
-SVar:DBConjure:DB$ MakeCard | Conjure$ True | ConditionDefined$ Targeted | ConditionPresent$ Card.nonToken | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Warzone Duplicator's Perpetual Effect | SubAbility$ DBCleanup | SpellDescription$ It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.OppCtrl+powerLTTriggeredCard$CardPower | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select target creature an opponent controls with power less than CARDNAME's power | SubAbility$ DBConjure
+SVar:DBConjure:DB$ MakeCard | Conjure$ True | ConditionDefined$ Targeted | ConditionPresent$ Card.nonToken | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:TriggeredCard$CardPower
 DeckHints:Color$Blue
 Oracle:Prototype {3}{U} — 3/3\nWhen Warzone Duplicator enters the battlefield, return target creature an opponent controls with power less than Warzone Duplicator's power to it's owner's hand. If that creature wasn't a token, conjure a duplicate of it into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
--- a/forge-gui/res/cardsfolder/w/wizened_githzerai.txt
+++ b/forge-gui/res/cardsfolder/w/wizened_githzerai.txt
@@ -3,6 +3,5 @@ ManaCost:1 U
 Types:Creature Gith Monk
 PT:2/1
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigEffect | PrecostDesc$ Psionic Adept — | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, that creature perpetually gets -2/-0.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredBlockerLKICopy | StaticAbilities$ PerpetualDebuff | Name$ Wizened Githzerai's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -2/-0.
+SVar:TrigEffect:DB$ Pump | Defined$ TriggeredBlockerLKICopy | NumAtt$ -2 | Duration$ Perpetual
 Oracle:Psionic Adept — Whenever Wizened Githzerai becomes blocked by a creature, that creature perpetually gets -2/-0.
--- a/forge-gui/res/cardsfolder/w/wyll_pact_bound_duelist.txt
+++ b/forge-gui/res/cardsfolder/w/wyll_pact_bound_duelist.txt
@@ -69,8 +69,7 @@ ManaCost:3 R R G
 Types:Legendary Creature Human Warlock
 PT:5/5
 T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When this creature specializes, you may sacrifice another creature or an artifact. If you do, CARDNAME perpetually gets +3/+3 and gains trample.
-SVar:TrigEffect:AB$ Effect | Cost$ Sac<1/Creature.Other;Artifact/another creature or an artifact> | RememberObjects$ Self | Name$ Wyll of the Fey Pact's Perpetual Effect | StaticAbilities$ PerpetualAbility | Duration$ Permanent
-SVar:PerpetualAbility:Mode$ Continuous | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Trample | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +3/+3 and gains trample.
+SVar:TrigEffect:AB$ Pump | Cost$ Sac<1/Creature.Other;Artifact/another creature or an artifact> | NumAtt$ 3 | NumDef$ 3 | KW$ Trample | Duration$ Perpetual
 DeckHas:Ability$Sacrifice
 DeckHints:Type$Artifact
 Oracle:When this creature specializes, you may sacrifice another creature or an artifact. If you do, Wyll of the Fey Pact perpetually gets +3/+3 and gains trample.
--- a/forge-gui/res/cardsfolder/z/zopandrel_hunger_dominus.txt
+++ b/forge-gui/res/cardsfolder/z/zopandrel_hunger_dominus.txt
@@ -4,10 +4,7 @@ Types:Legendary Creature Phyrexian Horror
 PT:4/6
 K:Reach
 T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ TrigDouble | TriggerDescription$ At the beginning of each combat, double the power and toughness of each creature you control until end of turn.
-SVar:TrigDouble:DB$ RepeatEach | RepeatCards$ Creature.YouCtrl | RepeatSubAbility$ DBDouble
-SVar:DBDouble:DB$ Pump | Defined$ Remembered | NumAtt$ X | NumDef$ Y | Double$ True
+SVar:TrigDouble:DB$ Pump | Defined$ Valid Creature.YouCtrl | NumAtt$ Double | NumDef$ Double
 A:AB$ PutCounter | Cost$ GP GP Sac<2/Creature.Other/Other creature> | Defined$ Self | CounterType$ Indestructible | CounterNum$ 1 | SpellDescription$ Put an indestructible counter on CARDNAME. ({G/P} can be paid with either {G} or 2 life.)
-SVar:X:Remembered$CardPower
-SVar:Y:Remembered$CardToughness
 DeckHas:Ability$Sacrifice|Counters
 Oracle:Reach\nAt the beginning of each combat, double the power and toughness of each creature you control until end of turn.\n{G/P}{G/P}, Sacrifice two other creatures: Put an indestructible counter on Zopandrel, Hunger Dominus. ({G/P} can be paid with either {G} or 2 life.)