Changeset 6901 for 2015

Timestamp:

2015-07-22 11:44:38 (8 years ago)

Author:

novaanan

Message:

 

Location:

2015/30/NoelV/peli0.0.0.3/turhakepeli

Files:

• turhakepeli.suo (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/Sivu.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/Sivu.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/YlempiKeski.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/YlempiOikeaAla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/YlempiOikeaYla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/YlempiVasenAla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/YlempiVasenYla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/ala.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/ala.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/enkka.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/kalja.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/maa.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/maa.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/oikeaAla.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/oikeaAla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/oikeaYla.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/oikeaYla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/vasenAla.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/vasenAla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/vasenYla.png (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/Content/vasenYla.xnb (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/turhakepeli.exe (modified) (previous)
• turhakepeli/turhakepeli/bin/x86/Debug/turhakepeli.pdb (modified) (previous)
• turhakepeli/turhakepeli/obj/x86/Debug/turhakepeli.exe (modified) (previous)
• turhakepeli/turhakepeli/obj/x86/Debug/turhakepeli.pdb (modified) (previous)
• turhakepeli/turhakepeli/turhakepeli.cs (modified) (10 diffs)
• turhakepeli/turhakepeliContent/Sivu.png (modified) (previous)
• turhakepeli/turhakepeliContent/YlempiKeski.png (modified) (previous)
• turhakepeli/turhakepeliContent/YlempiOikeaAla.png (modified) (previous)
• turhakepeli/turhakepeliContent/YlempiOikeaYla.png (modified) (previous)
• turhakepeli/turhakepeliContent/YlempiVasenAla.png (modified) (previous)
• turhakepeli/turhakepeliContent/YlempiVasenYla.png (modified) (previous)
• turhakepeli/turhakepeliContent/ala.png (modified) (previous)
• turhakepeli/turhakepeliContent/enkka.png (modified) (previous)
• turhakepeli/turhakepeliContent/kalja.png (modified) (previous)
• turhakepeli/turhakepeliContent/maa.png (modified) (previous)
• turhakepeli/turhakepeliContent/obj/x86/Debug/ContentPipeline.xml (modified) (21 diffs)
• turhakepeli/turhakepeliContent/oikeaAla.png (modified) (previous)
• turhakepeli/turhakepeliContent/oikeaYla.png (modified) (previous)
• turhakepeli/turhakepeliContent/vasenAla.png (modified) (previous)
• turhakepeli/turhakepeliContent/vasenYla.png (modified) (previous)

2015/30/NoelV/peli0.0.0.3/turhakepeli/turhakepeli/turhakepeli/turhakepeli.cs

@@ -13 +13 @@
     IntMeter vihollistenMaara = new IntMeter(0, 0, 0);
     IntMeter ampumisLaskuri = new IntMeter(0, 0, 10);
-    PhysicsObject pelaaja;
+    public PhysicsObject pelaaja;
     PhysicsObject turhake;
     PhysicsObject muuri;
@@ -53 +53 @@
     Image LaatikkoYla3 = LoadImage("laatikkoYla3");
 
+    bool saakoAmpua = true;
+
 
 
@@ -75 +77 @@
     {
         //SetWindowSize(1900, 1060, false); 
-        IsFullScreen = true;
+        IsFullScreen = false;
         AloitaPeli();
        
@@ -119 +121 @@
         Keyboard.Listen(Key.A, ButtonState.Released, Liiku, null, Vector.Zero);
         Keyboard.Listen(Key.Space, ButtonState.Pressed, Hyokkaa, null);
-        Keyboard.Listen(Key.LeftShift, ButtonState.Down, Lataa, null);
-        Keyboard.Listen(Key.LeftShift, ButtonState.Released, Ammu, null);
+        //Keyboard.Listen(Key.LeftShift, ButtonState.Down, Lataa, null);
+        //Keyboard.Listen(Key.LeftShift, ButtonState.Released, Ammu, null);
+        Keyboard.Listen(Key.Up, ButtonState.Down, LuoAmmus, null, new Vector(0, 100000));
+        Keyboard.Listen(Key.Down, ButtonState.Down, LuoAmmus, null, new Vector(0, -100000));
+        Keyboard.Listen(Key.Left, ButtonState.Down, LuoAmmus, null, new Vector(-100000, 0));
+        Keyboard.Listen(Key.Right, ButtonState.Down, LuoAmmus, null, new Vector(100000, 0));
+        
+
+
+
+
 
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, KysyPoistumista, "Lopeta peli");
     }
-    void Ammu()
-    {
-
-    }
+    
+
+
+    void LuoAmmus(Vector suunta)
+    {
+        if (saakoAmpua == true)
+        {
+            PhysicsObject ammus = new PhysicsObject(10.0, 10.0);
+            ammus.Position = pelaaja.Position;
+            ammus.Tag = "ammus";
+            ammus.Push(suunta);
+            ammus.CollisionIgnoreGroup = 5;
+            ammus.CanRotate = false;
+            ammus.Lifetime = 
+            Add(ammus);
+
+            AddCollisionHandler(ammus, "vihu", HyokkausOsuu);
+            AddCollisionHandler(ammus, "laatikko", HyokkausOsuu);
+            AddCollisionHandler(ammus, "potionLaatikko", HyokkausOsuu);
+            AddCollisionHandler(ammus, "manaLaatikko", HyokkausOsuu);
+
+            saakoAmpua = false;
+
+            Timer.SingleShot(0.5, delegate { saakoAmpua = true; });
+
+        }
+        
+    }
+
     void Lataa()
     {
@@ -503 +539 @@
     hitbox.X = pelaaja.X;
     hitbox.Color = Color.Transparent;
+    hitbox.CollisionIgnoreGroup = 5;
     //hitbox.Image = hyokkauksenKuva;
     //hitbox.CollisionIgnoreGroup = 1;
@@ -656 +693 @@
     {
         laatikko laatikko = new laatikko(paikka, leveys, 30, alaOsanKuva, ylaOsanKuva, "laatikko");
-        
-        
     
         //laatikko.Tag = "laatikko";
         Add(laatikko);
-
-        AxleJoint liitos = new AxleJoint(laatikko);
-        Add(liitos);
     }
     private void LuoManaLaatikko(Vector paikka, double leveys, double korkeus)
@@ -780 +812 @@
     void HyokkausOsuu(PhysicsObject hyokkaus, PhysicsObject kohde)
     {
+
         if (kohde.Tag.Equals("vihu"))
         {
@@ -799 +832 @@
             OsuManaLaatikkoon(kohde as laatikko);
 
+        }
+
+        //tuhoa jos ammus
+        if (hyokkaus.Tag.Equals("ammus"))
+        {
+            hyokkaus.Destroy();
         }
 
@@ -1182 +1221 @@
         : base(leveys, korkeus)
     {
+        this.MakeStatic();
         this.Position = paikka;
         this.CanRotate = false;
@@ -1193 +1233 @@
 
         Timer kerroksenVaihtaja = new Timer();
-        kerroksenVaihtaja.Interval = 0.001;
-
-            
-
+        kerroksenVaihtaja.Interval = 3;
+        kerroksenVaihtaja.Timeout += delegate
+        {
+            if (((turhakepeli)Game.Instance).pelaaja != null)
+                {
+                  
+                if (((turhakepeli)Game.Instance).pelaaja.Position.Y < this.Position.Y)
+                {
+                    this.TuhoaLaatikko();
+                    ((turhakepeli)Game.Instance).Add(this, 3);
+                    ((turhakepeli)Game.Instance).Add(this.ylaOsa, 3);
+                }
+                else
+                {
+                    this.TuhoaLaatikko();
+                    ((turhakepeli)Game.Instance).Add(this, 3);
+                    ((turhakepeli)Game.Instance).Add(this.ylaOsa, 3);
+                }
+                }
+        };
+        //kerroksenVaihtaja.Start();
     }
     public void VaihdaKuva(Image alaOsanUusiKuva, Image ylaOsanUusiKuva)

2015/30/NoelV/peli0.0.0.3/turhakepeli/turhakepeli/turhakepeliContent/obj/x86/Debug/ContentPipeline.xml

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\kentta.xnb</Output>
-      <Time>2015-07-21T11:29:48.3054038+03:00</Time>
+      <Time>2015-07-21T11:29:50+03:00</Time>
     </Item>
     <Item>
@@ -63 +63 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\maa.xnb</Output>
-      <Time>2015-04-19T20:09:40+03:00</Time>
+      <Time>2015-07-21T19:12:38+03:00</Time>
     </Item>
     <Item>
@@ -72 +72 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\ala.xnb</Output>
-      <Time>2015-05-08T21:03:22+03:00</Time>
+      <Time>2015-07-21T16:49:44+03:00</Time>
     </Item>
     <Item>
@@ -81 +81 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\Sivu.xnb</Output>
-      <Time>2015-05-08T20:57:34+03:00</Time>
+      <Time>2015-07-21T17:18:28+03:00</Time>
     </Item>
     <Item>
@@ -90 +90 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\oikeaYla.xnb</Output>
-      <Time>2015-05-15T19:02:22+03:00</Time>
+      <Time>2015-07-21T17:18:36+03:00</Time>
     </Item>
     <Item>
@@ -108 +108 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\oikeaAla.xnb</Output>
-      <Time>2015-05-15T18:59:36+03:00</Time>
+      <Time>2015-07-21T18:05:38+03:00</Time>
     </Item>
     <Item>
@@ -117 +117 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\vasenAla.xnb</Output>
-      <Time>2015-05-15T18:51:56+03:00</Time>
+      <Time>2015-07-21T18:05:38+03:00</Time>
     </Item>
     <Item>
@@ -126 +126 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\vasenYla.xnb</Output>
-      <Time>2015-05-15T19:04:24+03:00</Time>
+      <Time>2015-07-21T17:18:36+03:00</Time>
     </Item>
     <Item>
@@ -171 +171 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\enkka.xnb</Output>
-      <Time>2015-03-26T22:39:22+02:00</Time>
+      <Time>2015-07-21T18:18:58+03:00</Time>
     </Item>
     <Item>
@@ -360 +360 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\YlempiOikeaAla.xnb</Output>
-      <Time>2015-05-15T18:57:42+03:00</Time>
+      <Time>2015-07-21T18:11:06+03:00</Time>
     </Item>
     <Item>
@@ -369 +369 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\YlempiOikeaYla.xnb</Output>
-      <Time>2015-05-15T19:01:08+03:00</Time>
+      <Time>2015-07-21T18:11:06+03:00</Time>
     </Item>
     <Item>
@@ -378 +378 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\YlempiVasenAla.xnb</Output>
-      <Time>2015-05-15T18:53:58+03:00</Time>
+      <Time>2015-07-21T18:11:06+03:00</Time>
     </Item>
     <Item>
@@ -387 +387 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\YlempiVasenYla.xnb</Output>
-      <Time>2015-05-15T19:03:36+03:00</Time>
+      <Time>2015-07-21T18:11:06+03:00</Time>
     </Item>
     <Item>
@@ -396 +396 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\YlempiKeski.xnb</Output>
-      <Time>2015-05-08T22:20:44+03:00</Time>
+      <Time>2015-07-21T18:11:28+03:00</Time>
     </Item>
     <Item>
@@ -441 +441 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\laatikkoAla.xnb</Output>
-      <Time>2015-07-21T11:06:42.3282038+03:00</Time>
+      <Time>2015-07-21T11:06:44+03:00</Time>
     </Item>
     <Item>
@@ -450 +450 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\laatikkoYla.xnb</Output>
-      <Time>2015-07-21T11:06:07.6962038+03:00</Time>
+      <Time>2015-07-21T11:06:08+03:00</Time>
     </Item>
     <Item>
@@ -459 +459 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\kalja.xnb</Output>
-      <Time>2015-07-21T10:32:59.5549471+03:00</Time>
+      <Time>2015-07-21T16:37:40+03:00</Time>
     </Item>
     <Item>
@@ -468 +468 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\laatikkoYla2.xnb</Output>
-      <Time>2015-07-21T11:49:43.7546038+03:00</Time>
+      <Time>2015-07-21T11:49:44+03:00</Time>
     </Item>
     <Item>
@@ -477 +477 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\laatikkoAla2.xnb</Output>
-      <Time>2015-07-21T11:50:09.9002038+03:00</Time>
+      <Time>2015-07-21T11:50:10+03:00</Time>
     </Item>
     <Item>
@@ -486 +486 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\laatikkoAla3.xnb</Output>
-      <Time>2015-07-21T13:30:37.3898043+03:00</Time>
+      <Time>2015-07-21T13:30:38+03:00</Time>
     </Item>
     <Item>
@@ -495 +495 @@
       <Options>None</Options>
       <Output>C:\MyTemp\NoelV\peli0.0.0.3\turhakepeli\turhakepeli\turhakepeli\bin\x86\Debug\Content\laatikkoYla3.xnb</Output>
-      <Time>2015-07-21T13:29:41.9162043+03:00</Time>
+      <Time>2015-07-21T13:29:42+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>