Changeset 2338 for 2011/26

Timestamp:

2011-06-30 10:36:54 (12 years ago)

Author:

teeevasa

Message:

initial bullet collision

Location:

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

Files:

• Peli.cs (modified) (3 diffs)
• Player.cs (modified) (2 diffs)
• Weapons.cs (modified) (2 diffs)

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

@@ -17 +17 @@
     {
         Gravity = new Vector(0, -1000);
-
         createLevel();
 
+        // Starts playing the background music, which is set to repeat
         MediaPlayer.Play("Sounds/Stage1Music");
         MediaPlayer.Volume = 0.5;
+        MediaPlayer.IsRepeating = true;
 
         Camera.Follow(player);
@@ -28 +29 @@
     }
 
+
+    // Creates the level from a text file
     void createLevel()
     {
@@ -43 +46 @@
     {
         player = new Player(33, 74, Shape.Rectangle);
-        //Image i = LoadImage("Images/character");
-        //player.Image = i;
         return player;
     }

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

@@ -31 +31 @@
         pistol.Y = 5;
         this.Weapon = pistol;
+
+        //pistol.ProjectileCollision += bulletReachedTarget;
         }
 
@@ -45 +47 @@
         PhysicsObject bullet = this.Weapon.Shoot();
         bullet.Hit(new Vector(1000, 0));
+
+        // As of now weapons are set to have infinite ammo, but that might change
+        if (bullet != null)
+        { 
+            
+        }
+    }
+
+    void bulletReachedTarget(Bullet bullet, MeleeAlien target)
+    { 
+    
     }
 

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

@@ -8 +8 @@
 public class Pistol : Weapon
 {
+    public CollisionHandler BulletCollision
+    {
+        get { return ProjectileCollision; }
+        set { ProjectileCollision = value; }
+    }
+
     public Pistol(double width, double height)
         : base(width, height)
@@ -14 +20 @@
         AttackSound = Game.LoadSoundEffect("Sounds/pistolshot");
         AmmoIgnoresGravity = true;
+        InfiniteAmmo = true;
     }