merge from trunk

.gitattributes

@@ -13,6 +13,7 @@
 /pom.xml svneol=native#text/xml
 res/AllTokens.txt svneol=native#text/plain
 res/PerSetTracking.py svneol=native#text/x-python
+res/assignSetInfo.py -text
 res/blockdata/blocks.txt svneol=native#text/plain
 res/blockdata/boosters.txt -text
 res/blockdata/fantasyblocks.txt -text
@@ -2493,6 +2494,7 @@ res/cardsfolder/d/deglamer.txt svneol=native#text/plain
 res/cardsfolder/d/dehydration.txt svneol=native#text/plain
 res/cardsfolder/d/deity_of_scars.txt svneol=native#text/plain
 res/cardsfolder/d/deja_vu.txt svneol=native#text/plain
+res/cardsfolder/d/delaying_shield.txt -text
 res/cardsfolder/d/delifs_cone.txt -text
 res/cardsfolder/d/delifs_cube.txt -text
 res/cardsfolder/d/delirium.txt svneol=native#text/plain
@@ -4342,6 +4344,7 @@ res/cardsfolder/g/goblin_warchief.txt svneol=native#text/plain
 res/cardsfolder/g/goblin_warchief_avatar.txt -text
 res/cardsfolder/g/goblin_wardriver.txt svneol=native#text/plain
 res/cardsfolder/g/goblin_warrens.txt svneol=native#text/plain
+res/cardsfolder/g/goblin_welder.txt -text
 res/cardsfolder/g/goblin_wizard.txt svneol=native#text/plain
 res/cardsfolder/g/goblins_of_the_flarg.txt svneol=native#text/plain
 res/cardsfolder/g/godhead_of_awe.txt svneol=native#text/plain
@@ -12422,6 +12425,7 @@ res/licenses/multiline-label-license.txt svneol=native#text/plain
 res/licenses/xpp3-license.txt svneol=native#text/plain
 res/licenses/xstream-license.txt svneol=native#text/plain
 res/mtg-data.txt svneol=native#text/plain
+res/mtgdata-sets-to-forge.txt -text
 res/oracleScript.py -text svneol=unset#text/x-python
 res/pics_link/card-pictures_a.txt svneol=native#text/plain
 res/pics_link/card-pictures_b.txt svneol=native#text/plain
@@ -13717,7 +13721,6 @@ src/main/java/forge/card/CardType.java -text
 src/main/java/forge/card/ColorSet.java -text
 src/main/java/forge/card/DeckHints.java -text
 src/main/java/forge/card/EditionCollection.java svneol=native#text/plain
-src/main/java/forge/card/EditionInfo.java svneol=native#text/plain
 src/main/java/forge/card/FatPackData.java -text
 src/main/java/forge/card/FormatCollection.java -text
 src/main/java/forge/card/ICardCharacteristics.java -text

CHANGES.txt

@@ -6,7 +6,13 @@ Forge Beta: 03-##-2013 ver 1.3.10
 
 Release Notes:
 
+A new quest world by Serrasmurf based on Ravinca has been added.
 
+An effort is being made to implement the split cards (e.g. Fire/Ice) in Forge.
+
+The "Scale Image Larger" option in the preferences should be fixed. It should no longer continue to scale images larger when it is disabled.
+
+The fat packs should now be available for purchase in the quest mode card shop.
 
 
 New Cards:
@@ -15,6 +21,13 @@ Dimensional Breach
 Lim-Dul's Vault
 Eureka
 Hypergenesis
+Death by Dragons
+Carpet of Flowers
+Goblin Welder
+Delaying Shield
+Fatal Lore
+Library of Lat-Nam
+Misfortune
 
 
 New Phenomenons:

res/assignSetInfo.py

@@ -0,0 +1,142 @@
+#!/usr/bin/env python
+
+import os,sys,fnmatch,re
+
+pathToMtgData = "mtg-data.txt"
+pathToSetsMatchTable = "mtgdata-sets-to-forge.txt"
+
+class cis:      # CardInSet
+	def __init__(self):
+		self.rarity = "C"
+		self.arts = 0
+
+	def __str__(self):
+		return self.rarityFull() if self.arts <= 1 else "{} x{}".format(self.rarityFull(), self.arts)
+
+	def __repr__(self):
+		return self.__str__()
+
+	def rarityFull(self):
+		if (self.rarity == "B"):
+			return "Land"
+		if (self.rarity == "R"):
+			return "Rare"
+		if (self.rarity == "U"):
+			return "Uncommon"
+		if (self.rarity == "S"):
+			return "Special"
+		if (self.rarity == "M"):
+			return "Mythic"
+		return "Common"
+
+
+if __name__ == '__main__':
+	if not os.path.exists(pathToMtgData) :
+		print("This script requires the text version of Arch's mtg-data to be present.You can download it from slightlymagic.net's forum and either place the text version next to this script or edit this script and provide the path to the file at the top.")
+		print("Press Enter to exit")
+		raw_input("")
+		sys.exit()
+
+	setCodes = []
+	setCodeToName = {}
+	setCodeToForge = {}
+	mtgDataCards = {}
+
+
+	hasFetchedSets = False
+	hasFetchedCardName = False
+	tmpName = ""
+	line = ""
+	prevline = ""
+
+	#Parse mtg-data
+	print("Parsing mtg-data...")
+	with open(pathToMtgData) as mtgdata :
+		for line in mtgdata :
+			# Parse the sets at the top of the mtgdata file
+			if not hasFetchedSets :
+				if line != "\n" :
+					splitLine = line.split('  ') 
+					code = splitLine[0]
+					setCodeToName[code] = splitLine[-1].replace('\n', '')
+					#print splitLine, code, setCodeToName[code]
+					setCodes.append(code)
+				else :
+					hasFetchedSets = True
+
+			# Once all sets are parsed, time to parse the cards
+			elif hasFetchedSets :
+				if not hasFetchedCardName :
+					tmpName = line.rstrip()
+					hasFetchedCardName = True
+					oracle = ""
+
+				else:
+					oracle += line
+
+				if line == "\n" :
+					#mtgOracleCards[tmpName] = oracle.replace(prevline, '')
+
+					sets = prevline.split(", ")
+					editions = {}
+					for i in range(len(sets)):
+						ee = sets[i].split(' ')
+						setName = ee[0]
+						if not setName in editions:
+							editions[setName] = cis()
+						editions[setName].rarity = ee[1].strip()
+						prints = int(ee[2][2:3]) if len(ee) > 2 else 1
+						editions[setName].arts += prints
+					#print sets
+					mtgDataCards[tmpName] = editions
+					hasFetchedCardName = False
+
+			prevline = line
+
+
+	print("Matching mtg-data and Forge sets")
+	with open(pathToSetsMatchTable) as setsMatch :
+		for line in setsMatch:
+			if line[0:3] == "---":
+				code = line[3:].split(" ")[0]
+				setCodeToForge[code] = None
+
+			elif line[0:3] == "===":
+				code = line[3:].split(" ")[0]				
+				setCodeToForge[code] = code;
+			else:
+				code1 = line.split(" ")[0]
+				code2 = line.split(" ")[1]
+				setCodeToForge[code1] = code2
+
+
+	folder = "cardsfolder"
+	for root, dirnames, filenames in os.walk(folder):
+		for fileName in fnmatch.filter(filenames, '*.txt'):
+			if fileName.startswith('.'):
+				continue
+			
+			cardfile = open(os.path.join(root, fileName), 'r')
+
+			firstLine = cardfile.readline().strip()
+			cardName = firstLine[5:]
+
+			print (cardName, fileName)
+			validLines = []
+			validLines.append(firstLine)
+
+			for line in cardfile.readlines(): 
+				if line[:8] != "SetInfo:" and line[:8] != "SVar:Rar":
+					validLines.append(line.strip())
+			cardfile.close()
+
+			for e in mtgDataCards[cardName]:
+				if not setCodeToForge[e] is None:
+					validLines.append( "SetInfo:{} {}".format(setCodeToForge[e], mtgDataCards[cardName][e]) )
+
+			toWrite = "\n".join(validLines)
+
+			cardfile = open(os.path.join(root, fileName), 'w')
+			cardfile.write(toWrite)
+			cardfile.close();
+		

res/blockdata/fatpacks.txt

@@ -32,18 +32,18 @@ Set:EVE|LandSet:SHM|Boosters:8|BasicLands:40
 Set:ALA|LandSet:ALA|Boosters:8|BasicLands:40
 Set:CFX|LandSet:ALA|Boosters:8|BasicLands:40
 Set:ARB|LandSet:ALA|Boosters:8|BasicLands:40
-Set:M10|LandSet:M10|Boosters:8|BasicLands:80
+Set:M10|LandSet:M10|Boosters:8|BasicLands:40
-Set:ZEN|LandSet:ZEN|Boosters:8|BasicLands:80
+Set:ZEN|LandSet:ZEN|Boosters:8|BasicLands:40
-Set:WWK|LandSet:ZEN|Boosters:8|BasicLands:80
+Set:WWK|LandSet:ZEN|Boosters:8|BasicLands:40
-Set:ROE|LandSet:ROE|Boosters:8|BasicLands:80
+Set:ROE|LandSet:ROE|Boosters:8|BasicLands:40
-Set:M11|LandSet:M11|Boosters:8|BasicLands:80
+Set:M11|LandSet:M11|Boosters:8|BasicLands:40
-Set:SOM|LandSet:SOM|Boosters:9|BasicLands:80
+Set:SOM|LandSet:SOM|Boosters:8|BasicLands:40
 Set:MBS|LandSet:MBS|Boosters:9|BasicLands:80
 Set:NPH|LandSet:NPH|Boosters:9|BasicLands:80
 Set:M12|LandSet:M12|Boosters:9|BasicLands:80
-Set:ISD|LandSet:ISD|Boosters:9|BasicLands:60
+Set:ISD|LandSet:ISD|Boosters:9|BasicLands:70
-Set:DKA|LandSet:ISD|Boosters:9|BasicLands:60
+Set:DKA|LandSet:ISD|Boosters:9|BasicLands:70
-Set:AVR|LandSet:AVR|Boosters:9|BasicLands:60
+Set:AVR|LandSet:AVR|Boosters:9|BasicLands:80
 Set:M13|LandSet:M13|Boosters:9|BasicLands:80
-Set:RTR|LandSet:RTR|Boosters:9|BasicLands:40
+Set:RTR|LandSet:RTR|Boosters:9|BasicLands:80
-Set:GTC|LandSet:RTR|Boosters:9|BasicLands:40
+Set:GTC|LandSet:RTR|Boosters:9|BasicLands:80

res/cardsfolder/a/a_display_of_my_dark_power.txt

@@ -5,7 +5,6 @@ T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DarkEffect | TriggerZones$
 SVar:DarkEffect:AB$ Effect | Cost$ 0 | Name$ Dark Power Scheme | Duration$ UntilYourNextTurn | Triggers$ DarkPower | SVars$ DarkMana
 SVar:DarkPower:Mode$ TapsForMana | ValidCard$ Land | Execute$ DarkMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
 SVar:DarkMana:AB$ ManaReflected | Cost$ 0 | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
-SVar:Rarity:Common
 SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/a_display_of_my_dark_power.jpg
-SetInfo:ARC|Common|http://magiccards.info/extras/scheme/archenemy/a-display-of-my-dark-power.jpg
 Oracle:When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+SetInfo:ARC Common

res/cardsfolder/a/abandon_hope.txt

@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ Discard | Cost$ X 1 B Discard<X/Card/card> | ValidTgts$ Opponent | Mode$ RevealYouChoose | NumCards$ X | References$ X | SpellDescription$ Look at target opponent's hand and choose X cards from it. That player discards those cards.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandon_hope.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/1.jpg
 Oracle:As an additional cost to cast Abandon Hope, discard X cards.\nLook at target opponent's hand and choose X cards from it. That player discards those cards.
+SetInfo:TMP Uncommon

res/cardsfolder/a/abandoned_outpost.txt

@@ -4,7 +4,6 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 K:CARDNAME enters the battlefield tapped.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandoned_outpost.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/312.jpg
 Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color to your mana pool.
+SetInfo:ODY Common

res/cardsfolder/a/abattoir_ghoul.txt

@@ -6,7 +6,6 @@ K:First Strike
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, you gain life equal to that creature's toughness.
 SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:TriggeredCard$CardToughness
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abattoir_ghoul.jpg
-SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/85.jpg
 Oracle:First strike\nWhenever a creature dealt damage by Abattoir Ghoul this turn dies, you gain life equal to that creature's toughness.
+SetInfo:ISD Uncommon

res/cardsfolder/a/abbey_gargoyles.txt

@@ -4,8 +4,7 @@ Types:Creature Gargoyle
 PT:3/4
 K:Flying
 K:Protection from red
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_gargoyles.jpg
-SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/101.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/277.jpg
 Oracle:Flying, protection from red
+SetInfo:5ED Uncommon
+SetInfo:HML Uncommon

res/cardsfolder/a/abbey_griffin.txt

@@ -4,7 +4,6 @@ Types:Creature Griffin
 PT:2/2
 K:Flying
 K:Vigilance
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_griffin.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/1.jpg
 Oracle:Flying, vigilance
+SetInfo:ISD Common

res/cardsfolder/a/abbey_matron.txt

@@ -3,7 +3,6 @@ ManaCost:2 W
 Types:Creature Human Cleric
 PT:1/3
 A:AB$ Pump | Cost$ W T | NumDef$ +3 | SpellDescription$ CARDNAME gets +0/+3 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_matron.jpg
-SetInfo:HML|Common|http://magiccards.info/scans/en/hl/102.jpg|2
 Oracle:{W}, {T}: Abbey Matron gets +0/+3 until end of turn.
+SetInfo:HML Common x2

res/cardsfolder/a/abduction.txt

@@ -9,8 +9,7 @@ SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Enchanted
 T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigReturnOwner | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under its owner's control.
 SVar:TrigReturnOwner:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abduction.jpg
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/30.jpg
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/55.jpg
 Oracle:Enchant creature\nWhen Abduction enters the battlefield, untap enchanted creature.\nYou control enchanted creature.\nWhen enchanted creature dies, return that card to the battlefield under its owner's control.
+SetInfo:WTH Uncommon
+SetInfo:6ED Uncommon

res/cardsfolder/a/abeyance.txt

@@ -5,7 +5,6 @@ A:SP$ Effect | Cost$ 1 W | ValidTgts$ Player | Name$ Abeyance Effect | StaticAbi
 SVar:STCantBeCast:Mode$ CantBeCast | ValidCard$ Instant,Sorcery | Caster$ Player.IsRemembered | EffectZone$ Command | Description$ Target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
 SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Card | Activator$ Player.IsRemembered | EffectZone$ Command | NonMana$ True
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abeyance.jpg
-SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/117.jpg
 Oracle:Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.\nDraw a card.
+SetInfo:WTH Rare

res/cardsfolder/a/abjure.txt

@@ -3,7 +3,6 @@ ManaCost:U
 Types:Instant
 A:SP$ Counter | Cost$ U Sac<1/Permanent.Blue/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
-SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/31.jpg
 Oracle:As an additional cost to cast Abjure, sacrifice a blue permanent.\nCounter target spell.
+SetInfo:WTH Common

res/cardsfolder/a/abolish.txt

@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Instant
 A:SP$ Destroy | Cost$ 1 W W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:AltCost:Cost$ Discard<1/Plains>
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abolish.jpg
-SetInfo:PCY|Uncommon|http://magiccards.info/scans/en/pr/1.jpg
 Oracle:You may discard a Plains card rather than pay Abolish's mana cost.\nDestroy target artifact or enchantment.
+SetInfo:PCY Uncommon
+SetInfo:DDF Uncommon

res/cardsfolder/a/abomination.txt

@@ -8,8 +8,7 @@ SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execu
 SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
 SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker
 SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/1.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/1.jpg
 Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+SetInfo:LEG Uncommon
+SetInfo:4ED Uncommon

res/cardsfolder/a/aboroth.txt

@@ -3,7 +3,6 @@ ManaCost:4 G G
 Types:Creature Elemental
 PT:9/9
 K:Cumulative upkeep:AddCounter<1/M1M1>:Put a -1/-1 counter on CARDNAME.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboroth.jpg
-SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/59.jpg
 Oracle:Cumulative upkeep-Put a -1/-1 counter on Aboroth. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
+SetInfo:WTH Rare

res/cardsfolder/a/aboshan_cephalid_emperor.txt

@@ -4,7 +4,6 @@ Types:Legendary Creature Cephalid
 PT:3/3
 A:AB$ Tap | Cost$ tapXType<1/Cephalid> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
 A:AB$ TapAll | Cost$ U U U | ValidCards$ Creature.withoutFlying | SpellDescription$ Tap all creatures without flying.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshan_cephalid_emperor.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/58.jpg
 Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
+SetInfo:ODY Rare

res/cardsfolder/a/aboshans_desire.txt

@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshans_desire.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/59.jpg
 Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
+SetInfo:ODY Common

res/cardsfolder/a/about_face.txt

@@ -3,7 +3,6 @@ ManaCost:R
 Types:Instant
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/about_face.jpg
-SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/73.jpg
 Oracle:Switch target creature's power and toughness until end of turn.
+SetInfo:ULG Common

res/cardsfolder/a/abrupt_decay.txt

@@ -3,7 +3,6 @@ ManaCost:B G
 Types:Instant
 K:CARDNAME can't be countered.
 A:SP$ Destroy | Cost$ B G | ValidTgts$ Permanent.nonLand+cmcLE3 | TgtPrompt$ Select target nonland permanent with converted mana cost 3 or less | SpellDescription$ Destroy target nonland permanent with converted mana cost 3 or less.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abrupt_decay.jpg
-SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/141.jpg
 Oracle:Abrupt Decay can't be countered by spells or abilities.\nDestroy target nonland permanent with converted mana cost 3 or less.
+SetInfo:RTR Rare

res/cardsfolder/a/absolute_grace.txt

@@ -3,7 +3,6 @@ ManaCost:1 W
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Protection from black | Description$ All creatures have protection from black.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolute_grace.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/1.jpg
 Oracle:All creatures have protection from black.
+SetInfo:USG Uncommon

res/cardsfolder/a/absolute_law.txt

@@ -3,7 +3,6 @@ ManaCost:1 W
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Protection from red | Description$ All creatures have protection from red.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolute_law.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/2.jpg
 Oracle:All creatures have protection from red.
+SetInfo:USG Uncommon

res/cardsfolder/a/absolver_thrull.txt

@@ -6,4 +6,4 @@ K:Haunt:TrigDestroy:Destroy target enchantment.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment
 Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Absolver Thrull enters the battlefield or the creature it haunts dies, destroy target enchantment.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolver_thrull.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/1.jpg
+SetInfo:GPT Common

res/cardsfolder/a/absorb.txt

@@ -3,7 +3,6 @@ ManaCost:W U U
 Types:Instant
 A:SP$ Counter | Cost$ W U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell. You gain 3 life. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card23155.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/226.jpg
 Oracle:Counter target spell. You gain 3 life.
+SetInfo:INV Rare

res/cardsfolder/a/absorb_vis.txt

@@ -4,7 +4,6 @@ Types:Sorcery
 K:TypeCycling:Basic:1 B
 A:SP$ LoseLife | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 4 life and you gain 4 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absorb_vis.jpg
-SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/40.jpg
 Oracle:Target player loses 4 life and you gain 4 life.\nBasic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+SetInfo:CFX Common

res/cardsfolder/a/abu_jafar.txt

@@ -4,8 +4,7 @@ Types:Creature Human
 PT:0/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockingSource,Creature.blockedBySource | NoRegen$ True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abu_jafar.jpg
 Oracle:When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
-SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/57.jpg
+SetInfo:CHR Uncommon
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/55.jpg
+SetInfo:ARN Uncommon

res/cardsfolder/a/abuna_acolyte.txt

@@ -4,7 +4,6 @@ Types:Creature Cat Cleric
 PT:1/1
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn.
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature.Artifact | Amount$ 2 | TgtPrompt$ Select target artifact creature | SpellDescription$ Prevent the next 2 damage that would be dealt to target artifact creature this turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abuna_acolyte.jpg
-SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/1.jpg
 Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\n{T}: Prevent the next 2 damage that would be dealt to target artifact creature this turn.
+SetInfo:SOM Uncommon

res/cardsfolder/a/abunas_chant.txt

@@ -6,7 +6,6 @@ A:SP$ PreventDamage | Cost$ 3 W | ValidTgts$ Creature | TgtPrompt$ Select target
 A:SP$ GainLife | Cost$ 5 W | PrecostDesc$ Entwine | CostDesc$ 2 | LifeAmount$ 5 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBPreventDamage
 SVar:DBPreventDamage:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abunas_chant.jpg
-SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/1.jpg
 Oracle:Choose one - You gain 5 life; or prevent the next 5 damage that would be dealt to target creature this turn.\nEntwine {2} (Choose both if you pay the entwine cost.)
+SetInfo:5DN Common

res/cardsfolder/a/abundance.txt

@@ -6,8 +6,7 @@ SVar:AbundantChoice:AB$ GenericChoice | Cost$ 0 | Choices$ DigLand,DigNonland |
 SVar:DigLand:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | ChoiceDescription$ Land
 SVar:DigNonland:DB$ DigUntil | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | ChoiceDescription$ nonLand
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundance.jpg
-SetInfo:USG|Rare|http://magiccards.info/scans/en/us/229.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/249.jpg
 Oracle:If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
+SetInfo:10E Rare
+SetInfo:USG Rare

res/cardsfolder/a/abundant_growth.txt

@@ -7,7 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:FreeCard:DB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "T: Add one mana of any color to your mana pool."
 SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundant_growth.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/167.jpg
 Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color to your mana pool."
+SetInfo:AVR Common

res/cardsfolder/a/abyssal_gatekeeper.txt

@@ -4,7 +4,7 @@ Types:Creature Horror
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player sacrifices a creature.
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ Each
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_gatekeeper.jpg
-SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/1.jpg
 Oracle:When Abyssal Gatekeeper dies, each player sacrifices a creature.
+SetInfo:DDC Common
+SetInfo:WTH Common

res/cardsfolder/a/abyssal_horror.txt

@@ -5,9 +5,8 @@ PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards two cards.
 SVar:TrigDiscard:DB$Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 2 | Mode$ TgtChoose
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_horror.jpg
-SetInfo:USG|Rare|http://magiccards.info/scans/en/us/115.jpg
-SetInfo:S99|Rare|http://magiccards.info/scans/en/st/63.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/115.jpg
 Oracle:Flying\nWhen Abyssal Horror enters the battlefield, target player discards two cards.
+SetInfo:S99 Rare
+SetInfo:7ED Rare
+SetInfo:USG Rare

res/cardsfolder/a/abyssal_hunter.txt

@@ -5,8 +5,7 @@ PT:1/1
 A:AB$ DealDamage | Cost$ B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ DBTap | References$ X | SpellDescription$ Tap target creature. CARDNAME deals damage equal to CARDNAME's power to that creature.
 SVar:DBTap:DB$ Tap | Defined$ Targeted
 SVar:X:Count$CardPower
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_hunter.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/109.jpg
-SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/1.jpg
 Oracle:{B}, {T}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
+SetInfo:MIR Rare
+SetInfo:6ED Rare

res/cardsfolder/a/abyssal_nightstalker.txt

@@ -4,7 +4,6 @@ Types:Creature Nightstalker
 PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDiscards | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player discards a card.
 SVar:TrigDiscards:AB$ Discard | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 1 | Mode$ TgtChoose
-SVar:Rarity:Uncommon
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Second_Age/abyssal_nightstalker.jpg
-SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/1.jpg
 Oracle:Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
+SetInfo:PO2 Uncommon

res/cardsfolder/a/abyssal_nocturnus.txt

@@ -4,7 +4,6 @@ Types:Creature Horror
 PT:2/2
 T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an opponent discards a card, CARDNAME gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | KW$ Fear
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_nocturnus.jpg
-SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/43.jpg
 Oracle:Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+SetInfo:GPT Rare

res/cardsfolder/a/abyssal_persecutor.txt

@@ -7,7 +7,6 @@ K:Trample
 S:Mode$ Continuous | Affected$ You | AddKeyword$ You can't win the game. | Description$ You can't win the game.
 S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ You can't lose the game. | Description$ Your opponents can't lose the game.
 SVar:RemAIDeck:True
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_persecutor.jpg
-SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/47.jpg
 Oracle:Flying, trample\nYou can't win the game and your opponents can't lose the game.
+SetInfo:WWK Mythic

res/cardsfolder/a/abyssal_specter.txt

@@ -5,11 +5,11 @@ PT:2/3
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_specter.jpg
-SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/117.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/1.jpg
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/110.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/1.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/116.jpg
 Oracle:Flying\nWhenever Abyssal Specter deals damage to a player, that player discards a card.
+SetInfo:8ED Uncommon
+SetInfo:7ED Uncommon
+SetInfo:6ED Uncommon
+SetInfo:5ED Uncommon
+SetInfo:ICE Uncommon
+SetInfo:DDC Uncommon

res/cardsfolder/a/academy_at_tolaria_west.txt

@@ -9,7 +9,6 @@ T:Mode$ PlanarDice | Result$ Planeswalk | TriggerZones$ Command | Execute$ Rolle
 SVar:RolledWalk:AB$ Planeswalk | Cost$ 0
 A:AB$ RollPlanarDice | Cost$ X | SorcerySpeed$ True | ActivationZone$ Command | SpellDescription$ Roll the planar dice.
 SVar:X:Count$RolledThisTurn
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_at_tolaria_west.jpg
-SetInfo:HOP|Common|http://magiccards.info/extras/plane/planechase/academy-at-tolaria-west.jpg
 Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever you roll {C}, discard your hand.
+SetInfo:HOP Common

res/cardsfolder/a/academy_rector.txt

@@ -8,7 +8,6 @@ SVar:DBReturn:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Chan
 SVar:SacMe:4
 SVar:RemRandomDeck:True
 DeckNeeds:Type$Enchantment
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_rector.jpg
-SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/1.jpg
 Oracle:When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library.
+SetInfo:UDS Rare

res/cardsfolder/a/academy_researchers.txt

@@ -4,8 +4,7 @@ Types:Creature Human Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource | AttachedTo$ Self
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_researchers.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/58.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/63.jpg
 Oracle:When Academy Researchers enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
+SetInfo:10E Uncommon
+SetInfo:USG Uncommon

res/cardsfolder/a/academy_ruins.txt

@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ ChangeZone | Cost$ 1 U T | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target artifact card from your graveyard on top of your library.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_ruins.jpg
-SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/269.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
+SetInfo:TSP Rare

res/cardsfolder/a/accelerate.txt

@@ -3,7 +3,6 @@ ManaCost:1 R
 Types:Instant
 A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SubAbility$ DBDraw | SpellDescription$ Target creature gains haste until end of turn.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerate.jpg
-SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/90.jpg
 Oracle:Target creature gains haste until end of turn.\nDraw a card.
+SetInfo:TOR Common

res/cardsfolder/a/accelerated_mutation.txt

@@ -3,7 +3,6 @@ ManaCost:3 G G
 Types:Instant
 A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | References$ X | SpellDescription$ Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
 SVar:X:Count$MaxCMCYouCtrl
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerated_mutation.jpg
-SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/109.jpg
 Oracle:Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
+SetInfo:SCG Common

res/cardsfolder/a/acceptable_losses.txt

@@ -2,7 +2,6 @@ Name:Acceptable Losses
 ManaCost:3 R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 3 R Discard<1/Random> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acceptable_losses.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/172.jpg
 Oracle:As an additional cost to cast Acceptable Losses, discard a card at random.\nAcceptable Losses deals 5 damage to target creature.
+SetInfo:ODY Common

res/cardsfolder/a/accorder_paladin.txt

@@ -4,7 +4,6 @@ Types:Creature Human Knight
 PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
 SVar:TrigBattleCry:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
-SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/1.jpg
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
+SetInfo:MBS Uncommon

res/cardsfolder/a/accorders_shield.txt

@@ -3,7 +3,6 @@ ManaCost:0
 Types:Artifact Equipment
 K:Equip 3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 3 | AddKeyword$ Vigilance | Description$ Equipped creature gets +0/+3 and has vigilance.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorders_shield.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/136.jpg
 Oracle:Equipped creature gets +0/+3 and has vigilance.\nEquip {3}
+SetInfo:SOM Common

res/cardsfolder/a/accumulated_knowledge.txt

@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ Draw | Cost$ 1 U | Defined$ You | NumCards$ 1 | SubAbility$ DBDraw | SpellDescription$ Draw a card, then draw cards equal to the number of cards named CARDNAME in all graveyards.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ X | References$ X
 SVar:X:Count$NamedInAllYards.Accumulated Knowledge
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accumulated_knowledge.jpg
-SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/26.jpg
 Oracle:Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
+SetInfo:NMS Common

res/cardsfolder/a/accursed_centaur.txt

@@ -5,7 +5,6 @@ PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice a creature.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accursed_centaur.jpg
-SetInfo:ONS|Common|http://magiccards.info/scans/en/on/123.jpg
 Oracle:When Accursed Centaur enters the battlefield, sacrifice a creature.
+SetInfo:ONS Common

res/cardsfolder/a/acid_rain.txt

@@ -3,7 +3,6 @@ ManaCost:3 U
 Types:Sorcery
 A:SP$ DestroyAll | Cost$ 3 U | ValidCards$ Forest | SpellDescription$ Destroy all Forests.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_rain.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/44.jpg
 Oracle:Destroy all Forests.
+SetInfo:LEG Rare

res/cardsfolder/a/acid_web_spider.txt

@@ -6,7 +6,6 @@ K:Reach
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target Equipment.
 SVar:TrigDestroy:DB$Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Choose target equipment.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_web_spider.jpg
-SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/108.jpg
 Oracle:Reach\nWhen Acid Web Spider enters the battlefield, you may destroy target Equipment.
+SetInfo:SOM Uncommon

res/cardsfolder/a/acidic_dagger.txt

@@ -8,7 +8,6 @@ SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
 SVar:TrigSac:DB$ SacrificeAll | Defined$ Imprinted | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_dagger.jpg
-SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/256.jpg
 Oracle:{4}, {T}: Whenever target creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature. When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger. Activate this ability only before blockers are declared.
+SetInfo:MIR Rare

res/cardsfolder/a/acidic_slime.txt

@@ -6,11 +6,10 @@ K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact, enchantment, or land.
 SVar:TrigDestroy:DB$Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_slime.jpg
-SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/161.jpg
-SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/165.jpg
-SetInfo:M13|Uncommon|http://magiccards.info/scans/en/m13/159.jpg
-SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/161.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/140.jpg
 Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
+SetInfo:M11 Uncommon
+SetInfo:M10 Uncommon
+SetInfo:M12 Uncommon
+SetInfo:COM Uncommon
+SetInfo:M13 Uncommon

res/cardsfolder/a/acidic_sliver.txt

@@ -5,7 +5,7 @@ PT:2/2
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Damage | Description$ All Slivers have "2, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
 SVar:Damage:AB$DealDamage | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:BuffedBy:Sliver
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_sliver.jpg
-SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/138.jpg
 Oracle:All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
+SetInfo:H09 Uncommon
+SetInfo:STH Uncommon

res/cardsfolder/a/acidic_soil.txt

@@ -6,7 +6,6 @@ SVar:DBDamageOpp:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:AIPlayForSub:True
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_soil.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/172.jpg
 Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
+SetInfo:USG Uncommon

res/cardsfolder/a/acolyte_of_xathrid.txt

@@ -3,7 +3,6 @@ ManaCost:B
 Types:Creature Human Cleric
 PT:0/1
 A:AB$ LoseLife | Cost$ 1 B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SpellDescription$ Target player loses 1 life.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acolyte_of_xathrid.jpg
-SetInfo:M10|Common|http://magiccards.info/scans/en/m10/83.jpg
 Oracle:{1}{B}, {T}: Target player loses 1 life.
+SetInfo:M10 Common

res/cardsfolder/a/acorn_catapult.txt

@@ -5,7 +5,6 @@ A:AB$ DealDamage | Cost$ 1 T | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPromp
 SVar:SquirrelTokenCtrl:DB$ Token | TokenAmount$ 1 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ Targeted | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ SquirrelTokenPlayer | ConditionDefined$ Targeted | ConditionPresent$ Card.Creature | ConditionCompare$ EQ0
 SVar:SquirrelTokenPlayer:DB$ Token | TokenAmount$ 1 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ TargetedController | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Card.Creature | ConditionCompare$ GE1
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_catapult.jpg
-SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/241.jpg
 Oracle:{1}, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
+SetInfo:COM Rare

res/cardsfolder/a/acorn_harvest.txt

@@ -3,7 +3,6 @@ ManaCost:3 G
 Types:Sorcery
 K:Flashback 1 G PayLife<3>
 A:SP$ Token | Cost$ 3 G | TokenAmount$ 2 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 green Squirrel creature tokens onto the battlefield.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_harvest.jpg
-SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/118.jpg
 Oracle:Put two 1/1 green Squirrel creature tokens onto the battlefield.\nFlashback-{1}{G}, Pay 3 life. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+SetInfo:TOR Common

res/cardsfolder/a/acquire.txt

@@ -2,7 +2,6 @@ Name:Acquire
 ManaCost:3 U U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 U U | Origin$ Library | Destination$ Battlefield | ValidTgts$ Opponent | ChangeType$ Artifact | ChangeNum$ 1 | GainControl$ True | IsCurse$ True | SpellDescription$ Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acquire.jpg
-SetInfo:5DN|Rare|http://magiccards.info/scans/en/5dn/21.jpg
 Oracle:Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
+SetInfo:5DN Rare

res/cardsfolder/a/acridian.txt

@@ -3,7 +3,6 @@ ManaCost:1 G
 Types:Creature Insect
 PT:2/4
 K:Echo:1 G
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acridian.jpg
-SetInfo:USG|Common|http://magiccards.info/scans/en/us/230.jpg
 Oracle:Echo {1}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
+SetInfo:USG Common

res/cardsfolder/a/act_of_aggression.txt

@@ -2,7 +2,6 @@ Name:Act of Aggression
 ManaCost:3 PR PR
 Types:Instant
 A:SP$ GainControl | Cost$ 3 PR PR | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls. | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_aggression.jpg
-SetInfo:NPH|Uncommon|http://magiccards.info/scans/en/nph/78.jpg
 Oracle:({R/P} can be paid with either {R} or 2 life.)\nGain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
+SetInfo:NPH Uncommon

res/cardsfolder/a/act_of_treason.txt

@@ -2,10 +2,9 @@ Name:Act of Treason
 ManaCost:2 R
 Types:Sorcery
 A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_treason.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/121.jpg
-SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/124.jpg
-SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/85.jpg
-SetInfo:M12|Common|http://magiccards.info/scans/en/m12/121.jpg
 Oracle:Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
+SetInfo:M11 Common
+SetInfo:M10 Uncommon
+SetInfo:GTC Common
+SetInfo:M12 Common

res/cardsfolder/a/active_volcano.txt

@@ -5,8 +5,7 @@ A:SP$ Destroy | Cost$ R | ValidTgts$ Permanent.Blue | TgtPrompt$ Select target b
 A:SP$ ChangeZone | Cost$ R | ValidTgts$ Island | TgtPrompt$ Select target Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ or return target Island to its owner's hand.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/active_volcano.jpg
 Oracle:Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
-SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/43.jpg
+SetInfo:CHR Common
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/130.jpg
+SetInfo:LEG Common

res/cardsfolder/a/ad_nauseam.txt

@@ -7,7 +7,6 @@ SVar:DBLose:DB$ LoseLife | LifeAmount$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ad_nauseam.jpg
-SetInfo:ALA|Rare|http://magiccards.info/scans/en/ala/63.jpg
 Oracle:Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times.
+SetInfo:ALA Rare

res/cardsfolder/a/adamaro_first_to_desire.txt

@@ -5,7 +5,6 @@ PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
 SVar:X:Count$InOppHand
 SVar:AntiBuffedBy:Card
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adamaro_first_to_desire.jpg
-SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/91.jpg
 Oracle:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
+SetInfo:SOK Rare

res/cardsfolder/a/adaptive_automaton.txt

@@ -6,7 +6,6 @@ K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
 S:Mode$ Continuous | Affected$ Card.Self | AddType$ ChosenType | Description$ CARDNAME is the chosen type in addition to its other types.
 S:Mode$ Continuous | Affected$ Creature.ChosenType+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control of the chosen type get +1/+1.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_automaton.jpg
-SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/201.jpg
 Oracle:As Adaptive Automaton enters the battlefield, choose a creature type.\nAdaptive Automaton is the chosen type in addition to its other types.\nOther creatures you control of the chosen type get +1/+1.
+SetInfo:M12 Rare

res/cardsfolder/a/adaptive_snapjaw.txt

@@ -3,7 +3,6 @@ ManaCost:4 G
 Types:Creature Lizard Beast
 PT:6/2
 K:Evolve
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_snapjaw.jpg
-SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/113.jpg
 Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
+SetInfo:GTC Common

res/cardsfolder/a/adarkar_sentinel.txt

@@ -3,7 +3,6 @@ ManaCost:5
 Types:Artifact Creature Soldier
 PT:3/3
 A:AB$ Pump | Cost$ 1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_sentinel.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/281.jpg
 Oracle:{1}: Adarkar Sentinel gets +0/+1 until end of turn.
+SetInfo:ICE Uncommon

res/cardsfolder/a/adarkar_valkyrie.txt

@@ -7,7 +7,6 @@ K:Vigilance
 A:AB$ Effect | Cost$ T | Name$ Adarkar Valkyrie Effect | ValidTgts$ Creature.Other | TgtPrompt$ Select target creature other than Adarkar Valkyrie | Triggers$ TrigChangesZone | SVars$ TrigChangeZone | References$ TrigChangesZone,TrigChangeZone | RememberObjects$ Targeted | SpellDescription$ When target creature other than CARDNAME dies this turn, return that card to the battlefield under your control.
 SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.IsRemembered | Execute$ TrigChangeZone | TriggerDescription$ If the targeted creature of Adarkar Valkyrie dies this turn, return it to the battlefield and you gain control of it.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/csp/en-us/card121196.jpg
-SetInfo:CSP|Rare|http://magiccards.info/scans/en/cs/1.jpg
 Oracle:Flying, vigilance\n{T}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control.
+SetInfo:CSP Rare

res/cardsfolder/a/adarkar_wastes.txt

@@ -5,12 +5,11 @@ A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_wastes.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/325.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/410.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/317.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/326.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/347.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/319.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
+SetInfo:7ED Rare
+SetInfo:6ED Rare
+SetInfo:9ED Rare
+SetInfo:10E Rare
+SetInfo:5ED Rare
+SetInfo:ICE Rare

res/cardsfolder/a/adarkar_windform.txt

@@ -5,7 +5,6 @@ PT:3/3
 K:Flying
 A:AB$ Debuff | Cost$ 1 S | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Flying | SpellDescription$ Target creature loses flying until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_windform.jpg
-SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/26.jpg
 Oracle:Flying\n{1}{S}: Target creature loses flying until end of turn. ({S} can be paid with one mana from a snow permanent.)
+SetInfo:CSP Uncommon

res/cardsfolder/a/adder_staff_boggart.txt

@@ -5,7 +5,6 @@ PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigClash | TriggerDescription$ When CARDNAME enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on CARDNAME.
 SVar:TrigClash:AB$Clash | Cost$ 0 | WinSubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adder_staff_boggart.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/148.jpg
 Oracle:When Adder-Staff Boggart enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Adder-Staff Boggart. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
+SetInfo:LRW Common

res/cardsfolder/a/addle.txt

@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ ChooseColor | Cost$ 1 B | Defined$ You | AILogic$ MostProminentInHumanDeck | SubAbility$ DBRevealDiscard | SpellDescription$ Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
 SVar:DBRevealDiscard:DB$ Discard | Mode$ RevealYouChoose | NumCards$ 1 | DiscardValid$ Card.ChosenColor | ValidTgts$ Player | TgtPrompt$ Select target player
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/addle.jpg
-SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/91.jpg
 Oracle:Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
+SetInfo:INV Uncommon

res/cardsfolder/a/admonition_angel.txt

@@ -9,7 +9,6 @@ SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Permanent.Other+nonLand | T
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | SubAbility$ DBCleanup | Destination$ Battlefield
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Land
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/admonition_angel.jpg
-SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/1.jpg
 Oracle:Flying\nLandfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.\nWhen Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
+SetInfo:WWK Mythic

res/cardsfolder/a/adun_oakenshield.txt

@@ -3,7 +3,6 @@ ManaCost:G R B
 Types:Legendary Creature Human Knight
 PT:1/2
 A:AB$ ChangeZone | Cost$ B R G T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl  | SpellDescription$ Return target creature card from your graveyard to your hand.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adun_oakenshield.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/256.jpg
 Oracle:{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
+SetInfo:LEG Rare

res/cardsfolder/a/advance_scout.txt

@@ -4,7 +4,6 @@ Types:Creature Human Soldier Scout
 PT:1/1
 K:First Strike
 A:AB$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advance_scout.jpg
-SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/213.jpg
 Oracle:First strike\n{W}: Target creature gains first strike until end of turn.
+SetInfo:TMP Common

res/cardsfolder/a/advanced_hoverguard.txt

@@ -4,7 +4,6 @@ Types:Creature Drone
 PT:2/2
 K:Flying
 A:AB$ Pump | Cost$ U | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advanced_hoverguard.jpg
-SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/22.jpg
 Oracle:Flying\n{U}: Advanced Hoverguard gains shroud until end of turn. (It can't be the target of spells or abilities.)
+SetInfo:5DN Common

res/cardsfolder/a/adventuring_gear.txt

@@ -5,7 +5,6 @@ K:Equip 1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Equipped | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Land
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adventuring_gear.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/195.jpg
 Oracle:Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+SetInfo:ZEN Common

res/cardsfolder/a/advice_from_the_fae.txt

@@ -6,7 +6,6 @@ SVar:Dig2:DB$ Dig | DigNum$ 5 | ChangeNum$ 2 | ConditionCheckSVar$ X | Condition
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Y:PlayerCountOther$HighestValid Creature.YouCtrl
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advice_from_the_fae.jpg
-SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/28.jpg
 Oracle:({2/U} can be paid with any two mana or with {U}. This card's converted mana cost is 6.)\nLook at the top five cards of your library. If you control more creatures than each other player, put two of those cards into your hand. Otherwise, put one of them into your hand. Then put the rest on the bottom of your library in any order.
+SetInfo:SHM Uncommon

res/cardsfolder/a/aegis_angel.txt

@@ -6,7 +6,6 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target permanent is indestructible for as long as you control CARDNAME. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
 SVar:TrigPump:AB$ Pump |  Cost$ 0 | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ HIDDEN Indestructible | UntilLoseControlOfHost$ True
 SVar:PlayMain1:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_angel.jpg
-SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/1.jpg
 Oracle:Flying\nWhen Aegis Angel enters the battlefield, another target permanent is indestructible for as long as you control Aegis Angel. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
+SetInfo:M12 Rare

res/cardsfolder/a/aegis_of_the_meek.txt

@@ -2,7 +2,6 @@ Name:Aegis of the Meek
 ManaCost:3
 Types:Artifact
 A:AB$ Pump | Cost$ 1 T | NumAtt$ 1 | NumDef$ 2 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 Creature | SpellDescription$ Target 1/1 creature gets +1/+2 until end of turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_of_the_meek.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/282.jpg
 Oracle:{1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.
+SetInfo:ICE Rare

res/cardsfolder/a/aeolipile.txt

@@ -2,7 +2,6 @@ Name:Aeolipile
 ManaCost:2
 Types:Artifact
 A:AB$ DealDamage | Cost$ 1 T Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeolipile.jpg
-SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/166.jpg
 Oracle:{1}, {T}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player.
+SetInfo:FEM Rare

res/cardsfolder/a/aeon_chronicler.txt

@@ -10,7 +10,6 @@ SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:X:Count$xPaid
 SVar:Y:Count$InYourHand
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeon_chronicler.jpg
-SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/32.jpg
 Oracle:Aeon Chronicler's power and toughness are each equal to the number of cards in your hand.\nSuspend X-{X}{3}{U}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{3}{U} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
+SetInfo:PLC Rare

res/cardsfolder/a/aerathi_berserker.txt

@@ -3,7 +3,6 @@ ManaCost:2 R R R
 Types:Creature Human Berserker
 PT:2/4
 K:Rampage 3
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerathi_berserker.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/131.jpg
 Oracle:Rampage 3 (Whenever this creature becomes blocked, it gets +3/+3 until end of turn for each creature blocking it beyond the first.)
+SetInfo:LEG Uncommon

res/cardsfolder/a/aerial_caravan.txt

@@ -6,7 +6,6 @@ K:Flying
 A:AB$ Dig | Cost$ 1 U U | DigNum$ 1 | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Exile the top card of your library. Until end of turn, you may play that card. (Reveal the card as you exile it.)
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played | PumpZone$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_caravan.jpg
-SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/58.jpg
 Oracle:Flying\n{1}{U}{U}: Exile the top card of your library. Until end of turn, you may play that card. (Reveal the card as you exile it.)
+SetInfo:MMQ Rare

res/cardsfolder/a/aerial_maneuver.txt

@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Instant
 A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Flying & First Strike | SpellDescription$ Target creature gets +1/+1 and gains flying and first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_maneuver.jpg
-SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/1.jpg
 Oracle:Target creature gets +1/+1 and gains flying and first strike until end of turn.
+SetInfo:GTC Common

res/cardsfolder/a/aerial_predation.txt

@@ -3,7 +3,6 @@ ManaCost:2 G
 Types:Instant
 A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SubAbility$ NaturalLife | SpellDescription$ Destroy target creature with flying. You gain 2 life
 SVar:NaturalLife:DB$GainLife | Defined$ You | LifeAmount$ 2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_predation.jpg
-SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/113.jpg
 Oracle:Destroy target creature with flying. You gain 2 life.
+SetInfo:RTR Common

res/cardsfolder/a/aerie_mystics.txt

@@ -4,7 +4,6 @@ Types:Creature Bird Wizard
 PT:3/3
 K:Flying
 A:AB$ PumpAll | Cost$ 1 G U | ValidCards$ Creature.YouCtrl | KW$ Shroud | SpellDescription$ Creatures you control gain shroud until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerie_mystics.jpg
-SetInfo:CFX|Uncommon|http://magiccards.info/scans/en/cfx/1.jpg
 Oracle:Flying\n{1}{G}{U}: Creatures you control gain shroud until end of turn.
+SetInfo:CFX Uncommon

res/cardsfolder/a/aerie_ouphes.txt

@@ -5,7 +5,6 @@ PT:3/3
 K:Persist
 A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature with flying.
 SVar:X:Count$CardPower
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerie_ouphes.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/65.jpg
 Oracle:Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+SetInfo:EVE Common

res/cardsfolder/a/aesthir_glider.txt

@@ -4,7 +4,6 @@ Types:Artifact Creature Bird
 PT:2/1
 K:CARDNAME can't block.
 K:Flying
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/al/en-us/card3040.jpg
-SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/156.jpg|2
 Oracle:Flying\nAesthir Glider can't block.
+SetInfo:ALL Common x2

res/cardsfolder/a/aether_adept.txt

@@ -4,8 +4,7 @@ Types:Creature Human Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
 SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_adept.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/41.jpg
-SetInfo:M12|Common|http://magiccards.info/scans/en/m12/41.jpg
 Oracle:When AEther Adept enters the battlefield, return target creature to its owner's hand.
+SetInfo:M11 Common
+SetInfo:M12 Common

res/cardsfolder/a/aether_barrier.txt

@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays 1.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | UnlessCost$ 1 | UnlessPayer$ TriggeredActivator | Defined$ TriggeredActivator | SacValid$ Permanent
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_barrier.jpg
-SetInfo:NMS|Rare|http://magiccards.info/scans/en/ne/27.jpg
 Oracle:Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}.
+SetInfo:NMS Rare

res/cardsfolder/a/aether_burst.txt

@@ -3,7 +3,6 @@ ManaCost:1 U
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | References$ X | SpellDescription$ Return up to X target creatures to their owners' hands, where X is one plus the number of cards named CARDNAME in all graveyards as you cast CARDNAME.
 SVar:X:Count$NamedInAllYards.AEther Burst/Plus.1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_burst.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/60.jpg
 Oracle:Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst.
+SetInfo:ODY Common

res/cardsfolder/a/aether_charge.txt

@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Beast.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | DamageSource$ TriggeredCard | ValidTgts$ Opponent | NumDmg$ 4
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_charge.jpg
-SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/184.jpg
 Oracle:Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent.
+SetInfo:ONS Uncommon

res/cardsfolder/a/aether_figment.txt

@@ -6,7 +6,6 @@ K:Unblockable
 K:Kicker 3
 K:etbCounter:P1P1:2:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with two +1/+1 counters on it.
 SVar:WasKicked:Count$Kicked.1.0
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_figment.jpg
-SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/40.jpg
 Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nAEther Figment is unblockable.\nIf AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it.
+SetInfo:ZEN Uncommon

res/cardsfolder/a/aether_flash.txt

@@ -4,9 +4,8 @@ Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever a creature enters the battlefield, CARDNAME deals 2 damage to it.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredCard | NumDmg$ 2
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_flash.jpg
 Oracle:Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it.
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/88.jpg
+SetInfo:7ED Uncommon
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/163.jpg
+SetInfo:WTH Uncommon
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/172.jpg
+SetInfo:6ED Uncommon

res/cardsfolder/a/aether_membrane.txt

@@ -8,7 +8,7 @@ T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Delaye
 SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
 SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker
 SVar:HasCombatEffect:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_membrane.jpg
-SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/93.jpg
 Oracle:Defender; reach (This creature can block creatures with flying.)\nWhenever AEther Membrane blocks a creature, return that creature to its owner's hand at end of combat.
+SetInfo:DDI Uncommon
+SetInfo:PLC Uncommon

res/cardsfolder/a/aether_mutation.txt

@@ -5,7 +5,6 @@ A:SP$ ChangeZone | Cost$ 3 G U | ValidTgts$ Creature | TgtPrompt$ Select target
 #X will be the Converted Mana Cost of the target of AEther Mutation
 SVar:TrigToken:DB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X
 SVar:X:Targeted$CardManaCost
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_mutation.jpg
-SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/91.jpg
 Oracle:Return target creature to its owner's hand. Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
+SetInfo:APC Uncommon

res/cardsfolder/a/aether_rift.txt

@@ -6,7 +6,6 @@ SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ You | NumCards$ 1 | Mode$ Rand
 SVar:DBReturn:DB$ ChangeZoneAll | Cost$ 0 | ChangeType$ Card.IsRemembered | Origin$ Graveyard | Destination$ Battlefield | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ EQ1 | UnlessCost$ PayLife<5> | UnlessPayer$ Player | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIdeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_rift.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/227.jpg
 Oracle:At the beginning of your upkeep, discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life.
+SetInfo:INV Rare

res/cardsfolder/a/aether_shockwave.txt

@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ TapAll | Cost$ 3 W | ValidCards$ Spirit | PrecostDesc$ Choose one - | SpellDescription$ Tap all Spirits;
 A:SP$ TapAll | Cost$ 3 W | ValidCards$ Creature.nonSpirit | PrecostDesc$ or | SpellDescription$ tap all non-Spirit creatures.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_shockwave.jpg
-SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/1.jpg
 Oracle:Choose one - Tap all Spirits; or tap all non-Spirit creatures.
+SetInfo:SOK Uncommon