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

Merge branch 'token-artwork' into 'master'

Browse Source 
Token artwork

See merge request core-developers/forge!214
This commit is contained in:
Sol
2018-02-18 03:08:38 +00:00
parent e72edb95b5 d60d350fcb
commit 2a086c8b64
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,13 +119,22 @@ public final class ImageKeys {
if (file != null) { return file; } if (file != null) { return file; }
} }
// try without set name
if (dir.equals(CACHE_TOKEN_PICS_DIR)) { if (dir.equals(CACHE_TOKEN_PICS_DIR)) {
int index = filename.lastIndexOf('_'); int index = filename.lastIndexOf('_');
if (index != -1) { if (index != -1) {
String setlessFilename = filename.substring(0, index); String setlessFilename = filename.substring(0, index);
String setCode = filename.substring(index + 1, filename.length());
// try with upper case set
file = findFile(dir, setlessFilename + "_" + setCode.toUpperCase());
if (file != null) { return file; }
// try without set name
file = findFile(dir, setlessFilename); file = findFile(dir, setlessFilename);
if (file != null) { return file; } if (file != null) { return file; }
// if there's an art variant try without it
if (setlessFilename.matches(".*[0-9]*$")) {
file = findFile(dir, setlessFilename.replaceAll("[0-9]*$", ""));
if (file != null) { return file; }
}
} }
} else if (filename.contains("/")) { } else if (filename.contains("/")) {
String setlessFilename = filename.substring(filename.indexOf('/') + 1); String setlessFilename = filename.substring(filename.indexOf('/') + 1);