diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 5680ece4ccd..a3b3af5c043 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -69,11 +69,11 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("BRB", "Battle Royale Box Set"); setsAliases.put("BTD", "Beatdown Box Set"); setsAliases.put("C13", "Commander 2013 Edition"); - setsAliases.put("C14", "Commander 2014 Edition"); + setsAliases.put("C14", "Commander 2014"); setsAliases.put("CHK", "Champions of Kamigawa"); setsAliases.put("CHR", "Chronicles"); setsAliases.put("CMD", "Magic: The Gathering-Commander"); - setsAliases.put("CNS", "Magic: The Gathering-Conspiracy"); + setsAliases.put("CNS", "Magic: The Gathering—Conspiracy"); setsAliases.put("CON", "Conflux"); setsAliases.put("CSP", "Coldsnap"); setsAliases.put("DD2", "Duel Decks: Jace vs. Chandra"); @@ -179,7 +179,7 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("TMP", "Tempest"); setsAliases.put("TOR", "Torment"); setsAliases.put("TPR", "Tempest Remastered"); - setsAliases.put("TSB", "Time Spiral 'Timeshifted'"); + setsAliases.put("TSB", "Time Spiral \"Timeshifted\""); setsAliases.put("TSP", "Time Spiral"); setsAliases.put("UDS", "Urza's Destiny"); setsAliases.put("UGL", "Unglued"); @@ -250,17 +250,21 @@ public class WizardCardsImageSource implements CardImageSource { String cardName = normalizeName(cardsImages.get(i).attr("alt")); if (cardName != null && !cardName.isEmpty()) { if (cardName.equals("Forest") || cardName.equals("Swamp") || cardName.equals("Mountain") || cardName.equals("Island") || cardName.equals("Plains")) { - Integer multiverseId = Integer.parseInt(cardsImages.get(i).attr("src").replaceAll("[^\\d]", "")); - String urlLandDocument = "http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=" + multiverseId; - Document landDoc = Jsoup.connect(urlLandDocument).get(); - Elements variations = landDoc.select("a.variationlink"); - int landNumber = 1; - for (Element variation : variations) { - Integer landMultiverseId = Integer.parseInt(variation.attr("onclick").replaceAll("[^\\d]", "")); - // "" - setLinks.put((cardName + landNumber).toLowerCase(), "/Handlers/Image.ashx?multiverseid=" +landMultiverseId + "&type=card"); - landNumber++; - } + Integer multiverseId = Integer.parseInt(cardsImages.get(i).attr("src").replaceAll("[^\\d]", "")); + String urlLandDocument = "http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=" + multiverseId; + Document landDoc = Jsoup.connect(urlLandDocument).get(); + Elements variations = landDoc.select("a.variationlink"); + if(!variations.isEmpty()) { + int landNumber = 1; + for (Element variation : variations) { + Integer landMultiverseId = Integer.parseInt(variation.attr("onclick").replaceAll("[^\\d]", "")); + // "" + setLinks.put((cardName + landNumber).toLowerCase(), "/Handlers/Image.ashx?multiverseid=" +landMultiverseId + "&type=card"); + landNumber++; + } + } else { + setLinks.put(cardName.toLowerCase(), cardsImages.get(i).attr("src").substring(5)); + } } else { setLinks.put(cardName.toLowerCase(), cardsImages.get(i).attr("src").substring(5)); } @@ -276,6 +280,14 @@ public class WizardCardsImageSource implements CardImageSource { } private String normalizeName(String name) { + //Split card + if(name.contains("//")) { + name = name.substring(0, name.indexOf("(") - 1); + } + //Special timeshifted name + if(name.startsWith("XX")) { + name = name.substring(name.indexOf("(") + 1, name.length() - 1); + } return name.replace("\u2014", "-").replace("\u2019", "'") .replace("\u00C6", "AE").replace("\u00E6", "ae") .replace("\u00C3\u2020", "AE") diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island1.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island.java similarity index 88% rename from Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island1.java rename to Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island.java index d52b74f7d7e..8173ded5373 100644 --- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island1.java +++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island.java @@ -35,19 +35,19 @@ import java.util.UUID; */ -public class Island1 extends mage.cards.basiclands.Island { +public class Island extends mage.cards.basiclands.Island { - public Island1(UUID ownerId) { + public Island(UUID ownerId) { super(ownerId, 79); this.expansionSetCode = "DDH"; } - public Island1(final Island1 card) { + public Island(final Island card) { super(card); } @Override - public Island1 copy() { - return new Island1(this); + public Island copy() { + return new Island(this); } } diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains1.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains.java similarity index 88% rename from Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains1.java rename to Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains.java index 85198b9e106..8fc8a78c995 100644 --- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains1.java +++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains.java @@ -35,19 +35,19 @@ import java.util.UUID; */ -public class Plains1 extends mage.cards.basiclands.Plains { +public class Plains extends mage.cards.basiclands.Plains { - public Plains1(UUID ownerId) { + public Plains(UUID ownerId) { super(ownerId, 40); this.expansionSetCode = "DDH"; } - public Plains1(final Plains1 card) { + public Plains(final Plains card) { super(card); } @Override - public Plains1 copy() { - return new Plains1(this); + public Plains copy() { + return new Plains(this); } } diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island1.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island.java similarity index 88% rename from Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island1.java rename to Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island.java index b9e666b1bba..dce598cc332 100644 --- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island1.java +++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island.java @@ -33,19 +33,19 @@ import java.util.UUID; * * @author LevelX2 */ -public class Island1 extends mage.cards.basiclands.Island { +public class Island extends mage.cards.basiclands.Island { - public Island1(UUID ownerId) { + public Island(UUID ownerId) { super(ownerId, 68); this.expansionSetCode = "DDE"; } - public Island1(final Island1 card) { + public Island(final Island card) { super(card); } @Override - public Island1 copy() { - return new Island1(this); + public Island copy() { + return new Island(this); } } diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain1.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain.java similarity index 87% rename from Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain1.java rename to Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain.java index 796b79cfdf9..41a6002954c 100644 --- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain1.java +++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain.java @@ -33,19 +33,19 @@ import java.util.UUID; * * @author LevelX2 */ -public class Mountain1 extends mage.cards.basiclands.Mountain { +public class Mountain extends mage.cards.basiclands.Mountain { - public Mountain1(UUID ownerId) { + public Mountain(UUID ownerId) { super(ownerId, 69); this.expansionSetCode = "DDE"; } - public Mountain1(final Mountain1 card) { + public Mountain(final Mountain card) { super(card); } @Override - public Mountain1 copy() { - return new Mountain1(this); + public Mountain copy() { + return new Mountain(this); } } diff --git a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains1.java b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains.java similarity index 88% rename from Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains1.java rename to Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains.java index 2fb2656c724..535b44f7a8a 100644 --- a/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains1.java +++ b/Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains.java @@ -33,19 +33,19 @@ import java.util.UUID; * * @author LevelX2 */ -public class Plains1 extends mage.cards.basiclands.Plains { +public class Plains extends mage.cards.basiclands.Plains { - public Plains1(UUID ownerId) { + public Plains(UUID ownerId) { super(ownerId, 67); this.expansionSetCode = "DDE"; } - public Plains1(final Plains1 card) { + public Plains(final Plains card) { super(card); } @Override - public Plains1 copy() { - return new Plains1(this); + public Plains copy() { + return new Plains(this); } }