added score to adding up

8 files changed, 37 insertions, 40 deletions

diff --git a/examples/adding_up_to_10/assets/generic/images/ball_37x37.png b/examples/adding_up_to_10/assets/generic/images/ball37px.png
index 4388283..4388283 100755
--- a/examples/adding_up_to_10/assets/generic/images/ball_37x37.png
+++ b/examples/adding_up_to_10/assets/generic/images/ball37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/ballon.png b/examples/adding_up_to_10/assets/generic/images/balloon.png
index 6c17c31..6c17c31 100755
--- a/examples/adding_up_to_10/assets/generic/images/ballon.png
+++ b/examples/adding_up_to_10/assets/generic/images/balloon.png
diff --git a/examples/adding_up_to_10/assets/generic/images/balloon37px.png b/examples/adding_up_to_10/assets/generic/images/balloon37px.png
new file mode 100644
index 0000000..8f47d6a
--- /dev/null
+++ b/examples/adding_up_to_10/assets/generic/images/balloon37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/banana_37x37.png b/examples/adding_up_to_10/assets/generic/images/banana37px.png
index 90728e6..90728e6 100755
--- a/examples/adding_up_to_10/assets/generic/images/banana_37x37.png
+++ b/examples/adding_up_to_10/assets/generic/images/banana37px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/fish64px.png b/examples/adding_up_to_10/assets/generic/images/fish64px.png
new file mode 100644
index 0000000..a29f12c
--- /dev/null
+++ b/examples/adding_up_to_10/assets/generic/images/fish64px.png
diff --git a/examples/adding_up_to_10/assets/generic/images/flower37px.png b/examples/adding_up_to_10/assets/generic/images/flower37px.png
new file mode 100644
index 0000000..224e707
--- /dev/null
+++ b/examples/adding_up_to_10/assets/generic/images/flower37px.png
diff --git a/examples/adding_up_to_10/index.html b/examples/adding_up_to_10/index.html
index 73a76c2..841e80a 100755
--- a/examples/adding_up_to_10/index.html
+++ b/examples/adding_up_to_10/index.html
@@ -69,26 +69,12 @@
 	
       </div>
 
-<img id="chimp" src="assets/generic/images/normalChimp_120x125.png" alt="" height="0px" width="0px"/>
 
     </div>
 
 
   </div>
 
-  <!--
-      <img id="actionTopLtBox" src="assets/generic/images/yellowBox.png" alt=""/>
-      <img id="actionTopRtBox" src="assets/generic/images/yellowBox.png" alt=""/>
-      <img id="bottomLtBox" src="assets/generic/images/yellowBox.png" alt=""/>
-      <img id="bottomMdBox" src="assets/generic/images/yellowBox.png" alt=""/>
-      <img id="bottomRtBox" src="assets/generic/images/yellowBox.png" alt=""/>
-      <img id="plussign" src="assets/generic/images/plussign.png" alt=""/>
-      <img id="timer" src="assets/generic/images/scorebox.png" alt=""/>
-      <img id="scorebox" src="assets/generic/images/scorebox.png" alt=""/>
-      <img id="chimp" src="assets/generic/images/normalChimp_200x209.png" alt=""/>
-      <img id="sidebar" src="assets/generic/images/sidebar.png" alt=""/>
-      <img id="chimp" src="assets/generic/images/normalChimp_200x209.png" alt=""/>
-      -->
 
 </body>
 
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js
index f1fddd0..d4ad4f4 100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10/js/lesson.js
@@ -3,14 +3,14 @@ $(document).ready(function(){
 var k = $.karma ({container: "#karma-main", lang: "es-MX"});
 k.init({
 	images: [
-		{id: "ball",   file: "ball_37x37.png",   localized : false },
-		/*{id: "ballon", file: "ballon.png", localized : false },**/
-		{id: "banana", file: "banana_37x37.png", localized : false },
-		/*{id: "chilli", file: "chilli.png", localized : false },
-		{id: "fish"  , file: "fish.png",   localized : false },
-		{id: "flower", file: "flower.png", localized : false },
+		{id: "ball",   file: "ball37px.png",   localized : false },
+		{id: "balloon", file: "balloon37px.png", localized : false },
+		{id: "banana", file: "banana37px.png", localized : false },
+		{id: "chilli", file: "chilli.png", localized : false },
+		{id: "fish"  , file: "fish64px.png",   localized : false },
+		{id: "flower", file: "flower37px.png", localized : false },
 		{id: "happyMonkey", file: "happyMonkey.jpg", localized : false },
-		{id: "scorebox", file: "scorebox.png", localized : false } */
+		{id: "scorebox", file: "scorebox.png", localized : false } 
 	]
 	,
 	sounds: [
@@ -29,27 +29,24 @@ k.main(function() {
 	var bottomLtCtx = bottomLtCanvas.getContext('2d');
 	var bottomMdCanvas = document.getElementById("bottomMdCanvas")
 	var bottomMdCtx = bottomMdCanvas.getContext('2d');
-	var bottomRtCanvas = document.getElementById("bottomRtCanvas")
-	var bottomRtCtx = bottomRtCanvas.getContext('2d');
+    var bottomRtCanvas = document.getElementById("bottomRtCanvas")
+    var bottomRtCtx = bottomRtCanvas.getContext('2d');
+    var scoreboxCanvas = document.getElementById('scoreboxCanvas');
+    var scoreboxCtx = scoreboxCanvas.getContext('2d');
 
 
-
-	var actionContexts = [ topLtCtx, topRtCtx, bottomLtCtx, bottomMdCtx, bottomRtCtx];
-	var actionCanvases = [ topLtCanvas, topRtCanvas, bottomLtCanvas, bottomMdCanvas, bottomRtCanvas];
-	
-	//    for (var i = 0; i < contexts.length; i++) {
-	// 
-	//	k.library.images["ball"].draw(contexts[i], 20, 30);
-	//    }
+    var actionContexts = [ topLtCtx, topRtCtx, 
+	bottomLtCtx, bottomMdCtx, bottomRtCtx];
+    var actionCanvases = [ topLtCanvas, topRtCanvas, 
+	bottomLtCanvas, bottomMdCanvas, bottomRtCanvas];
 
 
 
-
-    var imgNames = ["ball",  "banana", /* "ballon","chilli", "fish", "flower"*/ ];
+    var imgNames = ["ball",  "banana", "balloon","chilli", "fish", "flower"];
 	//game logic
 	var total, level=0, time, n0, n1, correct;
 	var maskd=200;
-	var d=170;
+	var d=160;
 	var choices=[];
 	var score = 0;
 	var startTimerY = 105;
@@ -137,7 +134,7 @@ k.main(function() {
 			x = k.math.rand( 0, d );
 			y = k.math.rand( 0, d );
 			for ( var j=0; j<pos.length; j++) {
-			    if ( k.geometry.distance2( pos[j], {"x": x, "y": y} )  < 200 ) {
+			    if ( k.geometry.distance2( pos[j], {"x": x, "y": y} )  < 160 ) {
 				flag = true;
 				break;
 			    }
@@ -164,7 +161,16 @@ k.main(function() {
 	    //  } else { clearInterval(timerId); resetTimer();}
 		
     }
-	
+
+    var writeScore = function (){
+	scoreboxCanvas.setAttribute("width", "100%");
+	scoreboxCtx.font = "bold 50px sans-serif";
+	scoreboxCtx.fillStyle = "#fff";
+	scoreboxCtx.textBaseline = "middle";
+	scoreboxCtx.fillText("" + score, 30, 100);
+    };
+
+
 	//put the buttons
 	var buttons=[];
 	buttons[ 0 ] = { "canvas": bottomLtCanvas, "id": 0};
@@ -174,12 +180,17 @@ k.main(function() {
 	$.each(buttons, function( key, item ) {
 		item.canvas.addEventListener('click',  function( ev ) {
 		   if ( choices[ item.id ] === total){
-				score = score + 1;
-				k.library.sounds[ "correct" ].play();
-				level = (level+1)% imgNames.length;
+		       score = score + 1;
+		       writeScore();
+		       //animateMonkey(true);
+		       k.library.sounds[ "correct" ].play();
+		       level = (level+1)% imgNames.length;
 				
 		   }else {
-				k.library.sounds[ "incorrect" ].play();
+		       score = score - 1;
+		       writeScore();
+		       //animateMonkey(false);
+		       k.library.sounds[ "incorrect" ].play();
 		   } 
 			game();
 		}, true);