X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FPlayer.cs;h=b5312550630b1e64a5c4927ee618e174ca26e34e;hp=da1af4ecc02a385cef816c1d5a2ca97d1326337b;hb=0483d0578f0d160ea3e80bae57d4a3ba2b061d35;hpb=3ca5852a7df47d4129743ed449816c7c7347b699

diff --git a/CarFire/CarFire/CarFire/Player.cs b/CarFire/CarFire/CarFire/Player.cs
index da1af4e..b531255 100644
--- a/CarFire/CarFire/CarFire/Player.cs
+++ b/CarFire/CarFire/CarFire/Player.cs
@@ -14,7 +14,7 @@ namespace CarFire
     {
         #region Member variables
         //The number of frames between each projectile is spawned.
-        const float basePlayerSpeed = 4.0f;
+        const float basePlayerSpeed = 8.0f;
         const int shootCoolDown = 18;
         String CharName;
         Game game;
@@ -28,18 +28,20 @@ namespace CarFire
 
         #region Public Properties
         public int Health { get { return playerHealth; } set{playerHealth = value;} }
-        public int Score { get { return score; } }
+        public int Score { get { return score; } set { score = value; } }
         public bool alive { get { return playerHealth > 0; } }
         public Game Game { get { return game; } }
         public MovementManager Motion { get { return mMotion; } }
         public int PlayerIndex { get { return mPlayerIndex; } }
+        public bool IsCollidable { get { return true; } }
         public Vector2 Position { get { return mMotion.Position; } }
-        public Point Coordinates { get { return mMotion.Coordinates; } 
+        public Point Coordinates { get { return mMotion.Coordinates; }
             set
             {
-                Coordinates = value;
+                mMotion.Coordinates = value;
                 mMotion = new MovementManager(value, basePlayerSpeed);
             } }
+        public char Identifier { get { return mPlayerIndex.ToString()[0]; } }
         public int Damage { get { return playerDamage; } set { playerDamage = value; } }
         public List<IEntity> Inventory { get { return mInventory; } }
         #endregion
@@ -55,7 +57,7 @@ namespace CarFire
             mPlayerIndex = playerIndex;
 
             // Speed is the number of grid cells you can move through per second.
-            mMotion = new MovementManager(position, 4.0f);
+            mMotion = new MovementManager(position, basePlayerSpeed);
         }
         public void causeDamageTo(int amount)
         {
@@ -86,22 +88,24 @@ namespace CarFire
             bool moveRight = keysPressed.Contains(Keys.Right);
             bool moveUp = keysPressed.Contains(Keys.Up);
             bool moveDown = keysPressed.Contains(Keys.Down);
-            Point destination = MovementManager.GetNeighborCell(mMotion.Coordinates, moveLeft, moveRight, moveUp, moveDown);
-            if (!keysPressed.Contains(Keys.LeftControl))
+
+            List<Point> possibleDestinations = new List<Point>(3);
+            possibleDestinations.Add(MovementManager.GetNeighbor(mMotion.Coordinates, moveLeft, moveRight, moveUp, moveDown));
+            possibleDestinations.AddRange(MovementManager.GetNeighbors(mMotion.Coordinates, possibleDestinations[0]));
+
+            Direction direction = Direction.None;
+            foreach (Point destination in possibleDestinations)
             {
                 if (game.IsCellOpen(destination))
                 {
-                    mMotion.Update(timeSpan, moveLeft, moveRight, moveUp, moveDown);
-                }
-                else
-                {
-                    mMotion.Update(timeSpan);
+                    direction = MovementManager.GetDirection(mMotion.Coordinates, destination);
+                    break;
                 }
             }
-            else
-            {
-                mMotion.LockUpdate(timeSpan, moveLeft, moveRight, moveUp, moveDown);
-            }
+
+            if (direction != Direction.None && !keysPressed.Contains(Keys.LeftControl)) 
+                mMotion.Update(timeSpan, direction);
+            else mMotion.LockUpdate(timeSpan, moveLeft, moveRight, moveUp, moveDown);
         }
         
         public void powerUp(int amount)