Changeset 749

Timestamp:

2010-06-11 13:06:59 (11 years ago)

Author:

lasakauh

Message:

 

Location:

2010/23/lasakauh/Testi

Files:

• Content/Content.contentproj (modified) (1 diff)
• Content/bg_m.mp3 (added)
• Peli.cs (modified) (12 diffs)

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

@@ -228 +228 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="bg_m.mp3">
+      <Name>bg_m</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</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

@@ -13 +13 @@
         const double nopeusTaakse = 100;
         const double hyppyVoima = 4000;
-        const double isku = 10;
 
         PlatformCharacter p1;
         PlatformCharacter p2;
 
-        int hp1 = 502;
-        int hp2 = 502;
+        int hp1 = 102;
+        int hp2 = 102;
 
         Stack<PhysicsObject> hiparit = new Stack<PhysicsObject>();
@@ -32 +31 @@
             Camera.StayInLevel = true;
             Gravity = new Vector(0, -1000);
-
+            StartNewRound();
+
+         
+        }
+
+        void StartNewRound()
+        {
             luoKentta();
             lisaaNappaimet();
             voitto(p1, p2);
             voitto(p2, p1);
-
-            
-         
-        }
-
+            MediaPlayer.Play("bg_m");
+        }
+        
         void voitto(PlatformCharacter hahmo, PlatformCharacter voittaja)
         {
@@ -63 +66 @@
             lisaaSeina(Level.Right +1, Tuhousl);
             hpbar2();
-            hpp1(145,100);
-            hpp2(-145, 100);
+            hpp1(145);
+            hpp2(-145);
         }
 
@@ -114 +117 @@
             p1.X = -140;
             p1.Y = Level.Bottom + 100;
-            Add(p1);
-            if (hp1 < 0) { 
-                        p1.Destroy();
-                        MessageDisplay.Add("Pelaaja 2 voitti");
-                        };
-            
+            Add(p1);   
         }
 
@@ -130 +128 @@
             p2.Y = Level.Bottom + 100;
             Add(p2);
-            if (hp2 < 0) {
-                p2.Destroy();  
-            };
-            
         }
 
@@ -140 +134 @@
             Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
             Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Poistu pelistä");
+            Keyboard.Listen(Key.M, ButtonState.Pressed, MediaPlayer.Pause, "Keskeyttää musiikin");
 
             Keyboard.Listen(Key.A, ButtonState.Down, liikutaTaakse, "Liikkuu vasemmalle", p1,nopeusTaakse);
             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.Down, iske,"iskee");
+            Keyboard.Listen(Key.S, ButtonState.Pressed, iske,"iskee");
             Keyboard.Listen(Key.S, ButtonState.Released, lp_isku, "lopettaaiskun");
 
@@ -150 +145 @@
             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.Down, iske2, "iskee");
+            Keyboard.Listen(Key.Down, ButtonState.Pressed, iske2, "iskee");
             Keyboard.Listen(Key.Down, ButtonState.Released, lp_isku2, "lopettaa iskun");
-            
-        }
-
+
+            lisaaOhjaimet();
+        }
+
+        void lisaaOhjaimet()
+        {
+            ControllerOne.Listen(Button.DPadLeft, ButtonState.Down, liikutaTaakse, "Liikkuu vasemmalle", p1, nopeusTaakse);
+            ControllerOne.Listen(Button.DPadRight, ButtonState.Down, liikutaEteenp1, "Liikkuu oikealle", p1, nopeusEteen);
+            ControllerOne.Listen(Key.A, ButtonState.Pressed, hyppaa, "Hyppää", p1, hyppyVoima);
+            ControllerOne.Listen(Key.B, ButtonState.Pressed, iske, "iskee");
+            ControllerOne.Listen(Key.B, ButtonState.Released, lp_isku, "lopettaaiskun");
+
+
+            ControllerOne.Listen(Button.DPadLeft, ButtonState.Down, liikutaTaakse, "Liikkuu vasemmalle", p2, nopeusTaakse);
+            ControllerOne.Listen(Button.DPadRight, ButtonState.Down, liikutaEteenp2, "Liikkuu oikealle", p2, nopeusEteen);
+            ControllerOne.Listen(Key.A, ButtonState.Pressed, hyppaa, "Hyppää", p2, hyppyVoima);
+            ControllerOne.Listen(Key.B, ButtonState.Pressed, iske2, "iskee");
+            ControllerOne.Listen(Key.B, ButtonState.Released, lp_isku2, "lopettaaiskun");
+
+        }
       
         void liikutaEteenp1(PlatformCharacter hahmo, double nopeus)
@@ -205 +217 @@
             Add(hpbar2);
         }
-        void hpp1(double x, double hp1)
+        void hpp1(double x)
         {
             for (int i = 1; i < hp1; i++) 
@@ -217 +229 @@
                 Add(hpp1);
                 hiparit.Push(hpp1);
-                 
-            }
-        }
-        void hpp2(double x, double hp2)
+                hp1 = 102;
+            }
+        }
+        void hpp2(double x)
         {
             for (int i = 1; i < hp2; i++)
@@ -251 +263 @@
                 p1.Animation.FPS = 20;
             }
-            for (int i = 0; i < 5; i++)
-            {
-                if (hiparit1.Count != 0)
-                {
-                    hiparit1.Pop().Destroy();
+            if (Vector.Distance(p1.Position, p2.Position) < 20)
+            {
+                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();
+                        hp2 = 102;
+                    }
                 }
-                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)
+           if (p2.FacingDirection == Direction.Left)
                 {
                     Image[] p2Kuvat = LoadImages("b1", "b2", "b3", "b4");
@@ -278 +291 @@
                     p2.Animation.Start();
                     p2.Animation.FPS = 20;
-                    hp1 = hp1 - 10;
 
                 }
-                if (p2.FacingDirection == Direction.Right)
+            if (p2.FacingDirection == Direction.Right)
                 {
                     Image[] p22Kuvat = LoadImages("b1_l", "b2_l", "b3_l", "b4_l");
@@ -287 +299 @@
                     p2.Animation.Start();
                     p2.Animation.FPS = 20;
-                    hp1 = hp1 - 10;
-
-
                 }
+            if (Vector.Distance(p2.Position, p1.Position) < 20)
+                {
                 for (int i = 0; i < 5; i++)
                 {