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

Some changes to Morph card image display.

Browse source
This commit is contained in:
LevelX2 2014-09-16 07:53:00 +02:00
parent 30d112e0bf
commit c3fba626a2
3 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -50,7 +50,9 @@ import org.apache.log4j.Logger;
import org.mage.card.arcane.ScaledImagePanel.MultipassType; import org.mage.card.arcane.ScaledImagePanel.MultipassType;
import org.mage.card.arcane.ScaledImagePanel.ScalingType; import org.mage.card.arcane.ScaledImagePanel.ScalingType;
import org.mage.plugins.card.dl.sources.DirectLinksForDownload; import org.mage.plugins.card.dl.sources.DirectLinksForDownload;
import org.mage.plugins.card.images.CardDownloadData;
import org.mage.plugins.card.images.ImageCache; import org.mage.plugins.card.images.ImageCache;
import org.mage.plugins.card.utils.CardImageUtils;
import org.mage.plugins.card.utils.impl.ImageManagerImpl; import org.mage.plugins.card.utils.impl.ImageManagerImpl;
/** /**
@ -304,8 +306,19 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
} }
BufferedImage srcImage; BufferedImage srcImage;
if (gameCard.isFaceDown()) { if (gameCard.isFaceDown()) {
TFile file = new TFile(DirectLinksForDownload.outDir + File.separator + DirectLinksForDownload.cardbackFilename); boolean morphedCard = false;
srcImage = ImageCache.loadImage(file); for (String rule:gameCard.getRules()) {
if (rule.startsWith("Morph ") ||
rule.equals("You may cast this card as a 2/2 face-down creature, with no text, no name, no subtypes, and no mana cost by paying {3} rather than paying its mana cost.")) {
morphedCard = true;
}
}
if (morphedCard) {
srcImage = ImageCache.getMorphImage();
}else {
TFile file = new TFile(DirectLinksForDownload.outDir + File.separator + DirectLinksForDownload.cardbackFilename);
srcImage = ImageCache.loadImage(file);
}
} else { } else {
srcImage = ImageCache.getImage(gameCard, getCardWidth(), getCardHeight()); srcImage = ImageCache.getImage(gameCard, getCardWidth(), getCardHeight());
} }

4
Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
View file

@ -1,5 +1,7 @@
package org.mage.plugins.card.images; package org.mage.plugins.card.images;
import java.util.Objects;
/** /**
* *
* @author North * @author North
@ -68,7 +70,7 @@ public class CardDownloadData {
if ((this.set == null) ? (other.set != null) : !this.set.equals(other.set)) { if ((this.set == null) ? (other.set != null) : !this.set.equals(other.set)) {
return false; return false;
} }
if (this.collectorId != other.collectorId && (this.collectorId == null || !this.collectorId.equals(other.collectorId))) { if (!Objects.equals(this.collectorId, other.collectorId) && (this.collectorId == null || !this.collectorId.equals(other.collectorId))) {
return false; return false;
} }
if (this.token != other.token) { if (this.token != other.token) {

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

@ -130,7 +130,15 @@ public class ImageCache {
} }
}); });
} }
public static BufferedImage getMorphImage() {
CardDownloadData info = new CardDownloadData("Morph", "KTK", 0, false, 0, "KTK");
info.setToken(true);
String path = CardImageUtils.generateTokenImagePath(info);
TFile file = new TFile(path);
return loadImage(file);
}
private static String buildThumbnailPath(String path) { private static String buildThumbnailPath(String path) {
String thumbnailPath; String thumbnailPath;
if (PreferencesDialog.isSaveImagesToZip()) { if (PreferencesDialog.isSaveImagesToZip()) {