Changeset 4295 for 2013/26/OtsoR/Projekti/Projekti/Projekti/Projekti.cs

Timestamp:

2013-06-28 10:53:42 (10 years ago)

Author:

juiitamm

Message:

 

File:

• 2013/26/OtsoR/Projekti/Projekti/Projekti/Projekti.cs (modified) (11 diffs)

2013/26/OtsoR/Projekti/Projekti/Projekti/Projekti.cs

@@ -92 +92 @@
     IntMeter shipcolor2;
     IntMeter shipWeapon2;
+    IntMeter points;
     int shipcounter;
     int bigshipcounter;
@@ -382 +383 @@
     void enemydeath()
     {
-        //shipcounter--;
+        shipcounter--;
+        points.Value += 5;
     }
     void bigenemydeath()
     {
-        //bigshipcounter--;
+        bigshipcounter--;
+        points.Value += 40;
     }
     void boss1death()
@@ -599 +602 @@
                 ammus.Size *= 0.4;
                 ammus.CollisionIgnoreGroup = 4;
-                AddCollisionHandler(ammus, CollisionHandler.DestroyObject);
+                AddCollisionHandler(ammus, AmmusOsui);
             }
             if (ase is LaserGun)
@@ -610 +613 @@
             {
                 ammus.Size *= 0.9;
-                AddCollisionHandler(ammus, CollisionHandler.DestroyObject);
+                AddCollisionHandler(ammus, AmmusOsui);
                 ammus.IgnoresCollisionResponse = true;
                 ammus.CollisionIgnoreGroup = 3;
@@ -634 +637 @@
         }
     }
+    void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde)
+    {
+        if (kohde.Tag == "powerup")
+        {
+            return;
+        }
+        ammus.Destroy();
+    }
+
     void missilehit(PhysicsObject tormaaja, PhysicsObject kohde)
     {
-        tormaaja.Destroy();
+        if (kohde.Tag == "powerup")
+        {
+            return;
+        }
         Explosion missilecrash = new Explosion(8);
         missilecrash.Position = tormaaja.Position;
         missilecrash.UseShockWave = false;
         Add(missilecrash);
+        tormaaja.Destroy();
     }
     void firehoming(Weapon ase)
@@ -741 +757 @@
         Controlsship();
 
+        Timer spawnrune = new Timer();
+        spawnrune.Interval = 15;
+        spawnrune.Timeout += Spawnrunes;
+        spawnrune.Start();
+
+        points = new IntMeter(0);
+        Label pointsdisplay = new Label();
+        pointsdisplay.Title = "Points";
+        pointsdisplay.X = Screen.Right - 100;
+        pointsdisplay.Y = Screen.Top - 100;
+        pointsdisplay.TextColor = Color.White;
+        pointsdisplay.Color = Color.Black;
+        pointsdisplay.BindTo(points);
+        Add(pointsdisplay);
+
         Timer a = new Timer();
         a.Interval = 8;
@@ -758 +789 @@
         Controlsship2();
 
-        Timer a = new Timer();
-        a.Interval = 8;
-        a.Timeout += Spawnhostiles;
-        a.Start();
-    }
-
+        Timer spawnrune = new Timer();
+        spawnrune.Interval = 15;
+        spawnrune.Timeout += Spawnrunes;
+        spawnrune.Start();
+
+        points = new IntMeter(0);
+        Label pointsdisplay = new Label();
+        pointsdisplay.Title = "Points";
+        pointsdisplay.X = Screen.Right - 100;
+        pointsdisplay.Y = Screen.Top - 100;
+        pointsdisplay.TextColor = Color.White;
+        pointsdisplay.Color = Color.Black;
+        pointsdisplay.BindTo(points);
+        Add(pointsdisplay);
+
+        Timer spawnenemy = new Timer();
+        spawnenemy.Interval = 8;
+        spawnenemy.Timeout += Spawnhostiles;
+        spawnenemy.Start();
+    }
     void Spawnrunes()
     {
         while (runecounter < 5)
         {
-            int runetype = RandomGen.NextInt(0, 2);
+            int runetype = RandomGen.NextInt(1, 3);
             double runey = 0.0;
             double runex = 0.0;
-            if (RandomGen.NextBool())
-            {
-                runey = Level.Bottom + 2 * Level.Top * RandomGen.NextInt(0, 2);
-                runex = RandomGen.NextDouble(Level.Left, Level.Right);
-            }
-            else
-            {
-                runey = RandomGen.NextDouble(Level.Bottom, Level.Top);
-                runex = Level.Left + 2 * Level.Right * RandomGen.NextInt(0, 2);
-            }
-            Createhostile(runetype, runey, runex);
+            Vector paikka = Level.GetRandomFreePosition(5.0);
+            runey = paikka.Y;
+            runex = paikka.X;
+            Createrune(runetype, runey, runex);
             runecounter++;
         }
@@ -787 +825 @@
     void Createrune(int runetype, double y, double x)
     {
-        PhysicsObject Rune = new PhysicsObject(5, 5);
+        PhysicsObject Rune = new PhysicsObject(10, 10);
         Rune.X = x;
         Rune.Y = y;
         Rune.CollisionIgnoreGroup = 2 & 3 & 4;
+        Rune.IgnoresCollisionResponse = true;
+        Rune.MakeStatic();
+        Rune.Tag = "powerup";
+        Rune.AngularVelocity = 5;
+        Add(Rune);
         switch (runetype)
         {
@@ -796 +839 @@
                 //Addcollision
                 Rune.Image = rdamage;
+                Rune.Height = 15;
+                Rune.Width = 10;
                 AddCollisionHandler(Rune, "player", delegate(PhysicsObject tormaaja, Player ship) { damagerune(tormaaja, ship); });
                 break;
@@ -801 +846 @@
                 //Addcollision
                 Rune.Image = rrepair;
-                AddCollisionHandler(Rune, "player", delegate(PhysicsObject tormaaja, Player ship) { damagerune(tormaaja, ship); });
+                AddCollisionHandler(Rune, "player", delegate(PhysicsObject tormaaja, Player ship) { repairrune(tormaaja, ship); });
+                Rune.Height = 14;
+                Rune.Width = 14;
                 break;
             case 3:
@@ -812 +859 @@
     {
         rune.Destroy();
+        weapon.FireRate *= 2;
+        Timer.SingleShot(10, delegate{ weapon.FireRate *=0.5; });
+        runecounter--;
     }
     void repairrune(PhysicsObject rune, Player ship)
     {
+        ship.Health.Value += 100;
         rune.Destroy();
+        runecounter--;
     }
     //void rune3(PhysicsObject rune, Player ship)