Merge error resolved

index.html

@@ -26,13 +26,14 @@
     <canvas id="gameCanvas" width="800" height="600"></canvas>
     <script src="js/Main/GraphicsCommon.js"></script>
     <script src="js/Main/ImageLoading.js"></script>
-     <script src="js/Main/Sprite.js"></script>
+    <script src="js/Main/Sprite.js"></script>
+    <script src="js/Main/Reset.js"></script>
     <script src="js/Main/Input.js"></script>
     <script src="js/Main/Track.js"></script>
     <script src="js/Main/Car.js"></script>
     <script src="js/PongScene/Ball.js"></script>
     <script src="js/PongScene/Paddle.js"></script>
-      <script src="js/PongScene/Kitchen.js"></script>
+    <script src="js/PongScene/Kitchen.js"></script>
     <script src="js/PongScene/PongInput.js"></script>
     <script src="js/Tools/Vector.js"></script>
     <script src="js/Tools/Operation.js"></script>

js/Main/ImageLoading.js

@@ -1,5 +1,6 @@
 // still images
 var menuPic = document.createElement("img");
+var kitchenPic = document.createElement("img");
 var hippoCarPic = document.createElement("img");
 var particlePic = document.createElement("img");
 var panPaddle = document.createElement("img");
@@ -89,6 +90,7 @@ function setUpImages() {
 function loadImages() {
 	var imageList = [
 	{varName: menuPic, theFile: "menu.png"},
+    {varName: kitchenPic, theFile: "kitchenbg.png"},
 
 	{varName: hippoCarPic, theFile: "foodTruck.png"},
 	{varName: particlePic, theFile: "particle.png"},

js/Main/Input.js

@@ -141,10 +141,7 @@ function keyPressed(evt) {
             break;
         case KEY_ENTER:
             if (gameOverState) {
-                mainMenuState = true;
-                gameOverState = false;
-                gameOverMusic.pauseSound();
-                menuMusic.loopSong();
+                resetGame();
             }
 	}
 };

js/Main/Main.js

@@ -11,7 +11,7 @@ const FRAMES_PER_SECOND = 30;
 window.onload = function() {
 	canvas = document.getElementById('gameCanvas');
 	canvasContext = canvas.getContext('2d');
-	colorRect(0,0, canvas.width,canvas.height, 'black');
+	drawScreenBlack();
 	var loadingText = "LOADING IMAGES";
 	var textWidth = canvasContext.measureText(Math.floor(loadingText));
 	colorText(loadingText, canvas.width/2 - textWidth.width * 2, canvas.height/2, 'white');
@@ -40,6 +40,9 @@ function updateAll() {
 	drawAll();
 	particles.update();
 	updateScreenshake();
+
+	checkFuelMeter();
+
 }
 
 function moveAll() {
@@ -55,9 +58,23 @@ function drawAll() {
 	//particles.clear();
     setGameStates();
     particles.draw();
-    if( isKitchenMode || isDrivingMode ){
+    if (!mainMenuState && !helpState && !creditsState) {
+    	fuelMeterSprite.render(canvas.width/2 - (fuelMeterSprite.width/9)/2,15);
+    }
+    /*if( isKitchenMode || isDrivingMode ){
 	    //timer.drawTimer();
 	    //timer.alertMessage();
 	    //drawFullnessLevel();
-    }
+    }*/
+}
+
+function checkFuelMeter() {
+	var currentFrameIndex = fuelMeterSprite.getFrameIndex();
+	var fuelMeterSpriteMaxFrames = 9;
+	if (currentFrameIndex == fuelMeterSpriteMaxFrames - 1) {
+		isKitchenMode = false;
+        isDrivingMode = false;
+        foodInPlay = false;
+		gameOverState = true;
+	} 
 }

js/Main/MenuStates.js

@@ -9,22 +9,18 @@ var gameOverState = false;
 var creditsState = false;
 
 function drawMainMenu() {
-    // colorRect(0, 0, canvas.width, canvas.height, "black");
     canvasContext.drawImage(menuPic, 0, 0);
 }
 
-
 // function showMenuText() {
 //     colorText("Death Road To McGamkedonalds", canvas.width/2, 200, "white", "30px Arial", "center", 1);
 //     colorText("[P]lay", canvas.width/2, 300, "white", "20px Arial", "center", 1);
 //     colorText("[H]elp", canvas.width/2, 350, "white", "20px Arial", "center", 1);
 //     colorText("[C]redits", canvas.width/2, 400, "white", "20px Arial", "center", 1);
 // }
 
-
-
-function drawHelpScreen() {
-     colorRect(0, 0, canvas.width, canvas.height);
+function drawScreenBlack() {
+     colorRect(0, 0, canvas.width, canvas.height, "black");
 }
 
 function showHelpScreenText() {
@@ -67,7 +63,7 @@ function setGameStates() {
     };
 
     if (helpState) {
-        drawHelpScreen();
+        drawScreenBlack();
         showHelpScreenText();
         return;
     };
@@ -92,7 +88,6 @@ function setGameStates() {
                 var measuredText = canvasContext.measureText(Math.floor(stateText));
                 colorText(stateText,canvas.width/2 - measuredText.width/2 ,canvas.height/1.25,
                             "black","30px Arial", "center", 1);
-                fullnessLevel++;
             } else if (ball.ballY >= canvas.height) {
                 var stateText = "Food lost...";
                 var measuredText = canvasContext.measureText(Math.floor(stateText));
@@ -117,15 +112,16 @@ function setGameStates() {
         drawTracks();
         playerCar.draw();
         canvasContext.restore();
-        fuelMeterSprite.render(canvas.width/2 - (fuelMeterSprite.width/9)/2,15);
         return;
     }
     if (gameOverState) {
-        drawHelpScreen();
+        DontCookMusic.pauseSound();
+        gameOverMusic.loopSong();
+        colorRect(0,0, canvas.width,canvas.height, "red");
         colorText("You lose!\n .Press [Enter] to go to menu", canvas.width/2, canvas.height/2, "white", "20px Arial", "center", 1);
     }
     if (creditsState) {
-        drawHelpScreen();
+        drawScreenBlack();
         showCreditsText();
     }
 }

js/Main/Reset.js

@@ -0,0 +1,9 @@
+function resetGame() {
+    gameOverMusic.pauseSound();
+    playerCar.x = 75;
+    playerCar.y = 75;
+    fuelMeterSprite.reset();
+    menuMusic.loopSong();
+    gameOverState = false;
+    mainMenuState = true;
+}

js/Main/Timer.js

@@ -1,4 +1,5 @@
 
+
 /*var countdownTimer;
 function TimerClass() {
 

js/PongScene/Ball.js

@@ -1,4 +1,6 @@
 var crossingMiddle = false;
+var cookedToPerfection = false;
+var burntToACrisp = false;
 
 // Ball class constructor: 1 class per file, file name is "class name".js
 function Ball(canvas) {
@@ -23,28 +25,42 @@ function Ball(canvas) {
             foodInPlay = false;
             launchPlantMode = false;
             launchMeatMode = false;
-          /*  if (fullnessLevel > 0) {
-               fullnessLevel-= 1;   
-            } else if (fullnessLevel == 0) {
-                isKitchenMode = false;
-                isDrivingMode = false;
-                gameOverState = true;
-            }*/
             return;
         }
 
         if (this.ballY <= 0) {
-            launchPlantMode = false;
-            launchMeatMode = false;
+
             foodInPlay = false;
+<<<<<<< HEAD
             // screenshake(2);
             if (this.cookedLevel <= 2) {
                 DecreaseFrameIndexBasedOnFoodQuality(2);
             } else if (this.cookedLevel <= 6) {
                 DecreaseFrameIndexBasedOnFoodQuality(6);
             } else if (this.cookedLevel >= 7) {
                 DecreaseFrameIndexBasedOnFoodQuality(1);
+=======
+            if (launchMeatMode) {
+                if (this.cookedLevel <= 2) {
+                    DecreaseFrameIndexBasedOnFoodQuality(2);
+                } else if (this.cookedLevel <= 10) {
+                    DecreaseFrameIndexBasedOnFoodQuality(4);
+                } else if (this.cookedLevel >= 11) {
+                    DecreaseFrameIndexBasedOnFoodQuality(1);
+                }
+            } 
+            if (launchPlantMode) {
+                if (this.cookedLevel <= 2) {
+                    DecreaseFrameIndexBasedOnFoodQuality(1);
+                } else if (this.cookedLevel <= 6) {
+                    DecreaseFrameIndexBasedOnFoodQuality(8);
+                } else if (this.cookedLevel >= 7) {
+                    DecreaseFrameIndexBasedOnFoodQuality(-1);
+                }
+>>>>>>> 0ecfa47c53d8e697916f953c97b870b71c40bc27
             }
+            launchPlantMode = false;
+            launchMeatMode = false;
             return; 
         } 
 
@@ -58,27 +74,45 @@ function Ball(canvas) {
             crossingMiddle = true;
             smokeScreenEffect(this.ballX, this.ballY);
             this.cookedLevel++;
-            var cookedToPerfection = false;
-            var burntToACrisp = false;
             if (launchMeatMode) {
-                if (this.cookedLevel == 3 && !cookedToPerfection) {
+                if (this.cookedLevel == 5 && !cookedToPerfection) {
                     var currentFrameIndex = meatBallSprite.getFrameIndex();
                     currentFrameIndex++;
                     meatBallSprite.setFrameIndex(currentFrameIndex);
                     cookedToPerfection = true;
                 }
-                if (this.cookedLevel == 7 && !burntToACrisp) {
+                if (this.cookedLevel == 12 && !burntToACrisp) {
                     var currentFrameIndex = meatBallSprite.getFrameIndex();
-                    currentFrameIndex += 2;
+                    currentFrameIndex++;
                     meatBallSprite.setFrameIndex(currentFrameIndex);
                     burntToACrisp = true;
                 }
-                if (this.cookedLevel >= 10 && burntToACrisp) {
+                if (this.cookedLevel == 15 && burntToACrisp) {
                     launchMeatMode = false;
                     foodInPlay = false;
-                }
+                    return;
+                } // end of if cookedlevel >= 13
             } // end of if launchMeatMode
-        } // end of is ball at the middle?
+            if (launchPlantMode) {
+                if (this.cookedLevel == 4 && !cookedToPerfection) {
+                    var currentFrameIndex = vegBallSprite.getFrameIndex();
+                    currentFrameIndex++;
+                    vegBallSprite.setFrameIndex(currentFrameIndex);
+                    cookedToPerfection = true;
+                }
+                if (this.cookedLevel == 9 && !burntToACrisp) {
+                    var currentFrameIndex = vegBallSprite.getFrameIndex();
+                    currentFrameIndex++;
+                    vegBallSprite.setFrameIndex(currentFrameIndex);
+                    burntToACrisp = true;
+                }
+                if (this.cookedLevel >= 13 && burntToACrisp) {
+                    launchPlantMode = false;
+                    foodInPlay = false;
+                    return;
+                } // end of if cookedlevel >= 10
+            } // end of if launchPlantMode section
+        } // end of if ball crosses middle
 
         if (this.ballY > paddle1Y && this.ballY < (paddle1Y + PADDLE_HEIGHT) 
         && this.ballX > paddle1X && this.ballX < paddle1X + PADDLE_THICKNESS) {
@@ -109,6 +143,8 @@ function Ball(canvas) {
         meatBallSprite.reset();
         vegBallSprite.reset();
         cookedToPerfection = false;
+        burntToACrisp = false;
+        crossingMiddle = false;
     }
 }
 

js/PongScene/Kitchen.js

@@ -7,13 +7,12 @@ var ball = new Ball(document.getElementById('gameCanvas'));
 
 function kitchenStuff() {
     //kitchen bg
-    colorRect(0, 0, canvas.width, canvas.height, "lightgrey");
-
-    fuelMeterSprite.render(canvas.width/2 - (fuelMeterSprite.width/9)/2,15);
+    /*colorRect(0, 0, canvas.width, canvas.height, "lightgrey");*/
+    canvasContext.drawImage(kitchenPic, 0, 0)
 
     //paddle 1
-    //colorRect(paddle1X, paddle1Y, PADDLE_THICKNESS, PADDLE_HEIGHT, "white");
-    canvasContext.drawImage(panPaddle, paddle1X, paddle1Y, PADDLE_THICKNESS, PADDLE_HEIGHT)
+    colorRect(paddle1X, paddle1Y, PADDLE_THICKNESS, PADDLE_HEIGHT, "white");
+   /* canvasContext.drawImage(panPaddle, paddle1X, paddle1Y, PADDLE_THICKNESS, PADDLE_HEIGHT)*/
 
     //paddle 2
     colorRect(paddle2X, paddle2Y, PADDLE_THICKNESS, PADDLE_HEIGHT, "white");

js/PongScene/PongInput.js

@@ -66,8 +66,8 @@ function pongPaddleMove() {
 
     if (keyHeld_RightPong) {
         paddle1X += PADDLE_SPEED;
-        if (paddle1X >= 790 - PADDLE_THICKNESS) {
-            paddle1X = 790 - PADDLE_THICKNESS;
+        if (paddle1X >= canvas.width) {
+            paddle1X = canvas.width
         }
     }
 }