- Updating SetInfo Script to use CFX instead of CON

- Adding SetInfo data for some recently added cards including the 6 cards that were unable to be parsed by the SetInfoScript

res/cardsfolder/abjure.txt

@@ -6,4 +6,5 @@ A:SP$Counter|Cost$U Sac<1/Permanent.Blue>|Type$Spell|Destination$Graveyard|Spell
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abjure.jpg
+SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/31.jpg
 End

res/cardsfolder/augur_of_skulls.txt

@@ -7,4 +7,5 @@ A:AB$Regenerate|Cost$1 B|SpellDescription$Regenerate CARDNAME.
 A:AB$Discard|Cost$Sac<1/CARDNAME>|ValidTgts$Player|NumCards$2|Mode$TgtChoose|PlayerTurn$True|ActivatingPhases$Upkeep|SpellDescription$Target player discards two cards. Activate this ability only during your upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/augur_of_skulls.jpg
+SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/63.jpg
 End

res/cardsfolder/berserk.txt

@@ -5,4 +5,6 @@ Text:Cast Berserk only before the combat damage step.\r\nTarget creature gains t
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/berserk.jpg
-End
+SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/94.jpg
+SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/94.jpg
+End

res/cardsfolder/cat_burglar.txt

@@ -6,4 +6,5 @@ PT:2/2
 A:AB$Discard|Cost$2 B T|ValidTgts$Player|NumCards$1|Mode$TgtChoose|SorcerySpeed$True|SpellDescription$Target player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cat_burglar.jpg
+SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/54.jpg
 End

res/cardsfolder/consult_the_necrosages.txt

@@ -2,8 +2,9 @@ Name:Consult the Necrosages
 ManaCost:1 U B
 Types:Sorcery
 Text:no text
-A:SP$Draw|Cost$1 U B|ValidTgts$Player|NumCards$2|SpellDescription$Choose one - Target player draws two cards; 
+A:SP$Draw|Cost$1 U B|ValidTgts$Player|NumCards$2|SpellDescription$Choose one - Target player draws two cards;
 A:SP$Discard|Cost$1 U B|ValidTgts$Player|NumCards$2|Mode$TgtChoose|SpellDescription$or target player discards two cards.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/consult_the_necrosages.jpg
+SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/199.jpg
 End

res/cardsfolder/cunning_advisor.txt

@@ -6,4 +6,5 @@ PT:1/1
 A:AB$Discard|Cost$T|Opponent$True|NumCards$1|Mode$TgtChoose|PlayerTurn$True|ActivatingPhases$Upkeep,Draw,Main1,BeginCombat|SpellDescription$Target opponent discards a card. Activate this ability only during your turn, before attackers are declared.
 SVar:Rarity:Uncommon
 SVar:Picture:http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=10533&type=card
-End
+SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/72.jpg
+End

res/cardsfolder/daring_apprentice.txt

@@ -6,4 +6,9 @@ PT:1/1
 A:AB$Counter|Cost$T Sac<1/CARDNAME>|Type$Spell|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
+SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/62.jpg
+SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/60.jpg
+SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/72.jpg
+SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/68.jpg
 End

res/cardsfolder/douse.txt

@@ -6,4 +6,5 @@ A:AB$Counter|Cost$1 U|Type$Spell|Destination$Graveyard|CounterValid$Card.Red|Spe
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/douse.jpg
+SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/70.jpg
 End

res/cardsfolder/dragon_whelp.txt

@@ -7,4 +7,10 @@ K:Flying
 A:AB$Pump | Cost$ R | NumAtt$ +1 | ActivationNumberSacrifice$4 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice CARDNAME at the beginning of the next end step.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_whelp.jpg
+SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/143.jpg
+SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/59.jpg
+SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/204.jpg
+SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/133.jpg
+SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/142.jpg
+SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/142.jpg
 End

res/cardsfolder/dwarven_blastminer.txt

@@ -7,4 +7,5 @@ K:Morph:R
 A:AB$Destroy | Cost$ 2 R T | ValidTgts$ Land.nonBasic | TgtPrompt$Select target nonbasic land.| SpellDescription$ Destroy target nonbasic land.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_blastminer.jpg
+SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/199.jpg
 End

res/cardsfolder/ebony_owl_netsuke.txt

@@ -4,4 +4,5 @@ Types:Artifact
 Text:At the beginning of each opponent's upkeep, if that player has seven or more cards in hand, Ebony Owl Netsuke deals 4 damage to him or her.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ebony_owl_netsuke.jpg
+SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/154.jpg
 End

res/cardsfolder/esper_charm.txt

@@ -2,10 +2,11 @@ Name:Esper Charm
 ManaCost:W U B
 Types:Sorcery
 Text:no text
-A:SP$Destroy|Cost$W U B|ValidTgts$Enchantment|TgtPrompt$Select target Enchantment.|SpellDescription$Choose one - Destroy target Enchantment; 
+A:SP$Destroy|Cost$W U B|ValidTgts$Enchantment|TgtPrompt$Select target Enchantment.|SpellDescription$Choose one - Destroy target Enchantment;
-A:SP$Draw|Cost$W U B|NumCards$2|SpellDescription$or draw two cards; 
+A:SP$Draw|Cost$W U B|NumCards$2|SpellDescription$or draw two cards;
 A:SP$Discard|Cost$W U B|ValidTgts$Player|NumCards$2|Mode$TgtChoose|SpellDescription$or target player discards two cards.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/esper_charm.jpg
+SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/167.jpg
 End

res/cardsfolder/greel_mind_raker.txt

@@ -8,4 +8,5 @@ SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/greel_mind_raker.jpg
+SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/66.jpg
 End

res/cardsfolder/instill_infection.txt

@@ -7,4 +7,5 @@ K:Draw a card.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/instill_infection.jpg
+SetInfo:SOM|Common|http://magiccards.info/scans/en/som/68.jpg
 End

res/cardsfolder/kongming_sleeping_dragon.txt

@@ -7,4 +7,5 @@ K:stPumpAll:Creature.Other+YouCtrl:1/1:no Condition:Other creatures you control
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kongming_sleeping_dragon.jpg
+SetInfo:PTK|Rare|http://magiccards.info/scans/en/p3k/9.jpg
 End

res/cardsfolder/lotus_vale.txt

@@ -10,4 +10,5 @@ K:tap: add G G G
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lotus_vale.jpg
+SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/165.jpg
 End

res/cardsfolder/mindwarper.txt

@@ -7,4 +7,5 @@ K:etbCounter:P1P1:3
 A:AB$Discard|Cost$2 B SubCounter<1/P1P1>|ValidTgts$Player|SorcerySpeed$True|NumCards$1|Mode$TgtChoose|SpellDescription$Target player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindwarper.jpg
+SetInfo:STH|Rare|http://magiccards.info/scans/en/sh/14.jpg
 End

res/cardsfolder/nezumi_bone_reader.txt

@@ -6,4 +6,5 @@ PT:1/1
 A:AB$Discard|Cost$B Sac<1/Creature>|ValidTgts$Player|SorcerySpeed$True|NumCards$1|Mode$TgtChoose|SpellDescription$Target player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_bone_reader.jpg
+SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/127.jpg
 End

res/cardsfolder/piracy_charm.txt

@@ -4,4 +4,5 @@ Types:Instant
 Text:(NOTE: Computer will only use the first ability against you.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/piracy_charm.jpg
+SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/58.jpg
 End

res/cardsfolder/royal_falcon.txt

@@ -6,4 +6,6 @@ PT:1/1
 K:Flying
 SVar:Rarity:Common
 SVar:Picture:http://www.magickartenmarkt.de/img/cards/Starter_1999/royal_falcon.jpg
+SetInfo:S99|Common|http://magiccards.info/scans/en/st/24.jpg
+SetInfo:S00|Common|http://magiccards.info/scans/en/st2k/14.jpg
 End

res/cardsfolder/sadistic_hypnotist.txt

@@ -6,4 +6,5 @@ PT:2/2
 A:AB$Discard | Cost$ Sac<1/Creature> | ValidTgts$Player | NumCards$ 2 | Mode$TgtChoose | SorcerySpeed$True|SpellDescription$ Target player discards two cards. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sadistic_hypnotist.jpg
+SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/159.jpg
 End

res/cardsfolder/scar.txt

@@ -6,4 +6,5 @@ A:SP$PutCounter | Cost$ BR | Tgt$ TgtC | CounterType$ M1M1 | CounterNum$ 1 | IsC
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scar.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/194.jpg
 End

res/cardsfolder/scepter_of_fugue.txt

@@ -5,4 +5,5 @@ Text:no text
 A:AB$Discard|Cost$1 B T|ValidTgts$Player|NumCards$1|Mode$TgtChoose|PlayerTurn$True|SpellDescription$Target player discards a card. Activate this ability only during your turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scepter_of_fugue.jpg
+SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/53.jpg
 End

res/cardsfolder/sea_eagle.txt

@@ -6,4 +6,6 @@ PT:1/1
 K:Flying
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_eagle.jpg
+SetInfo:S99|Common|http://magiccards.info/scans/en/st/50.jpg
+SetInfo:S00|Common|http://magiccards.info/scans/en/st2k/15.jpg
 End

res/cardsfolder/skull_fracture.txt

@@ -6,4 +6,5 @@ A:SP$Discard|Cost$B|ValidTgts$Player|NumCards$1|Mode$TgtChoose|SpellDescription$
 K:Flashback:3 B
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skull_fracture.jpg
+SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/162.jpg
 End

res/cardsfolder/splitting_headache.txt

@@ -2,9 +2,10 @@ Name:Splitting Headache
 ManaCost:3 B
 Types:Sorcery
 Text:no text
-A:SP$Discard | Cost$ 3 B | ValidTgts$ Player | NumCards$ 2 | Mode$ TgtChoose | SpellDescription$ Choose one <20> Target player discards two cards; 
+A:SP$Discard | Cost$ 3 B | ValidTgts$ Player | NumCards$ 2 | Mode$ TgtChoose | SpellDescription$ Choose one <20> Target player discards two cards;
 A:SP$Discard | Cost$ 3 B | ValidTgts$ Player | NumCards$ 1 | Mode$ RevealYouChoose | SpellDescription$ or target player reveals his or her hand, you choose a card from it, then that player discards that card.
 K:Flashback:3 B
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/splitting_headache.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/79.jpg
 End

res/cardsfolder/sudden_impact.txt

@@ -8,4 +8,9 @@ Text:CARDNAME deals damage equal to the number of cards in target player's hand
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sudden_impact.jpg
+SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/226.jpg
+SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/208.jpg
+SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/223.jpg
+SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/222.jpg
+SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/241.jpg
 End

res/cardsfolder/tendrils_of_despair.txt

@@ -5,4 +5,5 @@ Text:no text
 A:SP$Discard|Cost$B Sac<1/Creature>|Opponent$True|NumCards$2|Mode$TgtChoose|SpellDescription$Target opponent discards two cards.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tendrils_of_despair.jpg
-End
+SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/25.jpg
+End

res/cardsfolder/unstable_mutation.txt

@@ -5,4 +5,9 @@ Text:Enchanted creature gets +3/+3.\r\nAt the beginning of the upkeep of enchant
 K:enPump:+3/+3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unstable_mutation.jpg
+SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/33.jpg
+SetInfo:3ED|Common|http://magiccards.info/scans/en/rv/86.jpg
+SetInfo:4ED|Common|http://magiccards.info/scans/en/4e/110.jpg
+SetInfo:ARN|Common|http://magiccards.info/scans/en/an/28.jpg
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/131.jpg
 End

res/cardsfolder/urborg_mindsucker.txt

@@ -6,4 +6,5 @@ PT:2/2
 A:AB$Discard|Cost$B Sac<1/CARDNAME>|Opponent$True|SorcerySpeed$True|NumCards$1|Mode$Random|SpellDescription$Target opponent discards a card at random. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg_mindsucker.jpg
+SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/21.jpg
 End

res/cardsfolder/vodalian_hypnotist.txt

@@ -6,4 +6,5 @@ PT:1/1
 A:AB$Discard|Cost$2 B T|ValidTgts$Player|SorcerySpeed$True|NumCards$1|Mode$TgtChoose|SpellDescription$Target player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vodalian_hypnotist.jpg
+SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/84.jpg
 End

res/cardsfolder/wall_of_distortion.txt

@@ -7,4 +7,5 @@ K:Defender
 A:AB$Discard|Cost$2 B T|ValidTgts$Player|SorcerySpeed$True|NumCards$1|Mode$TgtChoose|SpellDescription$Target player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_distortion.jpg
+SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/171.jpg
 End

res/cardsfolder/willow_elf.txt

@@ -5,4 +5,6 @@ Text:no text
 PT:1/1
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/p3/en-us/card21051.jpg
+SetInfo:S99|Common|http://magiccards.info/scans/en/st/152.jpg
+SetInfo:S00|Common|http://magiccards.info/scans/en/st2k/20.jpg
 End

res/cardsfolder/windseeker_centaur.txt

@@ -4,6 +4,7 @@ Types:Creature Centaur
 Text:no text
 PT:2/2
 K:Vigilance
-SVar:Rarity:Common
+SVar:Rarity:Special
 SVar:Picture:http://www.wizards.com/global/images/magic/general/windseeker_centaur.jpg
+SetInfo:MBP|Special|http://magiccards.info/scans/en/mbp/3.jpg
 End

res/cardsfolder/zuran_enchanter.txt

@@ -6,4 +6,5 @@ PT:1/1
 A:AB$Discard|Cost$2 B T|ValidTgts$Player|PlayerTurn$True|NumCards$1|Mode$TgtChoose|SpellDescription$Target player discards a card. Activate this ability only during your turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zuran_enchanter.jpg
+SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/110.jpg
 End

res/setInfoScript.py

@@ -125,7 +125,7 @@ def initSets():
 	
 	# Alara
 	allSets['Shards of Alara'] = 'ALA'
-	allSets['Conflux'] = 'CON'
+	allSets['Conflux'] = 'CFX'
 	allSets['Alara Reborn'] = 'ARB'
 	
 	# Zendikar