Changeset 2567

Timestamp:

2011-08-05 09:10:27 (11 years ago)

Author:

eskuniem

Message:

 

Location:

2011/31/EsaN/DevOid

Files:

• DevOid.suo (modified) (previous)
• DevOid/DevOid/DevOid.csproj.Debug.cachefile (modified) (1 diff)
• DevOid/DevOid/Peli.cs (modified) (14 diffs)
• DevOid/DevOid/bin/x86/Debug/DevOid.exe (modified) (previous)
• DevOid/DevOid/bin/x86/Debug/DevOid.pdb (modified) (previous)
• DevOid/DevOid/obj/x86/Debug/DevOid.csproj.FileListAbsolute.txt (modified) (1 diff)
• DevOid/DevOid/obj/x86/Debug/DevOid.exe (modified) (previous)
• DevOid/DevOid/obj/x86/Debug/DevOid.pdb (modified) (previous)
• DevOid/DevOid/obj/x86/Debug/cachefile-{14B54A56-7075-4480-92EA-C8481771F4DD}-targetpath.txt (modified) (1 diff)
• DevOid/DevOidContent/DevOidContent.contentproj (modified) (1 diff)
• DevOid/DevOidContent/obj/x86/Debug/ContentPipeline.xml (modified) (1 diff)

2011/31/EsaN/DevOid/DevOid/DevOid/DevOid.csproj.Debug.cachefile

@@ -10 +10 @@
 Content\hiirip.xnb
 Content\hiiris.xnb
+Content\punaisenvalintak.xnb
+Content\sinisenvalintak.xnb

2011/31/EsaN/DevOid/DevOid/DevOid/Peli.cs

@@ -9 +9 @@
 public class Peli : PhysicsGame
 {
+    PhysicsObject alus;
+
+    GameObject punaisenvalinta;
+    GameObject sinisenvalinta;
+
+    PhysicsObject bbase;
+    PhysicsObject rbase;
+    PhysicsObject pbase;
+    PhysicsObject pbase2;
+    PhysicsObject pbase3;
+    PhysicsObject pbase4;
+
     Widget hiiris;
     Widget hiirip;
+
     Label maara1;
     Label maara2;
@@ -17 +30 @@
     Label maara5;
     Label maara6;
+
     int aluksia1;
     int aluksia2;
@@ -24 +38 @@
     int aluksia6;
 
+    double perusnopeus1;
+    double perusnopeus2;
+    double perusnopeus3;
+    double perusnopeus4;
+    double perusnopeus5;
+    double perusnopeus6;
+
+    List<GameObject> baset = new List<GameObject>();
+
+    List<Label> maarat = new List<Label>();
+
 
     public override void Begin()
@@ -34 +59 @@
 
         LuoMeri();
+
+
         LuoSaari2(700, 700, -385, 200, -45);
         LuoSaari1(700, 700, -100, -250, 0);
@@ -39 +66 @@
         LuoSaari3(700, 700, 287, 250, 0);
         LuoSaari4(700, 700, 200, -100, 0);
-        LuoBBase(50, 50, 200, -150, 0, 1);
-        LuoRBase(50, 50, -200, 200, 0, 2);
-        LuoPBase(30, 30, 200, 100, 0, 3);
-        LuoPBase(50, 50, -100, -250, 0, 4);
-        LuoPBase(40, 40, 425, 200, 0, 5);
-        LuoPBase(35, 35, -375, 0, 0, 6);
+
+
+        LuobBase(50, 50, 200, -150, 0, 1);
+        LuorBase(50, 50, -200, 200, 0, 2);
+        LuopBase1(30, 30, 200, 100, 0, 3);
+        LuopBase2(50, 50, -100, -250, 0, 4);
+        LuopBase3(40, 40, 425, 200, 0, 5);
+        LuopBase4(35, 35, -375, 0, 0, 6);
+
+
         LuoHiiri1(50, 50, -400, 350, 0);
         LuoHiiri2(50, 50, 400, -350, 0);
@@ -54 +85 @@
         //tukikohtien tekstit ja ajastimet
 
-    LuoAjastin1(1, 0, 200, -150);
-    LuoAjastin2(1, 0, -200, 200);
-    LuoAjastin3(1, 0, 200, 100);
-    LuoAjastin4(1, 0, -100, -250);
-    LuoAjastin5(1, 0, 425, 200);
-    LuoAjastin6(1, 0, 0, 0);
-
-    Keyboard.Listen(Key.Left, ButtonState.Down,
-LiikutaRastia1, null, new Vector(-2, 0));
-    Keyboard.Listen(Key.Right, ButtonState.Down,
-    LiikutaRastia1, null, new Vector(2, 0));
-    Keyboard.Listen(Key.Up, ButtonState.Down,
-    LiikutaRastia1, null, new Vector(0, 2));
-    Keyboard.Listen(Key.Down, ButtonState.Down,
-    LiikutaRastia1, null, new Vector(0, -2));
-
-
-    //pelaaja 2
-
-    Keyboard.Listen(Key.A, ButtonState.Down,
-    LiikutaRastia2, null, new Vector(-2, 0));
-    Keyboard.Listen(Key.D, ButtonState.Down,
-    LiikutaRastia2, null, new Vector(2, 0));
-    Keyboard.Listen(Key.W, ButtonState.Down,
-    LiikutaRastia2, null, new Vector(0, 2));
-    Keyboard.Listen(Key.S, ButtonState.Down,
-    LiikutaRastia2, null, new Vector(0, -2));
+        LuoAjastin1(1, 0, 270, -204);
+        LuoAjastin2(1, 0, -270, 268);
+        LuoAjastin3(1, 0, 270, 132);
+        LuoAjastin4(1, 0, -133, -339);
+        LuoAjastin5(1, 0, 575, 268);
+        LuoAjastin6(1, 0, -507, -3);
+
+        //pelaaja 1
+
+        Keyboard.Listen(Key.Left, ButtonState.Down,
+        LiikutaRastia1, null, new Vector(-2, 0));
+        Keyboard.Listen(Key.Right, ButtonState.Down,
+        LiikutaRastia1, null, new Vector(2, 0));
+        Keyboard.Listen(Key.Up, ButtonState.Down,
+        LiikutaRastia1, null, new Vector(0, 2));
+        Keyboard.Listen(Key.Down, ButtonState.Down,
+        LiikutaRastia1, null, new Vector(0, -2));
+        Keyboard.Listen(Key.NumPad0, ButtonState.Pressed, ValitseBase, "");
+
+
+
+        //pelaaja 2
+
+        Keyboard.Listen(Key.A, ButtonState.Down,
+        LiikutaRastia2, null, new Vector(-2, 0));
+        Keyboard.Listen(Key.D, ButtonState.Down,
+        LiikutaRastia2, null, new Vector(2, 0));
+        Keyboard.Listen(Key.W, ButtonState.Down,
+        LiikutaRastia2, null, new Vector(0, 2));
+        Keyboard.Listen(Key.S, ButtonState.Down,
+        LiikutaRastia2, null, new Vector(0, -2));
+        Keyboard.Listen(Key.Space, ButtonState.Pressed, sinisenbasevalinta, "");
 
 
@@ -152 +188 @@
     }
 
-    void LuoBBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
+    void LuobBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
     {
     
         Image bbasek = LoadImage("bluebase");
-        PhysicsObject bluebase = new PhysicsObject(leveys, korkeus);
+        bbase = new PhysicsObject(leveys, korkeus);
+        baset.Add(bbase);
         PhysicsObject.CreateStaticObject(leveys, korkeus);
-        bluebase.X = x;
-        bluebase.Y = y;
-        bluebase.Angle = Angle.FromDegrees(rotation);
-        bluebase.Image = bbasek;
-        Add (bluebase);
-
-    }
-
-    void LuoRBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
+        bbase.X = x;
+        bbase.Y = y;
+        bbase.Angle = Angle.FromDegrees(rotation);
+        bbase.Image = bbasek;
+        Add (bbase);
+
+    }
+
+    void LuorBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
     {
 
         Image rbasek = LoadImage("redbase");
-        PhysicsObject redbase = new PhysicsObject(leveys, korkeus);
+        rbase = new PhysicsObject(leveys, korkeus);
+        baset.Add(rbase);
         PhysicsObject.CreateStaticObject(leveys, korkeus);
-        redbase.X = x;
-        redbase.Y = y;
-        redbase.Angle = Angle.FromDegrees(rotation);
-        redbase.Image = rbasek;
-        Add(redbase);
-
-    }
-
-    void LuoPBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
+        rbase.X = x;
+        rbase.Y = y;
+        rbase.Angle = Angle.FromDegrees(rotation);
+        rbase.Image = rbasek;
+        Add(rbase);
+
+    }
+
+    void LuopBase1(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
     {
 
         Image pbasek = LoadImage("plainbase");
-        PhysicsObject plainbase = new PhysicsObject(leveys, korkeus);
+        pbase = new PhysicsObject(leveys, korkeus);
+        baset.Add(pbase);
         PhysicsObject.CreateStaticObject(leveys, korkeus);
-        plainbase.X = x;
-        plainbase.Y = y;
-        plainbase.Angle = Angle.FromDegrees(rotation);
-        plainbase.Image = pbasek;
-        Add(plainbase);
+        pbase.X = x;
+        pbase.Y = y;
+        pbase.Angle = Angle.FromDegrees(rotation);
+        pbase.Image = pbasek;
+        Add(pbase);
+
+    }
+
+    void LuopBase2(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
+    {
+
+        Image pbasek = LoadImage("plainbase");
+        PhysicsObject pbase2 = new PhysicsObject(leveys, korkeus);
+        baset.Add(pbase2);
+        PhysicsObject.CreateStaticObject(leveys, korkeus);
+        pbase2.X = x;
+        pbase2.Y = y;
+        pbase2.Angle = Angle.FromDegrees(rotation);
+        pbase2.Image = pbasek;
+        Add(pbase2);
+
+    }
+
+    void LuopBase3(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
+    {
+
+        Image pbasek = LoadImage("plainbase");
+        PhysicsObject plainbase3 = new PhysicsObject(leveys, korkeus);
+        baset.Add(plainbase3);
+        PhysicsObject.CreateStaticObject(leveys, korkeus);
+        plainbase3.X = x;
+        plainbase3.Y = y;
+        plainbase3.Angle = Angle.FromDegrees(rotation);
+        plainbase3.Image = pbasek;
+        Add(plainbase3);
+
+    }
+
+    void LuopBase4(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
+    {
+
+        Image pbasek = LoadImage("plainbase");
+        PhysicsObject plainbase4 = new PhysicsObject(leveys, korkeus);
+        baset.Add(plainbase4);
+        PhysicsObject.CreateStaticObject(leveys, korkeus);
+        plainbase4.X = x;
+        plainbase4.Y = y;
+        plainbase4.Angle = Angle.FromDegrees(rotation);
+        plainbase4.Image = pbasek;
+        Add(plainbase4);
 
     }
@@ -316 +400 @@
     }
 
-    void LuoAjastin1( double perusnopeus, int aluksia1, double x, double y)
+    void LuoAjastin1( double perusnopeus1, int aluksia1, double x, double y)
     {
        Timer ajastin = new Timer();
-       ajastin.Interval = perusnopeus;
+       ajastin.Interval = perusnopeus1;
         ajastin.Timeout += lisaaalus1;
         ajastin.Start();
@@ -331 +415 @@
         Add(maara1);
     }
-    void LuoAjastin2( double perusnopeus, int aluksia2, double x, double y)
+    void LuoAjastin2( double perusnopeus2, int aluksia2, double x, double y)
     {
         Timer ajastin = new Timer();
-        ajastin.Interval = perusnopeus;
+        ajastin.Interval = perusnopeus2;
         ajastin.Timeout += lisaaalus2;
         ajastin.Start();
@@ -347 +431 @@
     }
 
-    void LuoAjastin3( double perusnopeus, int aluksia3, double x, double y)
+    void LuoAjastin3( double perusnopeus3, int aluksia3, double x, double y)
     {
         Timer ajastin = new Timer();
-        ajastin.Interval = perusnopeus;
+        ajastin.Interval = perusnopeus3;
         ajastin.Timeout += lisaaalus3;
         ajastin.Start();
@@ -362 +446 @@
     }
 
-    void LuoAjastin4( double perusnopeus, int aluksia4, double x, double y)
+    void LuoAjastin4( double perusnopeus4, int aluksia4, double x, double y)
     {
         Timer ajastin = new Timer();
-        ajastin.Interval = perusnopeus;
+        ajastin.Interval = perusnopeus4;
         ajastin.Timeout += lisaaalus4;
         ajastin.Start();
@@ -378 +462 @@
     }
 
-    void LuoAjastin5( double perusnopeus, int aluksia5, double x, double y)
+    void LuoAjastin5( double perusnopeus5, int aluksia5, double x, double y)
     {
         Timer ajastin = new Timer();
-        ajastin.Interval = perusnopeus;
+        ajastin.Interval = perusnopeus5;
         ajastin.Timeout += lisaaalus5;
         ajastin.Start();
@@ -394 +478 @@
     }
 
-    void LuoAjastin6(double perusnopeus, int aluksia1, double x, double y)
+    void LuoAjastin6(double perusnopeus6, int aluksia1, double x, double y)
     {
         Timer ajastin = new Timer();
-        ajastin.Interval = perusnopeus;
+        ajastin.Interval = perusnopeus6;
         ajastin.Timeout += lisaaalus6;
         ajastin.Start();
@@ -452 +536 @@
     }
 
-
-
-}
+    void lisaaalus6()
+    {
+
+        aluksia6++;
+        maara6.Text = aluksia6.ToString();
+
+    }
+
+
+    void ValitseBase()
+    {
+
+        Vector hiirenPaikka = Camera.ScreenToWorld( hiirip.Position );
+
+        foreach ( PhysicsObject b in baset)
+        {
+
+        if (hiirenPaikka.X < b.X + 50 && hiirenPaikka.X > b.X - 50 && hiirenPaikka.Y < b.Y + 50 && hiirenPaikka.Y > b.Y - 50)
+        {
+            if (punaisenvalinta == null)
+            {
+                punaisenvalinta = new GameObject(100, 100);
+                punaisenvalinta.Position = b.Position;
+                Image punaisenvalintak = LoadImage("punaisenvalintak");
+                punaisenvalinta.Image = punaisenvalintak;
+                
+                Add(punaisenvalinta, 1);
+            }
+
+            else
+            {
+
+                punaisenvalinta.Position = b.Position;
+
+            }
+
+        }
+
+        }
+    }
+
+    void sinisenbasevalinta()
+    {
+
+        Vector shiirenPaikka = Camera.ScreenToWorld(hiiris.Position);
+        
+        foreach (PhysicsObject b in baset)
+            if (shiirenPaikka.X < b.X + 50 && shiirenPaikka.X > b.X - 50 && shiirenPaikka.Y < b.Y + 50 && shiirenPaikka.Y > b.Y - 50)
+            {
+                if (sinisenvalinta == null)
+                {
+                    sinisenvalinta = new GameObject(100, 100);
+                    sinisenvalinta.Position = b.Position;
+                    Image sinisenvalintak = LoadImage("sinisenvalintak");
+                    sinisenvalinta.Image = sinisenvalintak;
+
+                    Add(sinisenvalinta, 1);
+
+                    alus = new PhysicsObject(100, 100);
+                    alus.Position = b.Position;
+                    Image alusk = LoadImage("alus");
+                    alus.Image = alusk;
+                    }
+
+                else
+                {
+
+                    sinisenvalinta.Position = b.Position;
+
+                }
+
+            }
+    }
+
+
+
+    }
+
+

2011/31/EsaN/DevOid/DevOid/DevOid/obj/x86/Debug/DevOid.csproj.FileListAbsolute.txt

@@ -18 +18 @@
 C:\MyTemp\EsaN\DevOid\DevOid\DevOid\bin\x86\Debug\Content\hiirip.xnb
 C:\MyTemp\EsaN\DevOid\DevOid\DevOid\bin\x86\Debug\Content\hiiris.xnb
+C:\MyTemp\EsaN\DevOid\DevOid\DevOid\bin\x86\Debug\Content\punaisenvalintak.xnb
+C:\MyTemp\EsaN\DevOid\DevOid\DevOid\bin\x86\Debug\Content\sinisenvalintak.xnb

2011/31/EsaN/DevOid/DevOid/DevOid/obj/x86/Debug/cachefile-{14B54A56-7075-4480-92EA-C8481771F4DD}-targetpath.txt

@@ -10 +10 @@
 Content\hiirip.xnb
 Content\hiiris.xnb
+Content\punaisenvalintak.xnb
+Content\sinisenvalintak.xnb

2011/31/EsaN/DevOid/DevOid/DevOidContent/DevOidContent.contentproj

@@ -113 +113 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="punaisenvalintak.png">
+      <Name>punaisenvalintak</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="sinisenvalintak.png">
+      <Name>sinisenvalintak</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. 

2011/31/EsaN/DevOid/DevOid/DevOidContent/obj/x86/Debug/ContentPipeline.xml

@@ -101 +101 @@
       <Time>2011-08-03T18:39:17.8192088+03:00</Time>
     </Item>
+    <Item>
+      <Source>punaisenvalintak.png</Source>
+      <Name>punaisenvalintak</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EsaN\DevOid\DevOid\DevOid\bin\x86\Debug\Content\punaisenvalintak.xnb</Output>
+      <Time>2011-08-04T12:40:05.5136921+03:00</Time>
+    </Item>
+    <Item>
+      <Source>sinisenvalintak.png</Source>
+      <Name>sinisenvalintak</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EsaN\DevOid\DevOid\DevOid\bin\x86\Debug\Content\sinisenvalintak.xnb</Output>
+      <Time>2011-08-04T14:11:57.5019598+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>