Merge pull request #112 from java-women/feature/applied001

石から花に変更
java-women · Jul 23, 2016 · 8eaabf7 · 8eaabf7
2 parents b71a6b5 + a0342bf
commit 8eaabf7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/JavajoTeachingForKids/src/main/resources/static/js/applied001.js b/JavajoTeachingForKids/src/main/resources/static/js/applied001.js
@@ -2,7 +2,7 @@ enchant();
 
 var core;
 const CHARA_IMG = 'chara1.png';
-const MAP_IMG = 'map1.png';
+const MAP_IMG = 'map0.png';
 
 const NOT_MOVE = 'notMove';
 const AUTO = 'auto';
@@ -16,6 +16,9 @@ const JUMP = 'jump';
 const ROTATE = 'rotate';
 const DEFAULT_ITERATE = 0;
 
+const ITERATE_ITEM = 18;
+const TRANSPARENT_ITEM = 48;
+
 
 /**
  * enchant.jsの描画
@@ -97,17 +100,17 @@ var sceneConf = {
             baseMap[i] = [];
 
             for (var n = 0; n < 20; n++) {
-                baseMap[i][n] = 103;  // 103は透明のmapが置かれる
+                baseMap[i][n] = TRANSPARENT_ITEM;
             }
         }
 
         // 適当にばらまく
         for (var item = 0; item < iterate; item++) {
             // Maximum call stack size exceededになってしまうので300を境に処理を変える
             if (item <= 300) {
-                stone.setRandomMapItem(baseMap);
+                mapItem.setRandom(baseMap);
             } else {
-                stone.setSearchMapItem(baseMap, item - 300);
+                mapItem.setSearch(baseMap, item - 300);
             }
         }
 
@@ -197,34 +200,34 @@ var bearMove = {
         // フレームアウトの処理
         if (bear.x > core.width - bear.width) bear.x = 0;
         if (bear.x < 0) bear.x = core.width - bear.width;
-        if (bear.y > core.height - bear.height) bear.y = 0;
-        if (bear.y < 0) bear.y = core.height - bear.height;
+        if (bear.y > core.height - bear.height + 20) bear.y = 0;
+        if (bear.y < -20) bear.y = core.height - bear.height;
     }
 };
 
 /**
- * 石を置く
+ * 花を置く
  */
-var stone = {
+var mapItem = {
 
     // 指定された場所に値があったら違う場所に置く（300以下）
-    setRandomMapItem: function(baseMap) {
+    setRandom: function(baseMap) {
         var randomI = Math.floor(Math.random() * 19);
         var randomN = Math.floor(Math.random() * 19);
 
-        if (baseMap[randomI][randomN] != 93) {
-            baseMap[randomI][randomN] = 93;
+        if (baseMap[randomI][randomN] != ITERATE_ITEM) {
+            baseMap[randomI][randomN] = ITERATE_ITEM;
         } else {
-            this.setRandomMapItem(baseMap);
+            this.setRandom(baseMap);
         }
     },
 
-    // 93じゃないところを探して置く（300以上）
-    setSearchMapItem: function(baseMap, val) {
+    // ITERATE_ITEMじゃないところを探して置く（300以上）
+    setSearch: function(baseMap, val) {
         for (var i = 0; i < 20; i++) {
             for (var n = 0; n < 20; n++) {
-                if (baseMap[i][n] != 93 && val != 0) {
-                    baseMap[i][n] = 93;
+                if (baseMap[i][n] != ITERATE_ITEM && val != 0) {
+                    baseMap[i][n] = ITERATE_ITEM;
                     val--;
                 }
             }

diff --git a/JavajoTeachingForKids/src/main/resources/templates/applied001.html b/JavajoTeachingForKids/src/main/resources/templates/applied001.html
@@ -37,7 +37,7 @@ <h2 class="panel-title">くまさんを動かそう！</h2>
                 <input type="hidden" id="color-picker" />
 
     <span class="contents-name">★くりかえし★</span>
-    くりかえしを使って、<input type="text" id="iterate" class="form-control" value="0" />個 ランダムに石を置く （1〜400の数）
+    くりかえしを使って、<input type="text" id="iterate" class="form-control" value="0" />個 ランダムに花を置く （1〜400の数）
 
 
     <span class="method">くまさんのせってい {</span>