github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #934 from ImperatorPrime/master

Browse source 
Fixed some gatherer image loading.
This commit is contained in:
LevelX2 2015-04-26 17:35:50 +02:00
commit 9fb75d3877
6 changed files with 51 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -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")

10
Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island1.java → Mage.Sets/src/mage/sets/ajanivsnicolbolas/Island.java
View file

@ -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);
}
}

10
Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains1.java → Mage.Sets/src/mage/sets/ajanivsnicolbolas/Plains.java
View file

@ -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);
}
}

10
Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island1.java → Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Island.java
View file

@ -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);
}
}

10
Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain1.java → Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Mountain.java
View file

@ -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);
}
}

10
Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains1.java → Mage.Sets/src/mage/sets/phyrexiavsthecoalition/Plains.java
View file

@ -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);
}
}