Changeset 2348 for 2011/26

Timestamp:

2011-06-30 12:40:53 (12 years ago)

Author:

teeevasa

Message:

messed w/ weapons

Location:

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372

Files:

• GenCharacter.cs (modified) (1 diff)
• Peli.cs (modified) (1 diff)
• Player.cs (modified) (3 diffs)
• Weapons.cs (modified) (1 diff)

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/GenCharacter.cs

@@ -31 +31 @@
 
     // A particlular method for reducing hit points. It also handles death, when it 
-    private void reduceHitPointsBy(int reduction)
+    public void reduceHitPointsBy(int reduction)
     {
         if (hitPoints > reduction)

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Peli.cs

@@ -53 +53 @@
     MeleeAlien addMeleeAlien()
     {
-        MeleeAlien meleeAlien = new MeleeAlien(45, 80, Shape.Rectangle, 10, "Patrol");
+        MeleeAlien meleeAlien = new MeleeAlien(45, 80, Shape.Rectangle, 50, "Patrol");
         return meleeAlien;
     }

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Player.cs

@@ -24 +24 @@
         this.CollisionIgnoreGroup = 1;
 
+        // Creating the timer system that is *supposed* to enable a nice walking sound effect
         walker = new Timer();
         walker.Interval = 0.7;
         walker.Trigger += playWalkingSound;
 
+        // Creating the weapon; for now only a pistol
         Pistol pistol = new Pistol(20.0, 10.0);
         pistol.X = 5;
         pistol.Y = 10;
         this.Weapon = pistol;
+        pistol.ProjectileCollision += bulletReachedTarget;
 
-        pistol.ProjectileCollision += bulletReachedTarget;
+        // Collision handlers for enemies
+        AddCollisionHandler();
         }
 
@@ -55 +59 @@
     }
 
-    void bulletReachedTarget(PhysicsObject bullet, PhysicsObject target)
+    private void bulletReachedTarget(PhysicsObject bullet, PhysicsObject target)
     {
         bullet.Destroy();
@@ -61 +65 @@
         if (target.Tag == "MeleeAlien")
         {
-            target.Destroy();
+            MeleeAlien alien = (MeleeAlien)target;
+            //alien.reduceHitPointsBy(this.Weapon.firePower());
+            alien.reduceHitPointsBy(10);
         }
     }

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Weapons.cs

@@ -24 +24 @@
         return proj;
     }
+
+    public int reloadTime()
+    {
+        return 1;
+    }
+
+    public int firePower()
+    {
+        return 10;
+    }
+
+    public string name()
+    {
+        return "Pistol";
+    }
 }