From 4e0af3bbde2c8e4501d44c2ee7ca3f2928e7a1b7 Mon Sep 17 00:00:00 2001
From: Philipp Abraham <abrahamp@informatik.uni-luebeck.de>
Date: Sat, 15 Feb 2014 20:30:46 +0100
Subject: [PATCH] added score

---
 src/game.js  | 34 +++++++++++++++++++++++++---------
 src/pipe.js  |  2 +-
 src/score.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 src/score.js

diff --git a/src/game.js b/src/game.js
index 4943abb..6f7d5fa 100644
--- a/src/game.js
+++ b/src/game.js
@@ -1,4 +1,4 @@
-define(['bird', 'pipe'], function(bird, Pipe) {
+define(['bird', 'pipe', 'score'], function(bird, Pipe, score) {
   "use strict";
   
   var offsetX = 0;
@@ -53,6 +53,7 @@ define(['bird', 'pipe'], function(bird, Pipe) {
     var promImg = new Promise(preloadImage);
     var promMap = new Promise(preloadMap);
 
+    score.init(game);
     bird.init(game);
     pipes.push(new Pipe(game));
     pipes.push(new Pipe(game));
@@ -65,7 +66,7 @@ define(['bird', 'pipe'], function(bird, Pipe) {
     var lastPipe = pipes[pipes.length-1];
     // add new pipe at the end
     if (lastPipe &&
-        lastPipe.getX()+offsetX < game.SIZE[0]) {
+        lastPipe.getX()-offsetX < game.SIZE[0]) {
       pipes.push(new Pipe(game));
     }
     // remove first pipe if offscreen
@@ -75,13 +76,7 @@ define(['bird', 'pipe'], function(bird, Pipe) {
     }
   }
   
-  function tick() {
-    var moveX = game.tickTime/16;
-    offsetX += moveX;
-    bird.tick(moveX);
-    
-    addAndRemovePipes();
-    
+  function checkCollisions() {
     var collision = false;
     pipes.forEach(function(pipe, i) {
       pipe.getBoundingBoxes().forEach(function(bb) {
@@ -95,12 +90,32 @@ define(['bird', 'pipe'], function(bird, Pipe) {
       h: game.SIZE[1]-groundLevel
     };
     if ( bird.collidesWith(bbG) || collision ) {
+      score.resetPoints();
       bird.die();
     }
     
     bird.drawBB(collision);
   }
   
+  function tick() {
+    var moveX = game.tickTime/16;
+    offsetX += moveX;
+    bird.tick(moveX);
+    
+    addAndRemovePipes();
+    checkCollisions();
+    
+    pipes.forEach(function(pipe) {
+      var pipeRightOuter = pipe.getX()+pipe.getBoundingBoxes()[0].w;
+      if ( !pipe.passed &&
+           pipeRightOuter <bird.getPosition().x) {
+        pipe.passed = true;
+        score.addPoint();
+      }
+    });
+    
+  }
+  
   function drawBG(ctx) {
     drawImage("bg", 0, 0, ctx);
     drawImage("bg", 288, 0, ctx);
@@ -129,6 +144,7 @@ define(['bird', 'pipe'], function(bird, Pipe) {
     bird.draw(ctx);
     
     ctx.restore();
+    score.draw(ctx);
   }
   
   return {
diff --git a/src/pipe.js b/src/pipe.js
index d130a2a..2c42a43 100644
--- a/src/pipe.js
+++ b/src/pipe.js
@@ -9,7 +9,7 @@ define([], function() {
     this.game = game;
     this.height = 270;
     this.widths = 52;
-    
+    this.passed = false;
     var newX = lastX + pipeDistance;
     lastX = newX;
     this.position = {x:newX, y:Math.random()*250+150};
diff --git a/src/score.js b/src/score.js
new file mode 100644
index 0000000..202e753
--- /dev/null
+++ b/src/score.js
@@ -0,0 +1,43 @@
+define([], function() {
+  "use strict";
+  
+  var points = 0;
+  var maxPoints = 0;
+  
+  var game;
+  
+  function init(theGame) {
+    game = theGame;
+  }
+  
+  function draw(ctx) {
+    var pos = {x:20, y:20};
+    
+    var strPoints = points.toString();
+    strPoints.split('').forEach(function(c,i) {
+      game.drawImage("number_score_0"+c, pos.x+i*15, pos.y, ctx); 
+    });
+    
+    var strMaxPoints = maxPoints.toString();
+    strMaxPoints.split('').forEach(function(c,i) {
+      game.drawImage("number_context_0"+c, pos.x+5+i*13, pos.y+25, ctx); 
+    });
+  }
+  
+  function resetPoints() {
+    points = 0;
+  }
+  
+  function addPoint() {
+    points += 1;
+    maxPoints = Math.max(points, maxPoints);
+  }
+  
+  return {
+    init: init,
+    draw: draw,
+    resetPoints: resetPoints,
+    addPoint: addPoint
+  };
+  
+});
\ No newline at end of file