Changeset 967 for 2010/24/joaamaka

Timestamp:

2010-06-18 10:37:34 (11 years ago)

Author:

joaamaka

Message:

Jatkoin omaa peliäni.

Location:

2010/24/joaamaka/The hole

Files:

• Content/Content.contentproj (modified) (1 diff)
• Content/Spikes.png (modified) (previous)
• Content/loppu.png (modified) (previous)
• Content/nuoli.png (modified) (previous)
• Content/nuoli2.png (modified) (previous)
• Content/ohje.png (modified) (previous)
• Content/pisteet.png (added)
• Content/vtaso.png (modified) (previous)
• Content/vtaso2.png (modified) (previous)
• Content/vtaso3.png (modified) (previous)
• Content/warning.png (modified) (previous)
• Peli.cs (modified) (14 diffs)
• Spikes.png (modified) (previous)
• loppu.png (modified) (previous)
• nuoli.png (modified) (previous)
• nuoli2.png (modified) (previous)
• ohje.png (modified) (previous)
• pisteet.png (added)
• vtaso.png (modified) (previous)
• vtaso2.png (modified) (previous)
• vtaso3.png (modified) (previous)
• warning.png (modified) (previous)

2010/24/joaamaka/The hole/Content/Content.contentproj

@@ -93 +93 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="pisteet.png">
+      <Name>pisteet</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/24/joaamaka/The hole/Peli.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using Jypeli;
 using Jypeli.ScreenObjects;
@@ -17 +18 @@
     GameObject vaikea = new GameObject(300, 100);
     GameObject loppu = new GameObject(100, 100);
-
+    GameObject pisteet = new GameObject(300, 100);
+
+    List<PhysicsObject> lista;
     PlatformCharacter olio;
     Vector aloituspaikka;
@@ -40 +43 @@
         Mouse.IsCursorVisible = true;
 
-        seuraavaKentta();
+        //seuraavaKentta();
         MessageDisplay.Add("Hyppää kuiluun!");
     }
@@ -52 +55 @@
         Camera.StayInLevel = true;
         Camera.FollowedObject = null;
+        Camera.ZoomFactor = 1.0;
 
         helppo = new GameObject(300, 100);
@@ -62 +66 @@
         Mouse.ListenOn(vaikea, MouseButton.Left, ButtonState.Pressed, valitse, "", 2);
         Mouse.ListenOn(loppu, MouseButton.Left, ButtonState.Pressed, Exit, "");
+        Mouse.ListenOn(pisteet, MouseButton.Left, ButtonState.Pressed, piste, "");
 
         
@@ -68 +73 @@
         vaikea.Image = LoadImage("vtaso3");
         loppu.Image = LoadImage("loppu");
+        pisteet.Image = LoadImage("pisteet");
         
         helppo.X = 100;
@@ -75 +81 @@
         vaikea.X = 100;
         vaikea.Y = -200;
-        loppu.X = -200;
+        loppu.X = -400;
         loppu.Y = 200;
+        pisteet.X = -400;
+        pisteet.Y = 0;
         
         Add(helppo);
@@ -82 +90 @@
         Add(vaikea); 
         Add(loppu);
+        Add(pisteet);
         Level.Background.CreateGradient(Color.Gray, Color.White);
     }
@@ -106 +115 @@
         Mouse.Enabled = false;
         seuraavaKentta();
+    }
+
+    void piste()
+    {
+        ClearAll();
+        Mouse.Enabled = true;
+        Mouse.IsCursorVisible = true;
+        Camera.Position = new Vector(0, 0);
+        Camera.StayInLevel = true;
+        Camera.FollowedObject = null;
+        Camera.ZoomFactor = 1.0;
+
+        loppu = new GameObject(100, 100);
+        Mouse.ListenOn(loppu, MouseButton.Left, ButtonState.Pressed, Exit, "");
+        loppu.X = -200;
+        loppu.Y = 200;
+        loppu.Image = LoadImage("loppu");
+        Add(loppu);
+        Level.Background.CreateGradient(Color.Gray, Color.White);
+
     }
     
@@ -117 +146 @@
         lisaaNappaimet();
         Camera.Follow(olio);
+        
          
         Timer korkeusAjastin = new Timer(); 
@@ -128 +158 @@
     {
         Level.Background.CreateGradient(Color.Gray, Color.White);
-        
+        lista = new List<PhysicsObject>();
+
         TileMap ruudut = TileMap.FromFile("TextFile1.txt");
         ruudut['-'] = lisaaTaso;
@@ -199 +230 @@
     PhysicsObject lisaaPiikit()
     {
-        PhysicsObject piikit = new PhysicsObject(100, 30, Shapes.Rectangle);
+        PhysicsObject piikit = new PhysicsObject(100, 20, Shapes.Rectangle);
         piikit.Tag = "piikki";
         piikit.IgnoresGravity = true;
         piikit.IgnoresCollisionResponse = true;
-        piikit.X = 100;
-        piikit.Y = 50;
+        //piikit.X = 100;
+        //piikit.Y = 50;
         piikit.Image = LoadImage("Spikes");
         return piikit;
@@ -230 +261 @@
     PhysicsObject Arvonta()
     {
+        PhysicsObject listas;
+        
         int ruutu= RandomGen.NextInt(1, 3);
         if (ruutu == 1)
         {
-            return lisaaPiikit();
-        }
-        if (ruutu == 2)
-        {
-            return lisaaTaso();
+            listas= lisaaPiikit();
+        }
+        else if (ruutu == 2)
+        {
+            listas= lisaaTaso();
         }
         else
@@ -244 +277 @@
             tyhja.IgnoresCollisionResponse = true;
             tyhja.IsVisible = false;
-            return tyhja;
-        }
-    }
-
+            tyhja.Tag = "tyhja";
+            listas= tyhja;
+        }
+        lista.Add(listas);
+        tarkistus();
+        return listas;
+    }
+
+    void tarkistus()
+    {
+        if (lista.Count == 7)
+        {
+            for (int i = 0; i < lista.Count; i++)
+            {
+                if (lista[i].Tag.ToString() == "tyhja")
+                {
+                    lista.Clear();
+                    return;
+                }
+                else if (i == 6)
+                {
+                    lista[RandomGen.NextInt(0, 6)].Destroy() ;
+                    lista.Clear();
+                }
+            }
+        }
+        else return;
+    }
 
     PhysicsObject lisaaNuoli()