English2

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index 24b9e3c..e650a86 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 0b468a5..0f81066 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 93e956c..96a3e8a 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/classes/com/jm/db/DatabaseHelper.class b/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class
index 70720f4..57c8f77 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class and b/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index b42b333..98467da 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/src/com/jm/PatternList.java b/workspace/JuggleMaster/src/com/jm/PatternList.java
index a336dcb..0fa303f 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/PatternList.java
+++ b/workspace/JuggleMaster/src/com/jm/PatternList.java
@@ -46,6 +46,7 @@ public class PatternList {
                        setPackage05();\r
                        break;\r
                default:\r
+                       setPackage00En();\r
                        setPackage01En();\r
                        break;\r
                }\r
@@ -536,6 +537,91 @@ public class PatternList {
                add(new JmPattern(type, "[新規作成]", "1"));\r
        }\r
        \r
+       public void setPackage00En() throws JmException {\r
+               int type = 0;\r
+               add(new JmPattern(type, "Cascade", "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 setPackage01En() throws JmException {\r
                int type = 1;\r
 \r

diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
index 0086f55..c5e8d50 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
+++ b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
@@ -27,7 +27,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                DatabaseHelper helper = new DatabaseHelper(context);\r
                SQLiteDatabase db = helper.getWritableDatabase();\r
                int count;\r
-               count = Dao.getInstance().count();\r
+               int type = 0;\r
+               count = Dao.getInstance().count(type);\r
                Dao.getInstance().start(db);\r
                PatternList p = new PatternList();\r
                if (count <= 0) {\r