[M13] added set

This commit is contained in:
North 2012-07-06 14:22:32 +03:00
parent e00a25a857
commit 6395e82e47
12 changed files with 871 additions and 401 deletions

View file

@ -197,7 +197,7 @@ public class CardsStorage {
readUnimplemented("ZEN", "/zen.txt", names, cards);
readUnimplemented("WWK", "/wwk.txt", names, cards);
readUnimplemented("ROE", "/roe.txt", names, cards);
readUnimplemented("AVR", "/avr.txt", names, cards);
readUnimplemented("M13", "/m13.txt", names, cards);
names.clear();
}

View file

@ -393,7 +393,7 @@ public class MageBook extends JComponent {
private HoverButton pageRight;
private int currentPage = 0;
private String currentSet = "AVR";
private String currentSet = "M13";
private static CardDimensions cardDimensions = new CardDimensions(1.2d);
private static final Logger log = Logger.getLogger(MageBook.class);

View file

@ -17,7 +17,7 @@ public class GathererSets implements Iterable<DownloadJob> {
private static File outDir = DEFAULT_OUT_DIR;
private static final String[] symbols = {"10E", "HOP", "TMP", "INV", "PLS", "APC", "MRD", "DST", "5DN", "CHK", "BOK", "SOK", "RAV", "GPT", "DIS", "TSP", "TSB", "PLC", "FUT", "LRW", "MOR", "SHM", "EVE", "USG", "9ED", "8ED", "ONS", "ULG", "WTH"};
private static final String[] withMythics = {"M10", "M11", "M12", "DDF", "ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "MBS", "NPH", "ISD", "DKA", "AVR"};
private static final String[] withMythics = {"M10", "M11", "M12", "M13", "DDF", "ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "MBS", "NPH", "ISD", "DKA", "AVR"};
private static final HashMap<String, String> symbolsReplacements = new HashMap<String, String>();
static {

View file

@ -15,6 +15,7 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameReplacement = new HashMap<String, String>() {
{
put("M13", "magic-2013");
put("AVR", "avacyn-restored");
put("DDI", "duel-decks-venser-vs-koth");
put("DKA", "dark-ascension");

View file

@ -27,6 +27,7 @@ public class WizardCardsImageSource implements CardImageSource {
public WizardCardsImageSource() {
sets = new HashMap();
setsAliases = new HashMap();
setsAliases.put("M13", "magic2013/cig");
setsAliases.put("AVR", "avacynrestored/cig");
setsAliases.put("DKA", "darkascension/cig");
setsAliases.put("ISD", "innistrad/cig");

View file

@ -1,244 +0,0 @@
1|Angel of Glory's Rise
2|Angel of Jubilation
3|Angel's Mercy
4|Angelic Wall
5|Archangel
6|Avacyn, Angel of Hope
7|Banishing Stroke
8|Builder's Blessing
9|Call to Serve
10|Cathars' Crusade
11|Cathedral Sanctifier
12|Cloudshift
13|Commander's Authority
14|Cursebreak
15|Defang
16|Defy Death
17|Devout Chaplain
18|Divine Deflection
19|Emancipation Angel
20|Entreat the Angels
21|Farbog Explorer
22|Goldnight Commander
23|Goldnight Redeemer
24|Herald of War
25|Holy Justiciar
26|Leap of Faith
27|Midnight Duelist
28|Midvast Protector
29|Moonlight Geist
30|Moorland Inquisitor
31|Nearheath Pilgrim
32|Restoration Angel
33|Riders of Gavony
34|Righteous Blow
35|Seraph of Dawn
36|Silverblade Paladin
37|Spectral Gateguards
38|Terminus
39|Thraben Valiant
40|Voice of the Provinces
41|Zealous Strike
42|Alchemist's Apprentice
43|Amass the Components
44|Arcane Melee
45|Captain of the Mists
46|Crippling Chill
47|Deadeye Navigator
48|Devastation Tide
49|Dreadwaters
50|Elgaud Shieldmate
51|Favorable Winds
52|Fettergeist
53|Fleeting Distraction
54|Galvanic Alchemist
55|Geist Snatch
56|Ghostform
57|Ghostly Flicker
58|Ghostly Touch
59|Gryff Vanguard
60|Havengul Skaab
61|Infinite Reflection
62|Into the Void
63|Latch Seeker
64|Lone Revenant
65|Lunar Mystic
66|Mass Appeal
67|Mist Raven
68|Misthollow Griffin
69|Nephalia Smuggler
70|Outwit
71|Peel from Reality
72|Rotcrown Ghoul
73|Scrapskin Drake
74|Second Guess
75|Spectral Prison
76|Spirit Away
77|Stern Mentor
78|Stolen Goods
79|Tamiyo, the Moon Sage
80|Tandem Lookout
81|Temporal Mastery
82|Vanishment
83|Wingcrafter
84|Appetite for Brains
85|Barter in Blood
86|Blood Artist
87|Bloodflow Connoisseur
88|Bone Splinters
89|Butcher Ghoul
90|Corpse Traders
91|Crypt Creeper
92|Dark Impostor
93|Death Wind
94|Demonic Rising
95|Demonic Taskmaster
96|Demonlord of Ashmouth
97|Descent into Madness
98|Dread Slaver
99|Driver of the Dead
100|Essence Harvest
101|Evernight Shade
102|Exquisite Blood
103|Ghoulflesh
104|Gloom Surgeon
105|Grave Exchange
106|Griselbrand
107|Harvester of Souls
108|Homicidal Seclusion
109|Human Frailty
110|Hunted Ghoul
111|Killing Wave
112|Maalfeld Twins
113|Marrow Bats
114|Mental Agony
115|Necrobite
116|Polluted Dead
117|Predator's Gambit
118|Renegade Demon
119|Searchlight Geist
120|Soulcage Fiend
121|Treacherous Pit-Dweller
122|Triumph of Cruelty
123|Undead Executioner
124|Unhallowed Pact
125|Aggravate
126|Archwing Dragon
127|Banners Raised
128|Battle Hymn
129|Bonfire of the Damned
130|Burn at the Stake
131|Dangerous Wager
132|Demolish
133|Dual Casting
134|Falkenrath Exterminator
135|Fervent Cathar
136|Gang of Devils
137|Guise of Fire
138|Hanweir Lancer
139|Havengul Vampire
140|Heirs of Stromkirk
141|Hound of Griselbrand
142|Kessig Malcontents
143|Kruin Striker
144|Lightning Mauler
145|Lightning Prowess
146|Mad Prophet
147|Malicious Intent
148|Malignus
149|Pillar of Flame
150|Raging Poltergeist
151|Reforge the Soul
152|Riot Ringleader
153|Rite of Ruin
154|Rush of Blood
155|Scalding Devil
156|Somberwald Vigilante
157|Stonewright
158|Thatcher Revolt
159|Thunderbolt
160|Thunderous Wrath
161|Tibalt, the Fiend-Blooded
162|Tyrant of Discord
163|Uncanny Speed
164|Vexing Devil
165|Vigilante Justice
166|Zealous Conscripts
167|Abundant Growth
168|Blessings of Nature
169|Borderland Ranger
170|Bower Passage
171|Champion of Lambholt
172|Craterhoof Behemoth
173|Descendants' Path
174|Diregraf Escort
175|Druid's Familiar
176|Druids' Repository
177|Eaten by Spiders
178|Flowering Lumberknot
179|Geist Trappers
180|Gloomwidow
181|Grounded
182|Howlgeist
183|Joint Assault
184|Lair Delve
185|Natural End
186|Nettle Swine
187|Nightshade Peddler
188|Pathbreaker Wurm
189|Primal Surge
190|Rain of Thorns
191|Revenge of the Hunted
192|Sheltering Word
193|Snare the Skies
194|Somberwald Sage
195|Soul of the Harvest
196|Terrifying Presence
197|Timberland Guide
198|Triumph of Ferocity
199|Trusted Forcemage
200|Ulvenwald Tracker
201|Vorstclaw
202|Wandering Wolf
203|Wild Defiance
204|Wildwood Geist
205|Wolfir Avenger
206|Wolfir Silverheart
207|Yew Spirit
208|Bruna, Light of Alabaster
209|Gisela, Blade of Goldnight
210|Sigarda, Host of Herons
211|Angel's Tomb
212|Angelic Armaments
213|Bladed Bracers
214|Conjurer's Closet
215|Gallows at Willow Hill
216|Haunted Guardian
217|Moonsilver Spear
218|Narstad Scrapper
219|Otherworld Atlas
220|Scroll of Avacyn
221|Scroll of Griselbrand
222|Tormentor's Trident
223|Vanguard's Shield
224|Vessel of Endless Rest
225|Alchemist's Refuge
226|Cavern of Souls
227|Desolate Lighthouse
228|Seraph Sanctuary
229|Slayers' Stronghold
230|Plains
231|Plains
232|Plains
233|Island
234|Island
235|Island
236|Swamp
237|Swamp
238|Swamp
239|Mountain
240|Mountain
241|Mountain
242|Forest
243|Forest
244|Forest

View file

@ -0,0 +1,249 @@
1|Ajani, Caller of the Pride
2|Ajani's Sunstriker
3|Angel's Mercy
4|Angelic Benediction
5|Attended Knight
6|Aven Squire
7|Battleflight Eagle
8|Captain of the Watch
9|Captain's Call
10|Crusader of Odric
11|Divine Favor
12|Divine Verdict
13|Erase
14|Faith's Reward
15|Glorious Charge
16|Griffin Protector
17|Guardian Lions
18|Guardians of Akrasa
19|Healer of the Pride
20|Intrepid Hero
21|Knight of Glory
22|Oblivion Ring
23|Odric, Master Tactician
24|Pacifism
25|Pillarfield Ox
26|Planar Cleansing
27|Prized Elephant
28|Rain of Blades
29|Rhox Faithmender
30|Safe Passage
31|Serra Angel
32|Serra Avatar
33|Serra Avenger
34|Show of Valor
35|Silvercoat Lion
36|Sublime Archangel
37|Touch of the Eternal
38|War Falcon
39|War Priest of Thune
40|Warclamp Mastiff
41|Archaeomancer
42|Arctic Aven
43|Augur of Bolas
44|Battle of Wits
45|Clone
46|Courtly Provocateur
47|Divination
48|Downpour
49|Encrust
50|Essence Scatter
51|Faerie Invaders
52|Fog Bank
53|Harbor Serpent
54|Hydrosurge
55|Index
56|Jace, Memory Adept
57|Jace's Phantasm
58|Kraken Hatchling
59|Master of the Pearl Trident
60|Merfolk of the Pearl Trident
61|Mind Sculpt
62|Negate
63|Omniscience
64|Redirect
65|Rewind
66|Scroll Thief
67|Sleep
68|Spelltwine
69|Sphinx of Uthuun
70|Stormtide Leviathan
71|Switcheroo
72|Talrand, Sky Summoner
73|Talrand's Invocation
74|Tricks of the Trade
75|Unsummon
76|Vedalken Entrancer
77|Void Stalker
78|Watercourser
79|Welkin Tern
80|Wind Drake
81|Blood Reckoning
82|Bloodhunter Bat
83|Bloodthrone Vampire
84|Cower in Fear
85|Crippling Blight
86|Dark Favor
87|Diabolic Revelation
88|Disciple of Bolas
89|Disentomb
90|Duress
91|Duskmantle Prowler
92|Duty-Bound Dead
93|Essence Drain
94|Giant Scorpion
95|Harbor Bandit
96|Knight of Infamy
97|Liliana of the Dark Realms
98|Liliana's Shade
99|Mark of the Vampire
100|Mind Rot
101|Murder
102|Mutilate
103|Nefarox, Overlord of Grixis
104|Phylactery Lich
105|Public Execution
106|Ravenous Rats
107|Rise from the Grave
108|Servant of Nefarox
109|Shimian Specter
110|Sign in Blood
111|Tormented Soul
112|Vampire Nighthawk
113|Vampire Nocturnus
114|Veilborn Ghoul
115|Vile Rebirth
116|Walking Corpse
117|Wit's End
118|Xathrid Gorgon
119|Zombie Goliath
120|Arms Dealer
121|Bladetusk Boar
122|Canyon Minotaur
123|Chandra, the Firebrand
124|Chandra's Fury
125|Cleaver Riot
126|Craterize
127|Crimson Muckwader
128|Dragon Hatchling
129|Fervor
130|Fire Elemental
131|Firewing Phoenix
132|Flames of the Firebrand
133|Furnace Whelp
134|Goblin Arsonist
135|Goblin Battle Jester
136|Hamletback Goliath
137|Kindled Fury
138|Krenko, Mob Boss
139|Krenko's Command
140|Magmaquake
141|Mark of Mutiny
142|Mindclaw Shaman
143|Mogg Flunkies
144|Reckless Brute
145|Reverberate
146|Rummaging Goblin
147|Searing Spear
148|Slumbering Dragon
149|Smelt
150|Thundermaw Hellkite
151|Torch Fiend
152|Trumpet Blast
153|Turn to Slag
154|Volcanic Geyser
155|Volcanic Strength
156|Wall of Fire
157|Wild Guess
158|Worldfire
159|Acidic Slime
160|Arbor Elf
161|Bond Beetle
162|Boundless Realms
163|Bountiful Harvest
164|Centaur Courser
165|Deadly Recluse
166|Duskdale Wurm
167|Elderscale Wurm
168|Elvish Archdruid
169|Elvish Visionary
170|Farseek
171|Flinthoof Boar
172|Fog
173|Fungal Sprouting
174|Garruk, Primal Hunter
175|Garruk's Packleader
176|Ground Seal
177|Mwonvuli Beast Tracker
178|Naturalize
179|Plummet
180|Predatory Rampage
181|Prey Upon
182|Primal Huntbeast
183|Primordial Hydra
184|Quirion Dryad
185|Rancor
186|Ranger's Path
187|Revive
188|Roaring Primadox
189|Sentinel Spider
190|Serpent's Gift
191|Silklash Spider
192|Spiked Baloth
193|Thragtusk
194|Timberpack Wolf
195|Titanic Growth
196|Vastwood Gorger
197|Yeva, Nature's Herald
198|Yeva's Forcemage
199|Nicol Bolas, Planeswalker
200|Akroma's Memorial
201|Chronomaton
202|Clock of Omens
203|Door to Nothingness
204|Elixir of Immortality
205|Gem of Becoming
206|Gilded Lotus
207|Jayemdae Tome
208|Kitesail
209|Phyrexian Hulk
210|Primal Clay
211|Ring of Evos Isle
212|Ring of Kalonia
213|Ring of Thune
214|Ring of Valkas
215|Ring of Xathrid
216|Sands of Delirium
217|Staff of Nin
218|Stuffy Doll
219|Tormod's Crypt
220|Trading Post
221|Cathedral of War
222|Dragonskull Summit
223|Drowned Catacomb
224|Evolving Wilds
225|Glacial Fortress
226|Hellion Crucible
227|Reliquary Tower
228|Rootbound Crag
229|Sunpetal Grove
230|Plains
231|Plains
232|Plains
233|Plains
234|Island
235|Island
236|Island
237|Island
238|Swamp
239|Swamp
240|Swamp
241|Swamp
242|Mountain
243|Mountain
244|Mountain
245|Mountain
246|Forest
247|Forest
248|Forest
249|Forest

View file

@ -0,0 +1,55 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets;
import java.util.GregorianCalendar;
import mage.Constants.SetType;
import mage.cards.ExpansionSet;
/**
*
* @author North
*/
public class Magic2013 extends ExpansionSet {
private static final Magic2013 fINSTANCE = new Magic2013();
public static Magic2013 getInstance() {
return fINSTANCE;
}
private Magic2013() {
super("Magic 2013", "M13", "seticon_M13", "mage.sets.magic2013", new GregorianCalendar(2012, 6, 7).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
}
}

View file

@ -94,6 +94,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
this.addSet(Magic2010.getInstance());
this.addSet(Magic2011.getInstance());
this.addSet(Magic2012.getInstance());
this.addSet(Magic2013.getInstance());
this.addSet(MagicPlayerRewards.getInstance());
this.addSet(Mirrodin.getInstance());
this.addSet(MirrodinBesieged.getInstance());

View file

@ -5,6 +5,7 @@ Tenth Edition|tenth|
Magic 2010|magic2010|
Magic 2011|magic2011|
Magic 2012|magic2012|
Magic 2013|magic2013|
Planechase|planechase|
Duel Decks: Elspeth vs. Tezzeret|elspethvstezzeret|
Tempest|tempest|

File diff suppressed because it is too large Load diff

View file

@ -55,6 +55,7 @@ Lorwyn|LRW|
Magic 2010|M10|
Magic 2011|M11|
Magic 2012|M12|
Magic 2013|M13|
Magic: The Gathering-Commander|CMD|
Masters Edition II|ME2|
Masters Edition III|ME3|