X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMelee.cs;fp=CarFire%2FCarFire%2FCarFire%2FMelee.cs;h=38be3038a5ae2e231affcf3ac3b9a29890173a65;hp=f52301219c667184ef107a0d4f1e3cc366329288;hb=f67652c2fe85f9ba6c71dedbab26760775004e00;hpb=398bc41a3075cfa9c9ad5dc607a86c56a4e7e913

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index f523012..38be303 100644
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -59,33 +59,41 @@ namespace CarFire
                     int startY = Coordinates.Y;
                     if (Motion.Direction == Direction.Down || Motion.Direction == Direction.LowerLeft || Motion.Direction == Direction.LowerRight)
                     {
-                        velocityY = 1;
                         startY = Coordinates.Y + 1;
                     }
                     else if (Motion.Direction == Direction.Up || Motion.Direction == Direction.UpperLeft || Motion.Direction == Direction.UpperRight)
                     {
-                        velocityY = -1;
                         startY = Coordinates.Y - 1;
                     }
                     if (Motion.Direction == Direction.Right || Motion.Direction == Direction.LowerRight || Motion.Direction == Direction.UpperRight)
                     {
-                        velocityX = 1;
                         startX = Coordinates.X + 1;
                     }
                     else if (Motion.Direction == Direction.Left || Motion.Direction == Direction.LowerLeft || Motion.Direction == Direction.UpperLeft)
                     {
-                        velocityX = -1;
                         startX = Coordinates.X - 1;
                     }
                     //Attack a monster
                     if (!Game.IsCellOpen(new Point(startX, startY)))
                     {
-                        foreach (IEntity entity in Game.State.Entities)
+                        IEntity toKill = Game.GetEntityAtCoordinates(new Point(startX, startY));
+                        //See if it is a monster
+                        if (toKill is IMonster)
                         {
-                            //See if it is a monster
-
-                            //Damage the monster
-
+                            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);
+                            }
                         }
                     }
                 }