From d1cc5472398e4a3332f93e43263b5e955329a576 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 13 Apr 2020 12:51:23 +0000 Subject: [PATCH 1/2] Update ImageKeys.java to support .full images first art variant renaming optional --- forge-core/src/main/java/forge/ImageKeys.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index f2b976f3008..986535b0ea8 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -116,9 +116,12 @@ public final class ImageKeys { String fullborderFile = TextUtil.fastReplace(filename, ".full", ".fullborder"); file = findFile(dir, fullborderFile); 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")); if (file != null) { return file; } + // if there's a 1st art variant try without it for .full images + file = findFile(dir, TextUtil.fastReplace(fullborderFile, "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 (!filename.contains(".full")) { From 5649ac6d7d2941ecb3351da3f59b0a781b5fbde1 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 13 Apr 2020 12:55:13 +0000 Subject: [PATCH 2/2] Update ImageKeys.java --- forge-core/src/main/java/forge/ImageKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index 986535b0ea8..37b1ba34128 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -120,7 +120,7 @@ public final class ImageKeys { file = findFile(dir, TextUtil.fastReplace(fullborderFile, "1.fullborder", ".fullborder")); if (file != null) { return file; } // if there's a 1st art variant try without it for .full images - file = findFile(dir, TextUtil.fastReplace(fullborderFile, "1.full", ".full")); + 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