update skinMap.

diff --git a/swig/englishmap.py b/swig/englishmap.py
index 0f4a305..f1df206 100644 (file)
--- a/swig/englishmap.py
+++ b/swig/englishmap.py
@@ -173,47 +173,48 @@ def getUnicodeBoneName(name):
         if v[0]==name:
             return v
 
-skinMap={
-"skin000":"base",
-"serious":"真面目",
-"sadness":"困る",
-"cheerful":"にこり",
-"anger":"怒り",
-"go up":"上",
-"go down":"下",
-"blink":"まばたき",
-"smile":"笑い",
-"wink":"ウィンク",
-"wink2":"ウィンク２",
-"wink_R":"ウィンク右",
-"wink2_R":"ｳｨﾝｸ２右",
-"close><":"はぅ",
-"calm":"なごみ",
-"surprise":"びっくり",
-"doubt":"じと目",
-"confuse":"なぬ！",
-"pupil":"瞳小",
-"a":"あ",
-"i":"い",
-"u":"う",
-"o":"お",
-"triangle":"▲",
-"regret":"∧",
-"omega":"ω",
-"omegabox":"ω□",
-"fool":"はんっ！",
-"tongue":"ぺろっ",
-"e-":"えー",
-"grin":"にやり",
-}
+skinMap=[
+("skin000", "base", 0),
+("serious", "真面目", 1),
+("sadness", "困る", 1),
+("cheerful", "にこり", 1),
+("anger", "怒り", 1),
+("go up", "上", 1),
+("go down", "下", 1),
+("blink", "まばたき", 2),
+("smile", "笑い", 2),
+("wink", "ウィンク", 2),
+("wink2", "ウィンク２", 2),
+("wink_R", "ウィンク右", 2),
+("wink2_R", "ｳｨﾝｸ２右", 2),
+("close><", "はぅ", 2),
+("calm", "なごみ", 2),
+("surprise", "びっくり", 2),
+("doubt", "じと目", 2),
+("confuse", "なぬ！", 2),
+("pupil", "瞳小", 4),
+("a", "あ", 3),
+("i", "い", 3),
+("u", "う", 3),
+("o", "お", 3),
+("triangle", "▲", 3),
+("regret", "∧", 3),
+("omega", "ω", 3),
+("omegabox", "ω□", 3),
+("fool", "はんっ！", 3),
+("tongue", "ぺろっ", 4),
+("e-", "えー", 3),
+("grin", "にやり", 3),
+]
 def getEnglishSkinName(name):
-    for k, v in skinMap.items():
-        if v==name:
-            return k
+    for v in skinMap:
+        if v[1]==name:
+            return v[0]
 
 def getUnicodeSkinName(name):
-    if name in skinMap:
-        return skinMap[name]
+    for v in skinMap:
+        if v[0]==name:
+            return v[1]
 
 if sys.version_info[0]<3:
     print 'convert boneMap and skinMap to unicode...',
@@ -228,7 +229,13 @@ if sys.version_info[0]<3:
                 replace.append(m)
         boneMap[i]=replace
 
-    for k in skinMap.keys():
-        skinMap[k]=skinMap[k].decode('utf-8')
+    for i, l in enumerate(skinMap):
+        replace=[]
+        for j, m in enumerate(l):
+            if j==1:
+                replace.append(m.decode('utf-8'))
+            else:
+                replace.append(m)
+        skinMap[i]=replace
     print('done')