diff --git a/.gitattributes b/.gitattributes index af1e034fda5..78d1ad1a409 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3530,7 +3530,7 @@ res/cardsfolder/f/fangren_hunter.txt svneol=native#text/plain res/cardsfolder/f/fangren_marauder.txt svneol=native#text/plain res/cardsfolder/f/fangren_pathcutter.txt svneol=native#text/plain res/cardsfolder/f/fanning_the_flames.txt svneol=native#text/plain -res/cardsfolder/f/far_away[!!-~].txt -text +res/cardsfolder/f/far_away.txt -text res/cardsfolder/f/far_wanderings.txt svneol=native#text/plain res/cardsfolder/f/farbog_boneflinger.txt -text res/cardsfolder/f/farbog_explorer.txt -text diff --git a/res/blockdata/formats.txt b/res/blockdata/formats.txt index c862804f822..2c05c014413 100644 --- a/res/blockdata/formats.txt +++ b/res/blockdata/formats.txt @@ -1,5 +1,5 @@ -Name:Standard|Index:1|Sets:ISD, DKA, AVR, M13, RTR, GTC -Name:Extended|Index:2|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep -Name:Modern|Index:3|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC|Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Bloodbraid Elf; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Seething Song; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Vault of Whispers; Wild Nacatl +Name:Standard|Index:1|Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM +Name:Extended|Index:2|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep +Name:Modern|Index:3|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM|Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Bloodbraid Elf; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Seething Song; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Vault of Whispers; Wild Nacatl Name:Legacy|Index:4|Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Lotus; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Falling Star; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will; Mental Misstep Name:Vintage|Index:5|Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends \ No newline at end of file diff --git a/res/cardsfolder/c/chains_of_mephistopheles.txt b/res/cardsfolder/c/chains_of_mephistopheles.txt index 23dfe643e39..d31d9de884b 100644 --- a/res/cardsfolder/c/chains_of_mephistopheles.txt +++ b/res/cardsfolder/c/chains_of_mephistopheles.txt @@ -2,7 +2,7 @@ Name:Chains of Mephistopheles ManaCost:1 B Types:Enchantment Text:If a player would draw a card except the first one he or she draws in his or her draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of his or her library into his or her graveyard. -SVar:MillOne:DB$ Mill | NumCards$ 1 +SVar:MillOne:DB$ Mill | NumCards$ 1 SVar:DiscardOne:DB$ Discard | Mandatory$ True | NumCards$ 1 | Mode$ TgtChoose SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/chains_of_mephistopheles.jpg diff --git a/res/cardsfolder/c/cyclone.txt b/res/cardsfolder/c/cyclone.txt index b2ec83e54e2..150fd9c7e65 100644 --- a/res/cardsfolder/c/cyclone.txt +++ b/res/cardsfolder/c/cyclone.txt @@ -9,4 +9,4 @@ SVar:X:Count$CardCounters.WIND SVar:Picture:http://www.wizards.com/global/images/magic/general/cyclone.jpg Oracle:At the beginning of your upkeep, put a wind counter on Cyclone, then sacrifice Cyclone unless you pay {G} for each wind counter on it. If you pay, Cyclone deals damage equal to the number of wind counters on it to each creature and each player. SetInfo:CHR Rare -SetInfo:ARN Uncommon +SetInfo:ARN Uncommon \ No newline at end of file diff --git a/res/cardsfolder/f/far_away .txt b/res/cardsfolder/f/far_away.txt similarity index 97% rename from res/cardsfolder/f/far_away .txt rename to res/cardsfolder/f/far_away.txt index 506cd73afca..e319c17b650 100644 --- a/res/cardsfolder/f/far_away .txt +++ b/res/cardsfolder/f/far_away.txt @@ -5,7 +5,9 @@ Types:Instant K:Fuse A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. SVar:Picture:http://www.wizards.com/global/images/magic/general/far_away.jpg + ALTERNATE + Name:Away ManaCost:2 B Types:Instant diff --git a/tools/assignSetInfo.py b/tools/assignSetInfo.py index fd1dec72c8f..a1af70653fe 100755 --- a/tools/assignSetInfo.py +++ b/tools/assignSetInfo.py @@ -11,7 +11,7 @@ class cis: # CardInSet self.arts = 0 def __str__(self): - return self.rarityFull() if self.arts <= 1 else "{} x{}".format(self.rarityFull(), self.arts) + return self.rarityFull() if self.arts <= 1 else "{0} x{1}".format(self.rarityFull(), self.arts) def __repr__(self): return self.__str__() @@ -81,11 +81,14 @@ if __name__ == '__main__': 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 @@ -142,8 +145,8 @@ if __name__ == '__main__': cardName = altName for e in mtgDataCards[cardName]: - if not setCodeToForge[e] is None: - validLines.append( "SetInfo:{} {}".format(setCodeToForge[e], mtgDataCards[cardName][e]) ) + if setCodeToForge[e] is not None: + validLines.append( "SetInfo:{0} {1}".format(setCodeToForge[e], mtgDataCards[cardName][e])) if previousLines == validLines: continue