External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redesigned handling of various art for cards.

Browse source
This commit is contained in:
LevelX2 2012-11-27 15:24:29 +01:00
parent 96738632d1
commit 4b2e6a8bc0
15 changed files with 82 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage.Client/src/main/java/org/mage/plugins/card/images/CardInfo.java
View file

@ -15,21 +15,21 @@ public class CardInfo {
private boolean twoFacedCard;
private boolean secondSide;
private boolean flipCard;
private boolean useCollectorId; // for building the image name (different images for the same card)
private boolean usesVariousArt;
public CardInfo(String name, String set, Integer collectorId, boolean useCollectorId, Integer type) {
this(name, set, collectorId, useCollectorId, type, false);
public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type) {
this(name, set, collectorId, usesVariousArt, type, false);
}
public CardInfo(String name, String set, Integer collectorId, boolean useCollectorId, Integer type, boolean token) {
this(name, set, collectorId, useCollectorId, type, token, false, false);
public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, boolean token) {
this(name, set, collectorId, usesVariousArt, type, token, false, false);
}
public CardInfo(String name, String set, Integer collectorId, boolean useCollectorId, Integer type, boolean token, boolean twoFacedCard, boolean secondSide) {
public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, boolean token, boolean twoFacedCard, boolean secondSide) {
this.name = name;
this.set = set;
this.collectorId = collectorId;
this.useCollectorId = useCollectorId;
this.usesVariousArt = usesVariousArt;
this.type = type;
this.token = token;
this.twoFacedCard = twoFacedCard;
@ -44,6 +44,7 @@ public class CardInfo {
this.twoFacedCard = card.twoFacedCard;
this.secondSide = card.secondSide;
this.type = card.type;
this.usesVariousArt = card.usesVariousArt;
}
@Override
@ -153,8 +154,8 @@ public class CardInfo {
this.type = type;
}
public boolean useCollectorId() {
return useCollectorId;
public boolean getUsesVariousArt() {
return usesVariousArt;
}
}

8
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
View file

@ -210,7 +210,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
TFile file;
for (Card card : allCards) {
if (card.getCardNumber() > 0 && !card.getExpansionSetCode().isEmpty()) {
CardInfo url = new CardInfo(card.getName(), card.getExpansionSetCode(), card.getCardNumber(),Character.isDigit(card.getClass().getName().charAt(card.getClass().getName().length()-1)),0 , false, card.canTransform(), card.isNightCard());
CardInfo url = new CardInfo(card.getName(), card.getExpansionSetCode(), card.getCardNumber(),card.getUsesVariousArt(),0 , false, card.canTransform(), card.isNightCard());
file = new TFile(CardImageUtils.getImagePath(url, imagesPath));
if (!file.exists()) {
return true;
@ -235,8 +235,8 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
for (Card card : allCards) {
if (card.getCardNumber() > 0 && !card.getExpansionSetCode().isEmpty()) {
String cardName = card.getName();
CardInfo url = new CardInfo(cardName, card.getExpansionSetCode(), card.getCardNumber(), Character.isDigit(card.getClass().getName().charAt(card.getClass().getName().length()-1)), 0, false, card.canTransform(), card.isNightCard());
if (url.useCollectorId()) {
CardInfo url = new CardInfo(cardName, card.getExpansionSetCode(),card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), card.isNightCard());
if (url.getUsesVariousArt()) {
url.setDownloadName(card.getClass().getName().replace(card.getClass().getPackage().getName() + ".", ""));
}
if (card.isFlipCard()) {
@ -248,7 +248,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
// it has the same expansion set code and card number as original one
// second side = true;
Card secondSide = card.getSecondCardFace();
url = new CardInfo(secondSide.getName(), card.getExpansionSetCode(), card.getCardNumber(), Character.isDigit(secondSide.getClass().getName().charAt(secondSide.getClass().getName().length()-1)), 0, false, card.canTransform(), true);
url = new CardInfo(secondSide.getName(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), true);
allCardsUrls.add(url);
}
} else {

18
Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
View file

@ -54,10 +54,10 @@ public class ImageCache {
public BufferedImage apply(String key) {
try {
boolean thumbnail = false;
boolean useCollectorId = false;
if (key.endsWith("#useCardNumber")) {
useCollectorId = true;
key = key.replace("#useCardNumber", "");
boolean usesVariousArt = false;
if (key.endsWith("#usesVariousArt")) {
usesVariousArt = true;
key = key.replace("#usesVariousArt", "");
}
if (key.endsWith("#thumb")) {
thumbnail = true;
@ -71,7 +71,7 @@ public class ImageCache {
Integer type = Integer.parseInt(m.group(3));
Integer collectorId = Integer.parseInt(m.group(4));
CardInfo info = new CardInfo(name, set, collectorId, useCollectorId, type);
CardInfo info = new CardInfo(name, set, collectorId, usesVariousArt, type);
if (collectorId == 0) {
info.setToken(true);
@ -139,8 +139,8 @@ public class ImageCache {
public static BufferedImage getThumbnail(CardView card) {
String key = getKey(card) + "#thumb";
if (card.useCardNumber()) {
key += "#useCardNumber";
if (card.getUsesVariousArt()) {
key += "#usesVariousArt";
}
//log.debug("#key: " + key);
return getImage(key);
@ -148,8 +148,8 @@ public class ImageCache {
public static BufferedImage getImageOriginal(CardView card) {
String key = getKey(card);
if (card.useCardNumber()) {
key += "#useCardNumber";
if (card.getUsesVariousArt()) {
key += "#usesVariousArt";
}
//log.debug("#key: " + key);
return getImage(key);

2
Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
View file

@ -136,7 +136,7 @@ public class CardImageUtils {
String type = card.getType() != 0 ? " " + Integer.toString(card.getType()) : "";
String name = card.getName().replace(":", "");
if (card.useCollectorId()) {
if (card.getUsesVariousArt()) {
imageName = name + "." + card.getCollectorId() + ".full.jpg";
} else {
imageName = name + type + ".full.jpg";