- -

diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js index c2393c7..2331fd1 100755 --- a/examples/adding_up_to_10/js/lesson.js +++ b/examples/adding_up_to_10/js/lesson.js @@ -28,22 +28,29 @@ $(document).ready(function(){ k.main(function() { - var imgNames = ["ball", "banana", "balloon","chilli", "fish", "flower"]; + var imageNames = ["ball", "banana", "balloon","chilli", "fish", "flower"]; //game logic - var total, time, n0, n1, correct; - var level = 0, d=160; - var choices=[], score = 0, speed = 12000; - var playerCorrect = 0, endTimerX = 80, startTimerY = 25, - endTimerY = 100, offsetTimerY = 5; - var overlayPaper, timerPaper, timerRect, - chimpPaper, normalChimp, sadChimp, happyChimp, - overlayBox, topLtBox, topRtBox, bottomLtBox, bottomMdBox, bottomRtBox; + var cards; + var totalCorrect = 0, n0 = 0, n1 = 0, correctCard = 0, + level = 0, score = 0, numCorrectAnswers = 0; + var DRAW_MAX_X = 170, DRAW_MAX_Y = 170; + var choices=[0, 0, 0] + var timerSpeed = 12000; + var START_TIMER_Y = 25, END_TIMER_Y = 125; + var timerPaper, chimpPaper; + var timerRect; + var normalChimpImage, sadChimpImage, happyChimpImage; + var overlayCard, topLeftCard, topRightCard, bottomLeftCard, + bottomMiddleCard, bottomRightCard; + var buttons=[]; - var stopTimer = false; - var chooseMe; + var isTimerRunning = false; + var dispatchChoice; + + var createCard = function (paperName, width, height) { + var set; + var paper; - var createBox = function (paperName, width, height) { - var set, paper; if(!width || !height){ paper = Raphael(paperName+"Paper", 200, 200); } @@ -55,144 +62,148 @@ k.main(function() { }; - overlayBox = createBox("overlay", 800, 600); - topLtBox = createBox("topLt"); - topRtBox = createBox("topRt"); - bottomLtBox = createBox("bottomLt"); - bottomMdBox = createBox("bottomMd"); - bottomRtBox = createBox("bottomRt"); + overlayCard = createCard("overlay", 800, 600); + topLeftCard = createCard("topLeft"); + topRightCard = createCard("topRight"); + bottomLeftCard = createCard("bottomLeft"); + bottomMiddleCard = createCard("bottomMiddle"); + bottomRightCard = createCard("bottomRight"); - boxes = [ topLtBox, topRtBox, bottomLtBox, - bottomMdBox, bottomRtBox]; + cards = [ topLeftCard, topRightCard, bottomLeftCard, + bottomMiddleCard, bottomRightCard]; - sets = [topLtBox["set"], topRtBox["set"], bottomLtBox["set"], - bottomMdBox["set"], bottomRtBox["set"]]; + sets = [topLeftCard["set"], topRightCard["set"], bottomLeftCard["set"], + bottomMiddleCard["set"], bottomRightCard["set"]]; - function game () { - boxes.forEach(function (box) { + function drawCards () { + var imageId = imageNames[ level ] ; + //reinitialize choices to zero + choices = [0, 0, 0]; + + cards.forEach(function (box) { box.set.remove(); }); - total = k.math.rand( 2, 5 + level ); //the total - n0 = total - k.math.rand(1, total - 1 ); //first number - n1 = total - n0; //second number + totalCorrect = k.math.rand( 2, 5 + level ); //the totalCorrect + n0 = totalCorrect - k.math.rand(1, totalCorrect - 1 ); //first number + n1 = totalCorrect - n0; //second number //chose one option (the correct option) //and then put the correct value into it - correct = k.math.rand( 0, 2 ); - choices[ correct ] = total; - - for (var i=0; i<3; i++) { - //generate the two other options - if ( choices[i] === total) { - continue; + correctCard = k.math.rand( 0, 2 ); + choices[ correctCard ] = totalCorrect; + + var computeUniqueChoice = function(choice){ + var newChoice = 0; + if (choice === totalCorrect) { + return choice; } else { - // generate the other options - choices[ i ] = k.math.rand( 2, 10 ); - for (var j = 0; j < i; j++){ - if (choices[i] === choices[j]) { - choices[ i ] = k.math.rand( 2, 10 ); - } - } + newChoice = k.math.rand( 1, 10 ); + if (newChoice === totalCorrect){ + return computeUniqueChoice(choice); + } else { + return newChoice; + } } - } - - var imgId = imgNames[ level ] ; + }; + choices = choices.map(computeUniqueChoice); - var card = function (box, n, d) { - var pos = []; - var x, y, flag; - var imgVarNames = {}; - var prefix = box["prefix"]; - imgVarNames[prefix] = []; - box["set"] = box["paper"].set(); + var drawCard = function (card, n) { + var positions = []; + var x = 0, y = 0; + var isOverlapping = false; + var imageVarNames = {}; + var varPrefix = card["prefix"]; + imageVarNames[varPrefix] = []; + card["set"] = card["paper"].set(); for (var i=0; i