Changeset 2826 for 2012/23

Timestamp:

2012-06-06 22:01:40 (9 years ago)

Author:

ramipasa

Message:

 

Location:

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS

Files:

• GUI/AMessageDisplay.cs (modified) (1 diff)
• YAG2DSS.cs (modified) (10 diffs)

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/AMessageDisplay.cs

@@ -62 +62 @@
         public int StartFromItem = 0;
 
-        public float TargetElapsedTime = 1.0f;
+        public float TargetElapsedTime = 15.0f;
 
         public Color backgroundTextureColor;

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/YAG2DSS.cs

@@ -27 +27 @@
     Timer Asteroidiajastin;
     Timer TuhoaAsteroidi;
+    Timer EnergianLataaja;
 
     ExplosionSystem WormholeExplosionES;
@@ -50 +51 @@
         //PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ShowExit, "Lopeta peli");
+        WormholeExplosion();
+
+    }
+
+    void WormholeExplosion()
+    {
 
         WormholeExplosionES = new ExplosionSystem(Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "wormhole_explosion.png")), 5000);
@@ -131 +138 @@
 
         Minioniajastin = new Timer();
-        Minioniajastin.Interval = 2;
+        Minioniajastin.Interval = 20;
         Minioniajastin.Timeout += new Action(Minioniajastin_Timeout);
         Minioniajastin.Start();
@@ -159 +166 @@
         TuhoaAsteroidi.Timeout += new Action(TuhoaAsteroidi_Timeout);
         TuhoaAsteroidi.Start();
+
+        EnergianLataaja = new Timer();
+        EnergianLataaja.Interval = 5.0;
+        EnergianLataaja.Timeout += new Action(EnergianLataaja_Timeout);
+        EnergianLataaja.Start();
+    }
+
+    void EnergianLataaja_Timeout()
+    {
+        if (;
     }
 
@@ -234 +251 @@
                 }
             }
+            else if (tagi == 123)
+            {
+                kohde.Mass = kohde.Mass * 0.7;
+                kohde.Size = kohde.Size * 0.7;
+                if (kohde.Mass < 20)
+                {
+                    kohde.Destroy();
+                }
+            }
             else if (tagi == 11)
             {
@@ -246 +272 @@
                 ALTKHandler.HealthBars[1].Value = ALTKHandler.HealthBars[1].Value - 5;
                 PelaajanTuhoaja();
-            }
+            }            
         }
         catch
@@ -283 +309 @@
         {
             int tagi = (int)kohde.Tag;
-            //if (tagi = 1 ||
-            //    tagi = 2)
-            //{
-
-            //}
-            if (tagi == 11)
-            {
-                ALTKHandler.HealthBars[0].Value = ALTKHandler.HealthBars[0].Value * Convert.ToInt32((asteroidi.Mass / 3600));
+            if (tagi == 1 ||
+                tagi == 2)
+            {
+                kohde.Destroy();
+                asteroidi.Mass = asteroidi.Mass * 0.7;
+                asteroidi.Size = asteroidi.Size * 0.7;
+                if (asteroidi.Mass < 20)
+                {
+                    asteroidi.Destroy();
+                }
+            }
+            else if (tagi == 11)
+            {
+                ALTKHandler.MessageDisplay.AddItem(Convert.ToString(Convert.ToDouble(ALTKHandler.HealthBars[0].Value) * (1 - ((asteroidi.Mass  / 360.0)))));
+                ALTKHandler.HealthBars[0].Value = Convert.ToInt32(Convert.ToDouble(ALTKHandler.HealthBars[0].Value) * (1 - ((asteroidi.Mass  / 360.0))));
                 PelaajanTuhoaja();
             }
             else if (tagi == 12)
             {
-                ALTKHandler.HealthBars[1].Value = ALTKHandler.HealthBars[0].Value * Convert.ToInt32((asteroidi.Mass / 3600));
+                ALTKHandler.MessageDisplay.AddItem(Convert.ToString(Convert.ToDouble(ALTKHandler.HealthBars[1].Value) * (1 - ((asteroidi.Mass  / 360.0)))));
+                ALTKHandler.HealthBars[1].Value = Convert.ToInt32(Convert.ToDouble(ALTKHandler.HealthBars[1].Value) * (1 - ((asteroidi.Mass  / 360.0))));
                 PelaajanTuhoaja();
             }
@@ -443 +477 @@
         madonreika.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "wormhole.png"));
         Madonreika.Add(madonreika);
+        AddCollisionHandler(madonreika, MadonreikaTormaa);
         Add(madonreika, -3);
         madonreika.AngularVelocity = 1;
@@ -500 +535 @@
         asteroidi.Y = y;
         asteroidi.Mass = (Math.Abs((asteroidi.Left - asteroidi.Right) * (asteroidi.Top - asteroidi.Bottom))) / 20;
+        asteroidi.Tag = 123;
+
         Vector suunta = -asteroidi.Position;
         Vector origo = Vector.FromLengthAndAngle(RandomGen.NextDouble(2000, 4000), suunta.Angle);
         Vector ohi = new Vector (RandomGen.NextDouble(-400.0, 400.0), RandomGen.NextDouble(-400.0, 400.0));
         Vector hit = origo + ohi;
+
         Asteroidi.Add(asteroidi);
         Add(Asteroidi[Asteroidi.Count -1], 0);
@@ -541 +579 @@
             if (tagi == 11)
             {
-                ALTKHandler.HealthBars[0].Value = ALTKHandler.HealthBars[0].Value - 30;
+                ALTKHandler.HealthBars[0].Value = ALTKHandler.HealthBars[0].Value - 17;
                 PelaajanTuhoaja(); 
             }
             else if (tagi == 12)
             {
-                ALTKHandler.HealthBars[1].Value = ALTKHandler.HealthBars[1].Value - 30;
+                ALTKHandler.HealthBars[1].Value = ALTKHandler.HealthBars[1].Value - 17;
                 PelaajanTuhoaja(); 
             }