English9

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index 566af09..ddfdc5f 100644 (file)
Binary files a/workspace/JuggleMaster/bin/JuggleMaster.apk and b/workspace/JuggleMaster/bin/JuggleMaster.apk differ

diff --git a/workspace/JuggleMaster/bin/classes.dex b/workspace/JuggleMaster/bin/classes.dex
index 63b65c3..ad67f06 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes.dex and b/workspace/JuggleMaster/bin/classes.dex differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class b/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class
index 65f67b7..aff5580 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class and b/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index 4613d7c..5e151fb 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/res/values-fr/strings.xml b/workspace/JuggleMaster/res/values-fr/strings.xml
new file mode 100644 (file)
index 0000000..618761e
--- /dev/null
+++ b/workspace/JuggleMaster/res/values-fr/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="lang">3</string>
+    
+    <string name="app_name">JuggleMaster</string>
+    <string name="help1">●By holding down the list, you can edit the pattern.</string>
+    <string name="help2">●By selecting 「[7]マイパターン」→「[新規作成]」, you can register a new pattern.</string>
+    <string name="help3">●By selecting 「[8]パターン生成」, you can generate new patterns.</string>
+    <string name="help4">●By touching the screen, you can change the juggler\'s perspective.</string>
+    <string name="help">Help</string>
+    <string name="save">save</string>
+    <string name="delete">delete</string>
+    <string name="cancel">cancel</string>
+    <string name="close">close</string>
+    <string name="pattern_name">name</string>
+    <string name="siteswap">siteswap</string>
+    <string name="handling">handling</string>
+    <string name="height">height</string>
+    <string name="hold">hold</string>
+    <string name="common_settings">[common settings]</string>
+    <string name="speed">speed</string>
+    <string name="create">new</string>
+    <string name="calculating">calculating・・・</string>
+    
+    <string name="patternTypes">pattern types</string>
+    <string name="normal">normal</string>
+    <string name="synchronization">synchronization</string>
+    <string name="number">number of balls</string>
+    <string name="bheight">height</string>
+    <string name="period">period</string>
+    <string name="patternMax">max</string>
+    <string name="generate">generate</string>
+
+    <string name="title_system_error">System Error</string>
+    <string name="title_delete">Delete</string>
+    <string name="message_delete_pattern">Do you want to remove this pattern?</string>
+    <string name="message_nopattern">Pattern was not found</string>
+    <string name="error_unexpected">An unexpected error has occurred</string>
+    
+    <string name="list0_1">[1] 3ball part1(フランス語)</string>
+    <string name="list0_2">[2] 3ボール その2</string>
+    <string name="list0_3">[3] 4ボール</string>
+    <string name="list0_4">[4] 5ボール</string>
+    <string name="list0_5">[5] 6ボール以上</string>
+    <string name="list0_6">[6] トレーニング</string>
+    <string name="list0_7">[7] マイパターン</string>
+    <string name="list0_8">[8] パターン生成</string>
+</resources>

diff --git a/workspace/JuggleMaster/src/com/jm/PatternList.java b/workspace/JuggleMaster/src/com/jm/PatternList.java
index 4a965b0..34c919f 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/PatternList.java
+++ b/workspace/JuggleMaster/src/com/jm/PatternList.java
@@ -46,6 +46,11 @@ public class PatternList {
                        setPackage05();\r
                        setPackage06();\r
                        break;\r
+               case DatabaseHelper.FRENCH_ID:\r
+                       setPackage00Fr();                       \r
+                       setPackage01Fr();\r
+                       setPackage06Fr();\r
+                       break;\r
                default:\r
                        setPackage00En();                       \r
                        setPackage01En();\r
@@ -748,4 +753,201 @@ public class PatternList {
                int type = 6;\r
                add(new JmPattern(type, "[Create]", "1"));\r
        }\r
+\r
+       public void setPackage00Fr() throws JmException {\r
+               clearIndex();\r
+               int type = 0;\r
+               add(new JmPattern(type, "フランス語", "3"));\r
+               add(new JmPattern(type, "フラッシュ", "333355500", 30, 50));\r
+               add(new JmPattern(type, "テニス", "3", new byte[][] { { 8, 0, 4, 0 },\r
+                               { 8, 0, 4, 0 }, { 14, 3, 14, 3 } }));\r
+               add(new JmPattern(type, "ハーフシャワー", "3", new byte[][] { { 8, 0, 15, 8 },\r
+                               { 15, 8, 8, 0 } }));\r
+               add(new JmPattern(type, "リバースカスケード", "3", reverse));\r
+               add(new JmPattern(type, "ウインドミル", "3", new byte[][] {\r
+                               { 10, 0, -10, -2 }, { -10, 4, 10, 2 } }));\r
+               add(new JmPattern(type, "リーチオーバー", "3", 15, 50, new byte[][] { n, n, n,\r
+                               g, n, { 10, 0, 8, -2 }, { -13, 5, 0, 2 }, { 13, -3, 4, 0 } }));\r
+               add(new JmPattern(type, "リーチアンダー", "3", 15, 50, new byte[][] { n, n, n,\r
+                               g, { 13, 0, 4, -3 }, { 10, 4, 4, 4 }, { -16, -3, 0, 0 },\r
+                               { 13, 3, 4, 0 } }));\r
+               add(new JmPattern(type, "オーバーザヘッド", "3",\r
+                               new byte[][] { { 12, 19, 3, 19 } }));\r
+               add(new JmPattern(type, "チョップ", "(2,4x)(4x,2)", 12, 50, new byte[][] {\r
+                               { 4, 9, -10, -3 }, { 10, 6, 7, 9 }, { 10, 6, 7, 9 },\r
+                               { 4, 9, -10, -3 } }));\r
+               add(new JmPattern(type, "リンゴ食べちゃえ", "33333423", new byte[][] {\r
+                               { 0, 6, -3, 4 }, n, n, n, n, { 13, 0, 2, 0 }, { 12, 7, 0, 7 },\r
+                               { 13, 0, -4, 0 } }));\r
+               add(new JmPattern(type, "1アップ2アップ", "(0,4)(4,4)", 14, 50, new byte[][] {\r
+                               a, b, b, b }));\r
+               add(new JmPattern(type, "ヨーヨー", "(4,2)", 13, 50, new byte[][] {\r
+                               { 5, 2, 5, 3 }, { -5, -1, -5, 0 }, { 5, 13, 5, 13 },\r
+                               { 5, -1, 5, 0 } }));\r
+               add(new JmPattern(type, "オイオイ", "(4,2)", 13, 50, new byte[][] {\r
+                               { 5, -1, 5, 0 }, { -5, 3, -5, 4 }, { 5, 10, 5, 10 },\r
+                               { 5, 3, 5, 4 } }));\r
+               add(new JmPattern(type, "アーチ", "3", 13, 50, new byte[][] {\r
+                               { 20, 10, 20, 10 }, b, { 15, 5, 15, 5 }, { 20, 10, 20, 10 }, b,\r
+                               { 15, 5, 15, 5 } }));\r
+               add(new JmPattern(type, "自由の女神", "3", 12, 50, new byte[][] {\r
+                               { 3, 0, 12, 4 }, { 10, 20, 9, 19 } }));\r
+               add(new JmPattern(type, "シャッフル", "(4x,2x)", 12, 50, new byte[][] {\r
+                               { 0, -5, 12, 10 }, { 10, 0, 14, 0 } }));\r
+               add(new JmPattern(type, "ルークスシャッフル", "(4,2x)(2x,4)", 15, 50,\r
+                               new byte[][] { { 10, 0, 14, 10 }, { 10, -3, 6, 0 },\r
+                                               { 10, -3, 6, 0 }, { 10, 0, 14, 10 } }));\r
+               add(new JmPattern(type, "ロボット", "242334", 15, 50, new byte[][] {\r
+                               { 5, 4, 10, -3 }, b, { 10, -3, 10, 13 }, a,\r
+                               { 10, 13, -10, 13 }, d }));\r
+               add(new JmPattern(type, "キャリー", "3", 10, 50, new byte[][] {\r
+                               { 7, 12, -7, 12 }, { 7, 0, -7, 0 } }));\r
+               add(new JmPattern(type, "シャワー", "51", 10, 50, shower));\r
+               add(new JmPattern(type, "日本のお手玉", "51"));\r
+               add(new JmPattern(type, "ボックス", "(2x,4)(4,2x)", 12, 50, new byte[][] {\r
+                               b, { 10, 0, 2, 0 }, { 10, 0, 2, 0 }, b }));\r
+               add(new JmPattern(type, "ウィーブ", "(2,4)(2,4x)(4,2)(4x,2)", 10, 50,\r
+                               new byte[][] { { 10, 1, -7, 0 }, { 12, 0, 12, 9 }, e,\r
+                                               { -5, 9, 0, 3 }, { 12, 0, 12, 9 }, { 10, 1, -7, 0 },\r
+                                               { -5, 9, 0, 3 }, e }));\r
+               add(new JmPattern(type, "フォロー", "423", 10, 50, new byte[][] {\r
+                               { -10, 10, -10, 4 }, { 10, -3, 10, 10 }, { 0, 4, 0, 2 } }));\r
+               add(new JmPattern(type, "ボストンメス A", "3", new byte[][] {\r
+                               { 10, -2, 10, -2 }, { 10, 3, 10, 3 }, { 0, -2, 0, -2 },\r
+                               { -10, 3, -10, 3 }, { -10, -2, -10, -2 }, { 0, 3, 0, 3 } }));\r
+               add(new JmPattern(type, "ボストンメス B", "3", new byte[][] {\r
+                               { 10, 3, 10, -2 }, { 10, 3, 10, 3 }, { 0, -2, 0, -2 },\r
+                               { -10, 3, -10, 3 }, { -10, -2, -10, -2 }, { 0, 3, 0, 3 },\r
+                               { 10, -2, 10, 3 }, { 10, -2, 10, -2 }, { 0, 3, 0, 3 },\r
+                               { -10, -2, -10, -2 }, { -10, 3, -10, 3 }, { 0, -2, 0, -2 } }));\r
+               add(new JmPattern(type, "ミルズメス", "3", 13, 50, millsmess));\r
+               add(new JmPattern(type, "リバースミルズメス", "3", 13, 50, new byte[][] {\r
+                               { -12, 0, -1, 0 }, { 12, 0, 0, 0 }, { -12, 0, 1, 0 } }));\r
+               add(new JmPattern(type, "バークスバラージ", "423", 10, 50, new byte[][] {\r
+                               { 12, 12, -6, -2 }, { -6, 5, -6, 12 }, { 0, 5, 0, 5 } }));\r
+               add(new JmPattern(\r
+                               type,\r
+                               "ルーベンシュタインズリベンジ",\r
+                               "35223",\r
+                               15,\r
+                               50,\r
+                               new byte[][] { { 3, 1, 13, 8 }, { 7, -2, -10, -3 },\r
+                                               { 3, 6, -12, 2 }, { -1, 0, 12, 2 }, { -2, 2, -10, -2 } }));\r
+               add(new JmPattern(type, "片手３個", "60"));\r
+               add(new JmPattern(type, "片手カスケード", "60", new byte[][] {\r
+                               { -6, 0, 2, 0 }, g, { 18, 0, 10, 0 }, g }));\r
+               add(new JmPattern(type, "片手３個のマルチ", "[46]06020"));\r
+               add(new JmPattern(type, "8040"));\r
+       }\r
+       \r
+       public void setPackage01Fr() throws JmException {\r
+               clearIndex();\r
+               int type = 1;\r
+\r
+               add(new JmPattern(type, "531"));\r
+               add(new JmPattern(type, "450"));\r
+               add(new JmPattern(type, "5241"));\r
+               add(new JmPattern(type, "51414"));\r
+               add(new JmPattern(type, "72312"));\r
+               add(new JmPattern(type, "wide cascade", "3", 12, 50, new byte[][] { { 21,\r
+                               9, 18, 4 } }));\r
+               add(new JmPattern(type, "ワイドリバースカスケード", "3", new byte[][] { { -8, 0,\r
+                               12, 0 } }));\r
+               add(new JmPattern(type, "リーチオーバー連続", "3", 15, 50, new byte[][] {\r
+                               { 10, 0, 3, -2 }, { -13, 5, 13, 0 }, { 13, -3, 4, 0 } }));\r
+               add(new JmPattern(type, "リーチアンダー連続", "3", 15, 50, new byte[][] {\r
+                               { 10, 4, 3, 4 }, { -13, -5, 13, 0 }, { 13, 3, 4, 0 } }));\r
+               add(new JmPattern(type, "クロス アーム", "3",\r
+                               new byte[][] { { -4, 0, -12, 0 } }));\r
+               add(new JmPattern(type, "リンゴ食べ放題", "(2,4x)(4x,2)", 12, 50,\r
+                               new byte[][] { { 0, 7, -3, -3 }, { 12, 10, 0, 8 },\r
+                                               { 12, 10, 0, 8 }, { 0, 7, -3, -3 } }));\r
+\r
+               add(new JmPattern(type, "1アップ2アップ B", "(4,4)(0,4x)(4,4)(4x,0)", 14, 50,\r
+                               new byte[][] { o, o, { 14, 0, 0, 0 }, o, o, o, o,\r
+                                               { 14, 0, 0, 0 } }));\r
+               add(new JmPattern(type, "1アップ2アップ C",\r
+                               "(4,4)(0,4x)(4,4)(4,0)(4,4)(4x,0)(4,4)(0,4)", 14, 50,\r
+                               new byte[][] { o, o, { 14, 0, 14, 0 }, o, o, o, o, a, o, o, o,\r
+                                               { 14, 0, 14, 0 }, o, o, a, o }));\r
+               add(new JmPattern(type, "1アップ2アップ D", "(4,4)(0,4x)(4,4)(4x,0)", 14, 50,\r
+                               new byte[][] { { 12, 0, -6, 0 }, { -6, 0, 12, 0 }, a, d,\r
+                                               { -6, 0, 12, 0 }, { 12, 0, -6, 0 }, d, a }));\r
+               add(new JmPattern(type, "1アップ2アップ E", "(4,4)(0,4)", 14, 50,\r
+                               new byte[][] { f, f, { 13, 0, -13, 0 }, f }));\r
+               add(new JmPattern(type, "1アップ2アップ F", "(6,6)(0,2x)(4x,0)", 10, 50,\r
+                               new byte[][] { f, f, { 13, 7, 4, 0 }, f, f, { 4, 0, 13, 7 } }));\r
+\r
+               byte[] fake1 = { 10, -1, 10, 0 };\r
+               byte[] fake2 = { 0, -1, 0, 0 };\r
+               byte[] fake3 = { 10, 10, 10, 10 };\r
+               add(new JmPattern(type, "フェイク A", "(2,4)", 14, 50, new byte[][] {\r
+                               fake1, fake1, fake2, fake3 }));\r
+               add(new JmPattern(type, "フェイク B", "(2,4)", 14, 50, new byte[][] {\r
+                               fake2, fake1, fake1, fake3 }));\r
+               add(new JmPattern(type, "フェイク C", "(4,2)(4x,2)(2,4)(2,4x)", 13, 50,\r
+                               new byte[][] { fake1, fake1, fake3, fake2, fake1, fake1, fake2,\r
+                                               fake3 }));\r
+               add(new JmPattern(type, "ヨーヨーを一周", "(4,2)", 13, 50, new byte[][] {\r
+                               { 0, 2, 0, 3 }, fake2, { 0, 13, 0, 13 }, { 10, -1, -10, -1 } }));\r
+               add(new JmPattern(type, "ヨーヨー(トルネード)", "(2,4)", new byte[][] { e,\r
+                               { 15, 15, -15, 14 }, { -5, 0, -5, 0 }, { 15, 14, -15, 15 } }));\r
+               add(new JmPattern(type, "ヨーヨー(横断)", "(2,4)", new byte[][] { e,\r
+                               { 15, 12, 0, 12 }, { -5, 0, -5, 0 }, { -15, 12, 0, 12 } }));\r
+               add(new JmPattern(type, "(4x,2x)(2,4)"));\r
+               add(new JmPattern(type, "(4x,6)(0,2x)"));\r
+               add(new JmPattern(type, "テニス B", "(2,4)(2,4x)(4,2)(4x,2)", 14, 50,\r
+                               new byte[][] { e, e, { 15, 3, 15, 3 }, e, e, e, e,\r
+                                               { 15, 3, 15, 3 } }));\r
+               add(new JmPattern(type, "自由の女神 B", "3", 14, 50, new byte[][] {\r
+                               { 3, 4, 12, 0 }, { 10, 17, 9, 19 } }));\r
+               add(new JmPattern(type, "441", 13, 50));\r
+               add(new JmPattern(type, "441 外回り", "441", 13, 50, new byte[][] { r, r,\r
+                               { 4, 0, 0, 0 } }));\r
+               add(new JmPattern(type, "441 シャッフル", "441", 10, 50, new byte[][] {\r
+                               { 5, -2, 5, -2 }, d, { 15, 4, 9, 10 } }));\r
+               add(new JmPattern(type, "ボスサイドスラム", "(4x,2x)(2,4x)(2x,4x)(4x,2)", 10,\r
+                               50, new byte[][] { { 6, 0, 12, 10 }, b, { 10, 0, 4, 0 }, d, b,\r
+                                               { 6, 0, 12, 10 }, d, { 10, 0, 4, 0 } }));\r
+               add(new JmPattern(type, "イクスチェンジ", "2334", 13, 50, new byte[][] {\r
+                               { 0, 11, 10, 11 }, { 10, 0, 0, 0 }, { 0, 12, -10, 12 },\r
+                               { 10, 0, 0, 0 } }));\r
+\r
+               byte[] eb = { 3, 0, 10, 0 };\r
+               add(new JmPattern(type, "ハーフシャワー B", "5223", shower));\r
+               add(new JmPattern(type, "腕の下シャワー", "(2x,4x)", new byte[][] {\r
+                               { 5, 0, -10, 0 }, { 3, 4, -3, 4 } }));\r
+               add(new JmPattern(type, "腕の下シャワー(交互)", "(2x,4x)", new byte[][] { eb,\r
+                               { 5, 4, 0, 4 }, { 3, 0, -10, 0 }, { 5, 4, 0, 4 } }));\r
+               add(new JmPattern(type, "シンクロシャワー", "(2x,4x)", shower));\r
+               add(new JmPattern(type, "ハイローシャワー A", "7131", shower));\r
+               add(new JmPattern(type, "ハイローシャワー B", "(2x,6x)(2x,2x)", 15, 50,\r
+                               new byte[][] { { 6, 0, 12, 3 }, { 6, 3, 6, 0 }, { 6, 0, 6, 3 },\r
+                                               { 12, 3, 6, 0 } }));\r
+               add(new JmPattern(type, "ハイローシャワー C", "315171", shower));\r
+               add(new JmPattern(type, "ハーフメス", "3", 13, 50, new byte[][] { c,\r
+                               { 0, 0, -12, -3 }, { 0, 2, -12, 2 }, { 0, -3, -6, 0 } }));\r
+               add(new JmPattern(type, "ミルズメス 423", "423", millsmess));\r
+               add(new JmPattern(type, "ミルズメス 414", "414", millsmess));\r
+               add(new JmPattern(type, "ミルズメス 315", "315", millsmess));\r
+               add(new JmPattern(type, "ミルズメス 44133", "44133", 13, 50, new byte[][] {\r
+                               { -2, 0, -12, 5 }, { 2, -2, 12, 0 }, { 0, 2, -3, 0 },\r
+                               { 10, 0, 10, 2 }, { 7, -2, -10, -3 } }));\r
+               add(new JmPattern(type, "ミルズメス ボックス", "612", millsmess));\r
+               add(new JmPattern(type, "ボックスもどき A", "126", 15, 50));\r
+               add(new JmPattern(type, "ボックスもどき B", "630", 15, 50));\r
+               add(new JmPattern(type, "ダブルボックス", "(4x,2x)(4,2x)(2x,4x)(2x,4)", 11,\r
+                               50, new byte[][] { { 14, 0, 7, 0 }, a, { 14, 0, 0, 0 },\r
+                                               { 0, 0, 14, 0 }, a, { 14, 0, 7, 0 }, { 0, 0, 14, 0 },\r
+                                               { 14, 0, 0, 0 } }));\r
+               add(new JmPattern(type, "拡張ボックス",\r
+                               "(2x,8)(2x,4)(0,2x)(8,2x)(4,2x)(2x,0)", new byte[][] { eb, h,\r
+                                               eb, h, h, eb, h, eb, h, eb, eb, h }));\r
+       }\r
+       \r
+       public void setPackage06Fr() throws JmException {\r
+               clearIndex();\r
+               int type = 6;\r
+               add(new JmPattern(type, "[Create(フランス語)]", "1"));\r
+       }\r
 }\r

diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
index c5adaac..aea639a 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
+++ b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
@@ -13,6 +13,7 @@ import com.jm.utility.JmException;
 public class DatabaseHelper extends SQLiteOpenHelper {\r
        public final static int ENGLISH_ID = 1;\r
        public final static int JAPANEASE_ID = 2;\r
+       public final static int FRENCH_ID = 3;\r
        private static int langId = -1;\r
        private static boolean convFlag = false;\r
        \r