Changeset 1824 for 2011

Timestamp:

2011-06-09 15:55:09 (9 years ago)

Author:

iltakuop

Message:

 

Location:

2011/23/iltakuop/Blocks/Blocks

Files:

• Blocks/Peli.cs (modified) (8 diffs)
• Blocks/kentta1.txt (modified) (1 diff)
• BlocksContent/BlocksContent.contentproj (modified) (2 diffs)
• BlocksContent/Bonus - Piste1k.png (deleted)
• BlocksContent/Bonus - Piste4k.png (deleted)
• BlocksContent/Bonus - Piste5k.png (deleted)
• BlocksContent/Power1.png (modified) (previous)
• BlocksContent/Power2.png (modified) (previous)
• BlocksContent/Power3.png (added)
• BlocksContent/Power4.png (added)
• BlocksContent/Power5.png (added)
• BlocksContent/Power6.png (added)
• BlocksContent/Power7.png (added)

2011/23/iltakuop/Blocks/Blocks/Blocks/Peli.cs

@@ -37 +37 @@
     PhysicsObject tnt;
     PhysicsObject elämä;
-    PhysicsObject Power1;
-    PhysicsObject Power2;
 
     PhysicsObject alaReuna;
@@ -59 +57 @@
     Image mailanKuva = LoadImage("Maila");
     Image elämänKuva = LoadImage("elämä");
-    Image Power2Kuva = LoadImage("Power2");
-    Image Power1Kuva = LoadImage("Power1");
+
+    List<Image> kuvat = new List<Image>();
     int pisteet;
     int elämät = 3;
@@ -80 +78 @@
     public override void Begin()
     {
+        for (int i = 1; i < 8; i++)
+        {
+            kuvat.Add(LoadImage("Power" + i));
+        }
+
         Valikko();
     }
@@ -448 +451 @@
         }
 
-        if (kohde.Tag.ToString() == "ttaso" && pallo.Velocity.X == 0)
-        {
-              pallo.Velocity = new Vector(100, pallo.Velocity.Y);
+        if (kohde.Tag.ToString() == "ttaso" && pallo.Velocity.X < 10)
+        {
+            Timer.SingleShot(0.05, korjaaXSuunta);
 
         }
         if (kohde != maila && pallo.Velocity.Y == 0 && ySuuntaKorjattu == 0)
         {
-            Timer.SingleShot(0.1, korjaaYSuunta);
+            Timer.SingleShot(0.05, korjaaYSuunta);
             ySuuntaKorjattu = 1;
         }
@@ -462 +465 @@
         elämätL.Value = elämät;
 
+    }
+
+    void korjaaXSuunta()
+    {
+        if (pallo.Velocity.X == 0) pallo.Velocity = new Vector(100, pallo.Velocity.Y);
     }
 
@@ -484 +492 @@
         else if ((Power > 4)&&(Power < 10))
         {
-            PudotaPower1(kohde);
-        }
-        else if ((Power > 9) && (Power < 15))
-        {
-            PudotaPower2(kohde);
+            PudotaPower(kohde, 1);
+        }
+        else if ((Power > 9) && (Power < 14))
+        {
+            PudotaPower(kohde, 2);
+        }
+        else if ((Power > 13) && (Power < 17))
+        {
+            PudotaPower(kohde, 3);
+        }
+        else if ((Power > 16) && (Power < 19))
+        {
+            PudotaPower(kohde, 4);
+        }
+        else if ((Power > 18) && (Power < 20))
+        {
+            PudotaPower(kohde, 5);
         }
     }
@@ -504 +524 @@
     }
 
-    void PudotaPower1(PhysicsObject kohde)
-    {
-        Power1 = new PhysicsObject(10, 10);
-        Power1.IgnoresCollisionResponse = true;
-        Power1.Tag = "Power1";
-        Power1.Position = kohde.Position;
-        Power1.Image = Power1Kuva;
+    void PudotaPower(PhysicsObject kohde, int x)
+    {
+        int y = x;
+        y--;
+        PhysicsObject Power = new PhysicsObject(10, 10);
+        Power.IgnoresCollisionResponse = true;
+        Power.Tag = "Power" + x;
+        Power.Position = kohde.Position;
+        Power.Image = kuvat[y];
         Vector impulssi = new Vector(0, -100);
-        Add(Power1);
-        Power1.Hit(impulssi);
-    }
-
-
-    void PudotaPower2(PhysicsObject kohde)
-    {
-        Power2 = new PhysicsObject(10, 10);
-        Power2.IgnoresCollisionResponse = true;
-        Power2.Tag = "Power2";
-        Power2.Position = kohde.Position;
-        Power2.Image = Power2Kuva;
-        Vector impulssi = new Vector(0, -100);
-        Add(Power2);
-        Power2.Hit(impulssi);
-    }
+        Add(Power);
+        Power.Hit(impulssi);
+    }
+
+
 
     void TarkistaVoitto()
@@ -799 +810 @@
             kohde.Destroy();
         }
-        else if (kohde.Tag.ToString() == "Power1")
-        {
+        //else if (kohde.Tag.ToString() == "Power1")
+        //{
             
-            if (pieniMaila == 1)
-            {
-                PalautaMaila();
-            }
-            else if (isoMaila == 0)
-            {
-                maila.Width += 20;
-                isoMaila = 1;
-                Timer.SingleShot(20, PalautaMaila);
-            }
+        //    if (pieniMaila == 1)
+        //    {
+        //        PalautaMaila();
+        //    }
+        //    else if (isoMaila == 0)
+        //    {
+        //        maila.Width += 20;
+        //        isoMaila = 1;
+        //        Timer.SingleShot(20, PalautaMaila);
+        //    }
             
-            kohde.Destroy();
-        }
-        else if (kohde.Tag.ToString() == "Power2")
-        {
-            if (isoMaila == 1)
-            {
-                PalautaMaila();
-            }
-            else if (pieniMaila == 0)
+        //    kohde.Destroy();
+        //}
+        //else if (kohde.Tag.ToString() == "Power2")
+        //{
+        //    if (isoMaila == 1)
+        //    {
+        //        PalautaMaila();
+        //    }
+        //    else if (pieniMaila == 0)
+        //    {
+        //        kohde.Destroy();
+        //        pieniMaila = 1;
+        //        maila.Width -= 20;
+        //        Timer.SingleShot(20, PalautaMaila);
+        //    }
+            
+
+        //}
+
+        for (int i = 1; i < 6; i++)
+        {
+            if (kohde.Tag.ToString() == "Power" + i)
             {
                 kohde.Destroy();
-                pieniMaila = 1;
-                maila.Width -= 20;
-                Timer.SingleShot(20, PalautaMaila);
-            }
-            
-        }
+                pisteet += i * 1000;
+            }
+        
+        }
+
+        pisteetL.Value = pisteet;
+        pisteetL.Value = pisteet;
     }
 

2011/23/iltakuop/Blocks/Blocks/Blocks/kentta1.txt

@@ -11 +11 @@
 -                           -
 
-
+  
 
 

2011/23/iltakuop/Blocks/Blocks/BlocksContent/BlocksContent.contentproj

@@ -149 +149 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Power6.png">
+      <Name>Power6</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Power7.png">
+      <Name>Power7</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Power2.png">
+      <Name>Power2</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Power3.png">
+      <Name>Power3</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="Power1.png">
       <Name>Power1</Name>
@@ -156 +184 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Power2.png">
-      <Name>Power2</Name>
+    <Compile Include="Power4.png">
+      <Name>Power4</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Power5.png">
+      <Name>Power5</Name>
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>