diff --git a/forge-gui/res/cardsfolder/rebalanced/a-civil_servant.txt b/forge-gui/res/cardsfolder/rebalanced/a-civil_servant.txt
index 23f8022eb71..40ac0bebe85 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-civil_servant.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-civil_servant.txt
@@ -3,7 +3,7 @@ ManaCost:G W
 Types:Creature Cat Citizen
 PT:2/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may tap another untapped Citizen you control. If you do, CARDNAME gets +1/+0 and gains trample until end of turn.
-SVar:TrigPump:AB$ Pump | Cost$ tapXType<1/Citizen.Other> | Defined$ Self | NumAtt$ 1 | KW$ Trample
+SVar:TrigPump:AB$ Pump | Cost$ tapXType<1/Citizen.Other> | Defined$ Self | NumAtt$ +1 | KW$ Trample
 SVar:HasAttackEffect:TRUE
 DeckNeeds:Type$Citizen
 Oracle:Whenever Civil Servant attacks, you may tap another untapped Citizen you control. If you do, Civil Servant gets +1/+0 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-eiganjo_exemplar.txt b/forge-gui/res/cardsfolder/rebalanced/a-eiganjo_exemplar.txt
index 3d666fdeaec..f0ce25b0752 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-eiganjo_exemplar.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-eiganjo_exemplar.txt
@@ -3,6 +3,6 @@ ManaCost:W
 Types:Enchantment Creature Human Samurai
 PT:1/1
 T:Mode$ Attacks | ValidCard$ Samurai.YouCtrl,Warrior.YouCtrl | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a Samurai or Warrior you control attacks alone, it gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +1 | NumDef$ +1
 DeckHints:Type$Samurai|Warrior
 Oracle:Whenever a Samurai or Warrior you control attacks alone, it gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-high-rise_sawjack.txt b/forge-gui/res/cardsfolder/rebalanced/a-high-rise_sawjack.txt
index 4a26df62e3c..e80c7568539 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-high-rise_sawjack.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-high-rise_sawjack.txt
@@ -4,5 +4,5 @@ Types:Creature Elf Citizen
 PT:1/4
 K:Reach
 T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +3/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 3
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +3
 Oracle:Reach\nWhenever High-Rise Sawjack blocks a creature with flying, High-Rise Sawjack gets +3/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-kargan_intimidator.txt b/forge-gui/res/cardsfolder/rebalanced/a-kargan_intimidator.txt
index 1fd45f34620..5050102c20d 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-kargan_intimidator.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-kargan_intimidator.txt
@@ -4,7 +4,7 @@ Types:Creature Human Warrior
 PT:3/1
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Warrior | ValidBlocker$ Creature.Coward | Description$ Cowards can't block Warriors.
 A:AB$ Charm | Cost$ 1 | Choices$ Pump,Coward | ChoiceRestriction$ ThisTurn | CharmNum$ 1
-SVar:Pump:DB$ Pump | ValidTgts$ Warrior | TgtPrompt$ Select target Warrior | NumAtt$ 1 | NumDef$ 1 | KW$ Trample | SpellDescription$ Target Warrior gets +1/+1 and gains trample until end of turn.
+SVar:Pump:DB$ Pump | ValidTgts$ Warrior | TgtPrompt$ Select target Warrior | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Target Warrior gets +1/+1 and gains trample until end of turn.
 SVar:Coward:DB$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ Coward | RemoveCreatureTypes$ True | SpellDescription$ Target creature becomes a Coward until end of turn.
 SVar:PlayMain1:TRUE
 DeckHints:Type$Warrior
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-paragon_of_modernity.txt b/forge-gui/res/cardsfolder/rebalanced/a-paragon_of_modernity.txt
index 459d79cb8bf..f8dfabc882f 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-paragon_of_modernity.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-paragon_of_modernity.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Angel Warrior
 PT:2/3
 K:Flying
 A:AB$ Branch | Cost$ 3 | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ3 | FalseSubAbility$ DBPump | TrueSubAbility$ DBPutCounter | SpellDescription$ CARDNAME gets +1/+1 until end of turn. If exactly three colors of mana were spent to activate this ability, put a +1/+1 counter on it instead.
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1
 SVar:X:Count$ManaColorsPaid
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-sunbathing_rootwalla.txt b/forge-gui/res/cardsfolder/rebalanced/a-sunbathing_rootwalla.txt
index a2e5befe00a..0ded1c14659 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-sunbathing_rootwalla.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-sunbathing_rootwalla.txt
@@ -2,7 +2,7 @@ Name:A-Sunbathing Rootwalla
 ManaCost:1 G
 Types:Creature Lizard
 PT:2/2
-A:AB$ Pump | Cost$ 1 G | Defined$ Self | NumAtt$ X | NumDef$ X | ActivationLimit$ 1 | PrecostDesc$ Domain — | SpellDescription$ Until end of turn, CARDNAME gets +1/+1 for each basic land type among lands you control. Activate only once each turn.
+A:AB$ Pump | Cost$ 1 G | Defined$ Self | NumAtt$ +X | NumDef$ +X | ActivationLimit$ 1 | PrecostDesc$ Domain — | SpellDescription$ Until end of turn, CARDNAME gets +1/+1 for each basic land type among lands you control. Activate only once each turn.
 SVar:X:Count$Domain
 AI:RemoveDeck:Random
 Oracle:Domain — {1}{G}: Until end of turn, Sunbathing Rootwalla gets +1/+1 for each basic land type among lands you control. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt b/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt
index ad36b9a7a0a..9325a55067e 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt
@@ -5,7 +5,7 @@ PT:1/3
 K:Flying
 K:Haste
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery,Wizard | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a instant, sorcery, or Wizard spell, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 SVar:BuffedBy:Instant,Sorcery,Wizard
 DeckHints:Type$Instant|Sorcery|Wizard
 Oracle:Flying, haste\nWhenever you cast an instant, sorcery, or Wizard spell, Umara Mystic gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-you_come_to_a_river.txt b/forge-gui/res/cardsfolder/rebalanced/a-you_come_to_a_river.txt
index a5edcfed152..95f41fee9df 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-you_come_to_a_river.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-you_come_to_a_river.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Sorcery
 A:SP$ Charm | Choices$ FightTheCurrent,FindACrossing
 SVar:FightTheCurrent:DB$ ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | StackDescription$ {p:TargetedOwner} puts {c:Targeted} on the top or bottom of their library. | SpellDescription$ Fight the Current — The owner of target nonland permanent puts it on the top or bottom of their library.
-SVar:FindACrossing:DB$ Pump | ValidTgts$ Creature | NumAtt$ 1 | SubAbility$ DBUnblockable | StackDescription$ REP Target creature_{c:Targeted} | SpellDescription$ Find a Crossing — Target creature gets +1/+0 until end of turn and can't be blocked this turn.
+SVar:FindACrossing:DB$ Pump | ValidTgts$ Creature | NumAtt$ +1 | SubAbility$ DBUnblockable | StackDescription$ REP Target creature_{c:Targeted} | SpellDescription$ Find a Crossing — Target creature gets +1/+0 until end of turn and can't be blocked this turn.
 SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:Choose one —\n• Fight the Current — The owner of target nonland permanent puts it on the top or bottom of their library.\n• Find a Crossing — Target creature gets +1/+0 until end of turn and can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/s/sanctuary_raptor.txt b/forge-gui/res/cardsfolder/s/sanctuary_raptor.txt
index a23040fe33c..f9f917b913e 100644
--- a/forge-gui/res/cardsfolder/s/sanctuary_raptor.txt
+++ b/forge-gui/res/cardsfolder/s/sanctuary_raptor.txt
@@ -4,6 +4,6 @@ Types:Artifact Creature Bird
 PT:2/1
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Permanent.token+YouCtrl | PresentCompare$ GE3 | TriggerDescription$ Whenever CARDNAME attacks, if you control three or more tokens, CARDNAME gets +2/+0 and gains first strike until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | KW$ First Strike
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | KW$ First Strike
 DeckHints:Ability$Token
 Oracle:Flying\nWhenever Sanctuary Raptor attacks, if you control three or more tokens, Sanctuary Raptor gets +2/+0 and gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sandstone_bridge.txt b/forge-gui/res/cardsfolder/s/sandstone_bridge.txt
index c157503654a..0c6bcc3ecde 100644
--- a/forge-gui/res/cardsfolder/s/sandstone_bridge.txt
+++ b/forge-gui/res/cardsfolder/s/sandstone_bridge.txt
@@ -4,7 +4,7 @@ Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gets +1/+1 and gains vigilance until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Vigilance
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance
 SVar:PlayMain1:TRUE
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 Oracle:Sandstone Bridge enters tapped.\nWhen Sandstone Bridge enters, target creature gets +1/+1 and gains vigilance until end of turn.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/s/sap_vitality.txt b/forge-gui/res/cardsfolder/s/sap_vitality.txt
index 672e8e4cb9f..14f6cea2990 100644
--- a/forge-gui/res/cardsfolder/s/sap_vitality.txt
+++ b/forge-gui/res/cardsfolder/s/sap_vitality.txt
@@ -3,6 +3,6 @@ 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 | 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: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.
diff --git a/forge-gui/res/cardsfolder/s/saradoc_master_of_buckland.txt b/forge-gui/res/cardsfolder/s/saradoc_master_of_buckland.txt
index 2c4d1b882e2..75c6802f686 100644
--- a/forge-gui/res/cardsfolder/s/saradoc_master_of_buckland.txt
+++ b/forge-gui/res/cardsfolder/s/saradoc_master_of_buckland.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Halfling Citizen
 PT:2/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.nonToken+powerLE2+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control with power 2 or less enters, create a 1/1 white Halfling creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_halfling
-A:AB$ Pump | Cost$ tapXType<2/Halfling.Other/other halflings> | NumAtt$ 2 | Defined$ Self | KW$ Lifelink | SpellDescription$ NICKNAME gets +2/+0 and gains lifelink until end of turn.
+A:AB$ Pump | Cost$ tapXType<2/Halfling.Other/other halflings> | NumAtt$ +2 | Defined$ Self | KW$ Lifelink | SpellDescription$ NICKNAME gets +2/+0 and gains lifelink until end of turn.
 DeckHints:Type$Halfling
 DeckHas:Type$Halfling & Ability$Token|LifeGain
 Oracle:Whenever Saradoc, Master of Buckland or another nontoken creature you control with power 2 or less enters, create a 1/1 white Halfling creature token.\nTap two other untapped Halflings you control: Saradoc gets +2/+0 and gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sardian_avenger.txt b/forge-gui/res/cardsfolder/s/sardian_avenger.txt
index aa5a1e6c5b1..448cb8766e0 100644
--- a/forge-gui/res/cardsfolder/s/sardian_avenger.txt
+++ b/forge-gui/res/cardsfolder/s/sardian_avenger.txt
@@ -5,7 +5,7 @@ PT:1/1
 K:First Strike
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +X/+0 until end of turn, where X is the number of artifacts your opponents control.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever an artifact an opponent controls is put into a graveyard from the battlefield, CARDNAME deals 1 damage to that player.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredCardController | NumDmg$ 1
 SVar:X:Count$Valid Artifact.OppCtrl
diff --git a/forge-gui/res/cardsfolder/s/sarevok_the_usurper.txt b/forge-gui/res/cardsfolder/s/sarevok_the_usurper.txt
index 960e054e439..90d087fd8d7 100644
--- a/forge-gui/res/cardsfolder/s/sarevok_the_usurper.txt
+++ b/forge-gui/res/cardsfolder/s/sarevok_the_usurper.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Knight
 PT:3/3
 K:Specialize:3
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X
 SVar:X:Count$TypeInYourYard.Creature
 DeckHas:Ability$Graveyard
 AlternateMode:Specialize
@@ -18,7 +18,7 @@ Types:Legendary Creature Human Knight
 PT:4/4
 K:First Strike
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gains first strike and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ First Strike
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | KW$ First Strike
 SVar:X:Count$TypeInYourYard.Creature
 DeckHas:Ability$Graveyard & Keyword$FirstStrike
 Oracle:First strike\nAt the beginning of combat on your turn, target creature you control gains first strike and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
@@ -30,7 +30,7 @@ ManaCost:3 U B
 Types:Legendary Creature Human Knight
 PT:4/4
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gets +X/+0 until end of turn, where X is the number of creature, instant, and sorcery cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn,Creature.YouOwn
 SVar:BuffedBy:Instant,Sorcery
 DeckHas:Ability$Graveyard
@@ -49,7 +49,7 @@ SVar:DBPut:DB$ ChangeZone | Origin$ Hand | Destination$ Graveyard | Defined$ Rem
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ Remembered | Zone$ Graveyard | Amount$ 2 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X
 SVar:X:Count$TypeInYourYard.Creature
 DeckHas:Ability$Graveyard
 Oracle:When this creature specializes, seek a creature card and put it into your graveyard, then conjure two duplicates of it into your graveyard.\nAt the beginning of combat on your turn, target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
@@ -62,7 +62,7 @@ Types:Legendary Creature Human Knight
 PT:4/4
 K:Menace
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gains menace and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Menace
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | KW$ Menace
 SVar:X:Count$TypeInYourYard.Creature
 DeckHas:Ability$Graveyard & Keyword$Menace
 Oracle:Menace\nAt the beginning of combat on your turn, target creature you control gains menace and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
@@ -75,7 +75,7 @@ Types:Legendary Creature Human Knight
 PT:4/4
 K:Trample
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gains trample and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Trample
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | KW$ Trample
 SVar:X:Count$TypeInYourYard.Creature
 DeckHas:Ability$Graveyard & Keyword$Trample
 Oracle:Trample\nAt the beginning of combat on your turn, target creature you control gains trample and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/s/sauron_the_lidless_eye.txt b/forge-gui/res/cardsfolder/s/sauron_the_lidless_eye.txt
index 2e789eec1d3..62465b82444 100644
--- a/forge-gui/res/cardsfolder/s/sauron_the_lidless_eye.txt
+++ b/forge-gui/res/cardsfolder/s/sauron_the_lidless_eye.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Avatar Horror
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, gain control of target creature an opponent controls until end of turn. Untap it. It gains haste until end of turn.
 SVar:TrigChange:DB$ GainControl | TgtPrompt$ Choose target creature an opponent controls | ValidTgts$ Creature.OppCtrl | LoseControl$ EOT | Untap$ True | AddKWs$ Haste
-A:AB$ PumpAll | Cost$ 1 B R | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | SubAbility$ LoseTwo | SpellDescription$ Creatures you control get +2/+0 until end of turn. Each opponent loses 2 life.
+A:AB$ PumpAll | Cost$ 1 B R | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | SubAbility$ LoseTwo | SpellDescription$ Creatures you control get +2/+0 until end of turn. Each opponent loses 2 life.
 SVar:LoseTwo:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2
 SVar:PlayMain1:OPPONENTCREATURES
 Oracle:When Sauron, the Lidless Eye enters, gain control of target creature an opponent controls until end of turn. Untap it. It gains haste until end of turn.\n{1}{B}{R}: Creatures you control get +2/+0 until end of turn. Each opponent loses 2 life.
diff --git a/forge-gui/res/cardsfolder/s/savage_offensive.txt b/forge-gui/res/cardsfolder/s/savage_offensive.txt
index 3ad0e9d9f78..6d5f4db882c 100644
--- a/forge-gui/res/cardsfolder/s/savage_offensive.txt
+++ b/forge-gui/res/cardsfolder/s/savage_offensive.txt
@@ -2,7 +2,7 @@ Name:Savage Offensive
 ManaCost:1 R
 Types:Sorcery
 K:Kicker:G
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | NumAtt$ X | NumDef$ X | SpellDescription$ Creatures you control gain first strike until end of turn. If this spell was kicked, they get +1/+1 until end of turn.
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | NumAtt$ +X | NumDef$ +X | SpellDescription$ Creatures you control gain first strike until end of turn. If this spell was kicked, they get +1/+1 until end of turn.
 SVar:X:Count$Kicked.1.0
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green
diff --git a/forge-gui/res/cardsfolder/s/sawtooth_thresher.txt b/forge-gui/res/cardsfolder/s/sawtooth_thresher.txt
index 4972445b558..e8702023399 100644
--- a/forge-gui/res/cardsfolder/s/sawtooth_thresher.txt
+++ b/forge-gui/res/cardsfolder/s/sawtooth_thresher.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact Creature Construct
 PT:1/1
 K:Sunburst
-A:AB$ Pump | Cost$ SubCounter<2/P1P1> | NumAtt$ 4 | NumDef$ 4 | SpellDescription$ CARDNAME gets +4/+4 until end of turn.
+A:AB$ Pump | Cost$ SubCounter<2/P1P1> | NumAtt$ +4 | NumDef$ +4 | SpellDescription$ CARDNAME gets +4/+4 until end of turn.
 SVar:NeedsToPlayVar:Z GE2
 SVar:Z:Count$UniqueManaColorsProduced.ByUntappedSources
 DeckHints:Ability$Proliferate
diff --git a/forge-gui/res/cardsfolder/s/scaled_hulk.txt b/forge-gui/res/cardsfolder/s/scaled_hulk.txt
index 39b7a8167d7..2a1912e8e92 100644
--- a/forge-gui/res/cardsfolder/s/scaled_hulk.txt
+++ b/forge-gui/res/cardsfolder/s/scaled_hulk.txt
@@ -3,7 +3,7 @@ ManaCost:5 G
 Types:Creature Spirit
 PT:4/4
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2
 SVar:BuffedBy:Arcane,Spirit
 DeckHints:Type$Spirit|Arcane
 Oracle:Whenever you cast a Spirit or Arcane spell, Scaled Hulk gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/scent_of_ivy.txt b/forge-gui/res/cardsfolder/s/scent_of_ivy.txt
index 4bd4dca9f8f..df10e971892 100644
--- a/forge-gui/res/cardsfolder/s/scent_of_ivy.txt
+++ b/forge-gui/res/cardsfolder/s/scent_of_ivy.txt
@@ -2,7 +2,7 @@ Name:Scent of Ivy
 ManaCost:G
 Types:Instant
 A:SP$ Reveal | Defined$ You | RevealValid$ Card.Green | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBScentOfIvyPump | SpellDescription$ Reveal any number of green cards in your hand. Target creature gets +X/+X until end of turn, where X is the number of cards revealed this way.
-SVar:DBScentOfIvyPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ ScentOfIvyX | NumDef$ ScentOfIvyX | SubAbility$ DBScentOfIvyCleanup
+SVar:DBScentOfIvyPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +ScentOfIvyX | NumDef$ +ScentOfIvyX | SubAbility$ DBScentOfIvyCleanup
 SVar:ScentOfIvyX:Remembered$Amount
 SVar:DBScentOfIvyCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/scion_of_shiv.txt b/forge-gui/res/cardsfolder/s/scion_of_shiv.txt
index e63a3027a81..c16fdbf9d8f 100644
--- a/forge-gui/res/cardsfolder/s/scion_of_shiv.txt
+++ b/forge-gui/res/cardsfolder/s/scion_of_shiv.txt
@@ -3,5 +3,5 @@ ManaCost:2 R R
 Types:Creature Dragon
 PT:3/3
 K:Flying
-A:AB$ Pump | Cost$ 2 R | NumAtt$ 1 | Duration$ Perpetual | StackDescription$ SpellDescription | SpellDescription$ CARDNAME 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.
diff --git a/forge-gui/res/cardsfolder/s/scour_the_scene.txt b/forge-gui/res/cardsfolder/s/scour_the_scene.txt
index 4580db1481d..17cfd76af0e 100644
--- a/forge-gui/res/cardsfolder/s/scour_the_scene.txt
+++ b/forge-gui/res/cardsfolder/s/scour_the_scene.txt
@@ -5,7 +5,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigToken:DB$ Token | TokenScript$ wu_2_2_detective
 T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigChooseCard | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, choose a creature card in your hand or a creature you control. It perpetually gets +1/+0.
 SVar:TrigChooseCard:DB$ ChooseCard | ChoiceZone$ Hand,Battlefield | ChoiceTitle$ Choose a creature card in your hand or a creature you control | Mandatory$ True | Choices$ Creature.YouCtrl | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ ChosenCard | NumAtt$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ ChosenCard | NumAtt$ +1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 DeckHas:Ability$Token & Type$Detective
 DeckHints:Type$Artifact
diff --git a/forge-gui/res/cardsfolder/s/scrapyard_steelbreaker.txt b/forge-gui/res/cardsfolder/s/scrapyard_steelbreaker.txt
index b0ecc0dff50..a89a18ef319 100644
--- a/forge-gui/res/cardsfolder/s/scrapyard_steelbreaker.txt
+++ b/forge-gui/res/cardsfolder/s/scrapyard_steelbreaker.txt
@@ -2,7 +2,7 @@ Name:Scrapyard Steelbreaker
 ManaCost:3 R
 Types:Artifact Creature Human Warrior
 PT:3/4
-A:AB$ Pump | Cost$ 1 Sac<1/Artifact.Other/another artifact> | NumAtt$ 2 | NumDef$ 1 | SpellDescription$ CARDNAME gets +2/+1 until end of turn.
+A:AB$ Pump | Cost$ 1 Sac<1/Artifact.Other/another artifact> | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ CARDNAME gets +2/+1 until end of turn.
 DeckHas:Ability$Sacrifice
 DeckHints:Type$Artifact
 Oracle:{1}, Sacrifice another artifact: Scrapyard Steelbreaker gets +2/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/scroll_of_the_masters.txt b/forge-gui/res/cardsfolder/s/scroll_of_the_masters.txt
index 558c5b4c958..25d2f52d734 100644
--- a/forge-gui/res/cardsfolder/s/scroll_of_the_masters.txt
+++ b/forge-gui/res/cardsfolder/s/scroll_of_the_masters.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a noncreature spell, put a lore counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ LORE | CounterNum$ 1
-A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | SpellDescription$ Target creature you control gets +1/+1 until end of turn for each lore counter on CARDNAME.
+A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ +X | SpellDescription$ Target creature you control gets +1/+1 until end of turn for each lore counter on CARDNAME.
 SVar:X:Count$CardCounters.LORE
 Oracle:Whenever you cast a noncreature spell, put a lore counter on Scroll of the Masters.\n{3}, {T}: Target creature you control gets +1/+1 until end of turn for each lore counter on Scroll of the Masters.
diff --git a/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt b/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt
index e919b06e73b..57692afd2d0 100644
--- a/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt
+++ b/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt
@@ -12,7 +12,7 @@ ALTERNATE
 Name:Aquatic Ingress
 ManaCost:2 U
 Types:Instant Adventure
-A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | NumAtt$ 1 | SubAbility$ DBUnblockable | StackDescription$ SpellDescription | SpellDescription$ Up to two target creatures each get +1/+0 until end of turn and can't be blocked this turn.
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | NumAtt$ +1 | SubAbility$ DBUnblockable | StackDescription$ SpellDescription | SpellDescription$ Up to two target creatures each get +1/+0 until end of turn and can't be blocked this turn.
 SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ These creatures can't be blocked this turn.
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/s/seasoned_consultant.txt b/forge-gui/res/cardsfolder/s/seasoned_consultant.txt
index 1d79f548973..9916a515a55 100644
--- a/forge-gui/res/cardsfolder/s/seasoned_consultant.txt
+++ b/forge-gui/res/cardsfolder/s/seasoned_consultant.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Human Detective
 PT:1/3
 T:Mode$ AttackersDeclared | Execute$ TrigPump | ValidAttackers$ Creature | ValidAttackersAmount$ GE3 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 Oracle:Whenever you attack with three or more creatures, Seasoned Consultant gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/seasoned_warrenguard.txt b/forge-gui/res/cardsfolder/s/seasoned_warrenguard.txt
index 86d9365159b..2fe20db91af 100644
--- a/forge-gui/res/cardsfolder/s/seasoned_warrenguard.txt
+++ b/forge-gui/res/cardsfolder/s/seasoned_warrenguard.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Rabbit Warrior
 PT:1/2
 T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Permanent.token+YouCtrl | PresentCompare$ GE1 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks while you control a token, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 SVar:HasAttackEffect:TRUE
 DeckHints:Ability$Token
 Oracle:Whenever Seasoned Warrenguard attacks while you control a token, Seasoned Warrenguard gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/second_breakfast.txt b/forge-gui/res/cardsfolder/s/second_breakfast.txt
index 0d6a295f62d..aeb913608a0 100644
--- a/forge-gui/res/cardsfolder/s/second_breakfast.txt
+++ b/forge-gui/res/cardsfolder/s/second_breakfast.txt
@@ -1,7 +1,7 @@
 Name:Second Breakfast
 ManaCost:2 W
 Types:Instant
-A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | NumDef$ 1 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SubAbility$ DBFood | SpellDescription$ Up to two target creatures each get +2/+1 until end of turn.
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | NumDef$ +1 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SubAbility$ DBFood | SpellDescription$ Up to two target creatures each get +2/+1 until end of turn.
 SVar:DBFood:DB$ Token | TokenScript$ c_a_food_sac | TokenOwner$ You | TokenAmount$ 1 | SpellDescription$ Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 DeckHas:Ability$Sacrifice|Token|LifeGain & Type$Artifact|Food
 Oracle:Up to two target creatures each get +2/+1 until end of turn. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/s/seedpod_squire.txt b/forge-gui/res/cardsfolder/s/seedpod_squire.txt
index 3fe22d733c1..fcf7907b6e0 100644
--- a/forge-gui/res/cardsfolder/s/seedpod_squire.txt
+++ b/forge-gui/res/cardsfolder/s/seedpod_squire.txt
@@ -4,6 +4,6 @@ Types:Creature Bird Scout
 PT:3/3
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature you control without flying gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.withoutFlying+YouCtrl | TgtPrompt$ Select target creature you control without flying. | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.withoutFlying+YouCtrl | TgtPrompt$ Select target creature you control without flying. | NumAtt$ +1 | NumDef$ +1
 SVar:HasAttackEffect:TRUE
 Oracle:Flying\nWhenever Seedpod Squire attacks, target creature you control without flying gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/seeds_of_strength.txt b/forge-gui/res/cardsfolder/s/seeds_of_strength.txt
index a3ab42f6b3b..3bc883a0e61 100644
--- a/forge-gui/res/cardsfolder/s/seeds_of_strength.txt
+++ b/forge-gui/res/cardsfolder/s/seeds_of_strength.txt
@@ -1,7 +1,7 @@
 Name:Seeds of Strength
 ManaCost:G W
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (1) | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBPump1 | SpellDescription$ Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn.
-SVar:DBPump1:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (2) | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (3) | NumAtt$ 1 | NumDef$ 1
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (1) | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBPump1 | SpellDescription$ Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn.
+SVar:DBPump1:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (2) | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBPump2
+SVar:DBPump2:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature (3) | NumAtt$ +1 | NumDef$ +1
 Oracle:Target creature gets +1/+1 until end of turn.\nTarget creature gets +1/+1 until end of turn.\nTarget creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_charm.txt b/forge-gui/res/cardsfolder/s/selesnya_charm.txt
index ed9388c89fe..2aa7325cd60 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_charm.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_charm.txt
@@ -2,7 +2,7 @@ Name:Selesnya Charm
 ManaCost:G W
 Types:Instant
 A:SP$ Charm | Choices$ Buff,Exile,Knight | CharmNum$ 1
-SVar:Buff:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature. | NumAtt$ 2 | NumDef$ 2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn.
+SVar:Buff:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature. | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn.
 SVar:Exile:DB$ ChangeZone | ValidTgts$ Creature.powerGE5 | TgtPrompt$ Choose target creature with power 5 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power 5 or greater.
 SVar:Knight:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_knight_vigilance | TokenOwner$ You | SpellDescription$ Create a 2/2 white Knight creature token with vigilance.
 Oracle:Choose one —\n• Target creature gets +2/+2 and gains trample until end of turn.\n• Exile target creature with power 5 or greater.\n• Create a 2/2 white Knight creature token with vigilance.
diff --git a/forge-gui/res/cardsfolder/s/sentry_oak.txt b/forge-gui/res/cardsfolder/s/sentry_oak.txt
index 2da1e52c575..33990fb7134 100644
--- a/forge-gui/res/cardsfolder/s/sentry_oak.txt
+++ b/forge-gui/res/cardsfolder/s/sentry_oak.txt
@@ -5,6 +5,6 @@ PT:3/5
 K:Defender
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigClash | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, you may clash with an opponent. If you win, CARDNAME gets +2/+0 and loses defender until end of turn. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
 SVar:TrigClash:DB$ Clash | WinSubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | SubAbility$ DBDebuff
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | SubAbility$ DBDebuff
 SVar:DBDebuff:DB$ Debuff | Defined$ Self | Keywords$ Defender
 Oracle:Defender\nAt the beginning of combat on your turn, you may clash with an opponent. If you win, Sentry Oak gets +2/+0 and loses defender until end of turn. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
diff --git a/forge-gui/res/cardsfolder/s/septic_rats.txt b/forge-gui/res/cardsfolder/s/septic_rats.txt
index 039c11ee4ad..c5007d1df69 100644
--- a/forge-gui/res/cardsfolder/s/septic_rats.txt
+++ b/forge-gui/res/cardsfolder/s/septic_rats.txt
@@ -4,5 +4,5 @@ Types:Creature Phyrexian Rat
 PT:2/2
 K:Infect
 T:Mode$ Attacks | ValidCard$ Creature.Self | TriggerZones$ Battlefield | DefendingPlayerPoisoned$ True | Execute$ TrigPump | TriggerDescription$ When CARDNAME attacks, if defending player is poisoned, it gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | Defined$ Self
+SVar:TrigPump:DB$ Pump | NumAtt$ +1 | NumDef$ +1 | Defined$ Self
 Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\nWhenever Septic Rats attacks, if defending player is poisoned, it gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/seraph_of_new_capenna_seraph_of_new_phyrexia.txt b/forge-gui/res/cardsfolder/s/seraph_of_new_capenna_seraph_of_new_phyrexia.txt
index 4d2415673fa..005781ded0b 100644
--- a/forge-gui/res/cardsfolder/s/seraph_of_new_capenna_seraph_of_new_phyrexia.txt
+++ b/forge-gui/res/cardsfolder/s/seraph_of_new_capenna_seraph_of_new_phyrexia.txt
@@ -16,7 +16,7 @@ Types:Creature Phyrexian Angel
 PT:3/3
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may sacrifice another creature or artifact. If you do, CARDNAME gets +2/+1 until end of turn.
-SVar:TrigPump:AB$ Pump | Cost$ Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | Defined$ Self | NumAtt$ 2 | NumDef$ 1
+SVar:TrigPump:AB$ Pump | Cost$ Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | Defined$ Self | NumAtt$ +2 | NumDef$ +1
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Sacrifice
 DeckHints:Type$Artifact
diff --git a/forge-gui/res/cardsfolder/s/serra_disciple.txt b/forge-gui/res/cardsfolder/s/serra_disciple.txt
index a76caa6e543..4552f79c81e 100644
--- a/forge-gui/res/cardsfolder/s/serra_disciple.txt
+++ b/forge-gui/res/cardsfolder/s/serra_disciple.txt
@@ -5,6 +5,6 @@ PT:1/1
 K:Flying
 K:First Strike
 T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a historic spell, CARDNAME gets +1/+1 until end of turn. (Artifacts, legendaries, and Sagas are historic.)
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 SVar:BuffedBy:Historic
 Oracle:Flying, first strike\nWhenever you cast a historic spell, Serra Disciple gets +1/+1 until end of turn. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/cardsfolder/s/serra_inquisitors.txt b/forge-gui/res/cardsfolder/s/serra_inquisitors.txt
index 91e636399e1..5f12960638a 100644
--- a/forge-gui/res/cardsfolder/s/serra_inquisitors.txt
+++ b/forge-gui/res/cardsfolder/s/serra_inquisitors.txt
@@ -4,5 +4,5 @@ Types:Creature Human Cleric
 PT:3/3
 T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.Black | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by one or more black creatures, CARDNAME gets +2/+0 until end of turn.
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.Black | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by one or more black creatures, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 0
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 Oracle:Whenever Serra Inquisitors blocks or becomes blocked by one or more black creatures, Serra Inquisitors gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/shadowstorm_vizier.txt b/forge-gui/res/cardsfolder/s/shadowstorm_vizier.txt
index 648e696b093..21fb5a751c6 100644
--- a/forge-gui/res/cardsfolder/s/shadowstorm_vizier.txt
+++ b/forge-gui/res/cardsfolder/s/shadowstorm_vizier.txt
@@ -4,5 +4,5 @@ Types:Creature Human Cleric
 PT:1/3
 K:Flying
 T:Mode$ Discarded | ValidCard$ Card.YouOwn | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cycle or discard a card, CARDNAME gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 Oracle:Flying\nWhenever you cycle or discard a card, Shadowstorm Vizier gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/shaleskin_bruiser.txt b/forge-gui/res/cardsfolder/s/shaleskin_bruiser.txt
index 0c812d022c1..852286deb00 100644
--- a/forge-gui/res/cardsfolder/s/shaleskin_bruiser.txt
+++ b/forge-gui/res/cardsfolder/s/shaleskin_bruiser.txt
@@ -4,6 +4,6 @@ Types:Creature Beast
 PT:4/4
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +3/+0 until end of turn for each other attacking Beast.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X
 SVar:X:Count$Valid Creature.Beast+Other+attacking/Times.3
 Oracle:Trample\nWhenever Shaleskin Bruiser attacks, it gets +3/+0 until end of turn for each other attacking Beast.
diff --git a/forge-gui/res/cardsfolder/s/shared_animosity.txt b/forge-gui/res/cardsfolder/s/shared_animosity.txt
index 76b9472af3d..73b8536a799 100644
--- a/forge-gui/res/cardsfolder/s/shared_animosity.txt
+++ b/forge-gui/res/cardsfolder/s/shared_animosity.txt
@@ -2,7 +2,7 @@ Name:Shared Animosity
 ManaCost:2 R
 Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ AnimosityPump | TriggerDescription$ Whenever a creature you control attacks, it gets +1/+0 until end of turn for each other attacking creature that shares a creature type with it.
-SVar:AnimosityPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ X
+SVar:AnimosityPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +X
 SVar:X:Count$Valid Creature.attacking+NotTriggeredAttacker+sharesCreatureTypeWith TriggeredAttacker
 AI:RemoveDeck:Random
 Oracle:Whenever a creature you control attacks, it gets +1/+0 until end of turn for each other attacking creature that shares a creature type with it.
diff --git a/forge-gui/res/cardsfolder/s/shell_shield.txt b/forge-gui/res/cardsfolder/s/shell_shield.txt
index a9279b5b8b6..2d82dbc93a4 100644
--- a/forge-gui/res/cardsfolder/s/shell_shield.txt
+++ b/forge-gui/res/cardsfolder/s/shell_shield.txt
@@ -2,6 +2,6 @@ Name:Shell Shield
 ManaCost:U
 Types:Instant
 K:Kicker:1
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumDef$ 3 | SubAbility$ Kicked | SpellDescription$ Target creature gets +0/+3 until end of turn. If CARDNAME was kicked, that creature also gains hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.)
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumDef$ +3 | SubAbility$ Kicked | SpellDescription$ Target creature gets +0/+3 until end of turn. If CARDNAME was kicked, that creature also gains hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.)
 SVar:Kicked:DB$ Pump | Defined$ Targeted | KW$ Hexproof | Condition$ Kicked | ConditionDescription$ If CARDNAME was kicked,
 Oracle:Kicker {1} (You may pay an additional {1} as you cast this spell.)\nTarget creature you control gets +0/+3 until end of turn. If this spell was kicked, that creature also gains hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/cardsfolder/s/shelobs_ambush.txt b/forge-gui/res/cardsfolder/s/shelobs_ambush.txt
index 62debfb0ad4..2a931affc59 100644
--- a/forge-gui/res/cardsfolder/s/shelobs_ambush.txt
+++ b/forge-gui/res/cardsfolder/s/shelobs_ambush.txt
@@ -1,7 +1,7 @@
 Name:Shelob's Ambush
 ManaCost:B
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | KW$ Deathtouch | NumAtt$ 1 | NumDef$ 2 | SubAbility$ DBFood | SpellDescription$ Target creature gets +1/+2 and gains deathtouch until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | KW$ Deathtouch | NumAtt$ +1 | NumDef$ +2 | SubAbility$ DBFood | SpellDescription$ Target creature gets +1/+2 and gains deathtouch until end of turn.
 SVar:DBFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | SpellDescription$ Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 DeckHas:Ability$Sacrifice|LifeGain & Type$Food|Artifact
 Oracle:Target creature gets +1/+2 and gains deathtouch until end of turn. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/s/shield_mate.txt b/forge-gui/res/cardsfolder/s/shield_mate.txt
index 091bc951686..1e37e8b8061 100644
--- a/forge-gui/res/cardsfolder/s/shield_mate.txt
+++ b/forge-gui/res/cardsfolder/s/shield_mate.txt
@@ -2,5 +2,5 @@ Name:Shield Mate
 ManaCost:W
 Types:Creature Human Soldier
 PT:1/1
-A:AB$ Pump | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ 4 | SpellDescription$ Target creature gets +0/+4 until end of turn.
+A:AB$ Pump | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ +4 | SpellDescription$ Target creature gets +0/+4 until end of turn.
 Oracle:Sacrifice Shield Mate: Target creature gets +0/+4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt b/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt
index 7b5d2a66aca..d5dee45b465 100644
--- a/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt
+++ b/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt
@@ -2,7 +2,7 @@ Name:Shields of Velis Vel
 ManaCost:W
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ PumpAll | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | NumAtt$ +0 | NumDef$ +1 | SubAbility$ DBAnimate | SpellDescription$ Creatures target player controls get +0/+1 and gain all creature types until end of turn.
+A:SP$ PumpAll | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | NumDef$ +1 | SubAbility$ DBAnimate | SpellDescription$ Creatures target player controls get +0/+1 and gain all creature types until end of turn.
 SVar:DBAnimate:DB$ AnimateAll | ValidCards$ Creature.TargetedPlayerCtrl | AddAllCreatureTypes$ True
 SVar:NeedsToPlay:Creature.YouCtrl
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/shore_up.txt b/forge-gui/res/cardsfolder/s/shore_up.txt
index c15a7ca7e19..2a8ffe56220 100644
--- a/forge-gui/res/cardsfolder/s/shore_up.txt
+++ b/forge-gui/res/cardsfolder/s/shore_up.txt
@@ -1,7 +1,7 @@
 Name:Shore Up
 ManaCost:U
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | TgtPrompt$ Select target creature you control | KW$ Hexproof | SubAbility$ DBUntap | SpellDescription$ Target creature you control gets +1/+1 and gains hexproof until end of turn. Untap it. (It can't be the target of spells or abilities your opponents control.)
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | TgtPrompt$ Select target creature you control | KW$ Hexproof | SubAbility$ DBUntap | SpellDescription$ Target creature you control gets +1/+1 and gains hexproof until end of turn. Untap it. (It can't be the target of spells or abilities your opponents control.)
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
 DeckHas:Keyword$Hexproof
 Oracle:Target creature you control gets +1/+1 and gains hexproof until end of turn. Untap it. (It can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/cardsfolder/s/shu_defender.txt b/forge-gui/res/cardsfolder/s/shu_defender.txt
index a5f196929da..4d510c2dd76 100644
--- a/forge-gui/res/cardsfolder/s/shu_defender.txt
+++ b/forge-gui/res/cardsfolder/s/shu_defender.txt
@@ -3,5 +3,5 @@ ManaCost:2 W
 Types:Creature Human Soldier
 PT:2/2
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks, it gets +0/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ +2
 Oracle:Whenever Shu Defender blocks, it gets +0/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sidar_kondo.txt b/forge-gui/res/cardsfolder/s/sidar_kondo.txt
index d6d27c040d7..6142fbdeb25 100644
--- a/forge-gui/res/cardsfolder/s/sidar_kondo.txt
+++ b/forge-gui/res/cardsfolder/s/sidar_kondo.txt
@@ -2,5 +2,5 @@ Name:Sidar Kondo
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:-1/+12
-A:AB$ Pump | ActivationZone$ Command | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
+A:AB$ Pump | ActivationZone$ Command | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
 Oracle:Hand -1, life +12\n{3}: Target creature gets +3/+3 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/siege_striker.txt b/forge-gui/res/cardsfolder/s/siege_striker.txt
index cc3e6ee0332..a275c8a6aca 100644
--- a/forge-gui/res/cardsfolder/s/siege_striker.txt
+++ b/forge-gui/res/cardsfolder/s/siege_striker.txt
@@ -5,7 +5,7 @@ PT:1/1
 K:Double Strike
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap any number of untapped creatures you control. CARDNAME gets +1/+1 until end of turn for each creature tapped this way.
 SVar:TrigTap:DB$ Tap | CardChoices$ Creature.YouCtrl+untapped | AnyNumber$ True | ChoiceAmount$ Count$Valid Creature.YouCtrl+untapped | RememberTapped$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ Y | NumDef$ Y | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ +Y | NumDef$ +Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Y:Count$RememberedSize
 Oracle:Double strike (This creature deals both first-strike and regular combat damage.)\nWhenever Siege Striker attacks, you may tap any number of untapped creatures you control. Siege Striker gets +1/+1 until end of turn for each creature tapped this way.
diff --git a/forge-gui/res/cardsfolder/s/sierra_nukas_biggest_fan.txt b/forge-gui/res/cardsfolder/s/sierra_nukas_biggest_fan.txt
index 6943efa9f4c..1e398b8c1aa 100644
--- a/forge-gui/res/cardsfolder/s/sierra_nukas_biggest_fan.txt
+++ b/forge-gui/res/cardsfolder/s/sierra_nukas_biggest_fan.txt
@@ -6,7 +6,7 @@ T:Mode$ DamageDoneOnce | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefie
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ QUEST | CounterNum$ 1 | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ c_a_food_sac
 T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Food | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you sacrifice a Food, target creature you control gets +X/+X until end of turn, where X is the number of quest counters on NICKNAME.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | NumDef$ +X
 SVar:X:Count$CardCounters.QUEST
 DeckHas:Ability$Token|Counters & Type$Food
 DeckHints:Type$Food
diff --git a/forge-gui/res/cardsfolder/s/sigardian_zealot.txt b/forge-gui/res/cardsfolder/s/sigardian_zealot.txt
index 6e225be6c68..4c45e091654 100644
--- a/forge-gui/res/cardsfolder/s/sigardian_zealot.txt
+++ b/forge-gui/res/cardsfolder/s/sigardian_zealot.txt
@@ -4,7 +4,7 @@ Types:Creature Human Cleric
 PT:3/3
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of combat on your turn, choose any number of creatures with different powers. Each of them gets +X/+X and gains vigilance until end of turn, where X is CARDNAME's power.
 SVar:TrigChoose:DB$ ChooseCard | MinAmount$ 0 | Amount$ Max | Choices$ Creature | WithDifferentPowers$ True | AILogic$ OwnCard | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ ChosenCard | NumAtt$ X | NumDef$ X | KW$ Vigilance | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | Defined$ ChosenCard | NumAtt$ +X | NumDef$ +X | KW$ Vigilance | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:Max:Count$DifferentPower_Creature
 SVar:X:Count$CardPower
diff --git a/forge-gui/res/cardsfolder/s/sigil_of_valor.txt b/forge-gui/res/cardsfolder/s/sigil_of_valor.txt
index de392054a90..ff317a2a6c3 100644
--- a/forge-gui/res/cardsfolder/s/sigil_of_valor.txt
+++ b/forge-gui/res/cardsfolder/s/sigil_of_valor.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip:1
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Alone$ True | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature attacks alone, it gets +1/+1 until end of turn for each other creature you control.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +X | NumDef$ +X
 SVar:X:Count$Valid Creature.YouCtrl+NotTriggeredAttacker
 Oracle:Whenever equipped creature attacks alone, it gets +1/+1 until end of turn for each other creature you control.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/silver_deputy.txt b/forge-gui/res/cardsfolder/s/silver_deputy.txt
index 150b15247fd..dbd0791122b 100644
--- a/forge-gui/res/cardsfolder/s/silver_deputy.txt
+++ b/forge-gui/res/cardsfolder/s/silver_deputy.txt
@@ -4,5 +4,5 @@ Types:Artifact Creature Mercenary
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card or a Desert card, reveal it, then shuffle and put that card on top.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic,Desert | ChangeTypeDesc$ basic land card or a Desert card | ChangeNum$ 1 | ShuffleNonMandatory$ True
-A:AB$ Pump | Cost$ T | NumAtt$ 1 | ValidTgts$ Creature.YouCtrl | SorcerySpeed$ True | TgtPrompt$ Select target creature you control | SpellDescription$ Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery.
+A:AB$ Pump | Cost$ T | NumAtt$ +1 | ValidTgts$ Creature.YouCtrl | SorcerySpeed$ True | TgtPrompt$ Select target creature you control | SpellDescription$ Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery.
 Oracle:When Silver Deputy enters, you may search your library for a basic land card or a Desert card, reveal it, then shuffle and put it on top.\n{T}: Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/silverquill_apprentice.txt b/forge-gui/res/cardsfolder/s/silverquill_apprentice.txt
index cb0a96e06a8..ef671d14679 100644
--- a/forge-gui/res/cardsfolder/s/silverquill_apprentice.txt
+++ b/forge-gui/res/cardsfolder/s/silverquill_apprentice.txt
@@ -3,6 +3,6 @@ ManaCost:W B
 Types:Creature Human Warlock
 PT:2/2
 T:Mode$ SpellCastOrCopy | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Magecraft — Whenever you cast or copy an instant or sorcery spell, target creature gets +1/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1
 DeckNeeds:Type$Instant|Sorcery
 Oracle:Magecraft — Whenever you cast or copy an instant or sorcery spell, target creature gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/silverquill_command.txt b/forge-gui/res/cardsfolder/s/silverquill_command.txt
index b38b79eb41a..156235f2c1c 100644
--- a/forge-gui/res/cardsfolder/s/silverquill_command.txt
+++ b/forge-gui/res/cardsfolder/s/silverquill_command.txt
@@ -2,7 +2,7 @@ Name:Silverquill Command
 ManaCost:2 W B
 Types:Sorcery
 A:SP$ Charm | Choices$ DBPump,DBReturn,DBDraw,SacCreature | CharmNum$ 2
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Flying | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | KW$ Flying | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
 SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.Creature+cmcLE2+YouOwn | TgtPrompt$ Select target creature card with mana value 2 or less | SpellDescription$ Return target creature card with mana value 2 or less from your graveyard to the battlefield.
 SVar:DBDraw:DB$ Draw | ValidTgts$ Player | NumCards$ 1 | SubAbility$ DBLoseLife | SpellDescription$ Target player draws a card and loses 1 life.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 | Defined$ ParentTarget
diff --git a/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt b/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
index 6b1b5c34fc2..8e71de099f7 100644
--- a/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
+++ b/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Dragon Ranger
 PT:4/4
 K:Specialize:4
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gets +X/+0 until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 AlternateMode:Specialize
@@ -18,7 +18,7 @@ Types:Legendary Creature Dragon Ranger
 PT:4/4
 K:Lifelink
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gains lifelink and gets +X/+0 until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | KW$ Lifelink
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X | KW$ Lifelink
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$LifeGain
@@ -32,7 +32,7 @@ Types:Legendary Creature Dragon Ranger
 PT:4/4
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gains flying and gets +X/+0 until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | KW$ Flying
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X | KW$ Flying
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 DeckHas:Keyword$Flying
@@ -46,7 +46,7 @@ Types:Legendary Creature Dragon Ranger
 PT:5/5
 K:Menace
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gains menace and gets +X/+0 until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | KW$ Menace
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X | KW$ Menace
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 DeckHas:Keyword$Menace
@@ -60,7 +60,7 @@ Types:Legendary Creature Dragon Ranger
 PT:5/5
 K:First Strike
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gains first strike and gets +X/+0 until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | KW$ First Strike
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X | KW$ First Strike
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 DeckHas:Keyword$FirstStrike
@@ -74,7 +74,7 @@ Types:Legendary Creature Dragon Ranger
 PT:6/6
 K:Vigilance
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gains vigilance and gets +X/+0 until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | KW$ Vigilance
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X | KW$ Vigilance
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 DeckHas:Keyword$Vigilance
diff --git a/forge-gui/res/cardsfolder/s/skanos_dragonheart.txt b/forge-gui/res/cardsfolder/s/skanos_dragonheart.txt
index edae1c27db0..2fcb1778613 100644
--- a/forge-gui/res/cardsfolder/s/skanos_dragonheart.txt
+++ b/forge-gui/res/cardsfolder/s/skanos_dragonheart.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Legendary Creature Dragon Ranger
 PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +X/+X until end of turn, where X is the greatest power among other Dragons you control and Dragon cards in your graveyard.
-SVar:TrigPump:DB$ Pump | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | NumAtt$ +X | NumDef$ +X
 SVar:X:Count$ValidGraveyard,Battlefield Dragon.YouCtrl+Other$GreatestPower
 K:Choose a Background
 SVar:HasAttackEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/s/skophos_warleader.txt b/forge-gui/res/cardsfolder/s/skophos_warleader.txt
index c5413926405..ded4045f51a 100644
--- a/forge-gui/res/cardsfolder/s/skophos_warleader.txt
+++ b/forge-gui/res/cardsfolder/s/skophos_warleader.txt
@@ -2,5 +2,5 @@ Name:Skophos Warleader
 ManaCost:4 R
 Types:Creature Minotaur Warrior
 PT:4/5
-A:AB$ Pump | Cost$ R Sac<1/Creature.Other;Enchantment/another creature or enchantment> | Defined$ Self | NumAtt$ 1 | KW$ Menace | SpellDescription$ CARDNAME gets +1/+0 and gains menace until end of turn.
+A:AB$ Pump | Cost$ R Sac<1/Creature.Other;Enchantment/another creature or enchantment> | Defined$ Self | NumAtt$ +1 | KW$ Menace | SpellDescription$ CARDNAME gets +1/+0 and gains menace until end of turn.
 Oracle:{R}, Sacrifice another creature or an enchantment: Skophos Warleader gets +1/+0 and gains menace until end of turn. (It can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/s/sky_theater_strix.txt b/forge-gui/res/cardsfolder/s/sky_theater_strix.txt
index a642a4075bf..2df5ef6ed28 100644
--- a/forge-gui/res/cardsfolder/s/sky_theater_strix.txt
+++ b/forge-gui/res/cardsfolder/s/sky_theater_strix.txt
@@ -4,6 +4,6 @@ Types:Creature Bird
 PT:1/2
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, CARDNAME gets +1/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1
 SVar:BuffedBy:Card.nonLand+nonCreature
 Oracle:Flying\nWhenever you cast a noncreature spell, Sky Theater Strix gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/skyclave_geopede.txt b/forge-gui/res/cardsfolder/s/skyclave_geopede.txt
index 1303419d327..413654c83fd 100644
--- a/forge-gui/res/cardsfolder/s/skyclave_geopede.txt
+++ b/forge-gui/res/cardsfolder/s/skyclave_geopede.txt
@@ -4,6 +4,6 @@ Types:Creature Insect
 PT:3/1
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, CARDNAME gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2
 SVar:BuffedBy:Land
 Oracle:Trample\nLandfall — Whenever a land you control enters, Skyclave Geopede gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/skyclave_pick_axe.txt b/forge-gui/res/cardsfolder/s/skyclave_pick_axe.txt
index 5f6e7302843..ee4f454c8b1 100644
--- a/forge-gui/res/cardsfolder/s/skyclave_pick_axe.txt
+++ b/forge-gui/res/cardsfolder/s/skyclave_pick_axe.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to target creature you control.
 SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, equipped creature gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Equipped | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Equipped | NumAtt$ +2 | NumDef$ +2
 K:Equip:2 G
 SVar:NeedsToPlay:Creature.YouCtrl
 SVar:BuffedBy:Land
diff --git a/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt b/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt
index 754e5023836..65a0933dce8 100644
--- a/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt
+++ b/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt
@@ -4,5 +4,5 @@ Types:Artifact Creature Lizard Warrior
 PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ FlipCoin | TriggerDescription$ Whenever CARDNAME attacks, flip a coin. If you win the flip, CARDNAME gets +1/+1 and gains flying until end of turn.
 SVar:FlipCoin:DB$ FlipACoin | WinSubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | KW$ Flying
 Oracle:Whenever Skyclaw Thrash attacks, flip a coin. If you win the flip, Skyclaw Thrash gets +1/+1 and gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/skyline_savior.txt b/forge-gui/res/cardsfolder/s/skyline_savior.txt
index 0eaa1baf410..0d7e4e3c28f 100644
--- a/forge-gui/res/cardsfolder/s/skyline_savior.txt
+++ b/forge-gui/res/cardsfolder/s/skyline_savior.txt
@@ -5,7 +5,7 @@ PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, return a permanent you control to its owner's hand. If it's a non-Angel creature card, it perpetually gets +1/+1, gains flying, and becomes an Angel in addition to its other types.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.YouCtrl | RememberChanged$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | ConditionDefined$ Remembered | ConditionPresent$ Creature.nonAngel | PumpZone$ Hand | Defined$ Remembered | NumAtt$ 1 | NumDef$ 1 | KW$ Flying | Duration$ Perpetual | SubAbility$ DBAnimate
+SVar:DBPump:DB$ Pump | ConditionDefined$ Remembered | ConditionPresent$ Creature.nonAngel | PumpZone$ Hand | Defined$ Remembered | NumAtt$ +1 | NumDef$ +1 | KW$ Flying | Duration$ Perpetual | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Duration$ Perpetual | ConditionDefined$ Remembered | ConditionPresent$ Creature.nonAngel | Types$ Angel | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Flying\nWhen Skyline Savior enters, return a permanent you control to its owner's hand. If it's a non-Angel creature card, it perpetually gets +1/+1, gains flying, and becomes an Angel in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/s/slab_hammer.txt b/forge-gui/res/cardsfolder/s/slab_hammer.txt
index ea6a1540197..429d9d8f882 100644
--- a/forge-gui/res/cardsfolder/s/slab_hammer.txt
+++ b/forge-gui/res/cardsfolder/s/slab_hammer.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip:2
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature attacks, you may return a land you control to its owner's hand. If you do, the creature gets +2/+2 until end of turn.
-SVar:TrigPump:AB$ Pump | Cost$ Return<1/Land> | Defined$ TriggeredAttackerLKICopy | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:AB$ Pump | Cost$ Return<1/Land> | Defined$ TriggeredAttackerLKICopy | NumAtt$ +2 | NumDef$ +2
 AI:RemoveDeck:Random
 Oracle:Whenever equipped creature attacks, you may return a land you control to its owner's hand. If you do, the creature gets +2/+2 until end of turn.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/s/slashing_tiger.txt b/forge-gui/res/cardsfolder/s/slashing_tiger.txt
index 85080efee96..cd8b3de0c7a 100644
--- a/forge-gui/res/cardsfolder/s/slashing_tiger.txt
+++ b/forge-gui/res/cardsfolder/s/slashing_tiger.txt
@@ -3,5 +3,5 @@ ManaCost:2 G G
 Types:Creature Cat
 PT:3/3
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2
 Oracle:Whenever Slashing Tiger becomes blocked, it gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/slayers_stronghold.txt b/forge-gui/res/cardsfolder/s/slayers_stronghold.txt
index 2303acbb522..8ba7185be4b 100644
--- a/forge-gui/res/cardsfolder/s/slayers_stronghold.txt
+++ b/forge-gui/res/cardsfolder/s/slayers_stronghold.txt
@@ -2,5 +2,5 @@ Name:Slayers' Stronghold
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Pump | Cost$ R W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | KW$ Vigilance & Haste | SpellDescription$ Target creature gets +2/+0 and gains vigilance and haste until end of turn.
+A:AB$ Pump | Cost$ R W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | KW$ Vigilance & Haste | SpellDescription$ Target creature gets +2/+0 and gains vigilance and haste until end of turn.
 Oracle:{T}: Add {C}.\n{R}{W}, {T}: Target creature gets +2/+0 and gains vigilance and haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/slickshot_show_off.txt b/forge-gui/res/cardsfolder/s/slickshot_show_off.txt
index a443679c731..6ab64e4f3cd 100644
--- a/forge-gui/res/cardsfolder/s/slickshot_show_off.txt
+++ b/forge-gui/res/cardsfolder/s/slickshot_show_off.txt
@@ -5,6 +5,6 @@ PT:1/2
 K:Flying
 K:Haste
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a noncreature spell, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 K:Plot:1 R
 Oracle:Flying, haste\nWhenever you cast a noncreature spell, Slickshot Show-Off gets +2/+0 until end of turn.\nPlot {1}{R} (You may pay {1}{R} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/slimy_dualleech.txt b/forge-gui/res/cardsfolder/s/slimy_dualleech.txt
index f61008f3ec7..14bd32ada1a 100644
--- a/forge-gui/res/cardsfolder/s/slimy_dualleech.txt
+++ b/forge-gui/res/cardsfolder/s/slimy_dualleech.txt
@@ -3,5 +3,5 @@ ManaCost:3 B
 Types:Creature Leech
 PT:2/4
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control with power 2 or less gets +1/+0 and gains deathtouch until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+powerLE2 | TgtPrompt$ Select target creature you control with power 2 or less | NumAtt$ 1 | KW$ Deathtouch
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+powerLE2 | TgtPrompt$ Select target creature you control with power 2 or less | NumAtt$ +1 | KW$ Deathtouch
 Oracle:At the beginning of combat on your turn, target creature you control with power 2 or less gets +1/+0 and gains deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/slimy_piper.txt b/forge-gui/res/cardsfolder/s/slimy_piper.txt
index 70585c99569..4f6680c0d8f 100644
--- a/forge-gui/res/cardsfolder/s/slimy_piper.txt
+++ b/forge-gui/res/cardsfolder/s/slimy_piper.txt
@@ -4,7 +4,7 @@ Types:Creature Fungus Bard
 PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigBranch | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+1 until end of turn. If you control four or more creatures, it gets +2/+2 and gains indestructible until end of turn instead. (Damage and effects that say "destroy" don't destroy it.)
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$GE4 | TrueSubAbility$ DBPump1 | FalseSubAbility$ DBPump2
-SVar:DBPump1:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | KW$ Indestructible
-SVar:DBPump2:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+SVar:DBPump1:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | KW$ Indestructible
+SVar:DBPump2:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 SVar:X:Count$Valid Creature.YouCtrl
 Oracle:Whenever Slimy Piper attacks, it gets +1/+1 until end of turn. If you control four or more creatures, it gets +2/+2 and gains indestructible until end of turn instead. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/s/snarespinner.txt b/forge-gui/res/cardsfolder/s/snarespinner.txt
index 08f38f1d81b..76af1024e44 100644
--- a/forge-gui/res/cardsfolder/s/snarespinner.txt
+++ b/forge-gui/res/cardsfolder/s/snarespinner.txt
@@ -4,5 +4,5 @@ Types:Creature Spider
 PT:1/3
 K:Reach
 T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 Oracle:Reach (This creature can block creatures with flying.)\nWhenever Snarespinner blocks a creature with flying, Snarespinner gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/snarling_wolf.txt b/forge-gui/res/cardsfolder/s/snarling_wolf.txt
index d00029effba..74a9893953b 100644
--- a/forge-gui/res/cardsfolder/s/snarling_wolf.txt
+++ b/forge-gui/res/cardsfolder/s/snarling_wolf.txt
@@ -2,5 +2,5 @@ Name:Snarling Wolf
 ManaCost:G
 Types:Creature Wolf
 PT:1/1
-A:AB$ Pump | Cost$ 1 G | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. Activate only once each turn.
+A:AB$ Pump | Cost$ 1 G | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. Activate only once each turn.
 Oracle:{1}{G}: Snarling Wolf gets +2/+2 until end of turn. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/s/snorting_gahr.txt b/forge-gui/res/cardsfolder/s/snorting_gahr.txt
index fbc1cac7f74..d59f079958e 100644
--- a/forge-gui/res/cardsfolder/s/snorting_gahr.txt
+++ b/forge-gui/res/cardsfolder/s/snorting_gahr.txt
@@ -3,5 +3,5 @@ ManaCost:2 G G
 Types:Creature Rhino Beast
 PT:3/3
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2
 Oracle:Whenever Snorting Gahr becomes blocked, it gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/soltari_trooper.txt b/forge-gui/res/cardsfolder/s/soltari_trooper.txt
index f7acb0a618d..36a037c3471 100644
--- a/forge-gui/res/cardsfolder/s/soltari_trooper.txt
+++ b/forge-gui/res/cardsfolder/s/soltari_trooper.txt
@@ -4,5 +4,5 @@ Types:Creature Soltari Soldier
 PT:1/1
 K:Shadow
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 Oracle:Shadow (This creature can block or be blocked by only creatures with shadow.)\nWhenever Soltari Trooper attacks, it gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/soul_shredder.txt b/forge-gui/res/cardsfolder/s/soul_shredder.txt
index b8313b34c8e..2f4d2c10369 100644
--- a/forge-gui/res/cardsfolder/s/soul_shredder.txt
+++ b/forge-gui/res/cardsfolder/s/soul_shredder.txt
@@ -5,6 +5,6 @@ PT:2/2
 K:Haste
 K:Crew:1
 T:Mode$ ChangesZoneAll | TriggerZones$ Battlefield,Graveyard | ValidCards$ Creature.Other | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigPump | TriggerDescription$ Whenever one or more other creatures die, CARDNAME perpetually gets +1/+1. This ability also triggers if CARDNAME is in your graveyard.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual
 A:AB$ ChangeZone | Cost$ 1 Sac<2/Creature> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield.
 Oracle:Haste\nWhenever one or more other creatures die, Soul Shredder perpetually gets +1/+1. This ability also triggers if Sould Shredder is in your graveyard.\nCrew 1\n{1}, Sacrifice two creatures: Return Soul Shredder from your graveyard to the battlefield. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/soulblade_djinn.txt b/forge-gui/res/cardsfolder/s/soulblade_djinn.txt
index 5b78697fc10..9de01ed019e 100644
--- a/forge-gui/res/cardsfolder/s/soulblade_djinn.txt
+++ b/forge-gui/res/cardsfolder/s/soulblade_djinn.txt
@@ -4,6 +4,6 @@ Types:Creature Djinn
 PT:4/3
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever you cast a noncreature spell, creatures you control get +1/+1 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1
 SVar:BuffedBy:Card.nonCreature+nonLand
 Oracle:Flying\nWhenever you cast a noncreature spell, creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/soulshriek.txt b/forge-gui/res/cardsfolder/s/soulshriek.txt
index 47a215dcc8c..53a220d9e5d 100644
--- a/forge-gui/res/cardsfolder/s/soulshriek.txt
+++ b/forge-gui/res/cardsfolder/s/soulshriek.txt
@@ -1,6 +1,6 @@
 Name:Soulshriek
 ManaCost:B
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | AILogic$ Berserk | AtEOT$ Sacrifice | SpellDescription$ Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | AILogic$ Berserk | AtEOT$ Sacrifice | SpellDescription$ Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
 SVar:X:Count$TypeInYourYard.Creature
 Oracle:Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/s/spellbound_dragon.txt b/forge-gui/res/cardsfolder/s/spellbound_dragon.txt
index 6b2f68dfe17..356f6f2066f 100644
--- a/forge-gui/res/cardsfolder/s/spellbound_dragon.txt
+++ b/forge-gui/res/cardsfolder/s/spellbound_dragon.txt
@@ -6,7 +6,7 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, draw a card, then discard a card. CARDNAME gets +X/+0 until end of turn, where X is the discarded card's mana value.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | NumAtt$ X | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | NumAtt$ +X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 Oracle:Flying\nWhenever Spellbound Dragon attacks, draw a card, then discard a card. Spellbound Dragon gets +X/+0 until end of turn, where X is the discarded card's mana value.
diff --git a/forge-gui/res/cardsfolder/s/spellrune_painter_spellrune_howler.txt b/forge-gui/res/cardsfolder/s/spellrune_painter_spellrune_howler.txt
index ba67ce47384..e075c5eb299 100644
--- a/forge-gui/res/cardsfolder/s/spellrune_painter_spellrune_howler.txt
+++ b/forge-gui/res/cardsfolder/s/spellrune_painter_spellrune_howler.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Human Shaman Werewolf
 PT:2/3
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, CARDNAME gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | ValidCard$ Card.Self | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | ValidCard$ Card.Self | NumAtt$ +1 | NumDef$ +1
 DeckHints:Type$Instant|Sorcery
 K:Daybound
 AlternateMode:DoubleFaced
@@ -17,6 +17,6 @@ Colors:red
 Types:Creature Werewolf
 PT:3/4
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, CARDNAME gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | ValidCard$ Card.Self | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | ValidCard$ Card.Self | NumAtt$ +2 | NumDef$ +2
 K:Nightbound
 Oracle:Whenever you cast an instant or sorcery spell, Spellrune Howler gets +2/+2 until end of turn.\nNightbound (If a player casts at least two spells during their own turn, it becomes day next turn.)
diff --git a/forge-gui/res/cardsfolder/s/spike_soldier.txt b/forge-gui/res/cardsfolder/s/spike_soldier.txt
index 0bf4254d0a3..614adcf2157 100644
--- a/forge-gui/res/cardsfolder/s/spike_soldier.txt
+++ b/forge-gui/res/cardsfolder/s/spike_soldier.txt
@@ -4,5 +4,5 @@ Types:Creature Spike Soldier
 PT:0/0
 K:etbCounter:P1P1:3
 A:AB$ PutCounter | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ MoveCounter.IsCounterUser | SpellDescription$ Put a +1/+1 counter on target creature.
-A:AB$ Pump | Cost$ SubCounter<1/P1P1> | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
+A:AB$ Pump | Cost$ SubCounter<1/P1P1> | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
 Oracle:Spike Soldier enters with three +1/+1 counters on it.\n{2}, Remove a +1/+1 counter from Spike Soldier: Put a +1/+1 counter on target creature.\nRemove a +1/+1 counter from Spike Soldier: Spike Soldier gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/spirit_shield.txt b/forge-gui/res/cardsfolder/s/spirit_shield.txt
index d40875246fc..7fe4d75d54a 100644
--- a/forge-gui/res/cardsfolder/s/spirit_shield.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_shield.txt
@@ -2,6 +2,6 @@ Name:Spirit Shield
 ManaCost:3
 Types:Artifact
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Pump | Cost$ 2 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ 2 | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target creature gets +0/+2 for as long as CARDNAME remains tapped.
+A:AB$ Pump | Cost$ 2 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ +2 | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target creature gets +0/+2 for as long as CARDNAME remains tapped.
 SVar:AIUntapPreference:BetterTgtThanRemembered
 Oracle:You may choose not to untap Spirit Shield during your untap step.\n{2}, {T}: Target creature gets +0/+2 for as long as Spirit Shield remains tapped.
diff --git a/forge-gui/res/cardsfolder/s/spoils_of_the_hunt.txt b/forge-gui/res/cardsfolder/s/spoils_of_the_hunt.txt
index e1bbe7fb8e1..9a51cf0aa32 100644
--- a/forge-gui/res/cardsfolder/s/spoils_of_the_hunt.txt
+++ b/forge-gui/res/cardsfolder/s/spoils_of_the_hunt.txt
@@ -1,10 +1,10 @@
 Name:Spoils of the Hunt
 ManaCost:2 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ Treasure | SubAbility$ DBDealDamage | StackDescription$ {c:ThisTargetedCard} gets +1/+0 until end of turn for each mana from a Treasure that was spent to cast this spell. | SpellDescription$ Target creature you control gets +1/+0 until end of turn for each mana from a Treasure that was spent to cast this spell. Then that creature deals damage equal to its power to target creature an opponent controls.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +TreasureX | SubAbility$ DBDealDamage | StackDescription$ {c:ThisTargetedCard} gets +1/+0 until end of turn for each mana from a Treasure that was spent to cast this spell. | SpellDescription$ Target creature you control gets +1/+0 until end of turn for each mana from a Treasure that was spent to cast this spell. Then that creature deals damage equal to its power to target creature an opponent controls.
 SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X | DamageSource$ ParentTarget | AILogic$ PowerDmg | StackDescription$ Then {c:ParentTarget} deals damage equal to its power to {c:ThisTargetedCard}.
 SVar:X:ParentTargeted$CardPower
-SVar:Treasure:Count$CastTotalManaSpent Treasure
+SVar:TreasureX:Count$CastTotalManaSpent Treasure
 SVar:AIPreference:ManaFrom$Treasure
 AI:RemoveDeck:Random
 Oracle:Target creature you control gets +1/+0 until end of turn for each mana from a Treasure that was spent to cast this spell. Then that creature deals damage equal to its power to target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/s/staggering_size.txt b/forge-gui/res/cardsfolder/s/staggering_size.txt
index f59b866f5d0..3a99a16616b 100644
--- a/forge-gui/res/cardsfolder/s/staggering_size.txt
+++ b/forge-gui/res/cardsfolder/s/staggering_size.txt
@@ -1,5 +1,5 @@
 Name:Staggering Size
 ManaCost:1 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 3 | NumDef$ 3 | KW$ Trample | SpellDescription$ Target creature gets +3/+3 and gains trample until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Target creature gets +3/+3 and gains trample until end of turn.
 Oracle:Target creature gets +3/+3 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stalwart_speartail.txt b/forge-gui/res/cardsfolder/s/stalwart_speartail.txt
index 54c76083b7e..0d13f1fbd19 100644
--- a/forge-gui/res/cardsfolder/s/stalwart_speartail.txt
+++ b/forge-gui/res/cardsfolder/s/stalwart_speartail.txt
@@ -3,7 +3,7 @@ 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
+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$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks, CARDNAME deals 1 damage to each creature and each planeswalker.
 SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature,Planeswalker | NumDmg$ 1
 SVar:HasAttackEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/s/stand_firm.txt b/forge-gui/res/cardsfolder/s/stand_firm.txt
index db3d754cd88..e4de9e0b4b9 100644
--- a/forge-gui/res/cardsfolder/s/stand_firm.txt
+++ b/forge-gui/res/cardsfolder/s/stand_firm.txt
@@ -1,6 +1,6 @@
 Name:Stand Firm
 ManaCost:W
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBScry | SpellDescription$ Target creature gets +1/+1 until end of turn. Scry 2 (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBScry | SpellDescription$ Target creature gets +1/+1 until end of turn. Scry 2 (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 SVar:DBScry:DB$ Scry | ScryNum$ 2
 Oracle:Target creature gets +1/+1 until end of turn. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/s/starlight_spectacular.txt b/forge-gui/res/cardsfolder/s/starlight_spectacular.txt
index 380374f5088..8145613ddac 100644
--- a/forge-gui/res/cardsfolder/s/starlight_spectacular.txt
+++ b/forge-gui/res/cardsfolder/s/starlight_spectacular.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Enchantment
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoop | TriggerDescription$ Parade! — At the beginning of combat on your turn, choose creatures you control one at a time until each creature you control has been chosen. Each of those creatures gets +1/+1 until end of turn for each creature chosen before it. (Places everyone! The first creature in line gets +0/+0.)
 SVar:TrigLoop:DB$ RepeatEach | RepeatCards$ Creature.YouCtrl | ChooseOrder$ True | SubAbility$ DBCleanup | RepeatSubAbility$ ParadePump | ClearRemembered$ True | UseImprinted$ True
-SVar:ParadePump:DB$ Pump | Defined$ Imprinted | NumAtt$ X | NumDef$ X | RememberPumped$ True
+SVar:ParadePump:DB$ Pump | Defined$ Imprinted | NumAtt$ +X | NumDef$ +X | RememberPumped$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/s/starnheim_memento.txt b/forge-gui/res/cardsfolder/s/starnheim_memento.txt
index f4a9b68f0df..9ab42102609 100644
--- a/forge-gui/res/cardsfolder/s/starnheim_memento.txt
+++ b/forge-gui/res/cardsfolder/s/starnheim_memento.txt
@@ -2,5 +2,5 @@ Name:Starnheim Memento
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
-A:AB$ Pump | Cost$ 1 W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Flying | SorcerySpeed$ True | SpellDescription$ Target creature gets +1/+1 and gains flying until end of turn. Activate only as a sorcery.
+A:AB$ Pump | Cost$ 1 W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ Flying | SorcerySpeed$ True | SpellDescription$ Target creature gets +1/+1 and gains flying until end of turn. Activate only as a sorcery.
 Oracle:{T}: Add {W}.\n{1}{W}, {T}: Target creature gets +1/+1 and gains flying until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/steadfast_cathar.txt b/forge-gui/res/cardsfolder/s/steadfast_cathar.txt
index 39d71cdcdac..21a5dfea774 100644
--- a/forge-gui/res/cardsfolder/s/steadfast_cathar.txt
+++ b/forge-gui/res/cardsfolder/s/steadfast_cathar.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Human Soldier
 PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +0/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ +2
 Oracle:Whenever Steadfast Cathar attacks, it gets +0/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/steady_tortoise_harried_dash.txt b/forge-gui/res/cardsfolder/s/steady_tortoise_harried_dash.txt
index bcae2ab1e81..5f0da0fa904 100644
--- a/forge-gui/res/cardsfolder/s/steady_tortoise_harried_dash.txt
+++ b/forge-gui/res/cardsfolder/s/steady_tortoise_harried_dash.txt
@@ -4,7 +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$ Pump | PumpZone$ Battlefield,Exile | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
+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.
diff --git a/forge-gui/res/cardsfolder/s/steel_plume_marshal.txt b/forge-gui/res/cardsfolder/s/steel_plume_marshal.txt
index c01ad726b65..c9019673ae0 100644
--- a/forge-gui/res/cardsfolder/s/steel_plume_marshal.txt
+++ b/forge-gui/res/cardsfolder/s/steel_plume_marshal.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Soldier
 PT:3/3
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME attacks, other attacking creatures you control with flying get +2/+2 until end of turn.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.attacking+withFlying+Other+YouCtrl | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.attacking+withFlying+Other+YouCtrl | NumAtt$ +2 | NumDef$ +2
 SVar:HasAttackEffect:TRUE
 DeckHints:Keyword$Flying
 Oracle:Flying\nWhenever Steel-Plume Marshal attacks, other attacking creatures you control with flying get +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/steel_squirrel.txt b/forge-gui/res/cardsfolder/s/steel_squirrel.txt
index f5062b502e1..55881f46f9c 100644
--- a/forge-gui/res/cardsfolder/s/steel_squirrel.txt
+++ b/forge-gui/res/cardsfolder/s/steel_squirrel.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Creature Squirrel
 PT:1/1
 T:Mode$ RolledDie | Execute$ TrigPump | ValidPlayer$ You | ValidResult$ GE5 | TriggerZones$ Battlefield | TriggerDescription$ Whenever you roll a 5 or higher on a die, CARDNAME gets +X/+X until end of turn, where X is the result.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | NumDef$ +X
 SVar:X:TriggerCount$Result
 A:AB$ RollDice | Cost$ 6 | AILogic$ Combat | SpellDescription$ Roll a six-sided die.
 Oracle:Whenever you roll a 5 or higher on a die, Steel Squirrel gets +X/+X until end of turn, where X is the result.\n{6}: Roll a six-sided die.
diff --git a/forge-gui/res/cardsfolder/s/steelgaze_griffin.txt b/forge-gui/res/cardsfolder/s/steelgaze_griffin.txt
index db6c50b739b..e8566739102 100644
--- a/forge-gui/res/cardsfolder/s/steelgaze_griffin.txt
+++ b/forge-gui/res/cardsfolder/s/steelgaze_griffin.txt
@@ -4,6 +4,6 @@ Types:Creature Griffin
 PT:2/4
 K:Flying
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you draw your second card each turn, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | NumAtt$ +2 | NumDef$ +0 | Defined$ Self
+SVar:TrigPump:DB$ Pump | NumAtt$ +2 | Defined$ Self
 SVar:PlayMain1:TRUE
 Oracle:Flying\nWhenever you draw your second card each turn, Steelgaze Griffin gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stir_the_pride.txt b/forge-gui/res/cardsfolder/s/stir_the_pride.txt
index 0466aa06d13..35f970c45dc 100644
--- a/forge-gui/res/cardsfolder/s/stir_the_pride.txt
+++ b/forge-gui/res/cardsfolder/s/stir_the_pride.txt
@@ -3,7 +3,7 @@ ManaCost:4 W
 Types:Instant
 K:Entwine:1 W
 A:SP$ Charm | Choices$ DBPumpAll,DBAnimateAll | CharmNum$ 1
-SVar:DBPumpAll:DB$ PumpAll | NumAtt$ 2 | NumDef$ 2 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +2/+2 until end of turn.
+SVar:DBPumpAll:DB$ PumpAll | NumAtt$ +2 | NumDef$ +2 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +2/+2 until end of turn.
 SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ TrigPrideDamage | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
 SVar:TrigPrideDamage:Mode$ DamageDealtOnce | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
 SVar:GainLife:DB$ GainLife | LifeAmount$ GainLifeX
diff --git a/forge-gui/res/cardsfolder/s/stolen_vitality.txt b/forge-gui/res/cardsfolder/s/stolen_vitality.txt
index 96a2b3770ca..dfbfcb2170c 100644
--- a/forge-gui/res/cardsfolder/s/stolen_vitality.txt
+++ b/forge-gui/res/cardsfolder/s/stolen_vitality.txt
@@ -1,7 +1,7 @@
 Name:Stolen Vitality
 ManaCost:1 R
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 1 | SubAbility$ DBPump1 | SpellDescription$ Target creature gets +3/+1 until end of turn. If it's your turn, that creature gains trample until end of turn. Otherwise, it gains first strike until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +1 | SubAbility$ DBPump1 | SpellDescription$ Target creature gets +3/+1 until end of turn. If it's your turn, that creature gains trample until end of turn. Otherwise, it gains first strike until end of turn.
 SVar:DBPump1:DB$ Pump | Defined$ Targeted | KW$ Trample | SubAbility$ DBPump2 | ConditionPlayerTurn$ True | StackDescription$ If it's your turn, that creature gains trample until end of turn.
 SVar:DBPump2:DB$ Pump | Defined$ Targeted | KW$ First Strike | ConditionPlayerTurn$ False | StackDescription$ Otherwise, it gains first strike until end of turn.
 Oracle:Target creature gets +3/+1 until end of turn. If it's your turn, that creature gains trample until end of turn. Otherwise, it gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stone_haven_pilgrim.txt b/forge-gui/res/cardsfolder/s/stone_haven_pilgrim.txt
index af731201968..464d6c860a5 100644
--- a/forge-gui/res/cardsfolder/s/stone_haven_pilgrim.txt
+++ b/forge-gui/res/cardsfolder/s/stone_haven_pilgrim.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Kor Cleric
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Artifact.YouCtrl,Enchantment.YouCtrl | TriggerDescription$ Whenever CARDNAME attacks, if you control an artifact or enchantment, CARDNAME gets +1/+1 and gains lifelink until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Lifelink
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | KW$ Lifelink
 SVar:BuffedBy:Artifact,Enchantment
 DeckHints:Type$Artifact|Enchantment
 Oracle:Whenever Stone Haven Pilgrim attacks, if you control an artifact or enchantment, Stone Haven Pilgrim gets +1/+1 and gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stonebrow_krosan_hero.txt b/forge-gui/res/cardsfolder/s/stonebrow_krosan_hero.txt
index c46f2a36d38..fd73e0e5ada 100644
--- a/forge-gui/res/cardsfolder/s/stonebrow_krosan_hero.txt
+++ b/forge-gui/res/cardsfolder/s/stonebrow_krosan_hero.txt
@@ -4,5 +4,5 @@ Types:Legendary Creature Centaur Warrior
 PT:4/4
 K:Trample
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withTrample | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature you control with trample attacks, it gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ 2 | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +2 | NumDef$ +2
 Oracle:Trample\nWhenever a creature you control with trample attacks, it gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/storm_skreelix.txt b/forge-gui/res/cardsfolder/s/storm_skreelix.txt
index 57654fc628e..41d2d737aef 100644
--- a/forge-gui/res/cardsfolder/s/storm_skreelix.txt
+++ b/forge-gui/res/cardsfolder/s/storm_skreelix.txt
@@ -5,6 +5,6 @@ PT:2/4
 K:Flying
 S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Instant and sorcery spells you cast cost {1} less to cast.
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | ValidCard$ Card.Self | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | ValidCard$ Card.Self | NumAtt$ +2
 DeckHints:Type$Instant|Sorcery
 Oracle:Flying\nInstant and sorcery spells you cast cost {1} less to cast.\nWhenever you cast an instant or sorcery spell, Storm Skreelix gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/storm_the_citadel.txt b/forge-gui/res/cardsfolder/s/storm_the_citadel.txt
index d688093a0b1..265af9c088c 100644
--- a/forge-gui/res/cardsfolder/s/storm_the_citadel.txt
+++ b/forge-gui/res/cardsfolder/s/storm_the_citadel.txt
@@ -1,7 +1,7 @@
 Name:Storm the Citadel
 ManaCost:4 G
 Types:Sorcery
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBAnimateAll | SpellDescription$ Until end of turn, creatures you control get +2/+2 and gain "Whenever this creature deals combat damage to a player or planeswalker, destroy target artifact or enchantment defending player controls."
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBAnimateAll | SpellDescription$ Until end of turn, creatures you control get +2/+2 and gain "Whenever this creature deals combat damage to a player or planeswalker, destroy target artifact or enchantment defending player controls."
 SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ Trig
 SVar:Trig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Planeswalker | CombatDamage$ True | Execute$ Eff | TriggerDescription$ Whenever this creature deals combat damage to a player or planeswalker, destroy target artifact or enchantment defending player controls.
 SVar:Eff:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TargetsWithDefinedController$ TriggeredDefendingPlayer | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target artifact or enchantment defending player controls.
diff --git a/forge-gui/res/cardsfolder/s/stormchaser_chimera.txt b/forge-gui/res/cardsfolder/s/stormchaser_chimera.txt
index ce12e71798e..2941e28543d 100644
--- a/forge-gui/res/cardsfolder/s/stormchaser_chimera.txt
+++ b/forge-gui/res/cardsfolder/s/stormchaser_chimera.txt
@@ -5,6 +5,6 @@ PT:2/3
 K:Flying
 A:AB$ Scry | Cost$ 2 U R | ScryNum$ 1 | SubAbility$ DBReveal | SpellDescription$ Scry 1, then reveal the top card of your library. CARDNAME gets +X/+0 until end of turn, where X is that card's mana value.
 SVar:DBReveal:DB$ PeekAndReveal | PeekAmount$ 1 | NoPeek$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | NumAtt$ X
+SVar:DBPump:DB$ Pump | NumAtt$ +X
 SVar:X:Count$TopOfLibraryCMC
 Oracle:Flying\n{2}{U}{R}: Scry 1, then reveal the top card of your library. Stormchaser Chimera gets +X/+0 until end of turn, where X is that card's mana value. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/s/strength_in_numbers.txt b/forge-gui/res/cardsfolder/s/strength_in_numbers.txt
index 79c90e4e9e1..cc17d204273 100644
--- a/forge-gui/res/cardsfolder/s/strength_in_numbers.txt
+++ b/forge-gui/res/cardsfolder/s/strength_in_numbers.txt
@@ -1,6 +1,6 @@
 Name:Strength in Numbers
 ManaCost:1 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | KW$ Trample | SpellDescription$ Until end of turn, target creature gains trample and gets +X/+X, where X is the number of attacking creatures.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ +X | KW$ Trample | SpellDescription$ Until end of turn, target creature gains trample and gets +X/+X, where X is the number of attacking creatures.
 SVar:X:Count$Valid Creature.attacking
 Oracle:Until end of turn, target creature gains trample and gets +X/+X, where X is the number of attacking creatures.
diff --git a/forge-gui/res/cardsfolder/s/strength_of_night.txt b/forge-gui/res/cardsfolder/s/strength_of_night.txt
index 10a07c0c4d8..4814be4d2df 100644
--- a/forge-gui/res/cardsfolder/s/strength_of_night.txt
+++ b/forge-gui/res/cardsfolder/s/strength_of_night.txt
@@ -2,8 +2,8 @@ Name:Strength of Night
 ManaCost:2 G
 Types:Instant
 K:Kicker:B
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBPumpYourZombies | SpellDescription$ Creatures you control get +1/+1 until end of turn. If this spell was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
-SVar:DBPumpYourZombies:DB$ PumpAll | ValidCards$ Creature.Zombie+YouCtrl | NumAtt$ 2 | NumDef$ 2 | Condition$ Kicked | ConditionDescription$ If CARDNAME was kicked,
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBPumpYourZombies | SpellDescription$ Creatures you control get +1/+1 until end of turn. If this spell was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
+SVar:DBPumpYourZombies:DB$ PumpAll | ValidCards$ Creature.Zombie+YouCtrl | NumAtt$ +2 | NumDef$ +2 | Condition$ Kicked | ConditionDescription$ If CARDNAME was kicked,
 SVar:NeedsToPlayKicked:Creature.Zombie+YouCtrl
 DeckNeeds:Color$Black & Type$Zombie
 Oracle:Kicker {B} (You may pay an additional {B} as you cast this spell.)\nCreatures you control get +1/+1 until end of turn. If this spell was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/strength_testing_hammer.txt b/forge-gui/res/cardsfolder/s/strength_testing_hammer.txt
index 8ae22bb7bf4..ac6af4cd8ce 100644
--- a/forge-gui/res/cardsfolder/s/strength_testing_hammer.txt
+++ b/forge-gui/res/cardsfolder/s/strength_testing_hammer.txt
@@ -4,6 +4,6 @@ Types:Artifact Equipment
 K:Equip:3
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigRollDice | TriggerDescription$ Whenever equipped creature attacks, roll a six-sided die. That creature gets +X/+0 until end of turn, where X is the result. Then if it has the greatest power or is tied for greatest power among creatures on the battlefield, draw a card.
 SVar:TrigRollDice:DB$ RollDice | ResultSVar$ X | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ X | SubAbility$ DBDraw
+SVar:DBPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +X | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | ConditionDefined$ TriggeredAttackerLKICopy | ConditionPresent$ Creature.greatestPower
 Oracle:Whenever equipped creature attacks, roll a six-sided die. That creature gets +X/+0 until end of turn, where X is the result. Then if it has the greatest power or is tied for greatest power among creatures on the battlefield, draw a card.\nEquip {3}.
diff --git a/forge-gui/res/cardsfolder/s/strongarm_monk.txt b/forge-gui/res/cardsfolder/s/strongarm_monk.txt
index ce02d28d6ba..aee639e4523 100644
--- a/forge-gui/res/cardsfolder/s/strongarm_monk.txt
+++ b/forge-gui/res/cardsfolder/s/strongarm_monk.txt
@@ -3,6 +3,6 @@ ManaCost:4 W
 Types:Creature Human Monk
 PT:3/3
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever you cast a noncreature spell, creatures you control get +1/+1 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1
 SVar:BuffedBy:Card.nonCreature+nonLand
 Oracle:Whenever you cast a noncreature spell, creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stubborn_burrowfiend.txt b/forge-gui/res/cardsfolder/s/stubborn_burrowfiend.txt
index 6942ff2542b..87a4916db0b 100644
--- a/forge-gui/res/cardsfolder/s/stubborn_burrowfiend.txt
+++ b/forge-gui/res/cardsfolder/s/stubborn_burrowfiend.txt
@@ -4,7 +4,7 @@ Types:Creature Badger Beast Mount
 PT:2/2
 T:Mode$ BecomesSaddled | ValidSaddled$ Card.Self | FirstTimeSaddled$ True | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes saddled for the first time each turn, mill two cards, then CARDNAME gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | NumAtt$ Count$TypeInYourYard.Creature | NumDef$ Count$TypeInYourYard.Creature
+SVar:DBPump:DB$ Pump | NumAtt$ +Count$TypeInYourYard.Creature | NumDef$ +Count$TypeInYourYard.Creature
 K:Saddle:2
 DeckHas:Ability$Mill
 DeckHints:Ability$Sacrifice|Mill|Dredge|Discard
diff --git a/forge-gui/res/cardsfolder/s/subdue.txt b/forge-gui/res/cardsfolder/s/subdue.txt
index 18718a9c09b..de0d432fb1b 100644
--- a/forge-gui/res/cardsfolder/s/subdue.txt
+++ b/forge-gui/res/cardsfolder/s/subdue.txt
@@ -1,7 +1,7 @@
 Name:Subdue
 ManaCost:G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 0 | NumDef$ +X | KW$ Prevent all combat damage that would be dealt by CARDNAME. | TgtPrompt$ Select target creature | SpellDescription$ Prevent all combat damage that would be dealt by target creature this turn. That creature gets +0/+X until end of turn, where X is its mana value.
+A:SP$ Pump | ValidTgts$ Creature | NumDef$ +X | KW$ Prevent all combat damage that would be dealt by CARDNAME. | TgtPrompt$ Select target creature | SpellDescription$ Prevent all combat damage that would be dealt by target creature this turn. That creature gets +0/+X until end of turn, where X is its mana value.
 SVar:X:Targeted$CardManaCost
 AI:RemoveDeck:All
 Oracle:Prevent all combat damage that would be dealt by target creature this turn. That creature gets +0/+X until end of turn, where X is its mana value.
diff --git a/forge-gui/res/cardsfolder/s/sugar_rush.txt b/forge-gui/res/cardsfolder/s/sugar_rush.txt
index e015ef06960..69743e9f175 100644
--- a/forge-gui/res/cardsfolder/s/sugar_rush.txt
+++ b/forge-gui/res/cardsfolder/s/sugar_rush.txt
@@ -1,6 +1,6 @@
 Name:Sugar Rush
 ManaCost:1 B
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 3 | SubAbility$ DBDraw | SpellDescription$ Target creature gets +3/+0 until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +3 | SubAbility$ DBDraw | SpellDescription$ Target creature gets +3/+0 until end of turn.
 SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
 Oracle:Target creature gets +3/+0 until end of turn.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/s/sunbathing_rootwalla.txt b/forge-gui/res/cardsfolder/s/sunbathing_rootwalla.txt
index ea6d044def2..9aef9566e49 100644
--- a/forge-gui/res/cardsfolder/s/sunbathing_rootwalla.txt
+++ b/forge-gui/res/cardsfolder/s/sunbathing_rootwalla.txt
@@ -2,7 +2,7 @@ Name:Sunbathing Rootwalla
 ManaCost:1 G
 Types:Creature Lizard
 PT:2/2
-A:AB$ Pump | Cost$ 3 G | Defined$ Self | NumAtt$ X | NumDef$ X | ActivationLimit$ 1 | PrecostDesc$ Domain — | SpellDescription$ Until end of turn, CARDNAME gets +1/+1 for each basic land type among lands you control. Activate only once each turn.
+A:AB$ Pump | Cost$ 3 G | Defined$ Self | NumAtt$ +X | NumDef$ +X | ActivationLimit$ 1 | PrecostDesc$ Domain — | SpellDescription$ Until end of turn, CARDNAME gets +1/+1 for each basic land type among lands you control. Activate only once each turn.
 SVar:X:Count$Domain
 AI:RemoveDeck:Random
 Oracle:Domain — {3}{G}: Until end of turn, Sunbathing Rootwalla gets +1/+1 for each basic land type among lands you control. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/s/sunblade_elf.txt b/forge-gui/res/cardsfolder/s/sunblade_elf.txt
index 84470a52cc1..18de0fa61d5 100644
--- a/forge-gui/res/cardsfolder/s/sunblade_elf.txt
+++ b/forge-gui/res/cardsfolder/s/sunblade_elf.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Elf Warrior
 PT:1/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | IsPresent$ Plains.YouCtrl | Description$ CARDNAME gets +1/+1 as long as you control a Plains.
-A:AB$ PumpAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
+A:AB$ PumpAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:BuffedBy:Plains
 AI:RemoveDeck:Random
 DeckNeeds:Color$White
diff --git a/forge-gui/res/cardsfolder/s/sustainer_of_the_realm.txt b/forge-gui/res/cardsfolder/s/sustainer_of_the_realm.txt
index 60eb6fe9908..3f1fe4c4e81 100644
--- a/forge-gui/res/cardsfolder/s/sustainer_of_the_realm.txt
+++ b/forge-gui/res/cardsfolder/s/sustainer_of_the_realm.txt
@@ -4,5 +4,5 @@ Types:Creature Angel
 PT:2/3
 K:Flying
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks, it gets +0/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ +2
 Oracle:Flying\nWhenever Sustainer of the Realm blocks, it gets +0/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/swell_of_growth.txt b/forge-gui/res/cardsfolder/s/swell_of_growth.txt
index b20a1db6670..6d4dadc418f 100644
--- a/forge-gui/res/cardsfolder/s/swell_of_growth.txt
+++ b/forge-gui/res/cardsfolder/s/swell_of_growth.txt
@@ -1,6 +1,6 @@
 Name:Swell of Growth
 ManaCost:1 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. You may put a land card from your hand onto the battlefield. | SubAbility$ DBChangeZone
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn. You may put a land card from your hand onto the battlefield. | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Optional$ You | ChangeType$ Land | ChangeNum$ 1
 Oracle:Target creature gets +2/+2 until end of turn. You may put a land card from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/swift_kick.txt b/forge-gui/res/cardsfolder/s/swift_kick.txt
index 218ba6befe2..6de643eaf28 100644
--- a/forge-gui/res/cardsfolder/s/swift_kick.txt
+++ b/forge-gui/res/cardsfolder/s/swift_kick.txt
@@ -1,6 +1,6 @@
 Name:Swift Kick
 ManaCost:3 R
 Types:Instant
-A:SP$ Pump | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBSwiftKick | NumAtt$ 1 | StackDescription$ None | SpellDescription$ Target creature you control gets +1/+0 until end of turn. It fights target creature you don't control.
+A:SP$ Pump | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBSwiftKick | NumAtt$ +1 | StackDescription$ None | SpellDescription$ Target creature you control gets +1/+0 until end of turn. It fights target creature you don't control.
 SVar:DBSwiftKick:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TargetUnique$ True | TgtPrompt$ Choose target creature to fight the first target
 Oracle:Target creature you control gets +1/+0 until end of turn. It fights target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/s/syr_faren_the_hengehammer.txt b/forge-gui/res/cardsfolder/s/syr_faren_the_hengehammer.txt
index 3e6ed811173..0af235d4908 100644
--- a/forge-gui/res/cardsfolder/s/syr_faren_the_hengehammer.txt
+++ b/forge-gui/res/cardsfolder/s/syr_faren_the_hengehammer.txt
@@ -3,6 +3,6 @@ ManaCost:G G
 Types:Legendary Creature Human Knight
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature gets +X/+X until end of turn, where X is NICKNAME's power.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +X | NumDef$ +X
 SVar:X:Count$CardPower
 Oracle:Whenever Syr Faren, the Hengehammer attacks, another target attacking creature gets +X/+X until end of turn, where X is Syr Faren's power.