Cleanup: NumAtt$ & NumDef$, part 3 (#6880)

2025-11-20 12:48:00 +00:00 · 2025-03-25 13:58:13 +00:00
parent f8836f0c40
commit e7775cdfa9
100 changed files with 109 additions and 109 deletions
--- a/forge-gui/res/cardsfolder/d/darigaazs_whelp.txt
+++ b/forge-gui/res/cardsfolder/d/darigaazs_whelp.txt
@@ -5,10 +5,10 @@ PT:2/1
 K:Kicker:1 R
 K:Flying
 T:Mode$ Drawn | ValidCard$ Card.YouOwn+Dragon | TriggerZones$ Battlefield | Execute$ DBPump | TriggerDescription$ Whenever you draw a Dragon card, it perpetually gets +1/+1.
-SVar:DBPump:DB$ Pump | PumpZone$ Hand | Defined$ TriggeredCard | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual
+SVar:DBPump:DB$ Pump | PumpZone$ Hand | Defined$ TriggeredCard | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigSeek | TriggerDescription$ When this creature enters, if it was kicked, seek a Dragon card. CARDNAME and that Dragon card each perpetually get +1/+1.
 SVar:TrigSeek:DB$ Seek | RememberFound$ True | Type$ Card.Dragon | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ RememberedAndSelf | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:DBPump2:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ RememberedAndSelf | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckNeeds:Type$Dragon
 DeckHints:Color$Red
--- a/forge-gui/res/cardsfolder/d/darksteel_garrison.txt
+++ b/forge-gui/res/cardsfolder/d/darksteel_garrison.txt
@@ -4,5 +4,5 @@ Types:Artifact Fortification
 K:Fortify:3
 S:Mode$ Continuous | Affected$ Land.FortifiedBy | AddKeyword$ Indestructible | Description$ Fortified land has indestructible.
 T:Mode$ Taps | ValidCard$ Land.FortifiedBy | Execute$ TrigPump | TriggerDescription$ Whenever fortified land becomes tapped, target creature gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
 Oracle:Fortified land has indestructible.\nWhenever fortified land becomes tapped, target creature gets +1/+1 until end of turn.\nFortify {3} ({3}: Attach to target land you control. Fortify only as a sorcery. This card enters unattached and stays on the battlefield if the land leaves.)
--- a/forge-gui/res/cardsfolder/d/daru_spiritualist.txt
+++ b/forge-gui/res/cardsfolder/d/daru_spiritualist.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Human Cleric
 PT:1/1
 T:Mode$ BecomesTarget | ValidTarget$ Cleric.Creature+YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a Cleric creature you control becomes the target of a spell or ability, it gets +0/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredTarget | NumDef$ 2
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredTarget | NumDef$ +2
 Oracle:Whenever a Cleric creature you control becomes the target of a spell or ability, it gets +0/+2 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dashing_bloodsucker.txt
+++ b/forge-gui/res/cardsfolder/d/dashing_bloodsucker.txt
@@ -4,6 +4,6 @@ Types:Creature Vampire Warrior
 PT:2/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 and gains lifelink until end of turn.
 T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 and gains lifelink until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | KW$ Lifelink
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | KW$ Lifelink
 DeckNeeds:Type$Enchantment
 Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Dashing Bloodsucker gets +2/+0 and gains lifelink until end of turn.
--- a/forge-gui/res/cardsfolder/d/dauntless_unity.txt
+++ b/forge-gui/res/cardsfolder/d/dauntless_unity.txt
@@ -2,6 +2,6 @@ Name:Dauntless Unity
 ManaCost:1 W
 Types:Instant
 K:Kicker:1 W
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ X | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn. If this spell was kicked, those creatures get +2/+1 until end of turn instead.
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn. If this spell was kicked, those creatures get +2/+1 until end of turn instead.
 SVar:X:Count$Kicked.2.1
 Oracle:Kicker {1}{W} (You may pay an additional {1}{W} as you cast this spell.)\nCreatures you control get +1/+1 until end of turn. If this spell was kicked, those creatures get +2/+1 until end of turn instead.
--- a/forge-gui/res/cardsfolder/d/davriel_soul_broker.txt
+++ b/forge-gui/res/cardsfolder/d/davriel_soul_broker.txt
@@ -10,7 +10,7 @@ A:AB$ GenericChoice | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ChoiceP
 SVar:Draw3:DB$ Draw | NumCards$ 3 | SpellDescription$ Draw three cards.
 SVar:Conjure:DB$ MakeCard | Conjure$ True | Name$ Manor Guardian | Zone$ Hand | SpellDescription$ Conjure a Manor Guardian card into your hand.
 SVar:Return2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouOwn | ChangeNum$ 2 | RememberChanged$ True | Hidden$ True | Mandatory$ True | AtRandom$ True | SubAbility$ DBEffect | SpellDescription$ Return two random creature cards from your graveyard to your hand. They perpetually gain +1/+1.
-SVar:DBEffect:DB$ Pump | PumpZone$ Hand | Defined$ Remembered | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:DBEffect:DB$ Pump | PumpZone$ Hand | Defined$ Remembered | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:ReturnBig:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.cmcEQV | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | AtRandom$ True | SpellDescription$ Return a random creature card with the highest mana value from among cards in your graveyard to the battlefield.
 SVar:V:Count$ValidGraveyard Creature.YouOwn$GreatestCMC
 SVar:EmblemBuff:DB$ Effect | Name$ Emblem — Davriel, Soul Broker (Offer 5) | StaticAbilities$ YoursP2Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get +2/+0."
@@ -30,7 +30,7 @@ SVar:DBDraw:DB$ Draw | Defined$ Opponent | ConditionCheckSVar$ X | ConditionSVar
 SVar:X:Remembered$Amount
 SVar:Y:Number$2/Minus.X
 SVar:Sac2:DB$ Sacrifice | Amount$ 2 | SacValid$ Permanent | Defined$ You | SpellDescription$ Sacrifice two permanents.
-SVar:PerpetualBuffTheirs:DB$ PumpAll | ValidCards$ Creature.YouDontCtrl | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SpellDescription$ Each creature you don't control perpetually gains +1/+1.
+SVar:PerpetualBuffTheirs:DB$ PumpAll | ValidCards$ Creature.YouDontCtrl | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual | SpellDescription$ Each creature you don't control perpetually gains +1/+1.
 SVar:EmblemDebuff:DB$ Effect | Name$ Emblem — Davriel, Soul Broker (Condition 5) | StaticAbilities$ YoursM1Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get -1/-0."
 SVar:YoursM1Pow:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ -1 | AffectedZone$ Battlefield | Description$ Creatures you control get -1/-0.
 SVar:EmblemRaiseCost:DB$ Effect | Name$ Emblem — Davriel, Soul Broker (Condition 6) | StaticAbilities$ CostBMore | Duration$ Permanent | SpellDescription$ You get an emblem with "Spells you cast cost {B} more to cast."
--- a/forge-gui/res/cardsfolder/d/dawnhart_mentor.txt
+++ b/forge-gui/res/cardsfolder/d/dawnhart_mentor.txt
@@ -4,7 +4,7 @@ Types:Creature Human Warlock
 PT:0/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Human creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_human | TokenOwner$ You
-A:AB$ Pump | PrecostDesc$ Coven — | Cost$ 5 G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ 3 | NumDef$ 3 | KW$ Trample | CheckSVar$ X | SVarCompare$ GE3 | SpellDescription$ Target creature you control gets +3/+3 and gains trample until end of turn. Activate only if you control three or more creatures with different powers.
+A:AB$ Pump | PrecostDesc$ Coven — | Cost$ 5 G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | CheckSVar$ X | SVarCompare$ GE3 | SpellDescription$ Target creature you control gets +3/+3 and gains trample until end of turn. Activate only if you control three or more creatures with different powers.
 SVar:X:Count$DifferentPower_Creature.YouCtrl
 DeckHas:Ability$Token
 Oracle:When Dawnhart Mentor enters, create a 1/1 white Human creature token.\nCoven — {5}{G}: Target creature you control gets +3/+3 and gains trample until end of turn. Activate only if you control three or more creatures with different powers.
--- a/forge-gui/res/cardsfolder/d/dawnwing_marshal.txt
+++ b/forge-gui/res/cardsfolder/d/dawnwing_marshal.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Cat Soldier
 PT:2/2
 K:Flying
-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.
 Oracle:Flying\n{4}{W}: Creatures you control get +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/d/daybreak_charger.txt
+++ b/forge-gui/res/cardsfolder/d/daybreak_charger.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Unicorn
 PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +0
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2
 Oracle:When Daybreak Charger enters, target creature gets +2/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/d/deeproot_warrior.txt
+++ b/forge-gui/res/cardsfolder/d/deeproot_warrior.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Merfolk Warrior
 PT:2/2
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, 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:Whenever Deeproot Warrior becomes blocked, it gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/d/deepwood_wolverine.txt
+++ b/forge-gui/res/cardsfolder/d/deepwood_wolverine.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Wolverine
 PT:1/1
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it 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 Deepwood Wolverine becomes blocked, it gets +2/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/d/defend_the_campus.txt
+++ b/forge-gui/res/cardsfolder/d/defend_the_campus.txt
@@ -2,6 +2,6 @@ Name:Defend the Campus
 ManaCost:3 W
 Types:Instant
 A:SP$ Charm | Choices$ DBPump,DBDestroy
-SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
+SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.powerGE4 | TgtPrompt$ Select target creature with power 4 or greater | SpellDescription$ Destroy target creature with power 4 or greater.
 Oracle:Choose one —\n• Creatures you control get +1/+1 until end of turn.\n• Destroy target creature with power 4 or greater.
--- a/forge-gui/res/cardsfolder/d/defensive_maneuvers.txt
+++ b/forge-gui/res/cardsfolder/d/defensive_maneuvers.txt
@@ -2,6 +2,6 @@ Name:Defensive Maneuvers
 ManaCost:3 W
 Types:Instant
 A:SP$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentComputerControls | SubAbility$ DBPumpAll | SpellDescription$ Creatures of the creature type of your choice get +0/+4 until end of turn.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.ChosenType | NumDef$ 4
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.ChosenType | NumDef$ +4
 AI:RemoveDeck:All
 Oracle:Creatures of the creature type of your choice get +0/+4 until end of turn.
--- a/forge-gui/res/cardsfolder/d/defiler_of_flesh.txt
+++ b/forge-gui/res/cardsfolder/d/defiler_of_flesh.txt
@@ -5,6 +5,6 @@ PT:4/4
 K:Menace
 S:Mode$ OptionalCost | ValidCard$ Permanent.Black | ValidSA$ Spell | Activator$ You | Cost$ PayLife<2> | ReduceColor$ B | Description$ As an additional cost to cast black permanent spells, you may pay 2 life. Those spells cost {B} less to cast if you paid life this way. This effect reduces only the amount of black mana you pay.
 T:Mode$ SpellCast | ValidCard$ Permanent.Black | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a black permanent spell, target creature you control gets +1/+1 and gains menace until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ 1 | NumDef$ 1 | KW$ Menace
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | NumDef$ +1 | KW$ Menace
 SVar:BuffedBy:Permanent.Black
 Oracle:Menace\nAs an additional cost to cast black permanent spells, you may pay 2 life. Those spells cost {B} less to cast if you paid life this way. This effect reduces only the amount of black mana you pay.\nWhenever you cast a black permanent spell, target creature you control gets +1/+1 and gains menace until end of turn.
--- a/forge-gui/res/cardsfolder/d/demolisher_spawn.txt
+++ b/forge-gui/res/cardsfolder/d/demolisher_spawn.txt
@@ -5,7 +5,7 @@ PT:7/7
 K:Trample
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigPumpAll | TriggerDescription$ Delirium — Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, other attacking creatures get +4/+4 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 4 | NumDef$ 4
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ +4 | NumDef$ +4
 SVar:HasAttackEffect:TRUE
 DeckHints:Ability$Graveyard|Discard
 DeckHas:Ability$Delirium
--- a/forge-gui/res/cardsfolder/d/demon_of_fates_design.txt
+++ b/forge-gui/res/cardsfolder/d/demon_of_fates_design.txt
@@ -5,7 +5,7 @@ PT:6/6
 K:Flying
 K:Trample
 S:Mode$ Continuous | Condition$ PlayerTurn | Affected$ Card.Enchantment+YouCtrl+nonLand | MayPlayLimit$ 1 | MayPlay$ True | MayPlayAltManaCost$ PayLife<ConvertedManaCost> | MayPlayDontGrantZonePermissions$ True | AffectedZone$ Hand,Graveyard,Exile,Library,Command | Description$ Once during each of your turns, you may cast an enchantment spell by paying life equal to its mana value rather than paying its mana cost.
-A:AB$ Pump | Cost$ 2 B Sac<1/Enchantment.Other> | NumAtt$ X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is the sacrificed enchantment's mana value.
+A:AB$ Pump | Cost$ 2 B Sac<1/Enchantment.Other> | NumAtt$ +X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is the sacrificed enchantment's mana value.
 SVar:X:Sacrificed$CardManaCost
 DeckHints:Type$Enchantment
 DeckHas:Ability$Sacrifice
--- a/forge-gui/res/cardsfolder/d/devourer_of_memory.txt
+++ b/forge-gui/res/cardsfolder/d/devourer_of_memory.txt
@@ -3,7 +3,7 @@ ManaCost:U B
 Types:Creature Nightmare
 PT:2/1
 T:Mode$ ChangesZoneAll | ValidCards$ Card.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever one or more cards are put into your graveyard from your library, CARDNAME gets +1/+1 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBUnblockable
+SVar:TrigPump:DB$ Pump | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBUnblockable
 SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 A:AB$ Mill | Cost$ 1 U B | SpellDescription$ Mill a card.
--- a/forge-gui/res/cardsfolder/d/devouring_rage.txt
+++ b/forge-gui/res/cardsfolder/d/devouring_rage.txt
@@ -1,7 +1,7 @@
 Name:Devouring Rage
 ManaCost:4 R
 Types:Instant Arcane
-A:SP$ Pump | Cost$ 4 R Sac<X/Spirit> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ Z | SpellDescription$ Target creature gets +3/+0 until end of turn. For each Spirit sacrificed this way, that creature gets an additional +3/+0 until end of turn.
+A:SP$ Pump | Cost$ 4 R Sac<X/Spirit> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +Z | SpellDescription$ Target creature gets +3/+0 until end of turn. For each Spirit sacrificed this way, that creature gets an additional +3/+0 until end of turn.
 SVar:Z:SVar$Y/Thrice
 SVar:Y:Sacrificed$Amount/Plus.1
 SVar:X:Count$xPaid
--- a/forge-gui/res/cardsfolder/d/diamond_faerie_avatar.txt
+++ b/forge-gui/res/cardsfolder/d/diamond_faerie_avatar.txt
@@ -2,6 +2,6 @@ Name:Diamond Faerie Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/+5
-A:AB$ Pump | ActivationZone$ Command | Cost$ S | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Target creature you control gets +1/+1 until end of turn.
+A:AB$ Pump | ActivationZone$ Command | Cost$ S | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature you control gets +1/+1 until end of turn.
 AI:RemoveDeck:Random
 Oracle:Hand +0, life +5\n{S}: Target creature you control gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dinosaur_stampede.txt
+++ b/forge-gui/res/cardsfolder/d/dinosaur_stampede.txt
@@ -1,7 +1,7 @@
 Name:Dinosaur Stampede
 ManaCost:2 R
 Types:Instant
-A:SP$ PumpAll | ValidCards$ Creature.attacking | NumAtt$ 2 | SubAbility$ DBPump | SpellDescription$ Attacking creatures get +2/+0 until end of turn. Dinosaurs you control gain trample until end of turn.
+A:SP$ PumpAll | ValidCards$ Creature.attacking | NumAtt$ +2 | SubAbility$ DBPump | SpellDescription$ Attacking creatures get +2/+0 until end of turn. Dinosaurs you control gain trample until end of turn.
 SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.Dinosaur+YouCtrl | KW$ Trample
 DeckHints:Type$Dinosaur
 Oracle:Attacking creatures get +2/+0 until end of turn. Dinosaurs you control gain trample until end of turn.
--- a/forge-gui/res/cardsfolder/d/dire_fleet_captain.txt
+++ b/forge-gui/res/cardsfolder/d/dire_fleet_captain.txt
@@ -3,7 +3,7 @@ ManaCost:B R
 Types:Creature Orc Pirate
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+1 until end of turn for each other attacking Pirate.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | NumDef$ +X
 SVar:X:Count$Valid Pirate.attacking+Other
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Pirate
--- a/forge-gui/res/cardsfolder/d/dire_fleet_poisoner.txt
+++ b/forge-gui/res/cardsfolder/d/dire_fleet_poisoner.txt
@@ -5,5 +5,5 @@ PT:2/2
 K:Flash
 K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target attacking Pirate you control gets +1/+1 and gains deathtouch until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Pirate.attacking+YouCtrl | TgtPrompt$ Select target attacking Pirate you control | NumAtt$ 1 | NumDef$ 1 | KW$ Deathtouch
+SVar:TrigPump:DB$ Pump | ValidTgts$ Pirate.attacking+YouCtrl | TgtPrompt$ Select target attacking Pirate you control | NumAtt$ +1 | NumDef$ +1 | KW$ Deathtouch
 Oracle:Flash\nDeathtouch\nWhen Dire Fleet Poisoner enters, target attacking Pirate you control gets +1/+1 and gains deathtouch until end of turn.
--- a/forge-gui/res/cardsfolder/d/distortion_strike.txt
+++ b/forge-gui/res/cardsfolder/d/distortion_strike.txt
@@ -2,7 +2,7 @@ Name:Distortion Strike
 ManaCost:U
 Types:Sorcery
 K:Rebound
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 1 | SubAbility$ DBUnblockable | StackDescription$ {c:Targeted} gets +1/+0 until end of turn and can't be blocked this turn. | SpellDescription$ Target creature gets +1/+0 until end of turn and can't be blocked this turn.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +1 | SubAbility$ DBUnblockable | StackDescription$ {c:Targeted} gets +1/+0 until end of turn and can't be blocked this turn. | SpellDescription$ 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:Target creature gets +1/+0 until end of turn and can't be blocked this turn.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
--- a/forge-gui/res/cardsfolder/d/diviners_wand.txt
+++ b/forge-gui/res/cardsfolder/d/diviners_wand.txt
@@ -6,6 +6,6 @@ S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ DivinerDraw | AddTr
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Wizard | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever a Wizard creature enters, you may attach CARDNAME to it.
 SVar:TrigAttach:DB$ Attach | Defined$ TriggeredCardLKICopy
 SVar:TrigDraw:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ DivinerTrigPump | TriggerDescription$ Whenever you draw a card, CARDNAME gets +1/+1 and gains flying until end of turn.
-SVar:DivinerTrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
+SVar:DivinerTrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | KW$ Flying
 SVar:DivinerDraw:AB$ Draw | Cost$ 4 | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Equipped creature has "Whenever you draw a card, this creature gets +1/+1 and gains flying until end of turn" and "{4}: Draw a card."\nWhenever a Wizard creature enters, you may attach Diviner's Wand to it.\nEquip {3}
--- a/forge-gui/res/cardsfolder/d/djinn_of_the_fountain.txt
+++ b/forge-gui/res/cardsfolder/d/djinn_of_the_fountain.txt
@@ -5,7 +5,7 @@ PT:4/4
 K:Flying
 T:Mode$ SpellCast | TriggerZones$ Battlefield | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCharm | TriggerDescription$ Whenever you cast an instant or sorcery spell, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBPump,DBExile,DBScry
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile CARDNAME. Return it to the battlefield under its owner's control at the beginning of the next end step.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card | TriggerDescription$ Return CARDNAME to the battlefield under its owner's control at the beginning of the next end step.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield
--- a/forge-gui/res/cardsfolder/d/doomskar_titan.txt
+++ b/forge-gui/res/cardsfolder/d/doomskar_titan.txt
@@ -3,7 +3,7 @@ ManaCost:4 R R
 Types:Creature Giant Berserker
 PT:4/4
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters, creatures you control get +1/+0 and gain haste until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | KW$ Haste
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Haste
 SVar:PlayMain1:TRUE
 K:Foretell:4 R
 Oracle:When Doomskar Titan enters, creatures you control get +1/+0 and gain haste until end of turn.\nForetell {4}{R} (During your turn, you may pay {2} and exile this card from your hand face down. Cast it on a later turn for its foretell cost.)
--- a/forge-gui/res/cardsfolder/d/dowsing_device_geode_grotto.txt
+++ b/forge-gui/res/cardsfolder/d/dowsing_device_geode_grotto.txt
@@ -14,6 +14,6 @@ Name:Geode Grotto
 ManaCost:no cost
 Types:Land Cave
 A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SpellDescription$ Add {R}.
-A:AB$ Pump | Cost$ 2 R T | ValidTgts$ Creature | NumAtt$ X | KW$ Haste | SorcerySpeed$ True | SpellDescription$ Until end of turn, target creature gains haste and gets +X/+0, where X is the number of artifacts you control. Activate only as a sorcery.
+A:AB$ Pump | Cost$ 2 R T | ValidTgts$ Creature | NumAtt$ +X | KW$ Haste | SorcerySpeed$ True | SpellDescription$ Until end of turn, target creature gains haste and gets +X/+0, where X is the number of artifacts you control. Activate only as a sorcery.
 SVar:X:Count$Valid Artifact.YouCtrl
 Oracle:{T}: Add {R}.\n{2}{R}, {T}: Until end of turn, target creature gains haste and gets +X/+0, where X is the number of artifacts you control. Activate only as a sorcery.
--- a/forge-gui/res/cardsfolder/d/dr_madison_li.txt
+++ b/forge-gui/res/cardsfolder/d/dr_madison_li.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Scientist
 PT:2/3
 T:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | Execute$ TrigEnergy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an artifact spell, you get {E} (an energy counter).
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
-A:AB$ Pump | Cost$ T PayEnergy<1> | ValidTgts$ Creature | KW$ Trample & Haste | NumAtt$ 1 | SpellDescription$ Target creature gets +1/+0 and gains trample and haste until end of turn.
+A:AB$ Pump | Cost$ T PayEnergy<1> | ValidTgts$ Creature | KW$ Trample & Haste | NumAtt$ +1 | SpellDescription$ Target creature gets +1/+0 and gains trample and haste until end of turn.
 A:AB$ Draw | Cost$ T PayEnergy<3> | SpellDescription$ Draw a card.
 A:AB$ ChangeZone | Cost$ T PayEnergy<5> | Tapped$ True | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return target artifact card from your graveyard to the battlefield tapped.
 DeckNeeds:Type$Artifact
--- a/forge-gui/res/cardsfolder/d/dracoplasm.txt
+++ b/forge-gui/res/cardsfolder/d/dracoplasm.txt
@@ -10,6 +10,6 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SacX:Count$Valid Creature.YouCtrl
 SVar:DracoPwr:RememberedLKI$CardPower
 SVar:DracoTgn:RememberedLKI$CardToughness
-A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 DeckHas:Ability$Sacrifice
 Oracle:Flying\nAs Dracoplasm enters, sacrifice any number of creatures. Dracoplasm's power becomes the total power of those creatures and its toughness becomes their total toughness.\n{R}: Dracoplasm gets +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dragon_hatchling.txt
+++ b/forge-gui/res/cardsfolder/d/dragon_hatchling.txt
@@ -3,5 +3,5 @@ ManaCost:1 R
 Types:Creature Dragon
 PT:0/1
 K:Flying
-A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | NumDef$ +0 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 Oracle:Flying\n{R}: Dragon Hatchling gets +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dragon_mask.txt
+++ b/forge-gui/res/cardsfolder/d/dragon_mask.txt
@@ -1,7 +1,7 @@
 Name:Dragon Mask
 ManaCost:3
 Types:Artifact
-A:AB$ Pump | Cost$ 3 T | NumAtt$ 2 | NumDef$ 2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DelTrig | SpellDescription$ Target creature you control gets +2/+2 until end of turn. Return it to its owner's hand at the beginning of the next end step. (Return it only if it's on the battlefield.)
+A:AB$ Pump | Cost$ 3 T | NumAtt$ +2 | NumDef$ +2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DelTrig | SpellDescription$ Target creature you control gets +2/+2 until end of turn. Return it to its owner's hand at the beginning of the next end step. (Return it only if it's on the battlefield.)
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | Secondary$ True | RememberObjects$ ParentTarget | SpellDescription$ Return creature to owner's hand | SubAbility$ DBCleanup
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRememberedLKI
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
--- a/forge-gui/res/cardsfolder/d/dragon_throne_of_tarkir.txt
+++ b/forge-gui/res/cardsfolder/d/dragon_throne_of_tarkir.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Legendary Artifact Equipment
 K:Equip:3
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddKeyword$ Defender | AddAbility$ ThroneTarkir | AddSVar$ ThroneTarkirX | Description$ Equipped creature has defender and "{2}, {T}: Other creatures you control gain trample and get +X/+X until end of turn, where X is this creature's power."
-SVar:ThroneTarkir:AB$ PumpAll | Cost$ 2 T | ValidCards$ Creature.StrictlyOther+YouCtrl | NumAtt$ ThroneTarkirX | NumDef$ ThroneTarkirX | KW$ Trample | SpellDescription$ Other creatures you control gain trample and get +X/+X until end of turn, where X is CARDNAME's power.
+SVar:ThroneTarkir:AB$ PumpAll | Cost$ 2 T | ValidCards$ Creature.StrictlyOther+YouCtrl | NumAtt$ +ThroneTarkirX | NumDef$ +ThroneTarkirX | KW$ Trample | SpellDescription$ Other creatures you control gain trample and get +X/+X until end of turn, where X is CARDNAME's power.
 SVar:ThroneTarkirX:Count$CardPower
 AI:RemoveDeck:All
 Oracle:Equipped creature has defender and "{2}, {T}: Other creatures you control gain trample and get +X/+X until end of turn, where X is this creature's power."\nEquip {3}
--- a/forge-gui/res/cardsfolder/d/dragonborn_immolator.txt
+++ b/forge-gui/res/cardsfolder/d/dragonborn_immolator.txt
@@ -2,12 +2,12 @@ Name:Dragonborn Immolator
 ManaCost:3 R
 Types:Creature Dragon Shaman
 PT:2/4
-A:AB$ Pump | Cost$ 2 R | NumAtt$ 2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
+A:AB$ Pump | Cost$ 2 R | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigNote | TriggerDescription$ Gift of Tiamat — When CARDNAME dies, if its power is greater than 0, note its power. You get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
 SVar:TrigNote:DB$ StoreSVar | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SVar$ NotedPower | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
 SVar:NotedPower:Number$0
 SVar:X:Count$CardPower
 SVar:DBEffect:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SetChosenNumber$ NotedPower
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number.
-SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ Count$ChosenNumber | Duration$ Perpetual
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ +Count$ChosenNumber | Duration$ Perpetual
 Oracle:{2}{R}: Dragonborn Immolator gets +2/+0 until end of turn.\nGift of Tiamat — When Dragonborn Immolator dies, if its power is greater than 0, note its power. You get a boon with "When you cast your next creature spell, it perpetually gets +X/+0, where X is the noted number."
--- a/forge-gui/res/cardsfolder/d/dragonrage.txt
+++ b/forge-gui/res/cardsfolder/d/dragonrage.txt
@@ -4,6 +4,6 @@ Types:Instant
 A:SP$ Mana | Produced$ R | Amount$ X | SubAbility$ DBAnimateAll | SpellDescription$ Add {R} for each attacking creature you control. Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."
 SVar:X:Count$Valid Creature.YouCtrl+attacking
 SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl+attacking | Abilities$ DrAbs
-SVar:DrAbs:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ 1 | SpellDescription$ This creature gets +1/+0 until end of turn.
+SVar:DrAbs:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ This creature gets +1/+0 until end of turn.
 AI:RemoveDeck:All
 Oracle:Add {R} for each attacking creature you control. Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."
--- a/forge-gui/res/cardsfolder/d/dream_devourer.txt
+++ b/forge-gui/res/cardsfolder/d/dream_devourer.txt
@@ -4,5 +4,5 @@ Types:Creature Demon Cleric
 PT:0/3
 S:Mode$ Continuous | Affected$ Card.nonLand+YouOwn+withoutForetell | AffectedZone$ Hand | AddKeyword$ Foretell | Description$ Each nonland card in your hand without foretell has foretell. Its foretell cost is equal to its mana cost reduced by {2}. (During your turn, you may pay {2} and exile it from your hand face down. Cast it on a later turn for its foretell cost.)
 T:Mode$ Foretell | ValidPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you foretell a card, 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:Each nonland card in your hand without foretell has foretell. Its foretell cost is equal to its mana cost reduced by {2}. (During your turn, you may pay {2} and exile it from your hand face down. Cast it on a later turn for its foretell cost.)\nWhenever you foretell a card, Dream Devourer gets +2/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dream_trawler.txt
+++ b/forge-gui/res/cardsfolder/d/dream_trawler.txt
@@ -5,7 +5,7 @@ PT:3/5
 K:Flying
 K:Lifelink
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you draw a card, CARDNAME gets +1/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Hexproof | SubAbility$ DBTap | SpellDescription$ CARDNAME gains hexproof until end of turn. Tap it.
--- a/forge-gui/res/cardsfolder/d/duskana_the_rage_mother.txt
+++ b/forge-gui/res/cardsfolder/d/duskana_the_rage_mother.txt
@@ -5,7 +5,7 @@ PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card for each creature you control with base power and toughness 2/2.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+basePowerEQ2+baseToughnessEQ2 | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature you control with base power and toughness 2/2 attacks, it gets +3/+3 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ 3 | NumDef$ 3
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +3 | NumDef$ +3
 SVar:X:Count$Valid Creature.YouCtrl+basePowerEQ2+baseToughnessEQ2
 SVar:BuffedBy:Creature.powerEQ2,Creature.toughnessEQ2
 Oracle:When Duskana, the Rage Mother enters, draw a card for each creature you control with base power and toughness 2/2.\nWhenever a creature you control with base power and toughness 2/2 attacks, it gets +3/+3 until end of turn.
--- a/forge-gui/res/cardsfolder/d/duskborne_skymarcher.txt
+++ b/forge-gui/res/cardsfolder/d/duskborne_skymarcher.txt
@@ -3,6 +3,6 @@ ManaCost:W
 Types:Creature Vampire Cleric
 PT:1/1
 K:Flying
-A:AB$ Pump | Cost$ W T | ValidTgts$ Creature.Vampire+attacking | TgtPrompt$ Select target attacking Vampire | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Target attacking Vampire gets +1/+1 until end of turn.
+A:AB$ Pump | Cost$ W T | ValidTgts$ Creature.Vampire+attacking | TgtPrompt$ Select target attacking Vampire | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target attacking Vampire gets +1/+1 until end of turn.
 DeckHints:Type$Vampire
 Oracle:Flying\n{W}, {T}: Target attacking Vampire gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/d/duskworker.txt
+++ b/forge-gui/res/cardsfolder/d/duskworker.txt
@@ -3,6 +3,6 @@ ManaCost:4
 Types:Artifact Creature Construct
 PT:2/2
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigRegen | TriggerDescription$ Whenever CARDNAME becomes blocked, regenerate it.
-A:AB$ Pump | Cost$ 3 | Defined$ Self | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ 3 | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:TrigRegen:DB$ Regenerate | Defined$ Self
 Oracle:Whenever Duskworker becomes blocked, regenerate it.\n{3}: Duskworker gets +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dwarven_berserker.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_berserker.txt
@@ -3,5 +3,5 @@ ManaCost:1 R
 Types:Creature Dwarf Berserker
 PT:1/1
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets +3/+0 and gains trample until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 3 | KW$ Trample
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +3 | KW$ Trample
 Oracle:Whenever Dwarven Berserker becomes blocked, it gets +3/+0 and gains trample until end of turn.
--- a/forge-gui/res/cardsfolder/d/dwarven_soldier.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_soldier.txt
@@ -4,5 +4,5 @@ Types:Creature Dwarf Soldier
 PT:2/1
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Orc | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by one or more Orcs, CARDNAME gets +0/+2 until end of turn.
 T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Orc | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by one or more Orcs, CARDNAME 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 Dwarven Soldier blocks or becomes blocked by one or more Orcs, Dwarven Soldier gets +0/+2 until end of turn.
--- a/forge-gui/res/cardsfolder/d/dynacharge.txt
+++ b/forge-gui/res/cardsfolder/d/dynacharge.txt
@@ -1,6 +1,6 @@
 Name:Dynacharge
 ManaCost:R
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control. | NumAtt$ 2 | SpellDescription$ Target creature you control gets +2/+0 until end of turn.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control. | NumAtt$ +2 | SpellDescription$ Target creature you control gets +2/+0 until end of turn.
 K:Overload:2 R
 Oracle:Target creature you control gets +2/+0 until end of turn.\nOverload {2}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
--- a/forge-gui/res/cardsfolder/e/eager_first_year.txt
+++ b/forge-gui/res/cardsfolder/e/eager_first_year.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Wizard
 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, 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:Instant,Sorcery
 DeckNeeds:Type$Instant|Sorcery
 Oracle:Magecraft — Whenever you cast or copy an instant or sorcery spell, Eager First-Year gets +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/e/earthlore.txt
+++ b/forge-gui/res/cardsfolder/e/earthlore.txt
@@ -3,6 +3,6 @@ ManaCost:G
 Types:Enchantment Aura
 K:Enchant land you control
 A:SP$ Attach | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | AILogic$ Pump
-A:AB$ Pump | Cost$ tapXType<1/Land.EnchantedBy/Enchanted Land> | ValidTgts$ Creature.blocking | NumAtt$ 1 | NumDef$ 2 | CostDesc$ Tap enchanted land: | SpellDescription$ Target blocking creature gets +1/+2 until end of turn.
+A:AB$ Pump | Cost$ tapXType<1/Land.EnchantedBy/Enchanted Land> | ValidTgts$ Creature.blocking | NumAtt$ +1 | NumDef$ +2 | CostDesc$ Tap enchanted land: | SpellDescription$ Target blocking creature gets +1/+2 until end of turn.
 SVar:NonStackingAttachEffect:True
 Oracle:Enchant land you control\nTap enchanted land: Target blocking creature gets +1/+2 until end of turn. Activate only if enchanted land is untapped.
--- a/forge-gui/res/cardsfolder/e/ego_erasure.txt
+++ b/forge-gui/res/cardsfolder/e/ego_erasure.txt
@@ -2,6 +2,6 @@ Name:Ego Erasure
 ManaCost:2 U
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ PumpAll | ValidTgts$ Player | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -0 | IsCurse$ True | SubAbility$ DBAnimateAll | SpellDescription$ Creatures target player controls get -2/-0 and lose all creature types until end of turn.
+A:SP$ PumpAll | ValidTgts$ Player | ValidCards$ Creature | NumAtt$ -2 | IsCurse$ True | SubAbility$ DBAnimateAll | SpellDescription$ Creatures target player controls get -2/-0 and lose all creature types until end of turn.
 SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.TargetedPlayerCtrl | RemoveCreatureTypes$ True | StackDescription$ None
 Oracle:Changeling (This card is every creature type.)\nCreatures target player controls get -2/-0 and lose all creature types until end of turn.
--- a/forge-gui/res/cardsfolder/e/eiganjo_exemplar.txt
+++ b/forge-gui/res/cardsfolder/e/eiganjo_exemplar.txt
@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Enchantment Creature Human Samurai
 PT:2/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.
--- a/forge-gui/res/cardsfolder/e/eldest_dragon_highlander.txt
+++ b/forge-gui/res/cardsfolder/e/eldest_dragon_highlander.txt
@@ -5,7 +5,7 @@ PT:7/7
 K:Flying
 K:Trample
 K:Rampage:2
-A:AB$ PumpAll | Cost$ W U B R G | ValidCards$ Dragon.Elder+YouCtrl | NumAtt$ 7 | NumDef$ 7 | SpellDescription$ Elder Dragons you control get +7/+7 until end of turn.
+A:AB$ PumpAll | Cost$ W U B R G | ValidCards$ Dragon.Elder+YouCtrl | NumAtt$ +7 | NumDef$ +7 | SpellDescription$ Elder Dragons you control get +7/+7 until end of turn.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you pay {W}{U}{B}{R}{G}.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ W U B R G
 Oracle:Flying, trample, rampage 2\n{W}{U}{B}{R}{G}: Elder Dragons you control get +7/+7 until end of turn.\nAt the beginning of your upkeep, sacrifice Eldest Dragon Highlander unless you pay {W}{U}{B}{R}{G}.
--- a/forge-gui/res/cardsfolder/e/eldrazi_linebreaker.txt
+++ b/forge-gui/res/cardsfolder/e/eldrazi_linebreaker.txt
@@ -5,7 +5,7 @@ PT:3/3
 K:Devoid
 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 haste and gets +X/+0 until end of turn, where X is the number of Eldrazi you control.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Haste
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | KW$ Haste
 SVar:X:Count$Valid Eldrazi.YouCtrl
 DeckHints:Type$Eldrazi
 Oracle:Devoid (This card has no color.)\nTrample\nAt the beginning of combat on your turn, target creature you control gains haste and gets +X/+0 until end of turn, where X is the number of Eldrazi you control.
--- a/forge-gui/res/cardsfolder/e/elspeth_knight_errant.txt
+++ b/forge-gui/res/cardsfolder/e/elspeth_knight_errant.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Legendary Planeswalker Elspeth
 Loyalty:4
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | TokenAmount$ 1 | TokenScript$ w_1_1_soldier | TokenOwner$ You | Planeswalker$ True | SpellDescription$ Create a 1/1 white Soldier creature token.
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Flying | Planeswalker$ True | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | KW$ Flying | Planeswalker$ True | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Emblem — Elspeth, Knight-Errant | Image$ emblem_elspeth_knight_errant | StaticAbilities$ STIndestructible | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Artifacts, creatures, enchantments, and lands you control have indestructible."
 SVar:STIndestructible:Mode$ Continuous | Affected$ Artifact.YouCtrl,Creature.YouCtrl,Enchantment.YouCtrl,Land.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Indestructible | Description$ Artifacts, creatures, enchantments, and lands you control are indestructible.
 DeckHas:Ability$Token
--- a/forge-gui/res/cardsfolder/e/elven_palisade.txt
+++ b/forge-gui/res/cardsfolder/e/elven_palisade.txt
@@ -1,7 +1,7 @@
 Name:Elven Palisade
 ManaCost:G
 Types:Enchantment
-A:AB$ Pump | Cost$ Sac<1/Forest> | NumAtt$ -3 | NumDef$ 0 | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking | SpellDescription$ Target attacking creature gets -3/-0 until end of turn.
+A:AB$ Pump | Cost$ Sac<1/Forest> | NumAtt$ -3 | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking | SpellDescription$ Target attacking creature gets -3/-0 until end of turn.
 SVar:NonStackingEffect:True
 AI:RemoveDeck:All
 Oracle:Sacrifice a Forest: Target attacking creature gets -3/-0 until end of turn.
--- a/forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt
+++ b/forge-gui/res/cardsfolder/e/emberhorn_minotaur.txt
@@ -3,5 +3,5 @@ ManaCost:3 R
 Types:Creature Minotaur Warrior
 PT:4/3
 S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +1/+1 and gains menace until end of turn. (An exerted creature won't untap during your next untap step.)
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Menace | SpellDescription$ When you do, it gets +1/+1 and gains menace until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | KW$ Menace | SpellDescription$ When you do, it gets +1/+1 and gains menace until end of turn.
 Oracle:You may exert Emberhorn Minotaur as it attacks. When you do, it gets +1/+1 and gains menace until end of turn. (An exerted creature won't untap during your next untap step.)
--- a/forge-gui/res/cardsfolder/e/endoskeleton.txt
+++ b/forge-gui/res/cardsfolder/e/endoskeleton.txt
@@ -2,6 +2,6 @@ Name:Endoskeleton
 ManaCost:2
 Types:Artifact
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Pump | Cost$ 2 T | ValidTgts$ Creature | NumDef$ 3 | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target creature gets +0/+3 for as long as CARDNAME remains tapped.
+A:AB$ Pump | Cost$ 2 T | ValidTgts$ Creature | NumDef$ +3 | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target creature gets +0/+3 for as long as CARDNAME remains tapped.
 SVar:AIUntapPreference:BetterTgtThanRemembered
 Oracle:You may choose not to untap Endoskeleton during your untap step.\n{2}, {T}: Target creature gets +0/+3 for as long as Endoskeleton remains tapped.
--- a/forge-gui/res/cardsfolder/e/enduring_friendship.txt
+++ b/forge-gui/res/cardsfolder/e/enduring_friendship.txt
@@ -4,7 +4,7 @@ Types:Enchantment Creature Otter Glimmer
 PT:2/1
 K:Double team
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell, creatures you control that are Otters and/or enchantments get +1/+1 until end of turn.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.Otter+YouCtrl,Creature.Enchantment+YouCtrl | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.Otter+YouCtrl,Creature.Enchantment+YouCtrl | NumAtt$ +1 | NumDef$ +1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
 SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | StaticEffect$ Animate
 SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Enchantment | RemoveCardTypes$ True
--- a/forge-gui/res/cardsfolder/e/engineered_might.txt
+++ b/forge-gui/res/cardsfolder/e/engineered_might.txt
@@ -2,6 +2,6 @@ Name:Engineered Might
 ManaCost:3 G W
 Types:Sorcery
 A:SP$ Charm | Choices$ DBPump,DBPumpAll | CharmNum$ 1
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature. | NumAtt$ 5 | NumDef$ 5 | KW$ Trample | SpellDescription$ Target creature gets +5/+5 and gains trample until end of turn.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature. | NumAtt$ +5 | NumDef$ +5 | KW$ Trample | SpellDescription$ Target creature gets +5/+5 and gains trample until end of turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Vigilance | SpellDescription$ Creatures you control get +2/+2 and gain vigilance until end of turn.
 Oracle:Choose one —\n• Target creature gets +5/+5 and gains trample until end of turn.\n• Creatures you control get +2/+2 and gain vigilance until end of turn.
--- a/forge-gui/res/cardsfolder/e/ents_fury.txt
+++ b/forge-gui/res/cardsfolder/e/ents_fury.txt
@@ -2,7 +2,7 @@ Name:Ent's Fury
 ManaCost:1 G
 Types:Sorcery
 A:SP$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Creature.powerGE4 | AILogic$ Fight | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on target creature you control if its power is 4 or greater.
-SVar:DBPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | Defined$ ParentTarget | SubAbility$ DBFight | SpellDescription$ Then that creature gets +1/+1 until end of turn and fights target creature you don't control.
+SVar:DBPump:DB$ Pump | NumAtt$ +1 | NumDef$ +1 | Defined$ ParentTarget | SubAbility$ DBFight | SpellDescription$ Then that creature gets +1/+1 until end of turn and fights target creature you don't control.
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control
 DeckHas:Ability$Counters
 Oracle:Put a +1/+1 counter on target creature you control if its power is 4 or greater. Then that creature gets +1/+1 until end of turn and fights target creature you don't control.
--- a/forge-gui/res/cardsfolder/e/erkenbrand_lord_of_westfold.txt
+++ b/forge-gui/res/cardsfolder/e/erkenbrand_lord_of_westfold.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Legendary Creature Human Soldier
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.Human+Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Human creature you control enters, creatures you control get +1/+0 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1
 SVar:BuffedBy:Human
 DeckHints:Type$Human
 Oracle:Whenever Erkenbrand, Lord of Westfold or another Human creature you control enters, creatures you control get +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/e/erratic_apparition.txt
+++ b/forge-gui/res/cardsfolder/e/erratic_apparition.txt
@@ -6,6 +6,6 @@ K:Flying
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +1/+1 until end of turn.
 T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, 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
 DeckNeeds:Type$Enchantment
 Oracle:Flying, vigilance\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Erratic Apparition gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/e/escape_from_orthanc.txt
+++ b/forge-gui/res/cardsfolder/e/escape_from_orthanc.txt
@@ -1,6 +1,6 @@
 Name:Escape from Orthanc
 ManaCost:W
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 1 | NumDef$ 3 | KW$ Flying | SubAbility$ DBUntap | SpellDescription$ Target creature gets +1/+3 and gains flying until end of turn. Untap it.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +1 | NumDef$ +3 | KW$ Flying | SubAbility$ DBUntap | SpellDescription$ Target creature gets +1/+3 and gains flying until end of turn. Untap it.
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
 Oracle:Target creature gets +1/+3 and gains flying until end of turn. Untap it.
--- a/forge-gui/res/cardsfolder/e/escaped_experiment.txt
+++ b/forge-gui/res/cardsfolder/e/escaped_experiment.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Artifact Creature Phyrexian Beast
 PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDebuff | TriggerDescription$ Whenever CARDNAME attacks, target creature an opponent controls gets -X/-0 until end of turn, where X is the number of artifacts you control.
-SVar:TrigDebuff:DB$ Pump | NumAtt$ -X | NumDef$ -0 | ValidTgts$ Creature.OppCtrl
+SVar:TrigDebuff:DB$ Pump | NumAtt$ -X | ValidTgts$ Creature.OppCtrl
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Artifact
--- a/forge-gui/res/cardsfolder/e/euroakus.txt
+++ b/forge-gui/res/cardsfolder/e/euroakus.txt
@@ -7,7 +7,7 @@ SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ u_1_1_human_wizard
 SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
 A:AB$ Draw | Cost$ 4 G U | NumCards$ Y | SubAbility$ PumpAll | SpellDescription$ Draw a card for each Wizard you control. They each get +1/+1 until end of turn for each card in your hand.
 SVar:Y:Count$Valid Wizard.YouCtrl
-SVar:PumpAll:DB$ PumpAll | ValidCards$ Wizard.YouCtrl | NumAtt$ Z | NumDef$ Z
+SVar:PumpAll:DB$ PumpAll | ValidCards$ Wizard.YouCtrl | NumAtt$ +Z | NumDef$ +Z
 SVar:Z:Count$CardsInYourHand
 DeckHas:Ability$Token
 Oracle:When Euroakus enters, create a number of 1/1 blue Human Wizard creature tokens equal to the number of differently named lands you control.\n{4}{G}{U}: Draw a card for each Wizard you control. They each get +1/+1 until end of turn for each card in your hand.
--- a/forge-gui/res/cardsfolder/e/everglove_courier.txt
+++ b/forge-gui/res/cardsfolder/e/everglove_courier.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf
 PT:2/1
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Pump | Cost$ 2 G T | ValidTgts$ Creature.Elf | TgtPrompt$ Select target Elf creature | NumAtt$ 2 | NumDef$ 2 | KW$ Trample | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target Elf creature gets +2/+2 and has trample for as long as CARDNAME remains tapped.
+A:AB$ Pump | Cost$ 2 G T | ValidTgts$ Creature.Elf | TgtPrompt$ Select target Elf creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target Elf creature gets +2/+2 and has trample for as long as CARDNAME remains tapped.
 SVar:AIUntapPreference:BetterTgtThanRemembered
 DeckNeeds:Type$Elf
 Oracle:You may choose not to untap Everglove Courier during your untap step.\n{2}{G}, {T}: Target Elf creature gets +2/+2 and has trample for as long as Everglove Courier remains tapped.
--- a/forge-gui/res/cardsfolder/e/explosive_growth.txt
+++ b/forge-gui/res/cardsfolder/e/explosive_growth.txt
@@ -2,6 +2,6 @@ Name:Explosive Growth
 ManaCost:G
 Types:Instant
 K:Kicker:5
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ WasKicked | NumDef$ WasKicked | SpellDescription$ Target creature gets +2/+2 until end of turn. If this spell was kicked, that creature gets +5/+5 until end of turn instead.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +WasKicked | NumDef$ +WasKicked | SpellDescription$ Target creature gets +2/+2 until end of turn. If this spell was kicked, that creature gets +5/+5 until end of turn instead.
 SVar:WasKicked:Count$Kicked.5.2
 Oracle:Kicker {5} (You may pay an additional {5} as you cast this spell.)\nTarget creature gets +2/+2 until end of turn. If this spell was kicked, that creature gets +5/+5 until end of turn instead.
--- a/forge-gui/res/cardsfolder/e/ezuris_archers.txt
+++ b/forge-gui/res/cardsfolder/e/ezuris_archers.txt
@@ -4,5 +4,5 @@ Types:Creature Elf Archer
 PT:1/2
 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 (This creature can block creatures with flying.)\nWhenever Ezuri's Archers blocks a creature with flying, Ezuri's Archers gets +3/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/f/faerie_dragon.txt
+++ b/forge-gui/res/cardsfolder/f/faerie_dragon.txt
@@ -5,7 +5,7 @@ PT:1/3
 K:Flying
 A:AB$ GenericChoice | Cost$ 1 G G | AtRandom$ True | ShowChoice$ Description | Choices$ Berserk,Twiddle,BloodLust,Green,White,Red,Damage3,Flying,P3P3,Banding,Black,Blue,NoRegen,LilSneak,M2M0,ToHand,Damage1,Nerf,Exile,Orcish | AILogic$ AtOppEOT | StackDescription$ SpellDescription | SpellDescription$ Perform a random action.
 SVar:Berserk:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | RememberChosen$ True | SubAbility$ DBPump1 | SpellDescription$ A creature chosen at random gains trample and gets +X/+0 until end of turn, where X is its power. At the beginning of the next end step, destroy that creature if it attacked this turn.
-SVar:DBPump1:DB$ Pump | Defined$ Remembered | KW$ Trample | NumAtt$ X1 | SubAbility$ DBDelayedTrigger1
+SVar:DBPump1:DB$ Pump | Defined$ Remembered | KW$ Trample | NumAtt$ +X1 | SubAbility$ DBDelayedTrigger1
 SVar:DBDelayedTrigger1:DB$ DelayedTrigger | RememberObjects$ Remembered | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroy1 | SubAbility$ DBCleanup | TriggerDescription$ At the beginning of the next end step, destroy that creature if it attacked this turn.
 SVar:TrigDestroy1:DB$ Destroy | Defined$ DelayTriggerRemembered | ConditionDefined$ DelayTriggerRemembered | ConditionPresent$ Card.attackedThisTurn
 SVar:X1:Remembered$CardPower
@@ -13,7 +13,7 @@ SVar:DBCleanup:DB$ Cleanup | Log$ True | ClearRemembered$ True | ClearChosenCard
 SVar:Twiddle:DB$ ChooseCard | Choices$ Artifact,Creature,Land | AtRandom$ True | SubAbility$ DBTapOrUntap2 | SpellDescription$ You may tap or untap an artifact, creature, or land chosen at random.
 SVar:DBTapOrUntap2:DB$ TapOrUntap | Defined$ ChosenCard | SubAbility$ DBCleanup
 SVar:BloodLust:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | RememberChosen$ True | SubAbility$ DBPump3 | SpellDescription$ If a creature chosen at random has toughness 5 or greater, it gets +4/-4 until end of turn. Otherwise, it gets +4/-X until end of turn, where X is its toughness minus 1.
-SVar:DBPump3:DB$ Pump | Defined$ Remembered | NumAtt$ 4 | NumDef$ -X3 | SubAbility$ DBCleanup
+SVar:DBPump3:DB$ Pump | Defined$ Remembered | NumAtt$ +4 | NumDef$ -X3 | SubAbility$ DBCleanup
 SVar:X3:Count$Compare T3 GE4.4.T3
 SVar:T3:Remembered$CardToughness/Minus.1
 SVar:Green:DB$ ChooseCard | Choices$ Permanent | IncludeSpellsOnStack$ True | AtRandom$ True | LockInText$ True | SubAbility$ DBAnimateG | SpellDescription$ A spell or permanent chosen at random becomes green. (Mana symbols on that permanent remain unchanged.)
@@ -26,7 +26,7 @@ SVar:Damage3:DB$ DealDamage | NumDmg$ 3 | Random$ True | CardChoices$ Creature |
 SVar:Flying:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump8 | SpellDescription$ A creature chosen at random gains flying until end of turn.
 SVar:DBPump8:DB$ Pump | Defined$ ChosenCard | KW$ Flying | SubAbility$ DBCleanup
 SVar:P3P3:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump9 | SpellDescription$ A creature chosen at random gets +3/+3 until end of turn.
-SVar:DBPump9:DB$ Pump | Defined$ ChosenCard | NumAtt$ 3 | NumDef$ 3 | SubAbility$ DBCleanup
+SVar:DBPump9:DB$ Pump | Defined$ ChosenCard | NumAtt$ +3 | NumDef$ +3 | SubAbility$ DBCleanup
 SVar:Banding:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump10 | SpellDescription$ A creature chosen at random gains banding until end of turn. (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding a player controls are blocking or being blocked by a creature, that player divides that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
 SVar:DBPump10:DB$ Pump | Defined$ ChosenCard | KW$ Banding | SubAbility$ DBCleanup
 SVar:Black:DB$ ChooseCard | Choices$ Permanent | IncludeSpellsOnStack$ True | AtRandom$ True | LockInText$ True | SubAbility$ DBAnimateB | SpellDescription$ A spell or permanent chosen at random becomes black. (Mana symbols on that permanent remain unchanged.)
--- a/forge-gui/res/cardsfolder/f/faerie_guidemother_gift_of_the_fae.txt
+++ b/forge-gui/res/cardsfolder/f/faerie_guidemother_gift_of_the_fae.txt
@@ -11,5 +11,5 @@ ALTERNATE
 Name:Gift of the Fae
 ManaCost:1 W
 Types:Sorcery Adventure
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 1 | KW$ Flying | SpellDescription$ Target creature gets +2/+1 and gains flying until end of turn. (Then exile this card. You may cast the creature later from exile.)
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +1 | KW$ Flying | SpellDescription$ Target creature gets +2/+1 and gains flying until end of turn. (Then exile this card. You may cast the creature later from exile.)
 Oracle:Target creature gets +2/+1 and gains flying until end of turn. (Then exile this card. You may cast the creature later from exile.)
--- a/forge-gui/res/cardsfolder/f/fallaji_vanguard.txt
+++ b/forge-gui/res/cardsfolder/f/fallaji_vanguard.txt
@@ -4,5 +4,5 @@ Types:Creature Human Soldier
 PT:2/3
 K:First Strike
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Creature.YouCtrl+Other,Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another creature you control enters, target creature gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ +2
 Oracle:First strike\nWhenever Fallaji Vanguard or another creature you control enters, target creature gets +2/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/f/family_reunion.txt
+++ b/forge-gui/res/cardsfolder/f/family_reunion.txt
@@ -2,6 +2,6 @@ Name:Family Reunion
 ManaCost:1 W
 Types:Instant
 A:SP$ Charm | Choices$ DBPump,DBHexproof
-SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
+SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:DBHexproof:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Hexproof | SpellDescription$ Creatures you control gain hexproof until end of turn. (They can't be the targets of spells or abilities your opponents control.)
 Oracle:Choose one —\n• Creatures you control get +1/+1 until end of turn.\n• Creatures you control gain hexproof until end of turn. (They can't be the targets of spells or abilities your opponents control.)
--- a/forge-gui/res/cardsfolder/f/fatal_frenzy.txt
+++ b/forge-gui/res/cardsfolder/f/fatal_frenzy.txt
@@ -1,6 +1,6 @@
 Name:Fatal Frenzy
 ManaCost:2 R
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Trample | AtEOT$ Sacrifice | AILogic$ Berserk | SpellDescription$ Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | KW$ Trample | AtEOT$ Sacrifice | AILogic$ Berserk | SpellDescription$ Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
 SVar:X:Targeted$CardPower
 Oracle:Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
--- a/forge-gui/res/cardsfolder/f/favor_of_jukai.txt
+++ b/forge-gui/res/cardsfolder/f/favor_of_jukai.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant artifact or creature
 A:SP$ Attach | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | AITgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Reach | Description$ As long as enchanted permanent is a creature, it gets +3/+3 and has reach.
-A:AB$ Pump | PrecostDesc$ Channel — | Cost$ 1 G Discard<1/CARDNAME> | ActivationZone$ Hand | ValidTgts$ Creature | TgtPrompt$ Choose target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Reach | SpellDescription$ Target creature gets +3/+3 and gains reach until end of turn.
+A:AB$ Pump | PrecostDesc$ Channel — | Cost$ 1 G Discard<1/CARDNAME> | ActivationZone$ Hand | ValidTgts$ Creature | TgtPrompt$ Choose target creature | NumAtt$ +3 | NumDef$ +3 | KW$ Reach | SpellDescription$ Target creature gets +3/+3 and gains reach until end of turn.
 DeckHas:Ability$Counters & Keyword$Reach
 DeckHints:Type$Artifact|Creature|Vehicle
 Oracle:Enchant artifact or creature\nAs long as enchanted permanent is a creature, it gets +3/+3 and has reach.\nChannel — {1}{G}, Discard Favor of Jukai: Target creature gets +3/+3 and gains reach until end of turn.
--- a/forge-gui/res/cardsfolder/f/feral_deceiver.txt
+++ b/forge-gui/res/cardsfolder/f/feral_deceiver.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 PT:3/2
 A:AB$ PeekAndReveal | Cost$ 1 | NoReveal$ True | SpellDescription$ Look at the top card of your library.
 A:AB$ PeekAndReveal | Cost$ 2 | ActivationLimit$ 1 | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBPump | SpellDescription$ Reveal the top card of your library.
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | KW$ Trample | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | SubAbility$ DBCleanup | IfDesc$ True | SpellDescription$ If it's a land card, CARDNAME gets +2/+2 and gains trample until end of turn. Activate only once each turn.
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | SubAbility$ DBCleanup | IfDesc$ True | SpellDescription$ If it's a land card, CARDNAME gets +2/+2 and gains trample until end of turn. Activate only once each turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
 Oracle:{1}: Look at the top card of your library.\n{2}: Reveal the top card of your library. If it's a land card, Feral Deceiver gets +2/+2 and gains trample until end of turn. Activate only once each turn.
--- a/forge-gui/res/cardsfolder/f/ferocious_charge.txt
+++ b/forge-gui/res/cardsfolder/f/ferocious_charge.txt
@@ -1,6 +1,6 @@
 Name:Ferocious Charge
 ManaCost:2 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 4 | NumDef$ 4 | SubAbility$ DBScry | SpellDescription$ Target creature gets +4/+4 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$ +4 | NumDef$ +4 | SubAbility$ DBScry | SpellDescription$ Target creature gets +4/+4 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 +4/+4 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/forge-gui/res/cardsfolder/f/festival_crasher.txt
+++ b/forge-gui/res/cardsfolder/f/festival_crasher.txt
@@ -3,6 +3,6 @@ ManaCost:1 R
 Types:Creature Devil
 PT:1/3
 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 | NumAtt$ 2
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 DeckHints:Type$Instant|Sorcery
 Oracle:Whenever you cast an instant or sorcery spell, Festival Crasher gets +2/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/f/fight_as_one.txt
+++ b/forge-gui/res/cardsfolder/f/fight_as_one.txt
@@ -2,6 +2,6 @@ Name:Fight as One
 ManaCost:W
 Types:Instant
 A:SP$ Charm | Choices$ Human,NonHuman | MinCharmNum$ 1 | CharmNum$ 2
-SVar:Human:DB$ Pump | ValidTgts$ Creature.Human+YouCtrl | TgtPrompt$ Select target Human creature you control | NumAtt$ 1 | NumDef$ 1 | KW$ Indestructible | SpellDescription$ Target Human creature you control gets +1/+1 and gains indestructible until end of turn.
+SVar:Human:DB$ Pump | ValidTgts$ Creature.Human+YouCtrl | TgtPrompt$ Select target Human creature you control | NumAtt$ +1 | NumDef$ +1 | KW$ Indestructible | SpellDescription$ Target Human creature you control gets +1/+1 and gains indestructible until end of turn.
-SVar:NonHuman:DB$ Pump | ValidTgts$ Creature.nonHuman+YouCtrl | TgtPrompt$ Select target non-Human creature you control | NumAtt$ 1 | NumDef$ 1 | KW$ Indestructible | SpellDescription$ Target non-Human creature you control gets +1/+1 and gains indestructible until end of turn.
+SVar:NonHuman:DB$ Pump | ValidTgts$ Creature.nonHuman+YouCtrl | TgtPrompt$ Select target non-Human creature you control | NumAtt$ +1 | NumDef$ +1 | KW$ Indestructible | SpellDescription$ Target non-Human creature you control gets +1/+1 and gains indestructible until end of turn.
 Oracle:Choose one or both —\n• Target Human creature you control gets +1/+1 and gains indestructible until end of turn.\n• Target non-Human creature you control gets +1/+1 and gains indestructible until end of turn.
--- a/forge-gui/res/cardsfolder/f/finale_of_devastation.txt
+++ b/forge-gui/res/cardsfolder/f/finale_of_devastation.txt
@@ -2,6 +2,6 @@ Name:Finale of Devastation
 ManaCost:X G G
 Types:Sorcery
 A:SP$ ChangeZone | ChangeType$ Creature.YouCtrl+cmcLEX | Hidden$ True | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Battlefield | ShuffleNonMandatory$ True | SubAbility$ DBPump | SpellDescription$ Search your library and/or graveyard for a creature card with mana value X or less and put it onto the battlefield. If you search your library this way, shuffle.
-SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Haste | NumAtt$ X | NumDef$ X | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | StackDescription$ SpellDescription | SpellDescription$ If X is 10 or more, creatures you control get +X/+X and gain haste until end of turn.
+SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Haste | NumAtt$ +X | NumDef$ +X | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | StackDescription$ SpellDescription | SpellDescription$ If X is 10 or more, creatures you control get +X/+X and gain haste until end of turn.
 SVar:X:Count$xPaid
 Oracle:Search your library and/or graveyard for a creature card with mana value X or less and put it onto the battlefield. If you search your library this way, shuffle. If X is 10 or more, creatures you control get +X/+X and gain haste until end of turn.
--- a/forge-gui/res/cardsfolder/f/fire_urchin.txt
+++ b/forge-gui/res/cardsfolder/f/fire_urchin.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental
 PT:1/3
 K:Trample
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery 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:Instant,Sorcery
 DeckHints:Type$Instant|Sorcery
 Oracle:Trample\nWhenever you cast an instant or sorcery spell, Fire Urchin gets +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/f/firedrinker_satyr.txt
+++ b/forge-gui/res/cardsfolder/f/firedrinker_satyr.txt
@@ -5,7 +5,7 @@ PT:2/1
 T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
 SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | Defined$ You
 SVar:X:TriggerCount$DamageAmount
-A:AB$ Pump | Cost$ 1 R | Defined$ Self | NumAtt$ 1 | SubAbility$ DBDmg | SpellDescription$ CARDNAME gets +1/+0 until end of turn and deals 1 damage to you.
+A:AB$ Pump | Cost$ 1 R | Defined$ Self | NumAtt$ +1 | SubAbility$ DBDmg | SpellDescription$ CARDNAME gets +1/+0 until end of turn and deals 1 damage to you.
 SVar:DBDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Whenever Firedrinker Satyr is dealt damage, it deals that much damage to you.\n{1}{R}: Firedrinker Satyr gets +1/+0 until end of turn and deals 1 damage to you.
--- a/forge-gui/res/cardsfolder/f/firewake_sliver.txt
+++ b/forge-gui/res/cardsfolder/f/firewake_sliver.txt
@@ -4,7 +4,7 @@ Types:Creature Sliver
 PT:1/1
 S:Mode$ Continuous | Affected$ Creature.Sliver | AddKeyword$ Haste | Description$ All Sliver creatures have haste.
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Pump | Description$ All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn."
-SVar:Pump:AB$ Pump | Cost$ 1 Sac<1/CARDNAME> | ValidTgts$ Sliver | TgtPrompt$ Choose target Sliver. | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target Sliver creature gets +2/+2 until end of turn.
+SVar:Pump:AB$ Pump | Cost$ 1 Sac<1/CARDNAME> | ValidTgts$ Sliver | TgtPrompt$ Choose target Sliver. | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target Sliver creature gets +2/+2 until end of turn.
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Sliver
 Oracle:All Sliver creatures have haste.\nAll Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn."
--- a/forge-gui/res/cardsfolder/f/fistful_of_force.txt
+++ b/forge-gui/res/cardsfolder/f/fistful_of_force.txt
@@ -1,7 +1,7 @@
 Name:Fistful of Force
 ManaCost:1 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBClash | SpellDescription$ Target creature gets +2/+2 until end of turn. Clash with an opponent. If you win, that creature gets an additional +2/+2 and gains trample until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBClash | SpellDescription$ Target creature gets +2/+2 until end of turn. Clash with an opponent. If you win, that creature gets an additional +2/+2 and gains trample until end of turn.
 SVar:DBClash:DB$ Clash | WinSubAbility$ AdditionalPump
-SVar:AdditionalPump:DB$ Pump | Defined$ Targeted | NumAtt$ 2 | NumDef$ 2 | KW$ Trample
+SVar:AdditionalPump:DB$ Pump | Defined$ Targeted | NumAtt$ +2 | NumDef$ +2 | KW$ Trample
 Oracle:Target creature gets +2/+2 until end of turn. Clash with an opponent. If you win, that creature gets an additional +2/+2 and gains trample 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.)
--- a/forge-gui/res/cardsfolder/f/flamestick_courier.txt
+++ b/forge-gui/res/cardsfolder/f/flamestick_courier.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Goblin
 PT:2/1
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Pump | Cost$ 2 R T | ValidTgts$ Creature.Goblin | TgtPrompt$ Select target Goblin creature | NumAtt$ 2 | NumDef$ 2 | KW$ Haste | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target Goblin creature gets +2/+2 and has haste for as long as CARDNAME remains tapped.
+A:AB$ Pump | Cost$ 2 R T | ValidTgts$ Creature.Goblin | TgtPrompt$ Select target Goblin creature | NumAtt$ +2 | NumDef$ +2 | KW$ Haste | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target Goblin creature gets +2/+2 and has haste for as long as CARDNAME remains tapped.
 SVar:AIUntapPreference:BetterTgtThanRemembered
 DeckNeeds:Type$Goblin
 Oracle:You may choose not to untap Flamestick Courier during your untap step.\n{2}{R}, {T}: Target Goblin creature gets +2/+2 and has haste for as long as Flamestick Courier remains tapped.
--- a/forge-gui/res/cardsfolder/f/flaming_fist_duskguard.txt
+++ b/forge-gui/res/cardsfolder/f/flaming_fist_duskguard.txt
@@ -5,5 +5,5 @@ PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBoon | TriggerDescription$ When CARDNAME enters, you get a boon with "When you cast your next creature spell, it perpetually gets +1/+0."
 SVar:TrigBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigEffect | TriggerDescription$ When you cast your next creature spell, it perpetually gets +1/+0.
-SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ 1 | Duration$ Perpetual
+SVar:TrigEffect:DB$ Pump | PumpZone$ Stack | Defined$ TriggeredCard | NumAtt$ +1 | Duration$ Perpetual
 Oracle:When Flaming Fist Duskguard enters, you get a boon with "When you cast your next creature spell, it perpetually gets +1/+0."
--- a/forge-gui/res/cardsfolder/f/flare_of_faith.txt
+++ b/forge-gui/res/cardsfolder/f/flare_of_faith.txt
@@ -1,7 +1,7 @@
 Name:Flare of Faith
 ManaCost:1 W
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | AITgts$ Human.YouOwn | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +2/+2 until end of turn. If it is a Human, it gets +3/+3 and gains indestructible until end of turn instead.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | AITgts$ Human.YouOwn | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +2/+2 until end of turn. If it is a Human, it gets +3/+3 and gains indestructible until end of turn instead.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Human | NumAtt$ 1 | NumDef$ 1 | KW$ Indestructible | StackDescription$ If it is a Human, it gets +3/+3 and gains indestructible until end of turn instead.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Human | NumAtt$ +1 | NumDef$ +1 | KW$ Indestructible | StackDescription$ If it is a Human, it gets +3/+3 and gains indestructible until end of turn instead.
 DeckHints:Type$Human
 Oracle:Target creature gets +2/+2 until end of turn. If it is a Human, it gets +3/+3 and gains indestructible until end of turn instead.
--- a/forge-gui/res/cardsfolder/f/flaring_flame_kin.txt
+++ b/forge-gui/res/cardsfolder/f/flaring_flame_kin.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Creature Elemental Warrior
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self+enchanted | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Trample | AddAbility$ Pump | Description$ As long as CARDNAME is enchanted, it gets +2/+2, has trample, and has "{R}: CARDNAME gets +1/+0 until end of turn."
-SVar:Pump:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+SVar:Pump:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:EnchantMe:Once
 Oracle:As long as Flaring Flame-Kin is enchanted, it gets +2/+2, has trample, and has "{R}: Flaring Flame-Kin gets +1/+0 until end of turn."
--- a/forge-gui/res/cardsfolder/f/flensing_raptor.txt
+++ b/forge-gui/res/cardsfolder/f/flensing_raptor.txt
@@ -5,6 +5,6 @@ PT:2/2
 K:Flying
 K:Toxic:1
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, another target creature you control with toxic gets +1/+1 and gains flying until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+withToxic+Other | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+withToxic+Other | NumAtt$ +1 | NumDef$ +1 | KW$ Flying
 DeckHints:Keyword$Toxic
 Oracle:Flying\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nWhen Flensing Raptor enters, another target creature you control with toxic gets +1/+1 and gains flying until end of turn.
--- a/forge-gui/res/cardsfolder/f/flesh_eater_imp.txt
+++ b/forge-gui/res/cardsfolder/f/flesh_eater_imp.txt
@@ -4,7 +4,7 @@ Types:Creature Phyrexian Imp
 PT:2/2
 K:Flying
 K:Infect
-A:AB$ Pump | Cost$ Sac<1/Creature> | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | AILogic$ Aristocrat | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+A:AB$ Pump | Cost$ Sac<1/Creature> | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | AILogic$ Aristocrat | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:AIPreference:SacCost$Creature.Other
 DeckHas:Ability$Sacrifice
 Oracle:Flying\nInfect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\nSacrifice a creature: Flesh-Eater Imp gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/f/flowerfoot_swordmaster.txt
+++ b/forge-gui/res/cardsfolder/f/flowerfoot_swordmaster.txt
@@ -4,5 +4,5 @@ Types:Creature Mouse Soldier
 PT:1/2
 K:Offspring:2
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | Valiant$ True | Execute$ TrigPumpAll | TriggerDescription$ Valiant — Whenever this creature becomes the target of a spell or ability you control for the first time each turn, Mice you control get +1/+0 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Mouse.YouCtrl | NumAtt$ 1
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Mouse.YouCtrl | NumAtt$ +1
 Oracle:Offspring {2} (You may pay an additional {2} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nValiant — Whenever this creature becomes the target of a spell or ability you control for the first time each turn, Mice you control get +1/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/f/flowstone_armor.txt
+++ b/forge-gui/res/cardsfolder/f/flowstone_armor.txt
@@ -2,6 +2,6 @@ Name:Flowstone Armor
 ManaCost:3
 Types:Artifact
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ -1 | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target creature gets +1/-1 for as long as CARDNAME remains tapped.
+A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ -1 | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target creature gets +1/-1 for as long as CARDNAME remains tapped.
 SVar:AIUntapPreference:BetterTgtThanRemembered
 Oracle:You may choose not to untap Flowstone Armor during your untap step.\n{3}, {T}: Target creature gets +1/-1 for as long as Flowstone Armor remains tapped.
--- a/forge-gui/res/cardsfolder/f/folk_of_an_havva.txt
+++ b/forge-gui/res/cardsfolder/f/folk_of_an_havva.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Human
 PT:1/1
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks, it 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 Folk of An-Havva blocks, it gets +2/+0 until end of turn.
--- a/forge-gui/res/cardsfolder/f/forerunner_of_the_legion.txt
+++ b/forge-gui/res/cardsfolder/f/forerunner_of_the_legion.txt
@@ -5,7 +5,7 @@ PT:2/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 Vampire card, reveal it, then shuffle and put that card on top.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card.Vampire | ChangeNum$ 1 | ShuffleNonMandatory$ True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Vampire.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another Vampire you control enters, target creature gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
 SVar:BuffedBy:Vampire
 DeckHints:Type$Vampire
 Oracle:When Forerunner of the Legion enters, you may search your library for a Vampire card, reveal it, then shuffle and put that card on top.\nWhenever another Vampire you control enters, target creature gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/f/fortified_beachhead.txt
+++ b/forge-gui/res/cardsfolder/f/fortified_beachhead.txt
@@ -8,6 +8,6 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SoldierPresence:Count$RememberedSize/Plus.SoldierControlled
 SVar:SoldierControlled:Count$Valid Soldier.inZoneBattlefield+YouCtrl
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-A:AB$ PumpAll | Cost$ 5 T | ValidCards$ Soldier.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Soldiers you control get +1/+1 until end of turn.
+A:AB$ PumpAll | Cost$ 5 T | ValidCards$ Soldier.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Soldiers you control get +1/+1 until end of turn.
 DeckNeeds:Type$Soldier
 Oracle:As Fortified Beachhead enters, you may reveal a Soldier card from your hand. Fortified Beachhead enters tapped unless you revealed a Soldier card this way or you control a Soldier.\n{T}: Add {W} or {U}.\n{5}, {T}: Soldiers you control get +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/f/fortress_cyclops.txt
+++ b/forge-gui/res/cardsfolder/f/fortress_cyclops.txt
@@ -3,7 +3,7 @@ ManaCost:3 R W
 Types:Creature Cyclops Soldier
 PT:3/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAttack | TriggerDescription$ Whenever CARDNAME attacks, it gets +3/+0 until end of turn.
-SVar:TrigPumpAttack:DB$ Pump | Defined$ Self | NumAtt$ 3
+SVar:TrigPumpAttack:DB$ Pump | Defined$ Self | NumAtt$ +3
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPumpBlock | TriggerDescription$ Whenever CARDNAME blocks, it gets +0/+3 until end of turn.
-SVar:TrigPumpBlock:DB$ Pump | Defined$ Self | NumDef$ 3
+SVar:TrigPumpBlock:DB$ Pump | Defined$ Self | NumDef$ +3
 Oracle:Whenever Fortress Cyclops attacks, it gets +3/+0 until end of turn.\nWhenever Fortress Cyclops blocks, it gets +0/+3 until end of turn.
--- a/forge-gui/res/cardsfolder/f/free_from_flesh.txt
+++ b/forge-gui/res/cardsfolder/f/free_from_flesh.txt
@@ -1,7 +1,7 @@
 Name:Free from Flesh
 ManaCost:R
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBCounter | SpellDescription$ Target creature gets +2/+2 until end of turn. Put two oil counters on it.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBCounter | SpellDescription$ Target creature gets +2/+2 until end of turn. Put two oil counters on it.
 SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ OIL | CounterNum$ 2
 DeckHints:Ability$Counters
 Oracle:Target creature gets +2/+2 until end of turn. Put two oil counters on it.
--- a/forge-gui/res/cardsfolder/f/freelance_muscle.txt
+++ b/forge-gui/res/cardsfolder/f/freelance_muscle.txt
@@ -4,7 +4,7 @@ Types:Creature Rhino Warrior
 PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks or blocks, it gets +X/+X until end of turn, where X is the greatest power and/or toughness among other creatures you control.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks or blocks, it gets +X/+X until end of turn, where X is the greatest power and/or toughness among other creatures you control.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | NumDef$ +X
 SVar:X:SVar$Y/LimitMin.Z
 SVar:Y:Count$Valid Creature.Other+YouCtrl$GreatestPower
 SVar:Z:Count$Valid Creature.Other+YouCtrl$GreatestToughness
--- a/forge-gui/res/cardsfolder/f/frenzied_devils.txt
+++ b/forge-gui/res/cardsfolder/f/frenzied_devils.txt
@@ -4,6 +4,6 @@ Types:Creature Devil
 PT:3/3
 K:Haste
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature 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:Card.nonLand+nonCreature
 Oracle:Haste\nWhenever you cast a noncreature spell, Frenzied Devils gets +2/+2 until end of turn.
--- a/forge-gui/res/cardsfolder/f/freyalise_skyshroud_partisan.txt
+++ b/forge-gui/res/cardsfolder/f/freyalise_skyshroud_partisan.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Freyalise
 Loyalty:4
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Elf | TgtPrompt$ Select up to one target Elf | TargetMin$ 0 | TargetMax$ 1 | RememberTargets$ True | SubAbility$ DBRandom | StackDescription$ REP up to one target Elf_{c:Targeted} | SpellDescription$ Untap up to one target Elf. That Elf and a random Elf creature card in your hand perpetually get +1/+1.
 SVar:DBRandom:DB$ ChooseCard | Defined$ You | Choices$ Elf.YouOwn | ChoiceZone$ Hand | AtRandom$ True | RememberChosen$ True | SubAbility$ DBPump | StackDescription$ None
-SVar:DBPump:DB$ Pump | Defined$ Remembered | PumpZone$ Battlefield, Hand | NumAtt$ 1 | NumDef$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBPump:DB$ Pump | Defined$ Remembered | PumpZone$ Battlefield, Hand | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
 A:AB$ Seek | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Type$ Card.Elf | StackDescription$ REP Seek_{p:You} seeks | SpellDescription$ Seek an Elf card.
 A:AB$ MakeCard | Conjure$ True | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Regal Force | Zone$ Battlefield | SpellDescription$ Conjure a card named Regal Force onto the battlefield.
--- a/forge-gui/res/cardsfolder/f/friendly_ghost.txt
+++ b/forge-gui/res/cardsfolder/f/friendly_ghost.txt
@@ -4,6 +4,6 @@ Types:Creature Spirit
 PT:2/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gets +2/+4 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 4
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +4
 SVar:PlayMain1:TRUE
 Oracle:Flying\nWhen Friendly Spirit enters, target creature gets +2/+4 until end of turn.
--- a/forge-gui/res/cardsfolder/f/frightshroud_courier.txt
+++ b/forge-gui/res/cardsfolder/f/frightshroud_courier.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Zombie
 PT:2/1
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Pump | Cost$ 2 B T | ValidTgts$ Creature.Zombie | TgtPrompt$ Select target Zombie creature | NumAtt$ 2 | NumDef$ 2 | KW$ Fear | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target Zombie creature gets +2/+2 and has fear for as long as CARDNAME remains tapped. (It can't be blocked except by artifact creatures and/or black creatures.)
+A:AB$ Pump | Cost$ 2 B T | ValidTgts$ Creature.Zombie | TgtPrompt$ Select target Zombie creature | NumAtt$ +2 | NumDef$ +2 | KW$ Fear | Duration$ UntilUntaps | AILogic$ ContinuousBonus | SpellDescription$ Target Zombie creature gets +2/+2 and has fear for as long as CARDNAME remains tapped. (It can't be blocked except by artifact creatures and/or black creatures.)
 SVar:AIUntapPreference:BetterTgtThanRemembered
 DeckNeeds:Type$Zombie
 Oracle:You may choose not to untap Frightshroud Courier during your untap step.\n{2}{B}, {T}: Target Zombie creature gets +2/+2 and has fear for as long as Frightshroud Courier remains tapped. (It can't be blocked except by artifact creatures and/or black creatures.)
--- a/forge-gui/res/cardsfolder/f/frolicking_familiar_blow_off_steam.txt
+++ b/forge-gui/res/cardsfolder/f/frolicking_familiar_blow_off_steam.txt
@@ -4,7 +4,7 @@ Types:Creature Otter Wizard
 PT:2/2
 K:Flying
 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 | NumAtt$ 1 | NumDef$ 1
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 DeckHints:Type$Instant|Sorcery
 AlternateMode:Adventure
 Oracle:Flying\nWhenever you cast an instant or sorcery spell, Frolicking Familiar gets +1/+1 until end of turn.
--- a/forge-gui/res/cardsfolder/f/furnace_gremlin.txt
+++ b/forge-gui/res/cardsfolder/f/furnace_gremlin.txt
@@ -2,7 +2,7 @@ Name:Furnace Gremlin
 ManaCost:1 R
 Types:Creature Phyrexian Gremlin
 PT:1/2
-A:AB$ Pump | Cost$ 1 R | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ 1 R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME dies, incubate X, where X is its power. (Create an Incubator token with X +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
 SVar:TrigIncubate:DB$ Incubate | Amount$ X
 SVar:X:TriggeredCard$CardPower
--- a/forge-gui/res/cardsfolder/f/fury_charm.txt
+++ b/forge-gui/res/cardsfolder/f/fury_charm.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Instant
 A:SP$ Charm | CharmNum$ 1 | Choices$ Bash,Buff,LoseTime
 SVar:Bash:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
-SVar:Buff:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Trample | SpellDescription$ Target creature gets +1/+1 and gains trample until end of turn.
+SVar:Buff:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Target creature gets +1/+1 and gains trample until end of turn.
 SVar:LoseTime:DB$ RemoveCounter | ValidTgts$ Permanent.inZoneBattlefield,Card.suspended | AITgts$ Permanent.counters_GE1_TIME+YouDontCtrl,Card.suspended+YouCtrl | TgtPrompt$ Select target permanent or suspended card. | CounterType$ TIME | CounterNum$ 2 | TgtZone$ Battlefield,Exile | SpellDescription$ Remove two time counters from target permanent or suspended card.
 AI:RemoveDeck:All
 Oracle:Choose one —\n• Destroy target artifact.\n• Target creature gets +1/+1 and gains trample until end of turn.\n• Remove two time counters from target permanent or suspended card.
--- a/forge-gui/res/cardsfolder/f/furyblade_vampire.txt
+++ b/forge-gui/res/cardsfolder/f/furyblade_vampire.txt
@@ -4,6 +4,6 @@ Types:Creature Vampire Berserker
 PT:1/2
 K:Trample
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, you may discard a card. If you do, CARDNAME gets +3/+0 until end of turn.
-SVar:TrigPump:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | NumAtt$ 3
+SVar:TrigPump:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | NumAtt$ +3
 DeckHints:Ability$Discard
 Oracle:Trample\nAt the beginning of combat on your turn, you may discard a card. If you do, Furyblade Vampire gets +3/+0 until end of turn.