Create fruitClass and add falling watermelon

anthony_cindy_fruitCatcher/game.html

@@ -14,6 +14,7 @@ <h1>Catch with some Math!</h1>
     <script src="./js/GraphicsCommon.js"></script>
     <script src="./js/ImageLoading.js"></script>
     <script src="./js/Player.js"></script>
+    <script src="./js/Fruit.js"></script>
     <script src="./js/World.js"></script>
     <script src="./js/Input.js"></script>
     <script src="./js/Main.js"></script>

anthony_cindy_fruitCatcher/js/Fruit.js

@@ -0,0 +1,33 @@
+const FALL_SPEED = 3;
+
+function fruitClass() { //create a class to easily create new fruits
+    this.x = 75;
+    this.y = 75;
+    this.fruitPic; //which picture to use
+    this.name = "Unknown Fruit"; //default name
+
+    this.reset = function(whichImage, fruitName) {
+        this.name = fruitName;
+        this.fruitPic = whichImage;
+        for(var eachRow = 0; eachRow < WORLD_ROWS; eachRow++){
+            for(var eachCol = 0; eachCol < WORLD_COLS; eachCol++){
+                var arrayIndex = rowColtoArrayIndex(eachCol, eachRow);
+                if(worldGrid[arrayIndex] == WORLD_PLAYERSTART) {
+                    worldGrid[arrayIndex] = WORLD_ROAD;
+                    this.x = eachCol * WORLD_W + WORLD_W/2;
+                    this.y = eachRow * WORLD_H + WORLD_H/2;    
+                    return;
+                } // end of PlayerStart if - is this world here
+            } //end of col for       
+        } // end of row for
+        console.log("NO FRUIT FOUND!");
+    } // end of playerReset func
+
+    this.move = function(){
+        this.y += FALL_SPEED;
+    }
+
+    this.draw = function() {
+        drawBitmapCenteredWithRotation(this.fruitPic, this.x, this.y, 0);
+    }
+}

anthony_cindy_fruitCatcher/js/ImageLoading.js

@@ -1,4 +1,5 @@
 var playerPic = document.createElement("img");
+var fruitPic = document.createElement("img");
 var worldPics = [];
 
 var picsToLoad = 0; // set automatically based on imageList in loadImages();
@@ -23,6 +24,7 @@ function loadImageForWorldCode(worldCode, fileName){
 function loadImages() {
     var imageList = [
       {varName: playerPic, theFile: "playerBasketDraft-Med.png"},
+      {varName: fruitPic, theFile: "watermelon.png"},
 
       {worldType: WORLD_ROAD, theFile: "world_road.png"},
       {worldType: WORLD_WALL, theFile: "world_wall.png"},

anthony_cindy_fruitCatcher/js/Main.js

@@ -3,6 +3,7 @@ var canvas, canvasContext;
 var framesPerSecond = 30;
 
 var playerOne = new playerClass(); //create a blue player using class definition
+var fruitOne = new fruitClass(); //create a fruit using class definition temporarily - array for fruit to make it dynamic?
 
 // ~~~~~~~~~~~~~~~~ Main Game Code ~~~~~~~~~~~~~~~~
 window.onload = function() {
@@ -33,7 +34,8 @@ function nextLevel() {
 
 function loadLevel(whichLevel) {
     worldGrid = whichLevel.slice(); // copy level array to worldGrid
-    playerOne.reset(playerPic, "Blue Storm");
+    playerOne.reset(playerPic, "Addition Character");
+    fruitOne.reset(fruitPic, "Apple Fruit");
 }
 
 function updateAll() {
@@ -42,7 +44,8 @@ function updateAll() {
 }
 
 function moveAll() {
-    playerOne.move();   
+    playerOne.move(); 
+    fruitOne.move();  
 }
 
 function clearScreen() {
@@ -52,5 +55,6 @@ function clearScreen() {
 function drawAll() {
     drawWorlds();
     playerOne.draw();
+    fruitOne.draw();
     drawUserStats(playerOne);
 }

anthony_cindy_fruitCatcher/js/Player.js

@@ -1,7 +1,4 @@
 const WALK_SPEED = 4;
-const REVERSE_POWER = 0.2;
-const TURN_RATE = 0.05;
-const MIN_SPEED_TO_TURN = 0.5;
 
 function playerClass() { //create a class to easily create new players
     this.x = 75;

anthony_cindy_fruitCatcher/js/World.js

@@ -76,11 +76,9 @@ function playerWorldHandling(whichPlayer) {
             nextLevel();
             // alert(whichPlayer.name + " WINS!!"); // player keeps going after alert as if up key was still pressed
         } 
-        else if(tileHere == WORLD_APPLE) {
+        else if(tileHere == WORLD_APPLE || tileHere == WORLD_WATERMELON) {
             whichPlayer.fruitsHeld++;
-            // console.log(whichPlayer.fruitsHeld);
             // console.log(playerWorldCol, ":", playerWorldRow, ":", worldGrid[playerWorldCol + WORLD_COLS*playerWorldRow]);
-            // console.log(rowColtoArrayIndex(playerWorldCol, playerWorldRow));
             worldGrid[rowColtoArrayIndex(playerWorldCol, playerWorldRow)] = WORLD_ROAD;
         }
         else if(!tileTypeMove(tileHere) ||