Changeset 7440 for 2016/24

Timestamp:

2016-06-17 12:05:32 (7 years ago)

Author:

karkaite

Message:

Game is kind of completed

Location:

2016/24/HaseebS/Dreamcast

Files:

• .vs/Dreamcast/v14/.suo (modified) (previous)
• Dreamcast/Dreamcast/Dreamcast.cs (modified) (8 diffs)
• Dreamcast/Dreamcast/Dreamcast.csproj.Debug.cachefile (modified) (1 diff)
• Dreamcast/Dreamcast/bin/x86/Debug/Dreamcast.exe (modified) (previous)
• Dreamcast/Dreamcast/bin/x86/Debug/Dreamcast.pdb (modified) (previous)
• Dreamcast/Dreamcast/obj/x86/Debug/Dreamcast.exe (modified) (previous)
• Dreamcast/Dreamcast/obj/x86/Debug/Dreamcast.pdb (modified) (previous)

2016/24/HaseebS/Dreamcast/Dreamcast/Dreamcast/Dreamcast.cs

@@ -86 +86 @@
         character.Tag = "character";
         characterHealth = 5;
+
         AddCollisionHandler(character, "character2", PlayerIsHit);
         Add(character);
@@ -102 +103 @@
         character2.Image = Image.Mirror(player2picture);
         character2.Tag = "character2";
+
         AddCollisionHandler(character2, "character", PlayerIsHit);
+
         character2Health = 5;
         Add(character2);
@@ -115 +118 @@
         Player1Gun.MaxAmmoLifetime = TimeSpan.FromSeconds(0.9);
         Player1Gun.ProjectileCollision = ProjectileHit;
-        //Add(Player1Gun);
+        
+        
         character.Weapon = Player1Gun;
     }
@@ -124 +128 @@
         Player2Gun.ProjectileCollision = ProjectileHit;
         Player2Gun.MaxAmmoLifetime = TimeSpan.FromSeconds(0.9);
+        
+       
         character2.Weapon = Player2Gun;
     }
@@ -130 +136 @@
         ammunition.Destroy();
     }
-    void Shootthegun(AssaultRifle weapon)
+    void Shootthegun(AssaultRifle weapon, String tag)
     {
         PhysicsObject ammo = weapon.Shoot();
         if (ammo != null)
         {
+            ammo.Tag = "ammo";
             ammo.Size *= 0.8;
         }
@@ -146 +153 @@
         Keyboard.Listen(Key.D,ButtonState.Down, movement, "Player1 will turn right", character,new Vector(100.0, 0.0));
  
-        Keyboard.Listen(Key.LeftControl, ButtonState.Pressed, Shootthegun, "Shoot button", Player1Gun);
+        Keyboard.Listen(Key.LeftControl, ButtonState.Pressed, Shootthegun, "Shoot button", Player1Gun, "character");
 
         
@@ -152 +159 @@
         Keyboard.Listen(Key.Left, ButtonState.Down, movement, "Player 2 will turn left", character2, new Vector(-100.0, 0.0));   
         Keyboard.Listen(Key.Right, ButtonState.Down, movement, "Player 2 will move right", character2, new Vector(100.0, 0.0)); 
-        Keyboard.Listen(Key.Space, ButtonState.Pressed, Shootthegun, "Shoot button for Player2", Player2Gun );
+        Keyboard.Listen(Key.Space, ButtonState.Pressed, Shootthegun, "Shoot button for Player2", Player2Gun, "character2" );
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
@@ -193 +200 @@
         Gravity = new Vector(0.0, -420.0);
         Level.Background.Image = wallpaper;
-        IsFullScreen = true;
+        //IsFullScreen = true;
        
 

2016/24/HaseebS/Dreamcast/Dreamcast/Dreamcast/Dreamcast.csproj.Debug.cachefile

@@ -3 +3 @@
 Content\Player1.xnb
 Content\cool.xnb
+Content\gunsound.xnb
 Content\Hassebproject.txt