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

Merge branch 'patch-5' into 'master'

Browse Source 
Update ImageKeys.java to support .full images first art variant renaming optional

See merge request core-developers/forge!2703
This commit is contained in:
austinio7116
2020-04-13 13:55:17 +00:00
parent ce1aca2674 5649ac6d7d
commit d17015cc88
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,9 +116,12 @@ public final class ImageKeys {
String fullborderFile = TextUtil.fastReplace(filename, ".full", ".fullborder"); String fullborderFile = TextUtil.fastReplace(filename, ".full", ".fullborder");
file = findFile(dir, fullborderFile); file = findFile(dir, fullborderFile);
if (file != null) { return file; } if (file != null) { return file; }
// if there's an art variant try without it // if there's a 1st art variant try without it for .fullborder images
file = findFile(dir, TextUtil.fastReplace(fullborderFile, "1.fullborder", ".fullborder")); file = findFile(dir, TextUtil.fastReplace(fullborderFile, "1.fullborder", ".fullborder"));
if (file != null) { return file; } if (file != null) { return file; }
// if there's a 1st art variant try without it for .full images
file = findFile(dir, TextUtil.fastReplace(filename, "1.full", ".full"));
if (file != null) { return file; }
} }
//if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder //if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder
if (!filename.contains(".full")) { if (!filename.contains(".full")) {