From 84d20bcccae5253bb6ab978b0fe0cab5b94e04ed Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 13:01:38 +0000
Subject: [PATCH] *converted all spCounter cards that doesn't use ExtraActions.
 (Might as well wait for Subabilities in AF_CounterMagic)

---
 res/cardsfolder/annul.txt              | 4 ++--
 res/cardsfolder/artifact_blast.txt     | 4 ++--
 res/cardsfolder/assert_authority.txt   | 4 ++--
 res/cardsfolder/avoid_fate.txt         | 4 ++--
 res/cardsfolder/bind.txt               | 2 --
 res/cardsfolder/cancel.txt             | 4 ++--
 res/cardsfolder/counterspell.txt       | 2 --
 res/cardsfolder/dispel.txt             | 4 ++--
 res/cardsfolder/dissipate.txt          | 4 ++--
 res/cardsfolder/envelop.txt            | 4 ++--
 res/cardsfolder/essence_scatter.txt    | 4 ++--
 res/cardsfolder/extinguish.txt         | 4 ++--
 res/cardsfolder/faerie_trickery.txt    | 4 ++--
 res/cardsfolder/false_summoning.txt    | 4 ++--
 res/cardsfolder/fervent_denial.txt     | 4 ++--
 res/cardsfolder/flash_counter.txt      | 4 ++--
 res/cardsfolder/flashfreeze.txt        | 4 ++--
 res/cardsfolder/frazzle.txt            | 4 ++--
 res/cardsfolder/gainsay.txt            | 4 ++--
 res/cardsfolder/guttural_response.txt  | 4 ++--
 res/cardsfolder/hisokas_defiance.txt   | 4 ++--
 res/cardsfolder/intervene.txt          | 4 ++--
 res/cardsfolder/lapse_of_certainty.txt | 4 ++--
 res/cardsfolder/last_word.txt          | 4 ++--
 res/cardsfolder/liquify.txt            | 4 ++--
 res/cardsfolder/memory_lapse.txt       | 4 ++--
 res/cardsfolder/muddle_the_mixture.txt | 4 ++--
 res/cardsfolder/mystic_denial.txt      | 4 ++--
 res/cardsfolder/negate.txt             | 4 ++--
 res/cardsfolder/preemptive_strike.txt  | 4 ++--
 res/cardsfolder/rebuff_the_wicked.txt  | 4 ++--
 res/cardsfolder/remove_soul.txt        | 4 ++--
 res/cardsfolder/spell_snare.txt        | 4 ++--
 res/cardsfolder/stifle.txt             | 4 ++--
 res/cardsfolder/thoughtbind.txt        | 4 ++--
 res/cardsfolder/traumatic_visions.txt  | 4 ++--
 res/cardsfolder/turn_aside.txt         | 4 ++--
 res/cardsfolder/voidslime.txt          | 4 ++--
 38 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/res/cardsfolder/annul.txt b/res/cardsfolder/annul.txt
index 3f1ccb4a549..9d0ac1dfec8 100644
--- a/res/cardsfolder/annul.txt
+++ b/res/cardsfolder/annul.txt
@@ -1,8 +1,8 @@
 Name:Annul
 ManaCost:U
 Types:Instant
-Text:Counter target artifact or enchantment spell.
-K:spCounter:Spell:Type(Artifact,Enchantment):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Spell | CounterValid$ Artifact,Enchantment | SpellDescription$ Counter target artifact or enchantment spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/annul.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/29.jpg
diff --git a/res/cardsfolder/artifact_blast.txt b/res/cardsfolder/artifact_blast.txt
index add266c6f4e..fb659bbf598 100644
--- a/res/cardsfolder/artifact_blast.txt
+++ b/res/cardsfolder/artifact_blast.txt
@@ -1,8 +1,8 @@
 Name:Artifact Blast
 ManaCost:R
 Types:Instant
-Text:Counter target artifact spell.
-K:spCounter:Spell:Type(Artifact):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ R | Type$ Spell | CounterValid$ Artifact | SpellDescription$ Counter target artifact spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/artifact_blast.jpg
 SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/87.jpg
diff --git a/res/cardsfolder/assert_authority.txt b/res/cardsfolder/assert_authority.txt
index 3431a599a34..528e3f1751f 100644
--- a/res/cardsfolder/assert_authority.txt
+++ b/res/cardsfolder/assert_authority.txt
@@ -1,8 +1,8 @@
 Name:Assert Authority
 ManaCost:5 U U
 Types:Instant
-Text:Counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.\r\nAffinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
-K:spCounter:Spell:None:Exile:None
+Text:no text
+A:SP$Counter | Cost$ 5 U U | Type$ Spell | Destination$ Exile | SpellDescription$ Counter target spell.  If that spell is countered this way, exile it instead of putting it into its owner's graveyard.\r\nAffinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/assert_authority.jpg
diff --git a/res/cardsfolder/avoid_fate.txt b/res/cardsfolder/avoid_fate.txt
index 2886cb1fa0d..dedf87c8280 100644
--- a/res/cardsfolder/avoid_fate.txt
+++ b/res/cardsfolder/avoid_fate.txt
@@ -1,8 +1,8 @@
 Name:Avoid Fate
 ManaCost:G
 Types:Instant
-Text:Counter target instant or Aura spell that targets a permanent you control.
-K:spCounter:Spell:Type(Instant,Aura) Targets(My-Creature,My-Enchantment,My-Artifact,My-Land,My-Equipment,My-Planeswalker):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ G | Type$ Spell | CounterValid$ Instant,Aura | SpellTarget$ Permanent.YouCtrl | SpellDescription$ Counter target instant or Aura spell that targets a permanent you control. 
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avoid_fate.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/73.jpg
diff --git a/res/cardsfolder/bind.txt b/res/cardsfolder/bind.txt
index ebce514e11f..30542fc429f 100644
--- a/res/cardsfolder/bind.txt
+++ b/res/cardsfolder/bind.txt
@@ -2,8 +2,6 @@ Name:Bind
 ManaCost:1 G
 Types:Instant
 Text:no text
-#Counter target activated ability.\r\nDraw a card.
-#K:spCounter:Ability:None:None:My-Draw(1)
 A:SP$Counter|Cost$1 G|Type$Ability|SpellDescription$Counter target activated ability.
 K:Draw a card.
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/cancel.txt b/res/cardsfolder/cancel.txt
index 78c08027d0c..114bd8bbf91 100644
--- a/res/cardsfolder/cancel.txt
+++ b/res/cardsfolder/cancel.txt
@@ -1,8 +1,8 @@
 Name:Cancel
 ManaCost:1 U U
 Types:Instant
-Text:Counter target spell.
-K:spCounter:Spell:None:Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U U | Type$ Spell | SpellDescription$ Counter target spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cancel.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/44.jpg
diff --git a/res/cardsfolder/counterspell.txt b/res/cardsfolder/counterspell.txt
index ff560259902..eddc615c5e8 100644
--- a/res/cardsfolder/counterspell.txt
+++ b/res/cardsfolder/counterspell.txt
@@ -2,8 +2,6 @@ Name:Counterspell
 ManaCost:U U
 Types:Instant
 Text:no text
-#Counter target spell.
-#K:spCounter:Spell:None:Graveyard:None
 A:SP$Counter|Cost$U U|Type$Spell|Destination$Graveyard|SpellDescription$Counter target spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/mm/en-us/card19570.jpg
diff --git a/res/cardsfolder/dispel.txt b/res/cardsfolder/dispel.txt
index 2f9150bfbd8..fc3c561f17c 100644
--- a/res/cardsfolder/dispel.txt
+++ b/res/cardsfolder/dispel.txt
@@ -1,8 +1,8 @@
 Name:Dispel
 ManaCost:U
 Types:Instant
-Text:Counter target instant spell.
-K:spCounter:Spell:Type(Instant):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Spell | CounterValid$ Instant | SpellDescription$ Counter target instant spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dispel.jpg
 SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/26.jpg
diff --git a/res/cardsfolder/dissipate.txt b/res/cardsfolder/dissipate.txt
index 946f7846a48..3ba90c5cf8e 100644
--- a/res/cardsfolder/dissipate.txt
+++ b/res/cardsfolder/dissipate.txt
@@ -1,8 +1,8 @@
 Name:Dissipate
 ManaCost:1 U U
 Types:Instant
-Text:Counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
-K:spCounter:Spell:None:Exile:None
+Text:no text
+A:SP$Counter | Cost$ 1 U U | Type$ Spell | Destination$ Exile | SpellDescription$ Counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dissipate.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/61.jpg
diff --git a/res/cardsfolder/envelop.txt b/res/cardsfolder/envelop.txt
index d0a3b6d5593..3373759a67f 100644
--- a/res/cardsfolder/envelop.txt
+++ b/res/cardsfolder/envelop.txt
@@ -1,8 +1,8 @@
 Name:Envelop
 ManaCost:U
 Types:Instant
-Text:Counter target sorcery spell.
-K:spCounter:Spell:Type(Sorcery):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Spell | CounterValid$ Sorcery | SpellDescription$ Counter target sorcery spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/envelop.jpg
 SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/39.jpg
diff --git a/res/cardsfolder/essence_scatter.txt b/res/cardsfolder/essence_scatter.txt
index 12bda8d8ba9..936a09e189b 100644
--- a/res/cardsfolder/essence_scatter.txt
+++ b/res/cardsfolder/essence_scatter.txt
@@ -1,8 +1,8 @@
 Name:Essence Scatter
 ManaCost:1 U
 Types:Instant
-Text:Counter target creature spell.
-K:spCounter:Spell:Type(Creature):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_scatter.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/51.jpg
diff --git a/res/cardsfolder/extinguish.txt b/res/cardsfolder/extinguish.txt
index c8b034c232d..1d8ef365c3f 100644
--- a/res/cardsfolder/extinguish.txt
+++ b/res/cardsfolder/extinguish.txt
@@ -1,8 +1,8 @@
 Name:Extinguish
 ManaCost:1 U
 Types:Instant
-Text:Counter target sorcery spell.
-K:spCounter:Spell:Type(Sorcery):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Sorcery | SpellDescription$ Counter target sorcery spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/extinguish.jpg
 SetInfo:P02|Common|http://magiccards.info/scans/en/po2/38.jpg
diff --git a/res/cardsfolder/faerie_trickery.txt b/res/cardsfolder/faerie_trickery.txt
index df3f3d4b6ee..a82f3423df7 100644
--- a/res/cardsfolder/faerie_trickery.txt
+++ b/res/cardsfolder/faerie_trickery.txt
@@ -1,8 +1,8 @@
 Name:Faerie Trickery
 ManaCost:1 U U
 Types:Tribal Instant Faerie
-Text:Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
-K:spCounter:Spell:Type(Non-Faerie):Exile:None
+Text:no text
+A:SP$Counter | Cost$ 1 U U | CounterValid$ nonFaerie | Destination$ Exile | SpellDescription$ Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. 
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/faerie_trickery.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/62.jpg
diff --git a/res/cardsfolder/false_summoning.txt b/res/cardsfolder/false_summoning.txt
index a1366dce1cd..62523ee78b9 100644
--- a/res/cardsfolder/false_summoning.txt
+++ b/res/cardsfolder/false_summoning.txt
@@ -1,8 +1,8 @@
 Name:False Summoning
 ManaCost:1 U
 Types:Instant
-Text:Counter target creature spell.
-K:spCounter:Spell:Type(Creature):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://gatherer.wizards.com/handlers/image.ashx?multiverseid=6533&type=card
 SetInfo:P02|Common|http://magiccards.info/scans/en/po2/40.jpg
diff --git a/res/cardsfolder/fervent_denial.txt b/res/cardsfolder/fervent_denial.txt
index fe2fde43dca..4b2fb20407a 100644
--- a/res/cardsfolder/fervent_denial.txt
+++ b/res/cardsfolder/fervent_denial.txt
@@ -1,8 +1,8 @@
 Name:Fervent Denial
 ManaCost:3 U U
 Types:Instant
-Text:Counter target spell.
-K:spCounter:Spell:None:Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 3 U U | Type$ Spell | SpellDescription$ Counter target spell.
 K:Flashback:5 U U
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fervent_denial.jpg
diff --git a/res/cardsfolder/flash_counter.txt b/res/cardsfolder/flash_counter.txt
index f2c481f04be..1cebd3b887e 100644
--- a/res/cardsfolder/flash_counter.txt
+++ b/res/cardsfolder/flash_counter.txt
@@ -1,8 +1,8 @@
 Name:Flash Counter
 ManaCost:1 U
 Types:Instant
-Text:Counter target instant spell.
-K:spCounter:Spell:Type(Instant):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Instant | SpellDescription$ Counter target instant spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flash_counter.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/78.jpg
diff --git a/res/cardsfolder/flashfreeze.txt b/res/cardsfolder/flashfreeze.txt
index 4517f0658b2..2f01ce1cac4 100644
--- a/res/cardsfolder/flashfreeze.txt
+++ b/res/cardsfolder/flashfreeze.txt
@@ -1,8 +1,8 @@
 Name:Flashfreeze
 ManaCost:1 U
 Types:Instant
-Text:Counter target red or green spell.
-K:spCounter:Spell:Color(red,green):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Card.Red,Card.Green | SpellDescription$ Counter target red or green spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flashfreeze.jpg
 SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/53.jpg
diff --git a/res/cardsfolder/frazzle.txt b/res/cardsfolder/frazzle.txt
index 4d5f759e693..6ac484161e0 100644
--- a/res/cardsfolder/frazzle.txt
+++ b/res/cardsfolder/frazzle.txt
@@ -1,8 +1,8 @@
 Name:Frazzle
 ManaCost:3 U
 Types:Instant
-Text:Counter target nonblue spell.
-K:spCounter:Spell:Color(Non-blue):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 3 U | Type$ Spell | CounterValid$ Card.nonBlue | SpellDescription$ Counter target non-blue spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frazzle.jpg
 SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/25.jpg
diff --git a/res/cardsfolder/gainsay.txt b/res/cardsfolder/gainsay.txt
index b0bd9178620..cdae9e77676 100644
--- a/res/cardsfolder/gainsay.txt
+++ b/res/cardsfolder/gainsay.txt
@@ -1,8 +1,8 @@
 Name:Gainsay
 ManaCost:1 U
 Types:Instant
-Text:Counter target blue spell.
-K:spCounter:Spell:Color(blue):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Card.Blue | SpellDescription$ Counter target blue spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gainsay.jpg
 SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/26.jpg
diff --git a/res/cardsfolder/guttural_response.txt b/res/cardsfolder/guttural_response.txt
index d0514014c55..54a18f45aeb 100644
--- a/res/cardsfolder/guttural_response.txt
+++ b/res/cardsfolder/guttural_response.txt
@@ -1,8 +1,8 @@
 Name:Guttural Response
 ManaCost:RG
 Types:Instant
-Text:Counter target blue instant spell.
-K:spCounter:Spell:Type(Instant) Color(blue):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ RG | Type$ Spell | CounterValid$ Instant.Blue | SpellDescription$ Counter target blue instant spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/guttural_response.jpg
 SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/208.jpg
diff --git a/res/cardsfolder/hisokas_defiance.txt b/res/cardsfolder/hisokas_defiance.txt
index 9d5abf1a571..2975286882f 100644
--- a/res/cardsfolder/hisokas_defiance.txt
+++ b/res/cardsfolder/hisokas_defiance.txt
@@ -1,8 +1,8 @@
 Name:Hisoka's Defiance
 ManaCost:1 U
 Types:Instant
-Text:Counter target Spirit or Arcane spell.
-K:spCounter:Spell:Type(Spirit,Arcane):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Spirit,Arcane | SpellDescription$ Counter target Spirit or Arcane spell. 
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hisokas_defiance.jpg
 SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/67.jpg
diff --git a/res/cardsfolder/intervene.txt b/res/cardsfolder/intervene.txt
index 95a3c858b36..e501d30821c 100644
--- a/res/cardsfolder/intervene.txt
+++ b/res/cardsfolder/intervene.txt
@@ -1,8 +1,8 @@
 Name:Intervene
 ManaCost:U
 Types:Instant
-Text:Counter target spell that targets a creature.
-K:spCounter:Spell:Targets(Creature):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Spell | SpellTarget$ Creature | SpellDescription$ Counter target spell that targets a creature. 
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/intervene.jpg
 SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/33.jpg
diff --git a/res/cardsfolder/lapse_of_certainty.txt b/res/cardsfolder/lapse_of_certainty.txt
index f79c8758c94..fb16ccf7e81 100644
--- a/res/cardsfolder/lapse_of_certainty.txt
+++ b/res/cardsfolder/lapse_of_certainty.txt
@@ -1,8 +1,8 @@
 Name:Lapse of Certainty
 ManaCost:2 W
 Types:Instant
-Text:Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard.
-K:spCounter:Spell:None:Topdeck:None
+Text:no text
+A:SP$Counter | Cost$ 2 W | Type$ Spell | Destination$ TopDeck | SpellDescription$ Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lapse_of_certainty.jpg
 SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/9.jpg
diff --git a/res/cardsfolder/last_word.txt b/res/cardsfolder/last_word.txt
index 7a8871009fe..929718c55c2 100644
--- a/res/cardsfolder/last_word.txt
+++ b/res/cardsfolder/last_word.txt
@@ -1,8 +1,8 @@
 Name:Last Word
 ManaCost:2 U U
 Types:Instant
-Text:Counter target spell.
-K:spCounter:Spell:None:Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 2 U U | Type$ Spell | SpellDescription$ Counter target spell.
 K:CARDNAME can't be countered.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/last_word.jpg
diff --git a/res/cardsfolder/liquify.txt b/res/cardsfolder/liquify.txt
index bd7c0fc77ed..53b3b8fdc00 100644
--- a/res/cardsfolder/liquify.txt
+++ b/res/cardsfolder/liquify.txt
@@ -1,8 +1,8 @@
 Name:Liquify
 ManaCost:2 U
 Types:Instant
-Text:Counter target spell with converted mana cost 3 or less. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
-K:spCounter:Spell:CMC(<=,3):Exile:None
+Text:no text
+A:SP$Counter | Cost$ 2 U | Type$ Spell | CounterValid$ Card.cmcLE3 | Destination$ Exile | SpellDescription$ Counter target spell with converted mana cost 3 or less. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liquify.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/41.jpg
diff --git a/res/cardsfolder/memory_lapse.txt b/res/cardsfolder/memory_lapse.txt
index fc72d995953..ba250f0341b 100644
--- a/res/cardsfolder/memory_lapse.txt
+++ b/res/cardsfolder/memory_lapse.txt
@@ -1,8 +1,8 @@
 Name:Memory Lapse
 ManaCost:1 U
 Types:Instant
-Text:Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard.
-K:spCounter:Spell:None:Topdeck:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | Destination$ TopDeck | SpellDescription$ Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_lapse.jpg
 SetInfo:HML|Common|http://magiccards.info/scans/en/hl/40.jpg
diff --git a/res/cardsfolder/muddle_the_mixture.txt b/res/cardsfolder/muddle_the_mixture.txt
index 99d2d57bfde..c30cf1da508 100644
--- a/res/cardsfolder/muddle_the_mixture.txt
+++ b/res/cardsfolder/muddle_the_mixture.txt
@@ -1,8 +1,8 @@
 Name:Muddle the Mixture
 ManaCost:U U
 Types:Instant
-Text:Counter target instant or sorcery spell.
-K:spCounter:Spell:Type(Instant,Sorcery):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U U | Type$ Spell | CounterValid$ Instant,Sorcery | SpellDescription$ Counter target instant or sorcery spell.
 K:Transmute:1 U U
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/muddle_the_mixture.jpg
diff --git a/res/cardsfolder/mystic_denial.txt b/res/cardsfolder/mystic_denial.txt
index 187692366a1..ff0179da27f 100644
--- a/res/cardsfolder/mystic_denial.txt
+++ b/res/cardsfolder/mystic_denial.txt
@@ -1,8 +1,8 @@
 Name:Mystic Denial
 ManaCost:1 U U
 Types:Instant
-Text:Counter target creature or sorcery spell.
-K:spCounter:Spell:Type(Creature,Sorcery):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U U | Type$ Spell | CounterValid$ Creature,Sorcery | SpellDescription$ Counter target creature or sorcery spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_denial.jpg
 SetInfo:P02|Uncommon|http://magiccards.info/scans/en/po2/41.jpg
diff --git a/res/cardsfolder/negate.txt b/res/cardsfolder/negate.txt
index e593bb70df1..5d5f41ac638 100644
--- a/res/cardsfolder/negate.txt
+++ b/res/cardsfolder/negate.txt
@@ -1,8 +1,8 @@
 Name:Negate
 ManaCost:1 U
 Types:Instant
-Text:Counter target noncreature spell.
-K:spCounter:Spell:Type(Non-Creature):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ nonCreature | SpellDescription$ Counter target noncreature spell. 
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/negate.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/68.jpg
diff --git a/res/cardsfolder/preemptive_strike.txt b/res/cardsfolder/preemptive_strike.txt
index beee06df2a6..185a9252e8a 100644
--- a/res/cardsfolder/preemptive_strike.txt
+++ b/res/cardsfolder/preemptive_strike.txt
@@ -1,8 +1,8 @@
 Name:Preemptive Strike
 ManaCost:1 U
 Types:Instant
-Text:Counter target creature spell.
-K:spCounter:Spell:Type(Creature):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://gatherer.wizards.com/handlers/image.ashx?multiverseid=10530&type=card
 SetInfo:POR|Common|http://magiccards.info/scans/en/p3k/50.jpg
diff --git a/res/cardsfolder/rebuff_the_wicked.txt b/res/cardsfolder/rebuff_the_wicked.txt
index e4ef512c47d..43bcccb1abf 100644
--- a/res/cardsfolder/rebuff_the_wicked.txt
+++ b/res/cardsfolder/rebuff_the_wicked.txt
@@ -1,8 +1,8 @@
 Name:Rebuff the Wicked
 ManaCost:W
 Types:Instant
-Text:Counter target spell that targets a permanent you control.
-K:spCounter:Spell:Targets(My-Creature,My-Land,My-Enchantment,My-Artifact,My-Planeswalker,My-Equipment):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ W | Type$ Spell | SpellTarget$ Permanent.YouCtrl | SpellDescription$ Counter target spell that targets a permanent you control.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rebuff_the_wicked.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/12.jpg
diff --git a/res/cardsfolder/remove_soul.txt b/res/cardsfolder/remove_soul.txt
index 4d62136c576..d450f6f8f4d 100644
--- a/res/cardsfolder/remove_soul.txt
+++ b/res/cardsfolder/remove_soul.txt
@@ -1,8 +1,8 @@
 Name:Remove Soul
 ManaCost:1 U
 Types:Instant
-Text:Counter target creature spell.
-K:spCounter:Spell:Type(Creature):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83228.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/95.jpg
diff --git a/res/cardsfolder/spell_snare.txt b/res/cardsfolder/spell_snare.txt
index 16982bea01f..0dcd4f1f832 100644
--- a/res/cardsfolder/spell_snare.txt
+++ b/res/cardsfolder/spell_snare.txt
@@ -1,8 +1,8 @@
 Name:Spell Snare
 ManaCost:U
 Types:Instant
-Text:Counter target spell with converted mana cost 2.
-K:spCounter:Spell:CMC(==,2):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Spell | CounterValid$ Card.cmcEQ2 | SpellDescription$ Counter target spell with converted mana cost 2. 
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_snare.jpg
 SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/33.jpg
diff --git a/res/cardsfolder/stifle.txt b/res/cardsfolder/stifle.txt
index 9fc452be4b4..0cfee25f2bb 100644
--- a/res/cardsfolder/stifle.txt
+++ b/res/cardsfolder/stifle.txt
@@ -1,8 +1,8 @@
 Name:Stifle
 ManaCost:U
 Types:Instant
-Text:Counter target activated or triggered ability.
-K:spCounter:Ability:None:None:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Ability | SpellDescription$ Counter target activated or triggered ability.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stifle.jpg
 SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/52.jpg
diff --git a/res/cardsfolder/thoughtbind.txt b/res/cardsfolder/thoughtbind.txt
index b53eb48e444..d735c308232 100644
--- a/res/cardsfolder/thoughtbind.txt
+++ b/res/cardsfolder/thoughtbind.txt
@@ -1,8 +1,8 @@
 Name:Thoughtbind
 ManaCost:2 U
 Types:Instant
-Text:Counter target spell with converted mana cost 4 or less.
-K:spCounter:Spell:CMC(<=,4):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 2 U | Type$ Spell | CounterValid$ Card.cmcLE4 | SpellDescription$ Counter target spell with converted mana cost 4 or less.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thoughtbind.jpg
 SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/96.jpg
diff --git a/res/cardsfolder/traumatic_visions.txt b/res/cardsfolder/traumatic_visions.txt
index ff0eecc6487..cf2ebfd67d3 100644
--- a/res/cardsfolder/traumatic_visions.txt
+++ b/res/cardsfolder/traumatic_visions.txt
@@ -1,8 +1,8 @@
 Name:Traumatic Visions
 ManaCost:3 U U
 Types:Instant
-Text:Counter target spell.
-K:spCounter:Spell:None:Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ 3 U U | Type$ Spell | SpellDescription$ Counter target spell.
 K:TypeCycling:Basic:1 U
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/traumatic_visions.jpg
diff --git a/res/cardsfolder/turn_aside.txt b/res/cardsfolder/turn_aside.txt
index 3d46efeb138..a4c0d8d82e6 100644
--- a/res/cardsfolder/turn_aside.txt
+++ b/res/cardsfolder/turn_aside.txt
@@ -1,8 +1,8 @@
 Name:Turn Aside
 ManaCost:U
 Types:Instant
-Text:Counter target spell that targets a permanent you control.
-K:spCounter:Spell:Targets(My-Creature,My-Land,My-Enchantment,My-Artifact,My-Planeswalker,My-Equipment):Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ U | Type$ Spell | SpellTarget$ Permanent.YouCtrl | SpellDescription$ Counter target spell that targets a permanent you control. 
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/turn_aside.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/49.jpg
diff --git a/res/cardsfolder/voidslime.txt b/res/cardsfolder/voidslime.txt
index c5c453a59d7..a7181d7ac49 100644
--- a/res/cardsfolder/voidslime.txt
+++ b/res/cardsfolder/voidslime.txt
@@ -1,8 +1,8 @@
 Name:Voidslime
 ManaCost:G U U
 Types:Instant
-Text:Counter target spell, activated ability, or triggered ability.
-K:spCounter:SpellOrAbility:None:Graveyard:None
+Text:no text
+A:SP$Counter | Cost$ G U U | Type$ SpellOrAbility | SpellDescription$ Counter target spell, activated ability, or triggered ability.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/voidslime.jpg
 SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/137.jpg