added combiplyer

diversify · Nov 23, 2014 · dac4ca7 · dac4ca7
1 parent ce31d8a
commit dac4ca7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/controllers.js b/app/controllers/controllers.js
@@ -23,7 +23,7 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
     $scope.timeLeft = 15;
     $scope.score.total = 0;
     $scope.markerSet = false;
-    $scope.combiplyer = 0;
+    $scope.comboplyer = 1;
 
     // this is the first song the user guesses
     firstSong = fetchNewSong();
@@ -164,6 +164,8 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
       if ($scope.currentYear >= $scope.timelineSongs[ans-1].year &&
           $scope.currentYear <= $scope.timelineSongs[ans].year)
         answerSuccess();
+      else
+      	$scope.comboplyer = 1;
     }
 
     //clear the selection
@@ -178,8 +180,8 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
 
   function answerSuccess() {
     addSongToTimeline($scope.currentSong); 
-    $scope.score.total += $scope.score.round;
-  	$scope.combiplyer++;
+    $scope.score.total += ($scope.score.round * $scope.comboplyer);
+  	$scope.comboplyer++;
   }
 
 }]);

diff --git a/app/partials/game.html b/app/partials/game.html
@@ -31,5 +31,5 @@ <h2 id="question">Which timespan?</h2>
 	<div id="endpoint">NOW</div>
 </div>
 
-<div id="game-footer"><h2 id="score">SCORE <em>{{score.total}}</em><em class="emergency">{{score.round!=0 && ' +' + score.round || ''}}</em></h2><h2 id="round">CORRECT GUESSES {{timelineSongs.length}} / 10</h2></div>
+<div id="game-footer"><h2 id="score">SCORE <em>{{score.total}}</em><em class="emergency">{{(score.round!=0 && ' + ' + score.round + (' x ' + comboplyer)|| '')}}</em></h2><h2 id="round">CORRECT GUESSES {{timelineSongs.length}} / 10</h2></div>