X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMelee.cs;h=f113824b4b250ba3119bebf2714a4f38dea65faa;hb=60d05271b295d2ca94a0028059add525c1bbffb1;hp=f461aa69e8110b8b855e342a7638dcfc5c5badd8;hpb=6bc3a108ec8f47188a2bf377a23e8a64ec53eccb;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index f461aa6..f113824 100644
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -18,6 +18,8 @@ namespace CarFire
         int coolDown;
         Texture2D charModel;
         Texture2D projectileModel;
+        int velocityX;
+        int velocityY;
         #endregion 
 
         #region Public Methods
@@ -51,9 +53,51 @@ namespace CarFire
                 coolDown--;
             else if (coolDown == 0)
             {
+                
                 if (keysPressed.Contains<Keys>(Keys.Space))
                 {
-                    
+                    coolDown = hitCoolDown;
+                    int startX = Coordinates.X;
+                    int startY = Coordinates.Y;
+                    if (Motion.Direction == Direction.Down || Motion.Direction == Direction.LowerLeft || Motion.Direction == Direction.LowerRight)
+                    {
+                        startY = Coordinates.Y + 1;
+                    }
+                    else if (Motion.Direction == Direction.Up || Motion.Direction == Direction.UpperLeft || Motion.Direction == Direction.UpperRight)
+                    {
+                        startY = Coordinates.Y - 1;
+                    }
+                    if (Motion.Direction == Direction.Right || Motion.Direction == Direction.LowerRight || Motion.Direction == Direction.UpperRight)
+                    {
+                        startX = Coordinates.X + 1;
+                    }
+                    else if (Motion.Direction == Direction.Left || Motion.Direction == Direction.LowerLeft || Motion.Direction == Direction.UpperLeft)
+                    {
+                        startX = Coordinates.X - 1;
+                    }
+                    //Attack a monster
+                    if (!Game.IsCellOpen(new Point(startX, startY)))
+                    {
+                        IEntity toKill = Game.GetEntityAtCoordinates(new Point(startX, startY));
+                        //See if it is a monster
+                        if (toKill is IMonster)
+                        {
+                            IMonster hitMonster = (IMonster)toKill;
+                            hitMonster.causeDamageTo(this.Damage);
+                            if (hitMonster.Health > 0)
+                            {
+                                this.Score += Game.State.HitMonsterScore;
+                                Console.WriteLine(this.Score);
+                            }
+                            else
+                            {
+                                this.Score += Game.State.KillMonsterScore;
+                                Console.WriteLine(this.Score);
+                                //Remove dead monsters
+                                Game.State.Entities.Remove(toKill);
+                            }
+                        }
+                    }
                 }
             }