colosseum is now crowded with monsters; made the SaberMonster moving code more robust...

[chaz/carfire] / CarFire / CarFire / CarFire / Player.cs

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