Changeset 656 for 2010/23

Timestamp:

2010-06-10 11:41:46 (11 years ago)

Author:

lasakauh

Message:

 

Location:

2010/23/lasakauh/Testi

Files:

• Content/Content.contentproj (modified) (1 diff)
• Content/a4.png (modified) (previous)
• Content/b1.png (added)
• Content/b2.png (added)
• Content/b3.png (added)
• Content/b4.png (added)
• Content/ninja2.png (modified) (previous)
• Content/ninja_l.png (added)
• Content/taso_maa.png (modified) (previous)
• Peli.cs (modified) (9 diffs)

2010/23/lasakauh/Testi/Content/Content.contentproj

@@ -109 +109 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="b1.png">
+      <Name>b1</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="b2.png">
+      <Name>b2</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="b3.png">
+      <Name>b3</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="b4.png">
+      <Name>b4</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</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/23/lasakauh/Testi/Peli.cs

@@ -16 +16 @@
         PlatformCharacter p1;
         PlatformCharacter p2;
-        int hp1 = 100;
-        int hp2 = 100;
+        //int hp1 = 100;
+        //int hp2 = 100;
         
 
@@ -43 +43 @@
             lisaap2();
             hpbar1();
+            lisaaTaso(0, -154);
             hpbar2();
             hpp1(145,100);
@@ -50 +51 @@
         void lisaaMaaTaso(double x, double y)
         {
-            PhysicsObject taso = PhysicsObject.CreateStaticObject(302, 5);
+            PhysicsObject taso = PhysicsObject.CreateStaticObject(302, 30);
             taso.Image = LoadImage("taso_maa");
             taso.X = x;
@@ -68 +69 @@
         void lisaaTaso(double x, double y)
         {
-            PhysicsObject taso = PhysicsObject.CreateStaticObject(30, 10);
+            PhysicsObject taso = PhysicsObject.CreateStaticObject(300, 1);
             taso.Image = LoadImage("taso_vaakaseina");
             taso.X = x;
             taso.Y = y;
+            AddCollisionHandler(taso,Tuhous);
             Add(taso);
         }
 
+        void Tuhous(PhysicsObject taso, PhysicsObject kohde)
+        {
+            kohde.Destroy();
+            MessageDisplay.Add("Pelaaja tuhoutui");
+        }
         void lisaaPelaajat()
         {
@@ -108 +115 @@
             Keyboard.Listen(Key.D, ButtonState.Down, liikutaEteen, "Liikkuu oikealle", p1,nopeusEteen);
             Keyboard.Listen(Key.W, ButtonState.Pressed, hyppaa, "Hyppää", p1, hyppyVoima);
+            Keyboard.Listen(Key.S, ButtonState.Pressed, iske,"iskee");
+            Keyboard.Listen(Key.S, ButtonState.Released, lp_isku, "lopettaaiskun");
 
             Keyboard.Listen(Key.Left, ButtonState.Down, liikutaTaakse, "Liikkuu vasemmalle", p2, nopeusTaakse);
             Keyboard.Listen(Key.Right, ButtonState.Down, liikutaEteen, "Liikkuu oikealle", p2, nopeusEteen);
             Keyboard.Listen(Key.Up, ButtonState.Pressed, hyppaa, "Hyppää", p2, hyppyVoima);
-            Keyboard.Listen(Key.NumPad0, ButtonState.Pressed, iske,"iske"); 
-
-            lisaaGamePadNappaimet(ControllerOne, p1);
-            lisaaGamePadNappaimet(ControllerTwo, p2);
-        }
-
-        void lisaaGamePadNappaimet(GamePad controller, PlatformCharacter hahmo)
+            Keyboard.Listen(Key.Down, ButtonState.Pressed, iske2, "iskee");
+            Keyboard.Listen(Key.Down, ButtonState.Released, lp_isku2, "lopettaa iskun");
+            
+
+            lisaaGamePadNappaimet(ControllerOne, p1, iske, lp_isku);
+            lisaaGamePadNappaimet(ControllerTwo, p2, iske2, lp_isku2);
+        }
+
+        void lisaaGamePadNappaimet(GamePad controller, PlatformCharacter hahmo, Handler ikse,Handler end)
         {
             controller.Listen(Button.Back, ButtonState.Pressed, Exit, "Poistu pelistä");
@@ -124 +135 @@
             controller.Listen(Button.DPadRight, ButtonState.Down, liikutaEteen, "Pelaaja liikkuu oikealle", hahmo, nopeusEteen);
             controller.Listen(Button.A, ButtonState.Pressed, hyppaa, "Pelaaja hyppää", hahmo, hyppyVoima);
-            Vector tatinAsento = ControllerOne.LeftThumbDirection;
-        }
+            controller.Listen(Button.B, ButtonState.Pressed, ikse, "iskee");
+            controller.Listen(Button.B, ButtonState.Released, end, "lopettaa iskun");
+            }
 
         void liikutaEteen(PlatformCharacter hahmo, double nopeus)
@@ -135 +147 @@
         {
             hahmo.Walk(-nopeus);
+            
+            
         }
 
@@ -141 +155 @@
             hahmo.Jump(voima);
         }
+
         void hpbar1()
         {
@@ -182 +197 @@
             }
         }
+
         void iske()
         {
-            Vector isku = new Vector(kohde.Position.X + 5, kohde.Position.Y + 5);
-            kohde.Hit(isku);
-            Image[] iskuKuvat = LoadImages("a1", "a2", "a3", "a4");
+            Image[]iskuKuvat = LoadImages("a1", "a2", "a3", "a4");
             p1.Animation = new Animation(iskuKuvat);
-            p1.Animation.Start;
-                hp2 =-10;
-                for (int i = 1; i < 102 - hp1; i++)
-                {
-                    PhysicsObject hpp1 = PhysicsObject.CreateStaticObject(1, 8.5);
-                    hpp1.Shape = Shapes.Rectangle;
-                    hpp1.Color = Color.Green;
-                    hpp1.X = -146 + i;
-                    hpp1.Y = 144.8;
-                    Add(hpp1);
-                }
-            }
-        }
-
+            p1.Animation.Start();
+            p1.Animation.FPS = 20;
+        }
+
+        void iske2()
+        {
+            Image[]p2Kuvat = LoadImages("b1", "b2", "b3", "b4");
+            p2.Animation = new Animation(p2Kuvat);
+            p2.Animation.Start();
+            p2.Animation.FPS = 20;
+        }
+
+        void lp_isku()
+        {
+            p1.Image = LoadImage("ninja");
+        }
+
+        void lp_isku2()
+        {
+            p2.Image = LoadImage("ninja2");
+        }
     }
 }