Update SubAbility for a few of my favorite cards (SVar= is not needed and has not been needed for a long time.)

res/cardsfolder/b/bazaar_of_baghdad.txt

@@ -2,7 +2,7 @@ Name:Bazaar of Baghdad
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$ Draw | Cost$ T | NumCards$ 2 | SpellDescription$ Draw two cards, then discard three cards. | SubAbility$ SVar=DBDiscard
+A:AB$ Draw | Cost$ T | NumCards$ 2 | SpellDescription$ Draw two cards, then discard three cards. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 3 | Mode$ TgtChoose
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bazaar_of_baghdad.jpg

res/cardsfolder/e/energy_tap.txt

@@ -2,7 +2,7 @@ Name:Energy Tap
 ManaCost:U
 Types:Sorcery
 Text:no text
-A:SP$ Tap | Cost$ U | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | SubAbility$ SVar=DBMana | SpellDescription$ Tap target untapped creature you control. If you do, add X to your mana pool, where X is that creature's converted mana cost.
+A:SP$ Tap | Cost$ U | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | SubAbility$ DBMana | SpellDescription$ Tap target untapped creature you control. If you do, add X to your mana pool, where X is that creature's converted mana cost.
 SVar:DBMana:DB$Mana | Produced$ X
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True

res/cardsfolder/m/magosi_the_waterveil.txt

@@ -4,8 +4,8 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
-A:AB$ PutCounter | Cost$ U T | Defined$ Self | CounterType$ EON | CounterNum$ 1 | SubAbility$ SVar=DBSkipTurn | SpellDescription$ Put an eon counter on CARDNAME. Skip your next turn.
+A:AB$ PutCounter | Cost$ U T | Defined$ Self | CounterType$ EON | CounterNum$ 1 | SubAbility$ DBSkipTurn | SpellDescription$ Put an eon counter on CARDNAME. Skip your next turn.
-A:AB$ AddTurn | Cost$ T SubCounter<1/EON> | NumTurns$ 1 | Defined$ You | SubAbility$ SVar=DBBounce | SpellDescription$ Take an extra turn after this one.
+A:AB$ AddTurn | Cost$ T SubCounter<1/EON> | NumTurns$ 1 | Defined$ You | SubAbility$ DBBounce | SpellDescription$ Take an extra turn after this one.
 SVar:DBSkipTurn:DB$AddTurn | NumTurns$ 1 | Defined$ Opponent
 SVar:DBBounce:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:RemAIDeck:True

res/cardsfolder/m/mana_drain.txt

@@ -2,7 +2,7 @@ Name:Mana Drain
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$Counter | Cost$ U U | TargetType$ Spell | RememberTargets$ True | ForgetOtherTargets$ True | ValidTgts$ Card | SubAbility$ SVar=DBDelTrig | SpellDescription$ Counter target spell. At the beginning of your next main phase, add X to your mana pool, where X is that spell's converted mana cost.
+A:SP$Counter | Cost$ U U | TargetType$ Spell | RememberTargets$ True | ForgetOtherTargets$ True | ValidTgts$ Card | SubAbility$ DBDelTrig | SpellDescription$ Counter target spell. At the beginning of your next main phase, add X to your mana pool, where X is that spell's converted mana cost.
 SVar:DBDelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ CARDNAME - At the beginning of your next main phase, add X to your mana pool, where X is the countered spell's converted mana cost.
 SVar:AddMana:DB$ Mana | Cost$ 0 | Produced$ 1 | Amount$ X
 SVar:X:Remembered$CardManaCost

res/cardsfolder/o/opt.txt

@@ -2,7 +2,7 @@ Name:Opt
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Dig | Cost$ U | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Library | LibraryPosition$ -1 | Optional$ True | LibraryPosition2$ 0 | SubAbility$ SVar=DBDraw | SpellDescription$ Look at the top card of your library. You may put that card on the bottom of your library. Draw a card.
+A:SP$ Dig | Cost$ U | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Library | LibraryPosition$ -1 | Optional$ True | LibraryPosition2$ 0 | SubAbility$ DBDraw | SpellDescription$ Look at the top card of your library. You may put that card on the bottom of your library. Draw a card.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/p/preordain.txt

@@ -2,7 +2,7 @@ Name:Preordain
 ManaCost:U
 Types:Sorcery
 Text:no text
-A:SP$ Scry | Cost$ U | ScryNum$ 2 | SpellDescription$ Scry 2, then draw a card. (To 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.) | SubAbility$ SVar=DBDraw
+A:SP$ Scry | Cost$ U | ScryNum$ 2 | SpellDescription$ Scry 2, then draw a card. (To 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.) | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/r/ring_of_renewal.txt

@@ -2,7 +2,7 @@ Name:Ring of Renewal
 ManaCost:5
 Types:Artifact
 Text:no text
-A:AB$ Discard | Cost$ 5 T | NumCards$ 1 | Mode$ Random | SpellDescription$ Discard a card at random, then draw two cards. | SubAbility$ SVar=DB
+A:AB$ Discard | Cost$ 5 T | NumCards$ 1 | Mode$ Random | SpellDescription$ Discard a card at random, then draw two cards. | SubAbility$ DB
 SVar:DB:DB$Draw | NumCards$ 2
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ring_of_renewal.jpg

res/cardsfolder/s/swords_to_plowshares.txt

@@ -2,7 +2,7 @@ Name:Swords to Plowshares
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature. Its controller gains life equal to its power. | SubAbility$ SVar=DBGainLife
+A:SP$ ChangeZone | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature. Its controller gains life equal to its power. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ TargetedController | LifeAmount$ X
 SVar:X:Targeted$CardPower
 SVar:Rarity:Uncommon

res/cardsfolder/t/tezzeret_agent_of_bolas.txt

@@ -5,7 +5,7 @@ Text:no text
 Loyalty:3
 A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Artifact | SpellDescription$ Look at the top five cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 A:AB$ Animate | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | Power$ 5 | Toughness$ 5 | Types$ Creature | Permanent$ True | SpellDescription$ Target artifact becomes a 5/5 artifact creature.
-A:AB$ LoseLife | Cost$ SubCounter<4/LOYALTY> | Planeswalker$ True | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | SubAbility$ SVar=DBGain | SpellDescription$ Target player loses X life and you gain X life, where X is twice the number of artifacts you control.
+A:AB$ LoseLife | Cost$ SubCounter<4/LOYALTY> | Planeswalker$ True | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | SubAbility$ DBGain | SpellDescription$ Target player loses X life and you gain X life, where X is twice the number of artifacts you control.
 SVar:DBGain:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$Valid Artifact.YouCtrl/Times.2
 SVar:Rarity:Mythic

res/cardsfolder/t/time_elemental.txt

@@ -7,7 +7,7 @@ A:AB$ ChangeZone | Cost$ 2 U U T | ValidTgts$ Permanent.unenchanted | TgtPrompt$
 T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
 T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
 SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigSac | TriggerDescription$ At end of combat, sacrifice CARDNAME and CARDNAME deals 5 damage to you.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ SVar=DBDamage
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBDamage
 SVar:DBDamage:DB$DealDamage | NumDmg$ 5 | Defined$ You
 SVar:RemAIDeck:True
 SVar:Rarity:Rare

res/cardsfolder/t/timetwister.txt

@@ -2,9 +2,9 @@ Name:Timetwister
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ 2 U |  ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True  | SubAbility$ SVar=DBChangeAll | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards.
+A:SP$ ChangeZoneAll | Cost$ 2 U |  ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True  | SubAbility$ DBChangeAll | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards.
-SVar:DBChangeAll:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBDraw | Shuffle$ True
+SVar:DBChangeAll:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ DBDraw | Shuffle$ True
-SVar:DBDraw:DB$Draw | NumCards$ 7 | Defined$ Each | SubAbility$ SVar=DBChange
+SVar:DBDraw:DB$Draw | NumCards$ 7 | Defined$ Each | SubAbility$ DBChange
 SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Graveyard
 SVar:RemAIDeck:True
 SVar:Rarity:Rare

res/cardsfolder/v/venarian_gold.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ X U U | ValidTgts$ Creature | AILogic$ Curse
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature and put X sleep counters on it.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted | SubAbility$ SVar=DBPutCounter
+SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Cost$ 0 | Defined$ Enchanted | CounterType$ SLEEP | CounterNum$ X
 S:Mode$ Continuous | Affected$ Creature.AttachedBy+counters_GE1_SLEEP | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step if it has a sleep counter on it.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, remove a sleep counter from that creature.

res/cardsfolder/w/wheel_of_fortune.txt

@@ -2,7 +2,7 @@ Name:Wheel of Fortune
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 2 R | Mode$ Hand | Defined$ Each | SubAbility$ SVar=DBEachDraw | SpellDescription$ Each player discards his or her hand and draws seven cards.
+A:SP$ Discard | Cost$ 2 R | Mode$ Hand | Defined$ Each | SubAbility$ DBEachDraw | SpellDescription$ Each player discards his or her hand and draws seven cards.
 SVar:DBEachDraw:DB$Draw | Defined$ Each | NumCards$ 7
 SVar:RemAIDeck:True
 SVar:Rarity:Rare