(Preparation of Branch merge)

- Updating Blockdata, setInfoScript, and reprints
2025-11-17 11:18:01 +00:00 · 2012-09-26 14:16:58 +00:00
parent 67a2665a41
commit bc45884460
29 changed files with 40 additions and 6 deletions
--- a/res/blockdata/blocks.txt
+++ b/res/blockdata/blocks.txt
@@ -47,3 +47,4 @@ Index:41|Set0:M12|Name:Magic 2012|DraftPacks:3|LandSetCode:M12|SealedPacks:6
 Index:42|Set0:ISD|Set1:DKA|Name:Innistrad|DraftPacks:3|LandSetCode:ISD|SealedPacks:6
 Index:43|Set0:AVR|Name:Avacyn Restored|DraftPacks:3|LandSetCode:AVR|SealedPacks:6
 Index:44|Set0:M13|Name:Magic 2013|DraftPacks:3|LandSetCode:M13|SealedPacks:6
+Index:45|Set0:RTR|Name:Return to Ravnica|DraftPacks:3|LandSetCode:RTR|SealedPacks:6
--- a/res/blockdata/boosters.txt
+++ b/res/blockdata/boosters.txt
@@ -58,6 +58,7 @@ Set:POR|Commons:11|Uncommons:3|Rares:1
 Set:PTK|Commons:5|Uncommons:2|Rares:1
 Set:RAV|Commons:11|Uncommons:3|Rares:1
 Set:ROE|Commons:10|Uncommons:3|Rares:1
+Set:RTR|Commons:10|Uncommons:3|Rares:1
 Set:SCG|Commons:11|Uncommons:3|Rares:1
 Set:SHM|Commons:11|Uncommons:3|Rares:1
 Set:SOK|Commons:11|Uncommons:3|Rares:1
--- a/res/blockdata/fatpacks.txt
+++ b/res/blockdata/fatpacks.txt
@@ -45,3 +45,4 @@ Set:ISD|LandSet:ISD|Boosters:9|BasicLands:60
 Set:DKA|LandSet:ISD|Boosters:9|BasicLands:60
 Set:AVR|LandSet:AVR|Boosters:9|BasicLands:60
 Set:M12|LandSet:M13|Boosters:9|BasicLands:80
+Set:RTR|LandSet:RTR|Boosters:9|BasicLands:40
--- a/res/blockdata/setdata.txt
+++ b/res/blockdata/setdata.txt
@@ -89,3 +89,4 @@ Index:79|Code2:DKA|Code3:DKA|Name:Dark Ascension
 Index:80|Code2:AVR|Code3:AVR|Name:Avacyn Restored
 Index:81|Code2:PC2|Code3:PC2|Name:Planechase 2012 Edition
 Index:82|Code2:M13|Code3:M13|Name:Magic 2013
+Index:83|Code2:RTR|Code3:RTR|Name:Return to Ravnica
--- a/res/cardsfolder/a/arrest.txt
+++ b/res/cardsfolder/a/arrest.txt
@@ -10,5 +10,6 @@ SVar:Picture:http://www.wizards.com/global/images/magic/general/arrest.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/2.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/2.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/4.jpg
+SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/3.jpg
 Oracle:Enchant creature\nEnchanted creature can't attack or block, and its activated abilities can't be activated.
 End
--- a/res/cardsfolder/b/blood_crypt.txt
+++ b/res/cardsfolder/b/blood_crypt.txt
@@ -4,6 +4,7 @@ Types:Land Swamp Mountain
 Text:As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/dis/en-us/card97102.jpg
+SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/238.jpg
 SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/171.jpg
 Oracle:({T}: Add {B} or {R} to your mana pool.)\nAs Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped.
 End
--- a/res/cardsfolder/c/cancel.txt
+++ b/res/cardsfolder/c/cancel.txt
@@ -5,12 +5,14 @@ Text:no text
 A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card  | SpellDescription$ Counter target spell.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cancel.jpg
+SetInfo:PC2|Common|http://magiccards.info/scans/en/pc2/15.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/44.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/33.jpg
+SetInfo:10E|Common|http://magiccards.info/scans/en/10e/71.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/48.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/44.jpg
 SetInfo:M12|Common|http://magiccards.info/scans/en/m12/47.jpg
-SetInfo:10E|Common|http://magiccards.info/scans/en/10e/71.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/31.jpg
+SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/33.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/51.jpg
 Oracle:Counter target spell.
 End
--- a/res/cardsfolder/c/cremate.txt
+++ b/res/cardsfolder/c/cremate.txt
@@ -8,5 +8,6 @@ SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cremate.jpg
 SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/45.jpg
 SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/96.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/59.jpg
 Oracle:Exile target card from a graveyard.\nDraw a card.
 End
--- a/res/cardsfolder/d/dispel.txt
+++ b/res/cardsfolder/d/dispel.txt
@@ -6,5 +6,6 @@ A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Instant | TgtPrompt$ Se
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dispel.jpg
 SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/26.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/36.jpg
 Oracle:Counter target instant spell.
 End
--- a/res/cardsfolder/f/forest.txt
+++ b/res/cardsfolder/f/forest.txt
@@ -23,6 +23,7 @@ SetInfo:ROE|Land|http://magiccards.info/scans/en/roe/245.jpg|4
 SetInfo:10E|Land|http://magiccards.info/scans/en/10e/380.jpg|4
 SetInfo:RAV|Land|http://magiccards.info/scans/en/rav/303.jpg|4
 SetInfo:6ED|Land|http://magiccards.info/scans/en/6e/347.jpg|4
+SetInfo:RTR|Land|http://magiccards.info/scans/en/rtr/272.jpg|5
 SetInfo:5ED|Land|http://magiccards.info/scans/en/5e/417.jpg|4
 SetInfo:ONS|Land|http://magiccards.info/scans/en/on/347.jpg|4
 SetInfo:S99|Land|http://magiccards.info/scans/en/st/170.jpg|4
--- a/res/cardsfolder/g/giant_growth.txt
+++ b/res/cardsfolder/g/giant_growth.txt
@@ -18,6 +18,7 @@ SetInfo:M11|Common|http://magiccards.info/scans/en/m11/178.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/184.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/233.jpg
 SetInfo:3ED|Common|http://magiccards.info/scans/en/rv/106.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/125.jpg
 SetInfo:2ED|Common|http://magiccards.info/scans/en/un/106.jpg
 Oracle:Target creature gets +3/+3 until end of turn.
 End
--- a/res/cardsfolder/h/hallowed_fountain.txt
+++ b/res/cardsfolder/h/hallowed_fountain.txt
@@ -4,6 +4,7 @@ Types:Land Plains Island
 Text:As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/dis/en-us/card97071.jpg
+SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/241.jpg
 SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/174.jpg
 Oracle:({T}: Add {W} or {U} to your mana pool.)\nAs Hallowed Fountain enters the battlefield, you may pay 2 life. If you don't, Hallowed Fountain enters the battlefield tapped.
 End
--- a/res/cardsfolder/h/heroes_reunion.txt
+++ b/res/cardsfolder/h/heroes_reunion.txt
@@ -6,5 +6,6 @@ A:SP$ GainLife | Cost$ W G | LifeAmount$ 7 | ValidTgts$ Player | TgtPrompt$ Choo
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heroes_reunion.jpg
 SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/250.jpg
+SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/168.jpg
 Oracle:Target player gains 7 life.
 End
--- a/res/cardsfolder/i/inspiration.txt
+++ b/res/cardsfolder/i/inspiration.txt
@@ -5,9 +5,10 @@ Text:no text
 A:SP$ Draw | Cost$ 3 U | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inspiration.jpg
+SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/85.jpg
 SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/35.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/76.jpg
 SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/81.jpg
-SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/85.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/42.jpg
 Oracle:Target player draws two cards.
 End
--- a/res/cardsfolder/i/island.txt
+++ b/res/cardsfolder/i/island.txt
@@ -23,6 +23,7 @@ SetInfo:ROE|Land|http://magiccards.info/scans/en/roe/233.jpg|4
 SetInfo:10E|Land|http://magiccards.info/scans/en/10e/368.jpg|4
 SetInfo:RAV|Land|http://magiccards.info/scans/en/rav/291.jpg|4
 SetInfo:6ED|Land|http://magiccards.info/scans/en/6e/335.jpg|4
+SetInfo:RTR|Land|http://magiccards.info/scans/en/rtr/256.jpg|5
 SetInfo:5ED|Land|http://magiccards.info/scans/en/5e/425.jpg|4
 SetInfo:ONS|Land|http://magiccards.info/scans/en/on/335.jpg|4
 SetInfo:S99|Land|http://magiccards.info/scans/en/st/158.jpg|4
--- a/res/cardsfolder/m/mind_rot.txt
+++ b/res/cardsfolder/m/mind_rot.txt
@@ -15,6 +15,7 @@ SetInfo:M11|Common|http://magiccards.info/scans/en/m11/105.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/105.jpg
 SetInfo:M13|Common|http://magiccards.info/scans/en/m13/100.jpg
 SetInfo:M12|Common|http://magiccards.info/scans/en/m12/101.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/70.jpg
 SetInfo:S99|Common|http://magiccards.info/scans/en/st/83.jpg
 Oracle:Target player discards two cards.
 End
--- a/res/cardsfolder/m/mountain.txt
+++ b/res/cardsfolder/m/mountain.txt
@@ -23,6 +23,7 @@ SetInfo:ROE|Land|http://magiccards.info/scans/en/roe/241.jpg|4
 SetInfo:10E|Land|http://magiccards.info/scans/en/10e/376.jpg|4
 SetInfo:RAV|Land|http://magiccards.info/scans/en/rav/299.jpg|4
 SetInfo:6ED|Land|http://magiccards.info/scans/en/6e/343.jpg|4
+SetInfo:RTR|Land|http://magiccards.info/scans/en/rtr/266.jpg|5
 SetInfo:5ED|Land|http://magiccards.info/scans/en/5e/430.jpg|4
 SetInfo:ONS|Land|http://magiccards.info/scans/en/on/343.jpg|4
 SetInfo:S99|Land|http://magiccards.info/scans/en/st/166.jpg|4
--- a/res/cardsfolder/o/overgrown_tomb.txt
+++ b/res/cardsfolder/o/overgrown_tomb.txt
@@ -5,5 +5,6 @@ Text:As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDN
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card89072.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/279.jpg
+SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/243.jpg
 Oracle:({T}: Add {B} or {G} to your mana pool.)\nAs Overgrown Tomb enters the battlefield, you may pay 2 life. If you don't, Overgrown Tomb enters the battlefield tapped.
 End
--- a/res/cardsfolder/p/paralyzing_grasp.txt
+++ b/res/cardsfolder/p/paralyzing_grasp.txt
@@ -8,5 +8,6 @@ S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN C
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/paralyzing_grasp.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/58.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/46.jpg
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.
 End
--- a/res/cardsfolder/p/pithing_needle.txt
+++ b/res/cardsfolder/p/pithing_needle.txt
@@ -10,6 +10,7 @@ SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pithing_needle.jpg
 SetInfo:M10|Rare|http://magiccards.info/scans/en/m10/217.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/158.jpg
+SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/231.jpg
 SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/338.jpg
 Oracle:As Pithing Needle enters the battlefield, name a card.\nActivated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 End
--- a/res/cardsfolder/p/plains.txt
+++ b/res/cardsfolder/p/plains.txt
@@ -23,6 +23,7 @@ SetInfo:ROE|Land|http://magiccards.info/scans/en/roe/229.jpg|4
 SetInfo:10E|Land|http://magiccards.info/scans/en/10e/364.jpg|4
 SetInfo:RAV|Land|http://magiccards.info/scans/en/rav/287.jpg|4
 SetInfo:6ED|Land|http://magiccards.info/scans/en/6e/331.jpg|4
+SetInfo:RTR|Land|http://magiccards.info/scans/en/rtr/253.jpg|5
 SetInfo:5ED|Land|http://magiccards.info/scans/en/5e/434.jpg|4
 SetInfo:ONS|Land|http://magiccards.info/scans/en/on/331.jpg|4
 SetInfo:S99|Land|http://magiccards.info/scans/en/st/154.jpg|4
--- a/res/cardsfolder/s/seek_the_horizon.txt
+++ b/res/cardsfolder/s/seek_the_horizon.txt
@@ -6,5 +6,6 @@ A:SP$ ChangeZone | Cost$ 3 G | Origin$ Library | Destination$ Hand | ChangeType$
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seek_the_horizon.jpg
 SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/147.jpg
+SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/134.jpg
 Oracle:Search your library for up to three basic land cards, reveal them, and put them into your hand. Then shuffle your library.
 End
--- a/res/cardsfolder/s/steam_vents.txt
+++ b/res/cardsfolder/s/steam_vents.txt
@@ -5,5 +5,6 @@ Text:As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDN
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96923.jpg
 SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/164.jpg
+SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/247.jpg
 Oracle:({T}: Add {U} or {R} to your mana pool.)\nAs Steam Vents enters the battlefield, you may pay 2 life. If you don't, Steam Vents enters the battlefield tapped.
 End
--- a/res/cardsfolder/s/swamp.txt
+++ b/res/cardsfolder/s/swamp.txt
@@ -23,6 +23,7 @@ SetInfo:ROE|Land|http://magiccards.info/scans/en/roe/237.jpg|4
 SetInfo:10E|Land|http://magiccards.info/scans/en/10e/372.jpg|4
 SetInfo:RAV|Land|http://magiccards.info/scans/en/rav/295.jpg|4
 SetInfo:6ED|Land|http://magiccards.info/scans/en/6e/339.jpg|4
+SetInfo:RTR|Land|http://magiccards.info/scans/en/rtr/263.jpg|5
 SetInfo:5ED|Land|http://magiccards.info/scans/en/5e/442.jpg|4
 SetInfo:ONS|Land|http://magiccards.info/scans/en/on/339.jpg|4
 SetInfo:S99|Land|http://magiccards.info/scans/en/st/162.jpg|4
--- a/res/cardsfolder/s/syncopate.txt
+++ b/res/cardsfolder/s/syncopate.txt
@@ -7,5 +7,6 @@ SVar:X:Count$xPaid
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/syncopate.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/103.jpg
+SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/54.jpg
 Oracle:Counter target spell unless its controller pays {X}. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
 End
--- a/res/cardsfolder/t/temple_garden.txt
+++ b/res/cardsfolder/t/temple_garden.txt
@@ -5,5 +5,6 @@ Text:As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDN
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card89093.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/284.jpg
+SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/248.jpg
 Oracle:({T}: Add {G} or {W} to your mana pool.)\nAs Temple Garden enters the battlefield, you may pay 2 life. If you don't, Temple Garden enters the battlefield tapped.
 End
--- a/res/cardsfolder/t/tower_drake.txt
+++ b/res/cardsfolder/t/tower_drake.txt
@@ -8,5 +8,6 @@ A:AB$ Pump | Cost$ W | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tower_drake.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/82.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/55.jpg
 Oracle:Flying\n{W}: Tower Drake gets +0/+1 until end of turn.
 End
--- a/res/cardsfolder/t/traitorous_instinct.txt
+++ b/res/cardsfolder/t/traitorous_instinct.txt
@@ -7,5 +7,6 @@ SVar:DBPump:DB$Pump | Defined$ Targeted | NumAtt$ +2 | KW$ Haste
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/traitorous_instinct.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/168.jpg
+SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/109.jpg
 Oracle:Gain control of target creature until end of turn. Untap that creature. Until end of turn, it gets +2/+0 and gains haste.
 End
--- a/res/setInfoScript.py
+++ b/res/setInfoScript.py
@@ -153,6 +153,11 @@ def initSets():
 	allSets['Dark Ascension']='DKA'
 	allSets['Avacyn Restored']='AVR'
 	
+	# Return to Ravnica
+	allSets['Return to Ravnica']='RTR'
+	#allSets['Gatecrash']='GTC'
+	#allSets['Sinker']='UNK'
+
 def addSets(card):
 	html = getURL('http://magiccards.info/query?q=!'+card.name)
 	start = html.find('<br><u><b>Editions:</b></u><br>')