Handle 'GameOver' sequence.

RandolphBurt · Sep 15, 2013 · 332df9e · 332df9e
1 parent 3d6d984
commit 332df9e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/App/js/GameStateEnum.js b/App/js/GameStateEnum.js
@@ -0,0 +1,7 @@
+"use string";
+
+var GameStateEnum = {
+    GameActive: 0,
+    LevelTransition: 1,
+    GameOver: 2
+};
diff --git a/App/js/services/GameEngine.js b/App/js/services/GameEngine.js
@@ -7,7 +7,6 @@ gameApp.factory('GameEngine', function(GraphicsEngine, GameBoard, GlobalSettings
             this.canvas = canvas;
 
             this.livesAnimationCount = 0;
-
             this.centipedeUpperBoundary = (GlobalSettings.gameBoardHeight - GlobalSettings.playerAreaHeight) + 1;
 
             this.resetBoard();
@@ -53,6 +52,9 @@ gameApp.factory('GameEngine', function(GraphicsEngine, GameBoard, GlobalSettings
 
         update: function(animation) {
             if (this.shouldPlayerRegenerate()) {
+                if (GameState.isGameOver()) {
+                    GameState.reset();
+                }
                 this.resetBoard();
                 this.initialiseLevel();
                 return;
@@ -84,6 +86,7 @@ gameApp.factory('GameEngine', function(GraphicsEngine, GameBoard, GlobalSettings
             this.drawCentipedes(animation);
             this.drawBullets();
             this.drawScoreMarkers();
+            this.drawGameState();
         },
 
         checkPlayerCollision: function() {
@@ -180,6 +183,17 @@ gameApp.factory('GameEngine', function(GraphicsEngine, GameBoard, GlobalSettings
             GraphicsEngine.blankScreen();
         },
 
+        drawGameState: function() {
+            if (GameState.isGameOver()) {
+                GraphicsEngine.drawText(
+                    GlobalSettings.gameOverXPosition,
+                    GlobalSettings.gameOverYPosition,
+                    "Game Over",
+                    GlobalSettings.gameOverFontColour,
+                    GlobalSettings.gameOverFont);
+            }
+        },
+
         drawScoreBoard: function(animation) {
             if (animation == 0) {
                 this.livesAnimationCount++;
@@ -194,7 +208,6 @@ gameApp.factory('GameEngine', function(GraphicsEngine, GameBoard, GlobalSettings
                 animationOffset = 9 - this.livesAnimationCount;
             }
 
-
             GraphicsEngine.drawText(
                 GlobalSettings.scoreBoardLivesXPositionText,
                 GlobalSettings.scoreBoardTitleYPosition,
@@ -244,7 +257,7 @@ gameApp.factory('GameEngine', function(GraphicsEngine, GameBoard, GlobalSettings
                 GlobalSettings.scoreBoardContentFontColour,
                 GlobalSettings.scoreBoardFont);
 
-            for (var i = 0; i < GameState.lives - 1; i++) {
+            for (var i = 0; i < GameState.lives; i++) {
                 GraphicsEngine.drawImage(
                     GlobalSettings.scoreBoardLivesXPositionImage + (GlobalSettings.scoreBoardLivesOffset * i) + (animationOffset * 4),
                     GlobalSettings.scoreBoardLivesYPosition,

diff --git a/App/js/services/GameState.js b/App/js/services/GameState.js
@@ -4,11 +4,16 @@ gameApp.factory("GameState", function(GlobalSettings) {
         highScore: 0,
         level: 1,
         lives: GlobalSettings.lives,
+        gameState: GameStateEnum.GameActive,
 
         isPlayerAlive: function() {
             return this.lives > 0;
         },
 
+        isGameOver: function() {
+            return this.gameState === GameStateEnum.GameOver;
+        },
+
         isCurrentLevelHighSpeed: function() {
             return this.level % 2 == 0;
         },
@@ -17,6 +22,7 @@ gameApp.factory("GameState", function(GlobalSettings) {
             this.lives = GlobalSettings.lives;
             this.level = 1;
             this.score = 0;
+            this.gameState = GameStateEnum.GameActive;
         },
 
         incrementScore: function(increment) {
@@ -31,6 +37,10 @@ gameApp.factory("GameState", function(GlobalSettings) {
             if (this.lives > 0) {
                 this.lives--;
             }
+
+            if (this.lives === 0) {
+                this.gameState = GameStateEnum.GameOver;
+            }
         }
     }
 });
diff --git a/App/js/services/GlobalSettings.js b/App/js/services/GlobalSettings.js
@@ -19,7 +19,12 @@ gameApp.constant("GlobalSettings", {
     scoreBoardTitleYPosition: 15,
     scoreBoardContentYPosition: 35,
     scoreBoardLivesYPosition: 20,
-    scoreBoardLivesOffset: 20,
+    scoreBoardLivesOffset: 15,
+
+    gameOverXPosition: 210,
+    gameOverYPosition: 300,
+    gameOverFontColour: "yellow",
+    gameOverFont: "32px Arial bold",
 
     gameBoardWidth: 30,
     gameBoardHeight: 30,