From 75eee0a53e8d038ea767fae4d60789f19859326c Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 16:36:41 +0000
Subject: [PATCH] - Converting more K:Draw a Card and next upkeep to SubAbility

---
 res/cardsfolder/blessed_wine.txt          | 4 ++--
 res/cardsfolder/bone_harvest.txt          | 4 ++--
 res/cardsfolder/enervate.txt              | 4 ++--
 res/cardsfolder/feral_instinct.txt        | 4 ++--
 res/cardsfolder/fevered_strength.txt      | 4 ++--
 res/cardsfolder/flare.txt                 | 4 ++--
 res/cardsfolder/force_void.txt            | 4 ++--
 res/cardsfolder/foresight.txt             | 4 ++--
 res/cardsfolder/headstone.txt             | 4 ++--
 res/cardsfolder/infuse.txt                | 4 ++--
 res/cardsfolder/last_caress.txt           | 4 +++-
 res/cardsfolder/lightning_blow.txt        | 4 ++--
 res/cardsfolder/mystic_melting.txt        | 4 ++--
 res/cardsfolder/panic.txt                 | 4 ++--
 res/cardsfolder/ray_of_erasure.txt        | 4 ++--
 res/cardsfolder/renewal.txt               | 4 ++--
 res/cardsfolder/telimtors_edict.txt       | 4 ++--
 res/cardsfolder/to_arms.txt               | 4 ++--
 res/cardsfolder/touch_of_death.txt        | 5 +++--
 res/cardsfolder/touch_of_invisibility.txt | 4 ++--
 res/cardsfolder/tranquil_path.txt         | 4 ++--
 res/cardsfolder/twisted_image.txt         | 4 ++--
 res/cardsfolder/unhinge.txt               | 4 ++--
 res/cardsfolder/updraft.txt               | 4 ++--
 res/cardsfolder/urborg_uprising.txt       | 4 ++--
 res/cardsfolder/wildsize.txt              | 4 ++--
 res/cardsfolder/zap.txt                   | 4 ++--
 27 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/res/cardsfolder/blessed_wine.txt b/res/cardsfolder/blessed_wine.txt
index 96169e5e3f9..9842580a554 100644
--- a/res/cardsfolder/blessed_wine.txt
+++ b/res/cardsfolder/blessed_wine.txt
@@ -2,8 +2,8 @@ Name:Blessed Wine
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$GainLife | Cost$ 1 W | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$GainLife | Cost$ 1 W | LifeAmount$ 1 | SpellDescription$ You gain 1 life. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blessed_wine.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/287.jpg
diff --git a/res/cardsfolder/bone_harvest.txt b/res/cardsfolder/bone_harvest.txt
index 9c4a1895407..0648f399076 100644
--- a/res/cardsfolder/bone_harvest.txt
+++ b/res/cardsfolder/bone_harvest.txt
@@ -2,8 +2,8 @@ Name:Bone Harvest
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Library | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Put any number of target creature cards from your graveyard on top of your library.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Library | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Put any number of target creature cards from your graveyard on top of your library. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/enervate.txt b/res/cardsfolder/enervate.txt
index a5d06c96a04..dd8094549cd 100644
--- a/res/cardsfolder/enervate.txt
+++ b/res/cardsfolder/enervate.txt
@@ -2,8 +2,8 @@ Name:Enervate
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Tap | Cost$ 1 U | TgtPrompt$ Choose target artifact, creature or land | ValidTgts$ Artifact,Creature,Land | SpellDescription$ Tap target artifact, creature or land.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Tap | Cost$ 1 U | TgtPrompt$ Choose target artifact, creature or land | ValidTgts$ Artifact,Creature,Land | SpellDescription$ Tap target artifact, creature or land. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/enervate.jpg
diff --git a/res/cardsfolder/feral_instinct.txt b/res/cardsfolder/feral_instinct.txt
index b41d0bba2bf..d1d0a00069b 100644
--- a/res/cardsfolder/feral_instinct.txt
+++ b/res/cardsfolder/feral_instinct.txt
@@ -2,8 +2,8 @@ Name:Feral Instinct
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/feral_instinct.jpg
 SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/57.jpg
diff --git a/res/cardsfolder/fevered_strength.txt b/res/cardsfolder/fevered_strength.txt
index d89fb30e565..36cd86c5c2a 100644
--- a/res/cardsfolder/fevered_strength.txt
+++ b/res/cardsfolder/fevered_strength.txt
@@ -2,8 +2,8 @@ Name:Fevered Strength
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | SpellDescription$ Target creature gets +2/+0 until end of turn.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | SpellDescription$ Target creature gets +2/+0 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fevered_strength.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/10.jpg|2
diff --git a/res/cardsfolder/flare.txt b/res/cardsfolder/flare.txt
index aecd5cb0065..329af6734e0 100644
--- a/res/cardsfolder/flare.txt
+++ b/res/cardsfolder/flare.txt
@@ -2,8 +2,8 @@ Name:Flare
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$DealDamage | Cost$ 2 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Flare deals 1 damage to target creature or player.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$DealDamage | Cost$ 2 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Flare deals 1 damage to target creature or player. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flare.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/230.jpg
diff --git a/res/cardsfolder/force_void.txt b/res/cardsfolder/force_void.txt
index b1354e039ef..c3a25e0cedf 100644
--- a/res/cardsfolder/force_void.txt
+++ b/res/cardsfolder/force_void.txt
@@ -2,8 +2,8 @@ Name:Force Void
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/force_void.jpg
diff --git a/res/cardsfolder/foresight.txt b/res/cardsfolder/foresight.txt
index 0a4e5cc479a..b88066cca0d 100644
--- a/res/cardsfolder/foresight.txt
+++ b/res/cardsfolder/foresight.txt
@@ -2,8 +2,8 @@ Name:Foresight
 ManaCost:1 U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | SpellDescription$ Search your library for three cards, exile them, then shuffle your library. Draw a card at the beginning of the next turn's upkeep.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | SpellDescription$ Search your library for three cards, exile them, then shuffle your library. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foresight.jpg
diff --git a/res/cardsfolder/headstone.txt b/res/cardsfolder/headstone.txt
index 6b29fac5ebb..1e524f6f805 100644
--- a/res/cardsfolder/headstone.txt
+++ b/res/cardsfolder/headstone.txt
@@ -2,8 +2,8 @@ Name:Headstone
 ManaCost:1 B
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/headstone.jpg
 SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/15.jpg
diff --git a/res/cardsfolder/infuse.txt b/res/cardsfolder/infuse.txt
index c042c541eeb..b23e5c1c2a6 100644
--- a/res/cardsfolder/infuse.txt
+++ b/res/cardsfolder/infuse.txt
@@ -2,8 +2,8 @@ Name:Infuse
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$Untap | Cost$ 2 U | TgtPrompt$ Choose target artifact, creature or land | ValidTgts$ Artifact,Creature,Land | SpellDescription$ Untap target artifact, creature or land.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Untap | Cost$ 2 U | TgtPrompt$ Choose target artifact, creature or land | ValidTgts$ Artifact,Creature,Land | SpellDescription$ Untap target artifact, creature or land. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infuse.jpg
diff --git a/res/cardsfolder/last_caress.txt b/res/cardsfolder/last_caress.txt
index 836455ac964..29f58d82e67 100644
--- a/res/cardsfolder/last_caress.txt
+++ b/res/cardsfolder/last_caress.txt
@@ -2,7 +2,9 @@ Name:Last Caress
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$LoseLife | Cost$ 2 B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 1 life | LifeAmount$ 1 | SubAbility$ YouGainLife/1 | SpellDescription$ Target player loses 1 life and you gain 1 life.
+A:SP$LoseLife | Cost$ 2 B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 1 life | LifeAmount$ 1 | SubAbility$ SVar=DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
+SVar:DBGainLife:DB$GainLife | LifeAmount$ 1 | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 K:Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/last_caress.jpg
diff --git a/res/cardsfolder/lightning_blow.txt b/res/cardsfolder/lightning_blow.txt
index d67247ebf1d..2903bfde178 100644
--- a/res/cardsfolder/lightning_blow.txt
+++ b/res/cardsfolder/lightning_blow.txt
@@ -2,8 +2,8 @@ Name:Lightning Blow
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_blow.jpg
 SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/266.jpg
diff --git a/res/cardsfolder/mystic_melting.txt b/res/cardsfolder/mystic_melting.txt
index 702e2191978..f4bda4fb93a 100644
--- a/res/cardsfolder/mystic_melting.txt
+++ b/res/cardsfolder/mystic_melting.txt
@@ -2,8 +2,8 @@ Name:Mystic Melting
 ManaCost:3 G
 Types:Instant
 Text:no text
-A:SP$Destroy | Cost$ 3 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Destroy | Cost$ 3 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_melting.jpg
 SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/114.jpg
diff --git a/res/cardsfolder/panic.txt b/res/cardsfolder/panic.txt
index b121e8f3a07..3ad911d5e80 100644
--- a/res/cardsfolder/panic.txt
+++ b/res/cardsfolder/panic.txt
@@ -2,8 +2,8 @@ Name:Panic
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | ActivatingPhases$ BeginCombat->Declare Attackers - Play Instants and Abilities| IsCurse$ True | SpellDescription$ Target creature can't block this turn.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | ActivatingPhases$ BeginCombat->Declare Attackers - Play Instants and Abilities| IsCurse$ True | SpellDescription$ Target creature can't block this turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/panic.jpg
diff --git a/res/cardsfolder/ray_of_erasure.txt b/res/cardsfolder/ray_of_erasure.txt
index bf47e651357..a5ec96981a0 100644
--- a/res/cardsfolder/ray_of_erasure.txt
+++ b/res/cardsfolder/ray_of_erasure.txt
@@ -2,8 +2,8 @@ Name:Ray of Erasure
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$Mill | Cost$ U | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Mill | Cost$ U | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ray_of_erasure.jpg
 SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/93.jpg
diff --git a/res/cardsfolder/renewal.txt b/res/cardsfolder/renewal.txt
index 1ae2308bc52..71997ddc469 100644
--- a/res/cardsfolder/renewal.txt
+++ b/res/cardsfolder/renewal.txt
@@ -2,8 +2,8 @@ Name:Renewal
 ManaCost:2 G
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/renewal.jpg
 SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/66.jpg
diff --git a/res/cardsfolder/telimtors_edict.txt b/res/cardsfolder/telimtors_edict.txt
index d4fce556469..10d8376ba24 100644
--- a/res/cardsfolder/telimtors_edict.txt
+++ b/res/cardsfolder/telimtors_edict.txt
@@ -2,8 +2,8 @@ Name:Telim'Tor's Edict
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ R | ValidTgts$ Permanet.YouCtrl,Permanet.YouOwn | TgtPrompt$ Select target permanent you own or control | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target permanent you own or control.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$ChangeZone | Cost$ R | ValidTgts$ Permanet.YouCtrl,Permanet.YouOwn | TgtPrompt$ Select target permanent you own or control | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target permanent you own or control. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/telimtors_edict.jpg
diff --git a/res/cardsfolder/to_arms.txt b/res/cardsfolder/to_arms.txt
index a12c731386d..2393474afd2 100644
--- a/res/cardsfolder/to_arms.txt
+++ b/res/cardsfolder/to_arms.txt
@@ -2,8 +2,8 @@ Name:To Arms!
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$UntapAll|Cost$1 W|ValidCards$Creature.YouCtrl|SpellDescription$Untap all creatures you control.
-K:Draw a card.
+A:SP$UntapAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | SpellDescription$ Untap all creatures you control. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/to_arms.jpg
 SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/20.jpg
diff --git a/res/cardsfolder/touch_of_death.txt b/res/cardsfolder/touch_of_death.txt
index 83e8d8bcf83..99efa5a56d5 100644
--- a/res/cardsfolder/touch_of_death.txt
+++ b/res/cardsfolder/touch_of_death.txt
@@ -2,8 +2,9 @@ Name:Touch of Death
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$DealDamage | Cost$ 2 B | Tgt$ TgtP | NumDmg$ 2 | SubAbility$ GainLifeYou/2 | SpellDescription$ CARDNAME deals 1 damage to target player. You gain 1 life.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$DealDamage | Cost$ 2 B | Tgt$ TgtP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player. You gain 1 life. | SubAbility$ SVar=DBGainLife
+SVar:DBGainLife:DB$GainLife | LifeAmount$ 1 | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/touch_of_death.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/62.jpg
diff --git a/res/cardsfolder/touch_of_invisibility.txt b/res/cardsfolder/touch_of_invisibility.txt
index 3ff1ddbe000..aa80efb82ab 100644
--- a/res/cardsfolder/touch_of_invisibility.txt
+++ b/res/cardsfolder/touch_of_invisibility.txt
@@ -2,8 +2,8 @@ Name:Touch of Invisibility
 ManaCost:3 U
 Types:Sorcery
 Text:no text
-A:SP$Pump | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature is unblockable this turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature is unblockable this turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/touch_of_invisibility.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/109.jpg
diff --git a/res/cardsfolder/tranquil_path.txt b/res/cardsfolder/tranquil_path.txt
index a181a140a99..551ad1b377e 100644
--- a/res/cardsfolder/tranquil_path.txt
+++ b/res/cardsfolder/tranquil_path.txt
@@ -2,8 +2,8 @@ Name:Tranquil Path
 ManaCost:4 G
 Types:Sorcery
 Text:no text
-A:SP$DestroyAll | Cost$ 4 G | ValidCards$ Enchantment | SpellDescription$ Destroy all enchantments.
-K:Draw a card.
+A:SP$DestroyAll | Cost$ 4 G | ValidCards$ Enchantment | SpellDescription$ Destroy all enchantments. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tranquil_path.jpg
 SetInfo:APC|Common|http://magiccards.info/scans/en/ap/89.jpg
diff --git a/res/cardsfolder/twisted_image.txt b/res/cardsfolder/twisted_image.txt
index 6a9cd28db0e..a8ceb5da567 100644
--- a/res/cardsfolder/twisted_image.txt
+++ b/res/cardsfolder/twisted_image.txt
@@ -2,8 +2,8 @@ Name:Twisted Image
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/twisted_image.jpg
diff --git a/res/cardsfolder/unhinge.txt b/res/cardsfolder/unhinge.txt
index 25b80933d43..13a007c381a 100644
--- a/res/cardsfolder/unhinge.txt
+++ b/res/cardsfolder/unhinge.txt
@@ -2,8 +2,8 @@ Name:Unhinge
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$Discard|Cost$2 B|ValidTgts$Player|NumCards$1|Mode$TgtChoose|SpellDescription$Target player discards a card.
-K:Draw a card.
+A:SP$Discard | Cost$ 2 B | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Target player discards a card. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unhinge.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/87.jpg
diff --git a/res/cardsfolder/updraft.txt b/res/cardsfolder/updraft.txt
index 49864a91c34..89402aeb5e3 100644
--- a/res/cardsfolder/updraft.txt
+++ b/res/cardsfolder/updraft.txt
@@ -2,8 +2,8 @@ Name:Updraft
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
-K:Draw a card at the beginning of the next turn's upkeep.
+A:SP$Pump | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/updraft.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/133.jpg
diff --git a/res/cardsfolder/urborg_uprising.txt b/res/cardsfolder/urborg_uprising.txt
index 55b803ef11c..1910c6c5b10 100644
--- a/res/cardsfolder/urborg_uprising.txt
+++ b/res/cardsfolder/urborg_uprising.txt
@@ -2,8 +2,8 @@ Name:Urborg Uprising
 ManaCost:4 B
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return up to two target creature cards from your graveyard to your hand.
-K:Draw a card.
+A:SP$ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return up to two target creature cards from your graveyard to your hand. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg_uprising.jpg
 SetInfo:APC|Common|http://magiccards.info/scans/en/ap/53.jpg
diff --git a/res/cardsfolder/wildsize.txt b/res/cardsfolder/wildsize.txt
index f85ac753145..e65c746927a 100644
--- a/res/cardsfolder/wildsize.txt
+++ b/res/cardsfolder/wildsize.txt
@@ -2,8 +2,8 @@ Name:Wildsize
 ManaCost:2 G
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn.
-K:Draw a card.
+A:SP$Pump | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card107097.jpg
 SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/98.jpg
diff --git a/res/cardsfolder/zap.txt b/res/cardsfolder/zap.txt
index 2b267875e1c..519f49320a0 100644
--- a/res/cardsfolder/zap.txt
+++ b/res/cardsfolder/zap.txt
@@ -2,8 +2,8 @@ Name:Zap
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$DealDamage | Cost$ 2 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Zap deals 1 damage to target creature or player.
-K:Draw a card.
+A:SP$DealDamage | Cost$ 2 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Zap deals 1 damage to target creature or player. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zap.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/180.jpg