- AF_Counter now uses actual Target object. AI seems to be casting away properly now.

- Converted all of the Counter SAs to use the new Target structure

.gitattributes

@@ -8383,7 +8383,6 @@ src/forge/CommandReturn.java svneol=native#text/plain
 src/forge/Computer.java svneol=native#text/plain
 src/forge/ComputerAI_General.java -text svneol=native#text/plain
 src/forge/ComputerAI_Input.java svneol=native#text/plain
-src/forge/ComputerAI_counterSpells2.java -text svneol=native#text/plain
 src/forge/ComputerUtil.java -text svneol=native#text/plain
 src/forge/ComputerUtil_Attack2.java svneol=native#text/plain
 src/forge/ComputerUtil_Block2.java svneol=native#text/plain

res/cardsfolder/abjure.txt

@@ -2,7 +2,7 @@ Name:Abjure
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U Sac<1/Permanent.Blue> | CostDesc$ As an additional cost to cast Abjure, sacrifice a blue permanent. | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ U Sac<1/Permanent.Blue> | CostDesc$ As an additional cost to cast Abjure, sacrifice a blue permanent. | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abjure.jpg

res/cardsfolder/absorb.txt

@@ -2,7 +2,7 @@ Name:Absorb
 ManaCost:W U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ W U U | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell. You gain 3 life. | SubAbility$ SVar=DBGainLife
+A:SP$ Counter | Cost$ W U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell. You gain 3 life. | SubAbility$ SVar=DBGainLife
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card23155.jpg

res/cardsfolder/annul.txt

@@ -2,7 +2,7 @@ Name:Annul
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | CounterValid$ Artifact,Enchantment | SpellDescription$ Counter target artifact or enchantment spell.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target artifact or enchantment spell | ValidTgts$ 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

res/cardsfolder/arensons_aura.txt

@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Enchantment
 Text:no text
 A:AB$ Destroy | Cost$ W Sac<1/Enchantment> | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
-A:AB$ Counter | Cost$ 3 U U | Type$ Spell | Destination$ Graveyard | CounterValid$ Enchantment | SpellDescription$ Counter target enchantment spell.
+A:AB$ Counter | Cost$ 3 U U | TargetType$ Spell | TgtPrompt$ Select target Enchantment | ValidTgts$ Enchantment | SpellDescription$ Counter target enchantment spell.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arensons_aura.jpg

res/cardsfolder/artifact_blast.txt

@@ -2,7 +2,7 @@ Name:Artifact Blast
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ R | Type$ Spell | CounterValid$ Artifact | SpellDescription$ Counter target artifact spell.
+A:SP$ Counter | Cost$ R | TargetType$ Spell | ValidTgts$ 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

res/cardsfolder/assert_authority.txt

@@ -2,7 +2,7 @@ Name:Assert Authority
 ManaCost:5 U U
 Types:Instant
 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. Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+A:SP$ Counter | Cost$ 5 U U | TargetType$ 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. Affinity 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

res/cardsfolder/avoid_fate.txt

@@ -2,7 +2,7 @@ Name:Avoid Fate
 ManaCost:G
 Types:Instant
 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. 
+A:SP$ Counter | Cost$ G | TargetType$ Spell | ValidTgts$ Instant,Aura | TargetValidTargeting$ 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

res/cardsfolder/azorius_guildmage.txt

@@ -4,7 +4,7 @@ Types:Creature Vedalken Wizard
 Text:no text
 PT:2/2
 A:AB$ Tap | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
-A:AB$ Counter | Cost$ 2 U | Type$ Ability | SpellDescription$ Counter target activated ability.
+A:AB$ Counter | Cost$ 2 U | TgtPrompt$ Select target Activated Ability | ValidTgts$ Card | TargetType$ Activated | SpellDescription$ Counter target activated ability.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_guildmage.jpg
 SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/141.jpg

res/cardsfolder/bant_charm.txt

@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ Destroy | Cost$ G W U | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Choose one - Destroy target artifact;
 A:SP$ ChangeZone | Cost$ G W U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ or put target creature on the bottom of it's owner's library;
-A:SP$ Counter | Cost$ G W U | Type$ Spell | Destination$ Graveyard | CounterValid$ Instant | SpellDescription$ or counter target instant spell.
+A:SP$ Counter | Cost$ G W U | TargetType$ Spell | ValidTgts$ Instant | SpellDescription$ or counter target instant spell.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bant_charm.jpg

res/cardsfolder/bind.txt

@@ -2,7 +2,7 @@ Name:Bind
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 G | Type$ Ability | SpellDescription$ Counter target activated ability. | SubAbility$ SVar=DBDraw
+A:SP$ Counter | Cost$ 1 G | TgtPrompt$ Select target Activated Ability | ValidTgts$ Card | TargetType$ Activated | SpellDescription$ Counter target activated ability. | SubAbility$ SVar=DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bind.jpg

res/cardsfolder/blue_elemental_blast.txt

@@ -2,7 +2,7 @@ Name:Blue Elemental Blast
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | Destination$ Graveyard | CounterValid$ Card.Red | SpellDescription$ Choose one - Counter target red spell;
+A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Card.Red | TgtPrompt$ Select target Red Spell | SpellDescription$ Choose one - Counter target red spell;
 A:SP$ Destroy | Cost$ U | ValidTgts$ Permanent.Red | TgtPrompt$ Select target red permanent. | SpellDescription$ or destroy target red permanent.
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/brine_shaman.txt

@@ -4,7 +4,7 @@ Types:Creature Human Cleric Shaman
 Text:no text
 PT:1/1
 A:AB$ Pump | Cost$ T Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets +2/+2 until end of turn.
-A:AB$ Counter | Cost$ 1 U U Sac<1/Creature> | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
+A:AB$ Counter | Cost$ 1 U U Sac<1/Creature> | TargetType$ Spell | ValidTgts$ Creature | TgtPrompt$ Select target Creature Spell | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brine_shaman.jpg
 SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/3.jpg

res/cardsfolder/cancel.txt

@@ -2,7 +2,7 @@ Name:Cancel
 ManaCost:1 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U U | Type$ Spell | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card  | 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

res/cardsfolder/circular_logic.txt

@@ -2,7 +2,7 @@ Name:Circular Logic
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each card in your graveyard.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card  | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each card in your graveyard.
 K:Madness:U
 SVar:X:Count$InYourYard
 SVar:RemAIDeck:True

res/cardsfolder/condescend.txt

@@ -2,7 +2,7 @@ Name:Condescend
 ManaCost:X U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ X U | Type$ Spell | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays X.
+A:SP$ Counter | Cost$ X U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card  | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays X.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/confound.txt

@@ -2,7 +2,7 @@ Name:Confound
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Counter | Cost$ 1 U | Type$ Spell | SpellTarget$ Creature | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell that targets one or more creatures. Draw a card.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ Creature | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell that targets one or more creatures. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/confound.jpg

res/cardsfolder/controvert.txt

@@ -2,7 +2,7 @@ Name:Controvert
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 K:Recover:2 U U
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/controvert.jpg

res/cardsfolder/convolute.txt

@@ -2,7 +2,7 @@ Name:Convolute
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 4 | SpellDescription$ Counter target spell unless its controller pays 4.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SpellDescription$ Counter target spell unless its controller pays 4.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/convolute.jpg

res/cardsfolder/counterspell.txt

@@ -2,7 +2,7 @@ Name:Counterspell
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U U | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ U U | TargetType$ Spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/mm/en-us/card19570.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/57.jpg

res/cardsfolder/countersquall.txt

@@ -2,7 +2,7 @@ Name:Countersquall
 ManaCost:U B
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U B | Type$ Spell | CounterValid$ Card.nonCreature | ExtraActions$ CC-LoseLife(2) | SpellDescription$ Counter target noncreature spell. Its controller loses 2 life.
+A:SP$ Counter | Cost$ U B | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target nonCreature spell | ExtraActions$ CC-LoseLife(2) | SpellDescription$ Counter target noncreature spell. Its controller loses 2 life.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/countersquall.jpg
 SetInfo:CFX|Uncommon|http://magiccards.info/scans/en/cfx/103.jpg

res/cardsfolder/cursecatcher.txt

@@ -3,7 +3,7 @@ ManaCost:U
 Types:Creature Merfolk Wizard
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ Sac<1/CARDNAME> | Type$ Spell | CounterValid$ Instant,Sorcery | UnlessCost$ 1 | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1.
+A:AB$ Counter | Cost$ Sac<1/CARDNAME> | TargetType$ Spell | ValidTgts$ Instant,Sorcery | TgtPrompt$ Select target Instant or Sorcery Spell | UnlessCost$ 1 | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cursecatcher.jpg

res/cardsfolder/daring_apprentice.txt

@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ T Sac<1/CARDNAME> | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:AB$ Counter | Cost$ T Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SpellDescription$ Counter target spell.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daring_apprentice.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/73.jpg

res/cardsfolder/daze.txt

@@ -2,8 +2,8 @@ Name:Daze
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
-A:SP$ Counter | Cost$ Return<1/Island> | Type$ Spell | UnlessCost$ 1 | CostDesc$ You may return an Island you control to its owner's hand | SpellDescription$ rather than pay CARDNAME's mana cost. 
+A:SP$ Counter | Cost$ Return<1/Island> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | CostDesc$ You may return an Island you control to its owner's hand | SpellDescription$ rather than pay CARDNAME's mana cost. 
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daze.jpg

res/cardsfolder/deathgrip.txt

@@ -2,7 +2,7 @@ Name:Deathgrip
 ManaCost:B B
 Types:Enchantment
 Text:no text
-A:AB$ Counter | Cost$ B B | Type$ Spell | CounterValid$ Card.Green | SpellDescription$ Counter target green spell.
+A:AB$ Counter | Cost$ B B | TargetType$ Spell | TgtPrompt$ Select target Green Spell | ValidTgts$ Card.Green | SpellDescription$ Counter target green spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathgrip.jpg

res/cardsfolder/deprive.txt

@@ -2,7 +2,7 @@ Name:Deprive
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U U Return<1/Land> | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ U U Return<1/Land> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SpellDescription$ Counter target spell.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deprive.jpg

res/cardsfolder/diplomatic_escort.txt

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ U T Discard<1/Card> | Type$ SpellOrAbility | SpellTarget$ Creature | SpellDescription$ Counter target spell or ability that targets a creature.
+A:AB$ Counter | Cost$ U T Discard<1/Card> | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card | TargetValidTargeting$ Creature | SpellDescription$ Counter target spell or ability that targets a creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diplomatic_escort.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/74.jpg

res/cardsfolder/discombobulate.txt

@@ -2,7 +2,7 @@ Name:Discombobulate
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | Destination$ Graveyard | SubAbility$ SVar=DBRearrange | SpellDescription$ Counter target spell. Look at the top four cards of your library, then put them back in any order.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SubAbility$ SVar=DBRearrange | SpellDescription$ Counter target spell. Look at the top four cards of your library, then put them back in any order.
 SVar:DBRearrange:DB$RearrangeTopOfLibrary | Defined$ You | NumCards$ 4
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/discombobulate.jpg

res/cardsfolder/dismal_failure.txt

@@ -2,7 +2,7 @@ Name:Dismal Failure
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | Destination$ Graveyard | ExtraActions$ CC-Discard(1) | SpellDescription$ Counter target spell. Its controller discards a card.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | ExtraActions$ CC-Discard(1) | SpellDescription$ Counter target spell. Its controller discards a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dismal_failure.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/39.jpg

res/cardsfolder/dismiss.txt

@@ -2,7 +2,7 @@ Name:Dismiss
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell. Draw a card.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dismiss.jpg

res/cardsfolder/dispel.txt

@@ -2,7 +2,7 @@ Name:Dispel
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | CounterValid$ Instant | SpellDescription$ Counter target instant spell.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Instant | TgtPrompt$ Select target Instant Spell | 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

res/cardsfolder/disrupt.txt

@@ -2,7 +2,7 @@ Name:Disrupt
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | CounterValid$ Instant,Sorcery | UnlessCost$ 1 | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1. Draw a card.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Instant,Sorcery  | TgtPrompt$ Select target Instant or Sorcery Spell | UnlessCost$ 1 | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/disruptive_pitmage.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ T | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
+A:AB$ Counter | Cost$ T | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
 K:Morph:U
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/disruptive_student.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ T | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
+A:AB$ Counter | Cost$ T | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disruptive_student.jpg

res/cardsfolder/dissipate.txt

@@ -2,7 +2,7 @@ Name:Dissipate
 ManaCost:1 U U
 Types:Instant
 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.
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | 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

res/cardsfolder/douse.txt

@@ -2,7 +2,7 @@ Name:Douse
 ManaCost:2 U
 Types:Enchantment
 Text:no text
-A:AB$ Counter | Cost$ 1 U | Type$ Spell | Destination$ Graveyard | CounterValid$ Card.Red | SpellDescription$ Counter target red spell.
+A:AB$ Counter | Cost$ 1 U | TargetType$ Spell | ValidTgts$ Card.Red | TgtPrompt$ Select target Red Spell | SpellDescription$ Counter target red spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/douse.jpg

res/cardsfolder/dream_fracture.txt

@@ -2,7 +2,7 @@ Name:Dream Fracture
 ManaCost:1 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U U | Type$ Spell | Destination$ Graveyard | ExtraActions$ My-Draw(1) CC-Draw(1) | SpellDescription$ Counter target spell. Its controller draws a card. Draw a card.
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | ExtraActions$ My-Draw(1) CC-Draw(1) | SpellDescription$ Counter target spell. Its controller draws a card. Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_fracture.jpg
 SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/19.jpg

res/cardsfolder/envelop.txt

@@ -2,7 +2,7 @@ Name:Envelop
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | CounterValid$ Sorcery | SpellDescription$ Counter target sorcery spell.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target Sorcery spell | ValidTgts$ 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

res/cardsfolder/ertai_the_corrupted.txt

@@ -3,7 +3,7 @@ ManaCost:2 W U B
 Types:Legendary Creature Wizard
 Text:no text
 PT:3/4
-A:AB$ Counter | Cost$ U T Sac<1/Creature,Enchantment> | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell. | CostDesc$ U, tap, sacrifice a creature or enchantment:
+A:AB$ Counter | Cost$ U T Sac<1/Creature,Enchantment> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell. | CostDesc$ U, tap, sacrifice a creature or enchantment:
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ertai_the_corrupted.jpg

res/cardsfolder/ertai_wizard_adept.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Legendary Creature Wizard
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ 2 U U T | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:AB$ Counter | Cost$ 2 U U T | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ertai_wizard_adept.jpg
 SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/33.jpg

res/cardsfolder/ertais_trickery.txt

@@ -2,7 +2,8 @@ Name:Ertai's Trickery
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | CounterValid$ Card.kicked | SpellDescription$ Counter target spell if it was kicked.
+#NOTE: This is incorrect as scripted. It should be able to target any spell, but will only Counter the Spell if it is Kicked
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell if it was kicked | ValidTgts$ Card.kicked | SpellDescription$ Counter target spell if it was kicked.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ertais_trickery.jpg

res/cardsfolder/essence_scatter.txt

@@ -2,7 +2,7 @@ Name:Essence Scatter
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ 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

res/cardsfolder/evasive_action.txt

@@ -2,7 +2,7 @@ Name:Evasive Action
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ X | SpellDescription$ Domain - Counter target spell unless its controller pays 1 for each basic land type among lands you control.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SpellDescription$ Domain - Counter target spell unless its controller pays 1 for each basic land type among lands you control.
 SVar:X:Count$Domain
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True

res/cardsfolder/exclude.txt

@@ -2,7 +2,7 @@ Name:Exclude
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type$ Spell | CounterValid$ Creature | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target creature spell. Draw a card.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target creature spell. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/exclude.jpg

res/cardsfolder/extinguish.txt

@@ -2,7 +2,7 @@ Name:Extinguish
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Sorcery | SpellDescription$ Counter target sorcery spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target sorcery spell | ValidTgts$ Sorcery | SpellDescription$ Counter target sorcery spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/extinguish.jpg
 SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/38.jpg

res/cardsfolder/faerie_trickery.txt

@@ -2,7 +2,7 @@ Name:Faerie Trickery
 ManaCost:1 U U
 Types:Tribal Instant Faerie
 Text:no text
-A:SP$ Counter | Cost$ 1 U U | Type$ Spell | CounterValid$ Card.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. 
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target non-Faerie spell | ValidTgts$ Card.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

res/cardsfolder/false_summoning.txt

@@ -2,7 +2,7 @@ Name:False Summoning
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal_Second_Age/false_summoning.jpg
 SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/40.jpg

res/cardsfolder/familiars_ruse.txt

@@ -2,7 +2,7 @@ Name:Familiar's Ruse
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U U Return<1/Creature> | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ U U Return<1/Creature> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SpellDescription$ Counter target spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/familiars_ruse.jpg

res/cardsfolder/fervent_denial.txt

@@ -2,8 +2,8 @@ Name:Fervent Denial
 ManaCost:3 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 3 U U | Type$ Spell | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ 3 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
-A:SP$ Counter | Cost$ 5 U U | Type$ Spell | Flashback$ True | CostDesc$ Flashback 5 U U | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+A:SP$ Counter | Cost$ 5 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Flashback$ True | CostDesc$ Flashback 5 U U | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fervent_denial.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/86.jpg

res/cardsfolder/flash_counter.txt

@@ -2,7 +2,7 @@ Name:Flash Counter
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Instant | SpellDescription$ Counter target instant spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Instant spell | ValidTgts$ 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

res/cardsfolder/flashfreeze.txt

@@ -2,7 +2,7 @@ Name:Flashfreeze
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Card.Red,Card.Green | SpellDescription$ Counter target red or green spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Red or Green spell | ValidTgts$ 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

res/cardsfolder/forbid.txt

@@ -2,8 +2,8 @@ Name:Forbid
 ManaCost:1 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U U | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SpellDescription$ Counter target spell.
-A:SP$ Counter | Cost$ 1 U U Discard<2/Any> | Type$ Spell | Destination$ Graveyard | CostDesc$ Buyback | SpellDescription$ - Discard two cards. (You may discard two cards in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) | SubAbility$ SVar=DBChange
+A:SP$ Counter | Cost$ 1 U U Discard<2/Any> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | CostDesc$ Buyback | SpellDescription$ - Discard two cards. (You may discard two cards in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) | SubAbility$ SVar=DBChange
 SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Hand
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/force_of_will.txt

@@ -2,7 +2,7 @@ Name:Force of Will
 ManaCost:3 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 3 U U | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ 3 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SpellDescription$ Counter target spell.
 SVar:AltCost:PayLife<1> ExileFromHand<1/Card.Blue>$You may pay 1 life and exile a blue card from your hand rather than pay CARDNAME's mana cost.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/force_spike.txt

@@ -2,7 +2,7 @@ Name:Force Spike
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/force_spike.jpg

res/cardsfolder/force_void.txt

@@ -2,7 +2,7 @@ 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. | SubAbility$ SVar=DBDraw
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | 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

res/cardsfolder/frazzle.txt

@@ -2,7 +2,7 @@ Name:Frazzle
 ManaCost:3 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 3 U | Type$ Spell | CounterValid$ Card.nonBlue | SpellDescription$ Counter target nonblue spell.
+A:SP$ Counter | Cost$ 3 U | TargetType$ Spell | TgtPrompt$ Select target nonBlue spell | ValidTgts$ Card.nonBlue | SpellDescription$ Counter target nonblue 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

res/cardsfolder/fuel_for_the_cause.txt

@@ -2,7 +2,7 @@ Name:Fuel for the Cause
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | SubAbility$ SVar=DBProliferate | SpellDescription$ Counter target spell, then proliferate.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ SVar=DBProliferate | SpellDescription$ Counter target spell, then proliferate.
 SVar:DBProliferate:DB$Proliferate
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fuel_for_the_cause.jpg

res/cardsfolder/gainsay.txt

@@ -2,7 +2,7 @@ Name:Gainsay
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Card.Blue | SpellDescription$ Counter target blue spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Blue spell | ValidTgts$ 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

res/cardsfolder/ghost_lit_warder.txt

@@ -3,8 +3,8 @@ ManaCost:1 U
 Types:Creature Spirit
 Text:no text
 PT:1/1
-A:AB$ Counter | Cost$ 3 U T | Type$ Spell | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
+A:AB$ Counter | Cost$ 3 U T | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
-A:AB$ Counter | Cost$ 3 U Discard<1/CARDNAME> | Type$ Spell | UnlessCost$ 4 | ActivatingZone$ Hand | PrecostDesc$ Channel - | SpellDescription$ Counter target spell unless its controller pays 4.
+A:AB$ Counter | Cost$ 3 U Discard<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | ActivatingZone$ Hand | PrecostDesc$ Channel - | SpellDescription$ Counter target spell unless its controller pays 4.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_lit_warder.jpg

res/cardsfolder/glen_elendra_archmage.txt

@@ -4,7 +4,7 @@ Types:Creature Faerie Wizard
 Text:no text
 PT:2/2
 K:Flying
-A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | Type$ Spell | CounterValid$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
 K:Persist
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glen_elendra_archmage.jpg

res/cardsfolder/guttural_response.txt

@@ -2,7 +2,7 @@ Name:Guttural Response
 ManaCost:RG
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ RG | Type$ Spell | CounterValid$ Instant.Blue | SpellDescription$ Counter target blue instant spell.
+A:SP$ Counter | Cost$ RG | TargetType$ Spell | TgtPrompt$ Select target Blue Instant spell | ValidTgts$ 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

res/cardsfolder/halt_order.txt

@@ -2,7 +2,7 @@ Name:Halt Order
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type$ Spell | CounterValid$ Artifact | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target artifact spell. Draw a card.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target Artifact spell | ValidTgts$ Artifact | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target artifact spell. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/halt_order.jpg

res/cardsfolder/hindering_light.txt

@@ -2,7 +2,7 @@ Name:Hindering Light
 ManaCost:W U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ W U | Type$ Spell | SpellTarget$ Permanent.YouCtrl,You | SpellDescription$ Counter target spell that targets you or a permanent you control. Draw a card. | SubAbility$ SVar=DB
+A:SP$ Counter | Cost$ W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ Permanent.YouCtrl,You | SpellDescription$ Counter target spell that targets you or a permanent you control. Draw a card. | SubAbility$ SVar=DB
 SVar:DB:DB$Draw | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hindering_light.jpg

res/cardsfolder/hindering_touch.txt

@@ -2,7 +2,7 @@ Name:Hindering Touch
 ManaCost:3 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 3 U | Type$ Spell | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
+A:SP$ Counter | Cost$ 3 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
 K:Storm
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/hisokas_defiance.txt

@@ -2,7 +2,7 @@ Name:Hisoka's Defiance
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Spirit,Arcane | SpellDescription$ Counter target Spirit or Arcane spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Spirit or Arcane spell | ValidTgts$ Spirit,Arcane | SpellDescription$ Counter target Spirit or Arcane spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hisokas_defiance.jpg

res/cardsfolder/hydromorph_guardian.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Elemental
 Text:no text
 PT:2/2
-A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | Type$ Spell | SpellTarget$ Creature.YouCtrl | SpellDescription$ Counter target spell that targets one or more creatures you control.
+A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ Creature.YouCtrl | SpellDescription$ Counter target spell that targets one or more creatures you control.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hydromorph_guardian.jpg

res/cardsfolder/hydromorph_gull.txt

@@ -4,7 +4,7 @@ Types:Creature Elemental Bird
 Text:no text
 PT:3/3
 K:Flying
-A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | Type$ Spell | SpellTarget$ Creature.YouCtrl | SpellDescription$ Counter target spell that targets one or more creatures you control.
+A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ Creature.YouCtrl | SpellDescription$ Counter target spell that targets one or more creatures you control.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hydromorph_gull.jpg

res/cardsfolder/illumination.txt

@@ -3,12 +3,13 @@ ManaCost:W W
 Types:Instant
 Text:(NOTE: This spell is rather buggy and should not be used at this time. When cast, it would cause a NPE. As a temporary fix, this card no longer has a drawback.)
 #
-# This might work if the AF_Counter code could handle (but we would still have the problem of determining target spell controller):
+# When Targeted can handle SpellAbilities along with Cards, this can be converted to the New SubAbilities
-# ExtraActions$ CC-GainLife(X)
+# May also need a check in TgtCardManaCost to convert from SA to Card
 #
-A:SP$ Counter | Cost$ W W | Type$ Spell | Destination$ Graveyard | CounterValid$ Artifact,Enchantment | SpellDescription$ Counter target artifact or enchantment spell. Its controller gains life equal to its converted mana cost.
+A:SP$ Counter | Cost$ W W | TargetType$ Spell | TgtPrompt$ Select target Artifact or Enchantment spell | ValidTgts$ Artifact,Enchantment | SpellDescription$ Counter target artifact or enchantment spell. Its controller gains life equal to its converted mana cost.
-# | SubAbility$ GainLifeTgtOwner/dX
+# | SubAbility$ SVar=DBGainLife
-# SVar:dX:Count$TgtCardManaCost
+# SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X
+# SVar:X:Count$TgtCardManaCost
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/illumination.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/225.jpg

res/cardsfolder/intervene.txt

@@ -2,7 +2,7 @@ Name:Intervene
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | Type$ Spell | SpellTarget$ Creature | SpellDescription$ Counter target spell that targets a creature. 
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ 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

res/cardsfolder/ixidors_will.txt

@@ -2,7 +2,7 @@ Name:Ixidor's Will
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 2 for each Wizard on the battlefield.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 2 for each Wizard on the battlefield.
 SVar:X:Count$TypeYouCtrl.Wizard/Twice
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True

res/cardsfolder/lapse_of_certainty.txt

@@ -2,7 +2,7 @@ Name:Lapse of Certainty
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 W | Type$ Spell | Destination$ TopOfLibrary | 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.
+A:SP$ Counter | Cost$ 2 W | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ TopOfLibrary | 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

res/cardsfolder/last_word.txt

@@ -2,7 +2,7 @@ Name:Last Word
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | SpellDescription$ Counter target spell.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | 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

res/cardsfolder/lay_bare.txt

@@ -2,7 +2,7 @@ Name:Lay Bare
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | Destination$ Graveyard | ExtraActions$ CC-RevealHand() | SpellDescription$ Counter target spell. Look at its controller's hand.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | ExtraActions$ CC-RevealHand() | SpellDescription$ Counter target spell. Look at its controller's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lay_bare.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/74.jpg

res/cardsfolder/lifeforce.txt

@@ -2,7 +2,7 @@ Name:Lifeforce
 ManaCost:G G
 Types:Enchantment
 Text:no text
-A:AB$ Counter | Cost$ G G | Type$ Spell | CounterValid$ Card.Black | SpellDescription$ Counter target black spell.
+A:AB$ Counter | Cost$ G G | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card.Black | SpellDescription$ Counter target black spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lifeforce.jpg

res/cardsfolder/lilting_refrain.txt

@@ -2,7 +2,7 @@ Name:Lilting Refrain
 ManaCost:1 U
 Types:Enchantment
 Text:no text
-A:AB$ Counter | Cost$ Sac<1/CARDNAME> | Type$ Spell | UnlessCost$ X | SpellDescription$ Sacrifice CARDNAME: Counter target spell unless its controller pays X, where X is the number of verse counters on CARDNAME.
+A:AB$ Counter | Cost$ Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SpellDescription$ Sacrifice CARDNAME: Counter target spell unless its controller pays X, where X is the number of verse counters on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a verse counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ VERSE | CounterNum$ 1
 SVar:X:Count$CardCounters.VERSE

res/cardsfolder/liquify.txt

@@ -2,7 +2,7 @@ Name:Liquify
 ManaCost:2 U
 Types:Instant
 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.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell with CMC 3 or less | ValidTgts$ 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

res/cardsfolder/mana_leak.txt

@@ -2,7 +2,7 @@ Name:Mana Leak
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ 3 | SpellDescription$ Counter target spell unless its controller pays 3.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 3 | SpellDescription$ Counter target spell unless its controller pays 3.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_leak.jpg

res/cardsfolder/mana_tithe.txt

@@ -2,7 +2,7 @@ Name:Mana Tithe
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ W | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
+A:SP$ Counter | Cost$ W | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_tithe.jpg

res/cardsfolder/memory_lapse.txt

@@ -2,7 +2,7 @@ Name:Memory Lapse
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | Destination$ TopOfLibrary | 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.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ TopOfLibrary | 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|2

res/cardsfolder/mental_misstep.txt

@@ -2,7 +2,7 @@ Name:Mental Misstep
 ManaCost:PU
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ PU | Type$ Spell | CounterValid$ Card.cmcEQ1 | SpellDescription$ Counter target spell with converted mana cost 1.
+A:SP$ Counter | Cost$ PU | TargetType$ Spell | TgtPrompt$ Select target spell with CMC 1 | ValidTgts$ Card.cmcEQ1 | SpellDescription$ Counter target spell with converted mana cost 1.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mental_misstep.jpg
 SetInfo:NPH|Uncommon|http://magiccards.info/scans/en/nph/38.jpg

res/cardsfolder/miscalculation.txt

@@ -2,7 +2,7 @@ Name:Miscalculation
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
 K:Cycling:2
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/mistfolk.txt

@@ -3,7 +3,7 @@ ManaCost:U U
 Types:Creature Illusion
 Text:no text
 PT:1/2
-A:AB$ Counter | Cost$ U | Type$ Spell | SpellTarget$ Card.Self | SpellDescription$ Counter target spell that targets CARDNAME.
+A:AB$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ Card.Self | SpellDescription$ Counter target spell that targets CARDNAME.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mistfolk.jpg
 SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/84.jpg

res/cardsfolder/muddle_the_mixture.txt

@@ -2,7 +2,7 @@ Name:Muddle the Mixture
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U U | Type$ Spell | CounterValid$ Instant,Sorcery | SpellDescription$ Counter target instant or sorcery spell.
+A:SP$ Counter | Cost$ U U | TargetType$ Spell | TgtPrompt$ Select target Instant or Sorcery spell | ValidTgts$ 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

res/cardsfolder/mystic_denial.txt

@@ -2,7 +2,7 @@ Name:Mystic Denial
 ManaCost:1 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U U | Type$ Spell | CounterValid$ Creature,Sorcery | SpellDescription$ Counter target creature or sorcery spell.
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target Creatire or Sorcery spell | ValidTgts$ 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:PO2|Uncommon|http://magiccards.info/scans/en/po2/41.jpg

res/cardsfolder/negate.txt

@@ -2,7 +2,7 @@ Name:Negate
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Card.nonCreature | SpellDescription$ Counter target noncreature spell. 
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target nonCreature Spell | ValidTgts$ Card.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

res/cardsfolder/null_brooch.txt

@@ -2,7 +2,7 @@ Name:Null Brooch
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$ Counter | Cost$ 2 Discard<0/Hand> | Type$ Spell | CounterValid$ Card.nonCreature | Destination$ Graveyard | SpellDescription$ Counter target noncreature spell.
+A:AB$ Counter | Cost$ 2 T Discard<0/Hand> | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature| SpellDescription$ Counter target noncreature spell.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/null_brooch.jpg

res/cardsfolder/offering_to_asha.txt

@@ -2,7 +2,7 @@ Name:Offering to Asha
 ManaCost:2 W U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 W U | Type$ Spell | UnlessCost$ 4 | SubAbility$ SVar=DBGainLife | SpellDescription$ Counter target spell unless its controller pays 4. You gain 4 life.
+A:SP$ Counter | Cost$ 2 W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SubAbility$ SVar=DBGainLife | SpellDescription$ Counter target spell unless its controller pays 4. You gain 4 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 4
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/oppressive_will.txt

@@ -2,7 +2,7 @@ Name:Oppressive Will
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type $ Spell | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each card in your hand.
+A:SP$ Counter | Cost$ 2 U | Type $ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each card in your hand.
 SVar:X:Count$InYourHand
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/order_of_the_sacred_torch.txt

@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Creature Human Knight
 Text:no text
 PT:2/2
-A:AB$ Counter | Cost$ T PayLife<1> | Type$ Spell | CounterValid$ Card.Black | SpellDescription$ Counter target black spell.
+A:AB$ Counter | Cost$ T PayLife<1> | TargetType$ Spell | TgtPrompt$ Select target Black spell | ValidTgts$ Card.Black | SpellDescription$ Counter target black spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_sacred_torch.jpg

res/cardsfolder/override.txt

@@ -2,7 +2,7 @@ Name:Override
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each artifact you control.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each artifact you control.
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True

res/cardsfolder/overrule.txt

@@ -2,7 +2,7 @@ Name:Overrule
 ManaCost:X W U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ X W U | Type$ Spell | UnlessCost$ X | SubAbility$ SVar=DBGainLife | SpellDescription$ Counter target spell unless its controller pays X. You gain X life.
+A:SP$ Counter | Cost$ X W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SubAbility$ SVar=DBGainLife | SpellDescription$ Counter target spell unless its controller pays X. You gain X life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ X
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True

res/cardsfolder/patron_wizard.txt

@@ -3,7 +3,7 @@ ManaCost:U U U
 Types:Creature Human Wizard
 Text:no text
 PT:2/2
-A:AB$ Counter | Cost$ tapXType<1/Wizard> | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
+A:AB$ Counter | Cost$ tapXType<1/Wizard> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare

res/cardsfolder/power_sink.txt

@@ -2,7 +2,7 @@ Name:Power Sink
 ManaCost:X U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ X U | Type$ Spell | UnlessCost$ X | PowerSink$ True | SpellDescription$ Counter target spell unless its controller pays X. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool.
+A:SP$ Counter | Cost$ X U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | PowerSink$ True | SpellDescription$ Counter target spell unless its controller pays X. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/preemptive_strike.txt

@@ -2,7 +2,7 @@ Name:Preemptive Strike
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | CounterValid$ Creature | SpellDescription$ Counter target creature spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal_Three_Kingdoms/preemptive_strike.jpg
 SetInfo:PTK|Common|http://magiccards.info/scans/en/p3k/50.jpg

res/cardsfolder/psychic_barrier.txt

@@ -2,7 +2,7 @@ Name:Psychic Barrier
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U U | Type$ Spell | CounterValid$ Creature | ExtraActions$ CC-LoseLife(1) | SpellDescription$ Counter target creature spell. Its controller loses 1 life.
+A:SP$ Counter | Cost$ U U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | ExtraActions$ CC-LoseLife(1) | SpellDescription$ Counter target creature spell. Its controller loses 1 life.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/psychic_barrier.jpg
 SetInfo:NPH|Common|http://magiccards.info/scans/en/nph/43.jpg

res/cardsfolder/punish_ignorance.txt

@@ -2,7 +2,7 @@ Name:Punish Ignorance
 ManaCost:W U U B
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ W U U B | Type$ Spell | Destination$ Graveyard | ExtraActions$ CC-LoseLife(3) My-GainLife(3) | SpellDescription$ Counter target spell. Its controller loses 3 life and you gain 3 life.
+A:SP$ Counter | Cost$ W U U B | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | ExtraActions$ CC-LoseLife(3) My-GainLife(3) | SpellDescription$ Counter target spell. Its controller loses 3 life and you gain 3 life.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/punish_ignorance.jpg
 SetInfo:ALA|Rare|http://magiccards.info/scans/en/ala/183.jpg

res/cardsfolder/put_away.txt

@@ -2,7 +2,7 @@ Name:Put Away
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | Type$ Spell | Destination$ Graveyard | SubAbility$ SVar=DBChangeZone | SpellDescription$ Counter target spell.  You may shuffle up to one target card from your graveyard into your library.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ SVar=DBChangeZone | SpellDescription$ Counter target spell.  You may shuffle up to one target card from your graveyard into your library.
 SVar:DBChangeZone:DB$ChangeZone | Origin$ Graveyard | Destination$ Library | ValidTgts$ Card.YouCtrl | TgtPrompt$ Select target card from your graveyard | TargetMin$ 0 | TargetMax$ 1 | Shuffle$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/put_away.jpg

res/cardsfolder/rebuff_the_wicked.txt

@@ -2,7 +2,7 @@ Name:Rebuff the Wicked
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ W | Type$ Spell | SpellTarget$ Permanent.YouCtrl | SpellDescription$ Counter target spell that targets a permanent you control.
+A:SP$ Counter | Cost$ W | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ 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

res/cardsfolder/red_elemental_blast.txt

@@ -3,7 +3,7 @@ ManaCost:R
 Types:Instant
 Text:no text
 A:SP$ Destroy | Cost$ R | ValidTgts$ Permanent.Blue | TgtPrompt$ Select target blue permanent | SpellDescription$ Choose one - Destroy target blue permanent
-A:SP$ Counter | Cost$ R | Type$ Spell | CounterValid$ Card.Blue | SpellDescription$ or Counter target blue spell.
+A:SP$ Counter | Cost$ R | TargetType$ Spell | ValidTgts$ Card.Blue | SpellDescription$ or Counter target blue spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/red_elemental_blast.jpg

res/cardsfolder/remand.txt

@@ -2,7 +2,7 @@ Name:Remand
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | Type$ Spell | Destination$ Hand | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell. If that spell is countered this way, put it into it's owner's hand instead of into that player's graveyard. Draw a card.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Hand | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell. If that spell is countered this way, put it into it's owner's hand instead of into that player's graveyard. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card87919.jpg