Changeset 736

Timestamp:

2010-06-11 11:29:27 (9 years ago)

Author:

lasakauh

Message:

 

Location:

2010/23/lasakauh/Testi

Files:

• Content/Content.contentproj (modified) (1 diff)
• Content/maali.wav (deleted)
• Peli.cs (modified) (10 diffs)

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

@@ -19 +19 @@
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="maali.wav">
-      <Name>maali</Name>
-      <Importer>WavImporter</Importer>
-      <Processor>SoundEffectProcessor</Processor>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.AudioImporters, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.EffectImporter, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />

2010/23/lasakauh/Testi/Peli.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;  
 using Jypeli;
 using Jypeli.ScreenObjects;
@@ -17 +18 @@
         PlatformCharacter p2;
 
-        int hp1 = 102;
-        int hp2 = 102;
+        int hp1 = 502;
+        int hp2 = 502;
+
+        Stack<PhysicsObject> hiparit = new Stack<PhysicsObject>();
+        Stack<PhysicsObject> hiparit1 = new Stack<PhysicsObject>();
         
 
@@ -56 +60 @@
             hpbar1();
             lisaaTaso(0, -154);
+            lisaaSeina(Level.Left -1, Tuhousr);
+            lisaaSeina(Level.Right +1, Tuhousl);
             hpbar2();
             hpp1(145,100);
@@ -70 +76 @@
         }
 
-        void lisaaSeina(double x,double y)
-        {
-            PhysicsObject taso = PhysicsObject.CreateStaticObject(10, 30);
-            taso.Image = LoadImage("taso_pystyseina");
+        void lisaaSeina(double x, CollisionHandler handi)
+        {
+            PhysicsObject taso = PhysicsObject.CreateStaticObject(2, 300);
             taso.X = x;
-            taso.Y = y;
+            taso.Y = 0;
+            AddCollisionHandler(taso ,handi);
             Add(taso);
         }
@@ -85 +91 @@
             taso.X = x;
             taso.Y = y;
-            AddCollisionHandler(taso,Tuhous);
+            AddCollisionHandler(taso,Tuhousu);
             Add(taso);
         }
 
-        void Tuhous(PhysicsObject taso, PhysicsObject kohde)
-        {
-            kohde.Destroy();
-            MessageDisplay.Add("Pelaaja tuhoutui");
+        void Tuhousr(PhysicsObject taso, PhysicsObject kohde)
+        {
+            kohde.X = 140;
+        }
+        void Tuhousl(PhysicsObject taso, PhysicsObject kohde)
+        {
+            kohde.X = -140;
+        }
+        void Tuhousu(PhysicsObject taso, PhysicsObject kohde)
+        {
+            kohde.Y = 140;
         }
         void lisaaPelaajat()
@@ -131 +144 @@
             Keyboard.Listen(Key.D, ButtonState.Down, liikutaEteenp1, "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.Down, iske,"iskee");
             Keyboard.Listen(Key.S, ButtonState.Released, lp_isku, "lopettaaiskun");
 
@@ -137 +150 @@
             Keyboard.Listen(Key.Right, ButtonState.Down, liikutaEteenp2, "Liikkuu oikealle", p2, nopeusEteen);
             Keyboard.Listen(Key.Up, ButtonState.Pressed, hyppaa, "Hyppää", p2, hyppyVoima);
-            Keyboard.Listen(Key.Down, ButtonState.Pressed, iske2, "iskee");
+            Keyboard.Listen(Key.Down, ButtonState.Down, iske2, "iskee");
             Keyboard.Listen(Key.Down, ButtonState.Released, lp_isku2, "lopettaa iskun");
             
@@ -194 +207 @@
         void hpp1(double x, double hp1)
         {
-            for (int i = 1; i < hp1; i++)
-            {
+            for (int i = 1; i < hp1; i++) 
+            {
+                
                 PhysicsObject hpp1 = PhysicsObject.CreateStaticObject(1, 8.5);
                 hpp1.Shape = Shapes.Rectangle;
                 hpp1.Color = Color.Green;
-                hpp1.X = -146+i;
+                hpp1.X = -146 + i;
                 hpp1.Y = 144.8;
                 Add(hpp1);
-                
+                hiparit.Push(hpp1);
+                 
             }
         }
@@ -215 +230 @@
                 hpp2.Y = 144.8;
                 Add(hpp2);
-            }
+                hiparit1.Push(hpp2);
+            }
+
         }
 
@@ -234 +251 @@
                 p1.Animation.FPS = 20;
             }
-            hp2 = hp2 - 10;         
-        }
-
-        void iske2()    
-        {
+            for (int i = 0; i < 5; i++)
+            {
+                if (hiparit1.Count != 0)
+                {
+                    hiparit1.Pop().Destroy();
+                }
+                if (hiparit1.Count == 0)
+                {
+                    p2.Destroy();
+                    MessageDisplay.Add("Pelaaja 1 voitti");
+                    ClearAll();
+                    Begin();
+                }
+            }         
+        }
+
+        void iske2()
+        {
+            if (Vector.Distance(p1.Position, p2.Position) == 10)
+            {
+
+                if (p2.FacingDirection == Direction.Left)
+                {
+                    Image[] p2Kuvat = LoadImages("b1", "b2", "b3", "b4");
+                    p2.Animation = new Animation(p2Kuvat);
+                    p2.Animation.Start();
+                    p2.Animation.FPS = 20;
+                    hp1 = hp1 - 10;
+
+                }
+                if (p2.FacingDirection == Direction.Right)
+                {
+                    Image[] p22Kuvat = LoadImages("b1_l", "b2_l", "b3_l", "b4_l");
+                    p2.Animation = new Animation(p22Kuvat);
+                    p2.Animation.Start();
+                    p2.Animation.FPS = 20;
+                    hp1 = hp1 - 10;
+
+
+                }
+                for (int i = 0; i < 5; i++)
+                {
+                    if (hiparit.Count != 0)
+                    {
+                        hiparit.Pop().Destroy();
+                    }
+                    if (hiparit.Count == 0)
+                    {
+                        p1.Destroy();
+                        MessageDisplay.Add("Pelaaja 2 voitti");
+                        ClearAll();
+                        Begin();
+                    }
+                }
+            }
+        }
+        
+
+        void lp_isku()
+        {
+            if (p1.FacingDirection == Direction.Right)
+            {
+                p1.Image = LoadImage("ninja");
+            }
+            if (p1.FacingDirection == Direction.Left)
+            {
+                p1.Image = LoadImage("ninja_l");
+            }
+        }
+
+        void lp_isku2()
+        {
+
             if (p2.FacingDirection == Direction.Left)
             {
-                Image[] p2Kuvat = LoadImages("b1", "b2", "b3", "b4");
-                p2.Animation = new Animation(p2Kuvat);
-                p2.Animation.Start();
-                p2.Animation.FPS = 20;
-                hp1 = hp1 - 10;
+                p2.Image = LoadImage("ninja2");
             }
             if (p2.FacingDirection == Direction.Right)
             {
-                Image[] p22Kuvat = LoadImages("b1_l", "b2_l", "b3_l", "b4_l");
-                p2.Animation = new Animation(p22Kuvat);
-                p2.Animation.Start();
-                p2.Animation.FPS = 20;
-                hp1 = hp1 - 10;
-            }
-        }
-
-        void lp_isku()
-        {
-            if (p1.FacingDirection == Direction.Right)
-            {
-                p1.Image = LoadImage("ninja");
-            }
-            if (p1.FacingDirection == Direction.Left)
-            {
-                p1.Image = LoadImage("ninja_l");
-            }
-        }
-
-        void lp_isku2()
-        {
-            if (p2.FacingDirection == Direction.Left)
-            {
-                p2.Image = LoadImage("ninja2");
-            }
-            if (p2.FacingDirection == Direction.Right)
-            {
                 p2.Image = LoadImage("ninja2_l");
             }
+           
         }
     }