Changeset 1215

Timestamp:

2010-07-09 11:06:09 (11 years ago)

Author:

paaaanro

Message:

valmis

Location:

2010/27/viaawipi/samsh cubes

Files:

• Content/Content.contentproj (modified) (1 diff)
• Peli.cs (modified) (9 diffs)
• kennta.txt (modified) (1 diff)

2010/27/viaawipi/samsh cubes/Content/Content.contentproj

@@ -82 +82 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="sm26.mp3">
+      <Name>sm26</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</Processor>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="jump.wav">
+      <Name>jump</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="plzbmfire.wav">
+      <Name>plzbmfire</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="icebfire.wav">
+      <Name>icebfire</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="power beam.wav">
+      <Name>power beam</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

2010/27/viaawipi/samsh cubes/Peli.cs

@@ -27 +27 @@
     protected override void Begin()
     {
+
+
         isku1 = new IntMeter(0);
         isku2 = new IntMeter(0);
@@ -39 +41 @@
     void seuraavaKentta()
     {
+
         ClearAll();
+        MediaPlayer.Play("sm26");
 
         isku1 = new IntMeter(20);
@@ -77 +81 @@
         
         Timer ajastin = new Timer();
-        ajastin.Interval = 1;
+        ajastin.Interval = 10;
         ajastin.Trigger += HeitaKranaatti;
         Add(ajastin);
@@ -121 +125 @@
         Keyboard.Listen(Key.Right, ButtonState.Down, liikuta, "Liikkuu oikealle", pelaaja1, nopeus);
         Keyboard.Listen(Key.Up, ButtonState.Pressed, hyppaa, "Hyppää", pelaaja1, hyppyVoima);
-        Keyboard.Listen(Key.Down, ButtonState.Pressed, iske1, "tiputa");
+        Keyboard.Listen(Key.Down, ButtonState.Pressed, iske1, "hit");
 
 
@@ -129 +133 @@
         Keyboard.Listen(Key.D, ButtonState.Down, liikuta, "Liikkuu oikealle", pelaaja2, nopeus);
         Keyboard.Listen(Key.W, ButtonState.Pressed, hyppaa, "Hyppää", pelaaja2, hyppyVoima);
-        Keyboard.Listen(Key.S, ButtonState.Pressed, iske2, "tiputa");
+        Keyboard.Listen(Key.S, ButtonState.Pressed, iske2, "hit");
         
-        Keyboard.Listen(Key.Enter, ButtonState.Pressed, seuraavaKentta , "Hyppää");
-
-
-        lisaaGamePadNappaimet(ControllerOne);
-    }
-
-    void lisaaGamePadNappaimet(GamePad controller)
-    {
-        controller.Listen(Button.Back, ButtonState.Pressed, Exit, "Poistu pelistä");
-
-        controller.Listen(Button.DPadLeft, ButtonState.Down, liikuta, "Pelaaja liikkuu vasemmalle", pelaaja1, -nopeus);
-        controller.Listen(Button.DPadRight, ButtonState.Down, liikuta, "Pelaaja liikkuu oikealle", pelaaja1, nopeus);
-        controller.Listen(Button.A, ButtonState.Pressed, hyppaa, "Pelaaja hyppää", pelaaja1, hyppyVoima);
+        Keyboard.Listen(Key.Enter, ButtonState.Pressed, seuraavaKentta , "restart");
     }
 
@@ -154 +146 @@
     {
         hahmo.Jump(voima);
+        PlaySound("power beam");
+       
+
     }
 
@@ -179 +174 @@
             isku1.Value +=RandomGen.NextInt(1,10);
             pelaaja2.Hit(new Vector(aba.X * isku1, aba.Y * isku1));
+            PlaySound("plzbmfire");
         }
 
@@ -190 +186 @@
             isku2.Value += RandomGen.NextInt(1, 10);
             pelaaja1.Hit(new Vector(aba.X * isku2, aba.Y * isku2));
+            PlaySound("icebfire");
         }
 
@@ -195 +192 @@
     void HeitaKranaatti(Timer sender)
     {
-      
-        Explosion rajahdys = new Explosion(RandomGen.NextDouble(10,50));
-        rajahdys.X = RandomGen.NextDouble(Level.Left, Level.Right);
-        rajahdys.Force = 500;
-        rajahdys.Y = RandomGen.NextDouble(Level.Left, Level.Right);
-        Add(rajahdys);
+        for (int i = 0; i < RandomGen.NextInt(1, 100); i++)
+        {
+
+
+            Grenade kranaatti = new Grenade(RandomGen.NextDouble(0.5,4));
+            kranaatti.X = RandomGen.NextDouble(Level.Left, Level.Right);
+            kranaatti.Y = Level.Top - 10;
+            kranaatti.FuseTime = TimeSpan.FromSeconds(RandomGen.NextDouble(0,3.0));
+            kranaatti.ExplosionForce = 2500;
+            kranaatti.ExplosionRadius = 50;
+            kranaatti.ExplosionSpeed = 100;
+
+            Add(kranaatti);
+            Vector heittoVoima = Vector.FromLengthAndAngle(RandomGen.NextDouble(5000, 10000), Angle.Degrees(RandomGen.NextDouble(180, 360)));
+            kranaatti.Hit(heittoVoima);
+        }
+
 
     }

2010/27/viaawipi/samsh cubes/kennta.txt

@@ -3 +3 @@
 
 
-      # #
-     #   #
-    #  #  #
+      ###
+  #         #
 
-  ##   #   ##
-      ###
-##   #####   ##
+    #######
+
+## ######### ##
+     #####