Changeset 1978

Timestamp:

2011-06-13 20:24:50 (12 years ago)

Author:

mikrkana

Message:

 

Location:

2011/24/MiskaK/HaxPong/Pong/Pong

Files:

• Peli.cs (modified) (11 diffs)
• Pong.csproj (modified) (1 diff)

2011/24/MiskaK/HaxPong/Pong/Pong/Peli.cs

@@ -10 +10 @@
 {
     PhysicsObject pallo;
+    PhysicsObject meteoriitti;
+
 
     Vector nopeusYlos = new Vector(0, 200);
@@ -25 +27 @@
     PhysicsObject alaReuna;
 
+    IntMeter laskuri;
+
+    Image meteoriitinKuva = LoadImage("meteoriitti1");
+
 
 
@@ -35 +41 @@
         AsetaOhjaimet();
         LisaaLaskurit();
+
+        
+        
         
         
@@ -129 +138 @@
         Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
         Keyboard.Listen(Key.Space, ButtonState.Down, Haxaa, null);
-        Keyboard.Listen(Key.LeftAlt, ButtonState.Pressed, Haxaa2, null);
+        Keyboard.Listen(Key.LeftAlt, ButtonState.Down, Haxaa2, null);
+        
         Keyboard.Listen(Key.X, ButtonState.Pressed, Haxaa3, null);
-        
+
+        Keyboard.Listen(Key.S, ButtonState.Pressed, Haxaa4, null);
 
         Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös", maila2, nopeusYlos);
@@ -162 +173 @@
     void Haxaa()
     {
-        Vector impulssi = new Vector(10.0, 0.0);
+        Vector impulssi = new Vector(20.0, 0.0);
         pallo.Hit(impulssi);
     }
@@ -168 +179 @@
     void Haxaa2()
     {
+
+        Explosion räjähdys = new Explosion(500);
+        räjähdys.Position = maila2.Position;
+
+        Add(räjähdys);
+        
         maila2.Destroy();
 
-    }
+        
+
+        
+
+
+    }
+
+   
 
     void Haxaa3()
@@ -178 +202 @@
     }
 
+    void Haxaa4()
+    {
+
+        
+        
+            meteoriitti = new PhysicsObject(50.0, 50.0);
+            meteoriitti.Shape = Shape.Circle;
+            meteoriitti.X = 0.0;
+            meteoriitti.Y = 0.0;
+            Vector impulssi = new Vector(RandomGen.NextDouble(500.0, -500.0), RandomGen.NextDouble(500.0, -500.0));
+            meteoriitti.Hit(impulssi);
+            meteoriitti.MaximumLifetime = TimeSpan.FromSeconds(10.0);
+            meteoriitti.Restitution = 2.0;
+            
+            Add(meteoriitti);
+        
+    }
+    
     
 
@@ -194 +236 @@
         pallo.Restitution = 1.2;
         Gravity = new Vector(0.0, 0.0);
-        alaReuna.IgnoresCollisionResponse = false;
+        
         
         
@@ -233 +275 @@
     IntMeter LuoPisteLaskuri( double x, double y )
     {
-        IntMeter laskuri = new IntMeter(0);
+        laskuri = new IntMeter(0);
         laskuri.MaxValue = 10;
         Label naytto = new Label();
@@ -244 +286 @@
         Add(naytto);
         laskuri.UpperLimit += PeliLoppui;
+        
         return laskuri;
 
@@ -260 +303 @@
     void Loppu()
     {
-
+        MessageDisplay.Add("Game Over!");
     }
 

2011/24/MiskaK/HaxPong/Pong/Pong/Pong.csproj

@@ -118 +118 @@
     <Content Include="Game.ico" />
     <Content Include="GameThumbnail.png" />
+    <Content Include="meteoriitti1.png" />
   </ItemGroup>
   <ItemGroup>