X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FPlayer.cs;h=e89b28473e1143abdaf37fc453f181f2042d7a03;hp=f1d121c1907a0395ddeb2cab037a5b202bf4ad3f;hb=122c062297acac44673e947b666c1d72cd23fb1b;hpb=0470a7b148c79aaacf0d8107b5bd40fa1e81ac0a

diff --git a/CarFire/CarFire/CarFire/Player.cs b/CarFire/CarFire/CarFire/Player.cs
index f1d121c..e89b284 100644
--- a/CarFire/CarFire/CarFire/Player.cs
+++ b/CarFire/CarFire/CarFire/Player.cs
@@ -10,10 +10,11 @@ using Microsoft.Xna.Framework.Input;
 
 namespace CarFire
 {
-    public class Player : ICharacter
+    public abstract class Player : ICharacter
     {
         #region Member variables
         //The number of frames between each projectile is spawned.
+        const float basePlayerSpeed = 4.0f;
         const int shootCoolDown = 18;
         String CharName;
         Game game;
@@ -21,10 +22,31 @@ namespace CarFire
         int playerDamage;
         int score;
         MovementManager mMotion;
+        List<IEntity> mInventory = new List<IEntity>(4);
         int mPlayerIndex;
         #endregion
 
+        #region Public Properties
+        public int Health { get { return playerHealth; } set{playerHealth = value;} }
+        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; }
+            set
+            {
+                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
 
+        #region Public Methods
         public Player(Game theGame, String Name, Point position, int playerIndex, int health, int damage)
         {
             game = theGame;
@@ -35,31 +57,8 @@ namespace CarFire
             mPlayerIndex = playerIndex;
 
             // Speed is the number of grid cells you can move through per second.
-            mMotion = new MovementManager(position, 4.0f);
-        }
-
-        public virtual void LoadContent(ContentManager contentManager)
-        {
-
+            mMotion = new MovementManager(position, 25.0f);
         }
-        /// <summary>
-        /// This method will draw a character to the screen.
-        /// </summary>
-        /// <param name="spriteBatch"></param>
-        public virtual void Draw(SpriteBatch spriteBatch)
-        {
-        }
-
-        public int Health { get { return playerHealth; } }
-        public int Score { get { return score; } }
-        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 Vector2 Position { get { return mMotion.Position; } }
-        public Point Coordinates { get { return mMotion.Coordinates; } }
-        public int Damage { get { return playerDamage; } }
-
         public void causeDamageTo(int amount)
         {
             playerHealth -= amount;
@@ -89,27 +88,25 @@ 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);
+                    direction = MovementManager.GetDirection(mMotion.Coordinates, destination);
+                    break;
                 }
-                else
-                {
-                    mMotion.Update(timeSpan);
-                }
-            }
-            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 virtual void Attack(List<Keys> keysPressed)
-        {
-                
-        }
+        
         public void powerUp(int amount)
         {
             playerHealth += amount;
@@ -117,8 +114,29 @@ namespace CarFire
 
         public void Spawn(Vector2 spawn)
         {
-            
+
         }
+        public void AddHealth(int healthBoost)
+        {
+            Health += healthBoost;
+        }
+        public void IncreaseDamage(int damageBoost)
+        {
+            Damage += damageBoost;
+        }
+        #endregion
+
+        #region Abstract Methods
+        public abstract void PlayAttackSound();
+        public abstract void PlayDieSound();
+        public abstract void LoadContent(ContentManager contentManager);
+        /// <summary>
+        /// This method will draw a character to the screen.
+        /// </summary>
+        /// <param name="spriteBatch"></param>
+        public abstract void Draw(SpriteBatch spriteBatch);
+        public abstract void Attack(List<Keys> keysPressed);
+        #endregion
 
 
     }