Normalize card names for image files

Dalamar32 · Dec 29, 2023 · 7e20fb3 · 7e20fb3
1 parent bacb72d
commit 7e20fb3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java
@@ -25,6 +25,7 @@
 import forge.util.ImageUtil;
 import forge.util.Localizer;
 import forge.util.TextUtil;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -311,7 +312,8 @@ private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IO
 
     @Override
     public String getImageKey(boolean altState) {
-        String imageKey = ImageKeys.CARD_PREFIX + name + CardDb.NameSetSeparator
+        String noramlizedName = StringUtils.stripAccents(name);
+        String imageKey = ImageKeys.CARD_PREFIX + noramlizedName + CardDb.NameSetSeparator
                 + edition + CardDb.NameSetSeparator + artIndex;
         if (altState) {
             imageKey += ImageKeys.BACKFACE_POSTFIX;

diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -6,6 +6,7 @@
 import forge.card.CardRules;
 import forge.card.CardSplitType;
 import forge.item.PaperCard;
+import org.apache.commons.lang3.StringUtils;
 
 public class ImageUtil {
     public static float getNearestHQSize(float baseSize, float actualSize) {
@@ -200,6 +201,7 @@ public static String getScryfallDownloadUrl(PaperCard cp, String face, String se
     }
 
     public static String toMWSFilename(String in) {
+        in = StringUtils.stripAccents(in);
         final StringBuilder out = new StringBuilder();
         char c;
         for (int i = 0; i < in.length(); i++) {