Updated CardData generation to not include that funky unicode character

BlueRaja · Dec 9, 2016 · e965ed5 · e965ed5
1 parent 6b19046
commit e965ed5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/CardData.xml b/CardData.xml
@@ -100,7 +100,7 @@
 <card idMagicAssist="398640" idMagicDuels="97" name="Alchemist's Vial"/>
 <card idMagicAssist="398436" idMagicDuels="98" name="Alhammarret, High Arbiter"/>
 <card idMagicAssist="398603" idMagicDuels="99" name="Ampryn Tactician"/>
-<card idMagicAssist="398474" idMagicDuels="100" name="Anchor to the Æther"/>
+<card idMagicAssist="398474" idMagicDuels="100" name="Anchor to the Aether"/>
 <card idMagicAssist="398437" idMagicDuels="101" name="Animist's Awakening"/>
 <card idMagicAssist="398455" idMagicDuels="102" name="Anointer of Champions"/>
 <card idMagicAssist="220230" idMagicDuels="103" name="Angelic Destiny"/>
@@ -155,7 +155,7 @@
 <card idMagicAssist="398613" idMagicDuels="152" name="Foundry of the Consuls"/>
 <card idMagicAssist="205033" idMagicDuels="153" name="Gaea's Revenge"/>
 <card idMagicAssist="398448" idMagicDuels="154" name="Gather the Pack"/>
-<card idMagicAssist="398517" idMagicDuels="155" name="Ghirapur Æther Grid"/>
+<card idMagicAssist="398517" idMagicDuels="155" name="Ghirapur Aether Grid"/>
 <card idMagicAssist="398681" idMagicDuels="156" name="Ghirapur Gearcrafter"/>
 <card idMagicAssist="398495" idMagicDuels="157" name="Gilt-Leaf Winnower"/>
 <card idMagicAssist="398598" idMagicDuels="158" name="Goblin Glory Chaser"/>
@@ -858,7 +858,7 @@
 <card idMagicAssist="417574" idMagicDuels="855" name="Acrobatic Maneuver"/>
 <card idMagicAssist="417815" idMagicDuels="856" name="Aether Hub"/>
 <card idMagicAssist="417609" idMagicDuels="857" name="Aether Meltdown"/>
-<card idMagicAssist="382208" idMagicDuels="858" name="Æther Tradewinds"/>
+<card idMagicAssist="382208" idMagicDuels="858" name="Aether Tradewinds"/>
 <card idMagicAssist="417612" idMagicDuels="859" name="Aethersquall Ancient"/>
 <card idMagicAssist="417576" idMagicDuels="860" name="Aetherstorm Roc"/>
 <card idMagicAssist="417679" idMagicDuels="861" name="Aethertorch Renegade"/>

diff --git a/src/com/blueraja/magicduelsimporter/carddata/CardDataGenerator.java b/src/com/blueraja/magicduelsimporter/carddata/CardDataGenerator.java
@@ -45,6 +45,8 @@ private static void LoadMagicAssistCardsForFile(File file)
             String name = element.getElementsByTagName("name").item(0).getTextContent();
             String idStr = element.getElementsByTagName("id").item(0).getTextContent();
             int id = Integer.parseInt(idStr);
+
+            name = cleanupName(name);
             String normalizedName = normalizeName(name);
 
             if(!_nameToMagicAssistEntry.containsKey(normalizedName)) {
@@ -81,10 +83,13 @@ private static void LoadMagicDuelsCardPool(String cardpoolPath)
         }
     }
 
-    public static String normalizeName(String name) {
+    private static String cleanupName(String name) {
         //There is a card named "Anchor to the Æther"
-        name = name.replace("Æ", "AE");
+        return name.replace("Æ", "Ae");
+    }
 
+    private static String normalizeName(String name) {
+        name = cleanupName(name);
         return name.replaceAll("[^a-zA-Z]", "").toUpperCase();
     }