Changeset 2542

Timestamp:

2011-08-03 14:59:38 (12 years ago)

Author:

eskuniem

Message:

Talletus.

Location:

2011/31/EsaN/DevOid/DevOid

Files:

• DevOid/Peli.cs (modified) (7 diffs)
• DevOidContent/DevOidContent.contentproj (modified) (1 diff)
• DevOidContent/alus.bmp (added)
• DevOidContent/hiirip.bmp (added)
• DevOidContent/hiiris.bmp (added)
• DevOidContent/plainbase.bmp (added)

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

@@ -7 +7 @@
 using Jypeli.Widgets;
 
-public class Peli : Game
+public class Peli : PhysicsGame
 {
+    Widget hiiris;
+    Widget hiirip;
+    Label maara1;
+    Label maara2;
+    Label maara3;
+    Label maara4;
+    Label maara5;
+    int aluksia1;
+    int aluksia2;
+    int aluksia3;
+    int aluksia4;
+    int aluksia5;
+
+
     public override void Begin()
     {
-;
+
+
+        //kenttä
+
         IsFullScreen = true;
+
+        Level.CreateBorders();
 
         LuoMeri();
@@ -20 +39 @@
         LuoSaari3(700, 700, 287, 250, 0);
         LuoSaari4(700, 700, 200, -100, 0);
-        LuoBBase(700, 700, 0, 0, 0);
-        LuoRBase(700, 700, 0, 0, 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);
+        LuoHiiri1(50, 50, -400, 350, 0);
+        LuoHiiri2(50, 50, 400, -350, 0);
+
+        //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));
+
+
+        //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));
+
+        //tukikohtien tekstit ja ajastimet
+
+    LuoAjastin1(1, 0, 200, -150);
+    LuoAjastin2(1, 0, 200, 200);
+    LuoAjastin3(1, 0, 200, 5);
+    LuoAjastin4(1, 0, 200, 100);
+    LuoAjastin5(1, 0, 425, 200);
+
+
 
         Camera.ZoomToLevel();
@@ -30 +88 @@
         Image Saari1k = LoadImage("Saari1k");
 
-        PhysicsObject saari1 = new PhysicsObject(leveys, korkeus);
+        GameObject saari1 = new GameObject(leveys, korkeus);
         saari1.X = x;
         saari1.Y = y;
@@ -44 +102 @@
         Image Saari2k = LoadImage("Saari2k");
 
-        PhysicsObject saari2 = new PhysicsObject(leveys, korkeus);
+        GameObject saari2 = new GameObject(leveys, korkeus);
         saari2.X = x;
         saari2.Y = y;
@@ -58 +116 @@
         Image Saari3k = LoadImage("Saari3k");
 
-        PhysicsObject saari3 = new PhysicsObject(leveys, korkeus);
+        GameObject saari3 = new GameObject(leveys, korkeus);
         saari3.X = x;
         saari3.Y = y;
@@ -81 +139 @@
         Image Saari4k = LoadImage("Saari4k");
 
-        PhysicsObject saari4 = new PhysicsObject(leveys, korkeus);
+        GameObject saari4 = new GameObject(leveys, korkeus);
         saari4.X = x;
         saari4.Y = y;
@@ -91 +149 @@
     }
 
-    void LuoBBase(double leveys, double korkeus, double x, double y, double rotation)
+    void LuoBBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
     {
     
         Image bbasek = LoadImage("bluebase");
         PhysicsObject bluebase = new PhysicsObject(leveys, korkeus);
+        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)
+    void LuoRBase(double leveys, double korkeus, double x, double y, double rotation, int basenumero)
     {
 
         Image rbasek = LoadImage("redbase");
         PhysicsObject redbase = new PhysicsObject(leveys, korkeus);
+        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)
+    {
+
+        Image pbasek = LoadImage("plainbase");
+        PhysicsObject plainbase = new PhysicsObject(leveys, korkeus);
+        PhysicsObject.CreateStaticObject(leveys, korkeus);
+        plainbase.X = x;
+        plainbase.Y = y;
+        plainbase.Angle = Angle.FromDegrees(rotation);
+        plainbase.Image = pbasek;
+        Add(plainbase);
+
+    }
+
+    void LuoAlus(double leveys, double korkeus, double x, double y, double rotation)
+    {
+
+        Image alusk = LoadImage("alus");
+        PhysicsObject alus = new PhysicsObject(leveys, korkeus);
+        alus.X = x;
+        alus.Y = y;
+        alus.Angle = Angle.FromDegrees(rotation);
+        alus.Image = alusk;
+        Add(alus);
+
+    }
+
+    void LuoHiiri2(double leveys, double korkeus, double x, double y, double rotation)
+    {
+
+        Image hiirisk = LoadImage("hiiris");
+        hiiris = new Widget(leveys, korkeus);
+        hiiris.X = x;
+        hiiris.Y = y;
+        hiiris.Angle = Angle.FromDegrees(rotation);
+        hiiris.Image = hiirisk;
+        Add(hiiris);
+
+
+    }
+
+    void LuoHiiri1(double leveys, double korkeus, double x, double y, double rotation)
+    {
+
+        Image hiiripk = LoadImage("hiirip");
+        hiirip = new Widget(leveys, korkeus);
+        hiirip.X = x;
+        hiirip.Y = y;
+        hiirip.Angle = Angle.FromDegrees(rotation);
+        hiirip.Image = hiiripk;
+        Add(hiirip);
+
+    }
+
+    void LiikutaRastia1(Vector vektori)
+    {
+
+
+        if (hiirip.X > Screen.Right)
+        {
+            hiirip.X -= 10;
+        }
+
+        else
+        {
+            hiirip.Position += vektori;
+        }
+
+        if (hiirip.X < Screen.Left)    
+        {
+            hiirip.X += 10;
+        }
+        else
+        {
+            hiirip.Position += vektori;
+        }
+
+        if (hiirip.Y > Screen.Top)
+        {
+            hiirip.Y -= 10;
+        }
+        else
+        {
+            hiirip.Position += vektori;
+        }
+
+        if (hiirip.Y < Screen.Bottom)
+        {
+            hiirip.Y += 10;
+        }
+        else
+        {
+            hiirip.Position += vektori;
+        }
+    }
+
+    void LiikutaRastia2(Vector vektori)
+    {
+        if (hiiris.X > Screen.Right)
+        {
+            hiiris.X -= 10;
+        }
+
+        else
+        {
+            hiiris.Position += vektori;
+        }
+
+        if (hiiris.X < Screen.Left)
+        {
+            hiiris.X += 10;
+        }
+        else
+        {
+            hiiris.Position += vektori;
+        }
+
+        if (hiiris.Y > Screen.Top)
+        {
+            hiiris.Y -= 10;
+        }
+        else
+        {
+            hiiris.Position += vektori;
+        }
+
+        if (hiiris.Y < Screen.Bottom)
+        {
+            hiiris.Y += 10;
+        }
+        else
+        {
+            hiiris.Position += vektori;
+        }
+    }
+
+    void LuoAjastin1( double perusnopeus, int aluksia1, double x, double y)
+    {
+       Timer ajastin = new Timer();
+       ajastin.Interval = perusnopeus;
+        ajastin.Timeout += lisaaalus1;
+        ajastin.Start();
+
+        maara1 = new Label(50.0, 20.0, aluksia1.ToString());
+        maara1.TextColor = Color.White;
+        maara1.X = x;
+        maara1.Y = y;
+
+
+        Add(maara1);
+    }
+    void LuoAjastin2( double perusnopeus, int aluksia2, double x, double y)
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = perusnopeus;
+        ajastin.Timeout += lisaaalus2;
+        ajastin.Start();
+
+        maara2 = new Label(50.0, 20.0, aluksia2.ToString());
+        maara2.TextColor = Color.White;
+        maara2.X = x;
+        maara2.Y = y;
+
+
+        Add(maara2);
+    }
+
+    void LuoAjastin3( double perusnopeus, int aluksia3, double x, double y)
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = perusnopeus;
+        ajastin.Timeout += lisaaalus3;
+        ajastin.Start();
+
+        maara3 = new Label(50.0, 20.0, aluksia3.ToString());
+        maara3.TextColor = Color.White;
+        maara3.X = x;
+        maara3.Y = y;
+
+        Add(maara3);
+    }
+
+    void LuoAjastin4( double perusnopeus, int aluksia4, double x, double y)
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = perusnopeus;
+        ajastin.Timeout += lisaaalus4;
+        ajastin.Start();
+
+        maara4 = new Label(50.0, 20.0, aluksia4.ToString());
+        maara4.TextColor = Color.White;
+        maara4.X = x;
+        maara4.Y = y;
+
+
+        Add(maara4);
+    }
+
+    void LuoAjastin5( double perusnopeus, int aluksia5, double x, double y)
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = perusnopeus;
+        ajastin.Timeout += lisaaalus5;
+        ajastin.Start();
+
+        maara5 = new Label(50.0, 20.0, aluksia5.ToString());
+        maara5.TextColor = Color.White;
+        maara5.X = x;
+        maara5.Y = y;
+
+
+        Add(maara5);
+    }
+
+
+
+    void lisaaalus1()
+    {
+       
+        aluksia1 ++;
+        maara1.Text = aluksia1.ToString();
+    
+    }
+
+    void lisaaalus2()
+    {
+
+        aluksia2++;
+        maara2.Text = aluksia2.ToString();
+
+    }
+
+    void lisaaalus3()
+    {
+
+        aluksia3++;
+        maara3.Text = aluksia3.ToString();
+
+    }
+
+    void lisaaalus4()
+    {
+
+        aluksia4++;
+        maara4.Text = aluksia4.ToString();
+
+    }
+
+    void lisaaalus5()
+    {
+
+        aluksia5++;
+        maara5.Text = aluksia5.ToString();
+
+    }
+
+
+
 }

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

@@ -87 +87 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="plainbase.bmp">
+      <Name>plainbase</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="alus.bmp">
+      <Name>alus</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="hiirip.bmp">
+      <Name>hiirip</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="hiiris.bmp">
+      <Name>hiiris</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.