external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed card picture selection to correctly show cards that have several prints throughout a set

Browse Source
This commit is contained in:
Maxmtg
2011-09-09 15:53:00 +00:00
parent e28fb2fcee
commit 5aff635eb8
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/forge/CardUtil.java
View File

@@ -16,6 +16,8 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
import net.slightlymagic.maxmtg.Predicate;
import org.apache.commons.lang3.StringUtils;
@@ -505,7 +507,14 @@ public final class CardUtil {
*/
public static String buildFilename(final Card card) {
boolean token = card.isToken() && !card.isCopiedToken();
return buildFilename(card.getName(), card.getCurSetCode(), card.getRandomPicture(), token);
final String set = card.getCurSetCode();
Predicate<SetInfo> findSetInfo = new Predicate<SetInfo>() {
@Override public boolean isTrue(final SetInfo subject) { return subject.Code.equals(set); }
};
SetInfo neededSet = findSetInfo.first(card.getSets());
int cntPictures = neededSet == null ? 1 : neededSet.PicCount;
return buildFilename(card.getName(), card.getCurSetCode(), card.getRandomPicture(), cntPictures, token);
}
/**
@@ -515,14 +524,15 @@ public final class CardUtil {
* @return the filename
*/
public static String buildFilename(final CardPrinted card) {
return buildFilename(card.getName(), card.getSet(), card.getArtIndex(), false);
int maxIndex = card.getCard().getSetInfo(card.getSet()).getCopiesCount();
return buildFilename(card.getName(), card.getSet(), card.getArtIndex(), maxIndex, false);
}
private static String buildFilename(final String cardName, final String setName,
final int artIndex, final boolean isToken)
final int artIndex, final int artIndexMax, final boolean isToken)
{
File path = ForgeProps.getFile(isToken ? NewConstants.IMAGE_TOKEN : NewConstants.IMAGE_BASE);
String nn = artIndex > 0 ? Integer.toString(artIndex) : "";
String nn = artIndexMax > 1 ? Integer.toString(artIndex+1) : "";
String cleanCardName = GuiDisplayUtil.cleanString(cardName);
File f = null;

2
src/main/java/forge/card/CardPrinted.java
View File

@@ -110,7 +110,7 @@ public final class CardPrinted implements Comparable<CardPrinted> {
Card c = AllZone.getCardFactory().getCard(name, null);
if (c != null) {
c.setCurSetCode(getSet());
c.setRandomPicture(artIndex);
c.setRandomPicture(artIndex+1);
c.setImageFilename(getImageFilename());
}
// else throw "Unsupported card";