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

Merge pull request #2409 from kevlahnota/newmaster2

Browse Source 
update lookup
This commit is contained in:
Anthony Calosa
2023-02-06 21:53:46 +08:00
committed by GitHub
parent bcbf4fbd3d 297356853a
commit 7526c9f544
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
forge-core/src/main/java/forge/ImageKeys.java
View File

@@ -272,6 +272,34 @@ public final class ImageKeys {
return file; return file;
} }
} }
//lookup other cards like planechase/phenomenon
if (!filename.contains(".full")) {
String newFilename = TextUtil.addSuffix(filename,".full");
file = findFile(dir, newFilename);
if (file != null) {
cachedCards.put(filename, file);
return file;
}
String newFilename2 = TextUtil.addSuffix(filename,".fullborder");
file = findFile(dir, newFilename2);
if (file != null) {
cachedCards.put(filename, file);
return file;
}
String setCode = filename.substring(0, filename.indexOf("/"));
if (!setCode.isEmpty() && editionAlias.containsKey(setCode)) {
file = findFile(dir, TextUtil.fastReplace(newFilename, setCode + "/", editionAlias.get(setCode) + "/"));
if (file != null) {
cachedCards.put(filename, file);
return file;
}
file = findFile(dir, TextUtil.fastReplace(newFilename2, setCode + "/", editionAlias.get(setCode) + "/"));
if (file != null) {
cachedCards.put(filename, file);
return file;
}
}
}
} }
} }
@@ -374,7 +402,10 @@ public final class ImageKeys {
CardEdition ed = StaticData.instance().getEditions().get(setFolder); CardEdition ed = StaticData.instance().getEditions().get(setFolder);
if (ed != null && !editionAlias.containsKey(setFolder)) { if (ed != null && !editionAlias.containsKey(setFolder)) {
String alias = ed.getAlias(); String alias = ed.getAlias();
editionAlias.put(setFolder, alias == null ? ed.getCode() : alias); if (alias == null)
alias = ed.getCode();
if (!alias.equalsIgnoreCase(setFolder))
editionAlias.put(setFolder, alias);
} }
editionHasImage = FileUtil.isDirectoryWithFiles(CACHE_CARD_PICS_DIR + setFolder); editionHasImage = FileUtil.isDirectoryWithFiles(CACHE_CARD_PICS_DIR + setFolder);
editionImageLookup.put(pc.getEdition(), editionHasImage); editionImageLookup.put(pc.getEdition(), editionHasImage);