From 248c41335ee28f5e522c814be05536aafbc38893 Mon Sep 17 00:00:00 2001 From: melvin Date: Thu, 9 Aug 2012 15:16:42 +0800 Subject: [PATCH] use utf-8 in card script to encode the correct name --- release/Magarena/scripts/Jotun_Owl_Keeper.txt | 2 +- release/Magarena/scripts/Lim_Dul_s_High_Guard.txt | 2 +- release/Magarena/scripts/Lim_Dul_the_Necromancer.txt | 2 +- release/Magarena/scripts/Seance.txt | 2 +- src/magic/card/{Jotun_Owl_Keeper.java => J_tun_Owl_Keeper.java} | 2 +- ...im_Dul_the_Necromancer.java => Lim_D_l_the_Necromancer.java} | 2 +- src/magic/card/{Seance.java => S_ance.java} | 2 +- src/magic/data/FileIO.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename src/magic/card/{Jotun_Owl_Keeper.java => J_tun_Owl_Keeper.java} (95%) rename src/magic/card/{Lim_Dul_the_Necromancer.java => Lim_D_l_the_Necromancer.java} (97%) rename src/magic/card/{Seance.java => S_ance.java} (97%) diff --git a/release/Magarena/scripts/Jotun_Owl_Keeper.txt b/release/Magarena/scripts/Jotun_Owl_Keeper.txt index cdcb851404..94ed1a605a 100644 --- a/release/Magarena/scripts/Jotun_Owl_Keeper.txt +++ b/release/Magarena/scripts/Jotun_Owl_Keeper.txt @@ -1,4 +1,4 @@ -name=Jotun Owl Keeper +name=Jötun Owl Keeper url=http://magiccards.info/cs/en/9.html image=http://magiccards.info/scans/en/cs/9.jpg value=3.757 diff --git a/release/Magarena/scripts/Lim_Dul_s_High_Guard.txt b/release/Magarena/scripts/Lim_Dul_s_High_Guard.txt index 7d18a35b19..e337c99040 100644 --- a/release/Magarena/scripts/Lim_Dul_s_High_Guard.txt +++ b/release/Magarena/scripts/Lim_Dul_s_High_Guard.txt @@ -1,4 +1,4 @@ -name=Lim-Dul's High Guard +name=Lim-Dûl's High Guard url=http://magiccards.info/ai/en/18.html image=http://magiccards.info/scans/en/ai/18.jpg value=3.516 diff --git a/release/Magarena/scripts/Lim_Dul_the_Necromancer.txt b/release/Magarena/scripts/Lim_Dul_the_Necromancer.txt index 603654a050..0bb813dce9 100644 --- a/release/Magarena/scripts/Lim_Dul_the_Necromancer.txt +++ b/release/Magarena/scripts/Lim_Dul_the_Necromancer.txt @@ -1,4 +1,4 @@ -name=Lim-Dul the Necromancer +name=Lim-Dûl the Necromancer url=http://magiccards.info/ts/en/114.html image=http://magiccards.info/scans/en/ts/114.jpg value=4.200 diff --git a/release/Magarena/scripts/Seance.txt b/release/Magarena/scripts/Seance.txt index 86b92f4ce7..429ff15784 100644 --- a/release/Magarena/scripts/Seance.txt +++ b/release/Magarena/scripts/Seance.txt @@ -1,4 +1,4 @@ -name=Seance +name=Séance url=http://magiccards.info/dka/en/20.html image=http://magiccards.info/scans/en/dka/20.jpg value=3.074 diff --git a/src/magic/card/Jotun_Owl_Keeper.java b/src/magic/card/J_tun_Owl_Keeper.java similarity index 95% rename from src/magic/card/Jotun_Owl_Keeper.java rename to src/magic/card/J_tun_Owl_Keeper.java index 38e5d8a87d..c0b5e01d9f 100644 --- a/src/magic/card/Jotun_Owl_Keeper.java +++ b/src/magic/card/J_tun_Owl_Keeper.java @@ -9,7 +9,7 @@ import magic.model.action.MagicPlayTokenAction; import magic.model.event.MagicEvent; import magic.model.trigger.MagicWhenLeavesPlayTrigger; -public class Jotun_Owl_Keeper { +public class J_tun_Owl_Keeper { public static final MagicWhenLeavesPlayTrigger T2 = new MagicWhenLeavesPlayTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent data) { diff --git a/src/magic/card/Lim_Dul_the_Necromancer.java b/src/magic/card/Lim_D_l_the_Necromancer.java similarity index 97% rename from src/magic/card/Lim_Dul_the_Necromancer.java rename to src/magic/card/Lim_D_l_the_Necromancer.java index 584d081e94..51beb860b9 100644 --- a/src/magic/card/Lim_Dul_the_Necromancer.java +++ b/src/magic/card/Lim_D_l_the_Necromancer.java @@ -30,7 +30,7 @@ import magic.model.mstatic.MagicStatic; import magic.model.target.MagicRegenerateTargetPicker; import magic.model.trigger.MagicWhenOtherPutIntoGraveyardFromPlayTrigger; -public class Lim_Dul_the_Necromancer { +public class Lim_D_l_the_Necromancer { private static final MagicStatic Zombie = new MagicStatic(MagicLayer.Type) { @Override public void modSubTypeFlags(final MagicPermanent permanent,final EnumSet flags) { diff --git a/src/magic/card/Seance.java b/src/magic/card/S_ance.java similarity index 97% rename from src/magic/card/Seance.java rename to src/magic/card/S_ance.java index ba99c9c8f1..a8f21b7d69 100644 --- a/src/magic/card/Seance.java +++ b/src/magic/card/S_ance.java @@ -25,7 +25,7 @@ import magic.model.mstatic.MagicStatic; import magic.model.target.MagicGraveyardTargetPicker; import magic.model.trigger.MagicAtUpkeepTrigger; -public class Seance { +public class S_ance { private static final MagicStatic Spirit = new MagicStatic(MagicLayer.Type) { @Override public void modSubTypeFlags(final MagicPermanent permanent,final EnumSet flags) { diff --git a/src/magic/data/FileIO.java b/src/magic/data/FileIO.java index 70f1cd7228..5ed039f8c0 100644 --- a/src/magic/data/FileIO.java +++ b/src/magic/data/FileIO.java @@ -73,7 +73,7 @@ public class FileIO { public static Properties toProp(final InputStream ins) { final Properties properties = new Properties(); try { - properties.load(ins); + properties.load(new BufferedReader(new InputStreamReader(ins, "utf-8"))); } catch (final IOException ex) { System.err.println("ERROR! Unable to load from input stream, " + ex.getMessage()); } finally {