Changeset 926

Timestamp:

2010-06-16 21:33:01 (13 years ago)

Author:

danmarti

Message:

Lyhennettiin koodia ja parannettiin kuolemasysteemiä

File:

• 2010/24/danmarti/Vantaa 2001/Peli.cs (modified) (8 diffs)

2010/24/danmarti/Vantaa 2001/Peli.cs

@@ -8 +8 @@
     PlatformCharacter Player1;
     PlatformCharacter Player2;
+
     IntMeter LifeP1;
     IntMeter LifeP2;
@@ -23 +24 @@
     {
         SetWindowSize(1024, 720, false);
-        
-        LifeP1 = new IntMeter( 3 ); // Pelaajan 1 osumat
-        LifeP2 = new IntMeter( 3 ); // Pelaajan 2 osumat
+
+        LifeP1 = new IntMeter(3); // Pelaajan 1 osumat
+        LifeP2 = new IntMeter(3); // Pelaajan 2 osumat
         LifeMeterP1 = new ValueDisplay();
         LifeMeterP2 = new ValueDisplay();
@@ -34 +35 @@
         LifeMeterP1.BindTo(LifeP1);
         LifeMeterP2.BindTo(LifeP2);
-         
+
         StartCoop();
     }
@@ -78 +79 @@
         Player.StaticFriction = 0;
         Player.LinearDamping = 1;
-        LaserGun Weapon = new LaserGun( 20, 5 );
-        PhysicsObject WProjectile = Weapon.Shoot();
+
+        LaserGun Weapon = new LaserGun(20, 5);
+        Weapon.X = 50;
+        Weapon.LaserCollision = LaserCollide;
+
         //Weapon.AttackSound = null;
-        Weapon.IsVisible=false;
-        Weapon.TimeBetweenUse = new TimeSpan(0,0,0,0,200);
+        Weapon.IsVisible = false;
+        Weapon.TimeBetweenUse = new TimeSpan(0, 0, 0, 0, 10);
+        Weapon.MaximumLifetime = new TimeSpan(1, 0, 0, 0, 0);
 
         Player.Weapon = Weapon;
@@ -106 +111 @@
     {
         TileMap Tiles = TileMap.FromFile("BetaMap.txt");
+        Tiles['x'] = CreatePit;
         Tiles['f'] = CreateFloor;
+        Tiles['w'] = CreateWall;
         Tiles['r'] = CreateRespawn;
         Tiles['e'] = CreateEnemy;
@@ -147 +154 @@
     }
 
+    PhysicsObject CreateWall()
+    {
+        PhysicsObject Wall = PhysicsObject.CreateStaticObject(50.0, 50.0);
+        return Wall;
+    }
+
     PhysicsObject CreateRespawn()
     {
@@ -156 +169 @@
     }
 
+    PhysicsObject CreatePit()
+    {
+        PhysicsObject Pit = PhysicsObject.CreateStaticObject(50.0, 50.0);
+        Pit.IgnoresCollisionResponse = true;
+        Pit.IsVisible = false;
+        AddCollisionHandler(Pit, PitCollide);
+        return Pit;
+    }
+
     void EnemyPlayerCollision(PhysicsObject Enemy, PhysicsObject Target)
     {
-        if (Target is PlatformCharacter)
-        {
-            // Tarkista onko elämiä jäljellä
-            if (Target == Player1)
+        if (Target == Player1)
+        {
+            Death(Player1);
+        }
+        else if (Target == Player2)
+        {
+            Death(Player2);
+        }
+    }
+
+    void LaserCollide(PhysicsObject WProjectile, PhysicsObject Target)
+    {
+        if((Target!=Player1) || (Target!=Player2))
+            WProjectile.Destroy();
+        //EnemyDeath(Enemy);
+
+    }
+
+    void PitCollide(PhysicsObject Pit, PhysicsObject Target)
+    {
+        if (Target == Player1)
+        {
+            Death(Player1);
+        }
+        else if (Target == Player2)
+        {
+            Death(Player2);
+        }
+}
+
+
+    void Death(PlatformCharacter Player)
+    {
+            if (Player == Player1)
             {
                 LifeP1.Value--;
-                Death(Player1);
                 if (Player2.IsDestroyed() == false)
                 {
                     Camera.Follow(Player2);
                 }
-
-            }
-            else if (Target == Player2)
+                Player1.Destroy();
+
+            }
+            else if (Player == Player2)
             {
                 LifeP2.Value--;
-                Death(Player2);
-            }
-          }
-      }
+                Player2.Destroy();
+                Camera.Follow(Player1);
+            }
         
-
-    void Death(PlatformCharacter Player)
-    {
-        Player.Destroy();
         if ((Player1.IsDestroyed()) && (Player2.IsDestroyed()))
         {
-            RespawnPlayers(RespawnCoord.X, RespawnCoord.Y+10);
-        }
-        
+            RespawnPlayers(RespawnCoord.X, RespawnCoord.Y + 10);
+            Camera.Follow(Player1);
+        }
+
+    }
+
+    void EnemyDeath(PhysicsObject Enemy)
+    {
+        Enemy.Destroy();
     }
 
     void RespawnPlayers(double x, double y)
     {
-        if(LifeP1 > 0)
+
+
+        if (LifeP1 > 0)
         {
             Player1 = CreatePlayer();
-            Player1.X = x+30;
+            Player1.X = x + 30;
             Player1.Y = y;
             Camera.Follow(Player1);
@@ -208 +263 @@
                 Camera.Follow(Player2);
             }
-            Controls();
-        }
+            else
+            {
+                Camera.Follow(Player1);
+            }
+
+        }
+        Controls();
     }