Changeset 3604 for 2012/27

Timestamp:

2012-07-05 14:56:29 (11 years ago)

Author:

eekrkolu

Message:

Talletus.

Location:

2012/27/EemilK/Survive untill U die!/Survive untill U die!

Files:

• Survive untill U die!/Survive_untill_U_die_.cs (modified) (9 diffs)
• Survive untill U die!Content/Survive untill U die!Content.contentproj (modified) (1 diff)
• Survive untill U die!Content/atom bomb.png (added)

2012/27/EemilK/Survive untill U die!/Survive untill U die!/Survive untill U die!/Survive_untill_U_die_.cs

@@ -20 +20 @@
     PlasmaCannon pyssy;
     PlasmaCannon pyssy2;
-    ExplosionSystem pamaus;
+    ExplosionSystem rajahdys;
+    ExplosionSystem rajahdysPelaaja;
+
+    IntMeter laskuri;
+    IntMeter laskuri2;
+    IntMeter laskuri23;
 
     Image kuva = LoadImage("lawn_summer_rf_0001_large");
     public override void Begin()
     {
+
+        rajahdysPelaaja = new ExplosionSystem(LoadImage("atom bomb"), 100);
+
         int i = 0;
-        while (i < 200)
-        {
-            LuoPalloja(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(1000, 200));
+        while (i < 100)
+        {
+            LuoPalloja(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(600, 200));
             i++;
-            LuoPallot(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(Level.Top, 300));
+            LuoPallot(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(600, 200));
             i++;
         }
-
+        LuoPistelaskuri();
+        LuoPistelaskuri2();
+        LuoPistelaskuri3();
 
         pyssy = new PlasmaCannon(20, 20);
@@ -42 +52 @@
 
         // Pelaaja 1 (vasemman puoleinen)
-        pallo = PhysicsObject.CreateStaticObject(170, 170);
+        pallo = new Pelaaja(170, 170);
+        pallo.MakeStatic();
         pallo.Shape = Shape.Circle;
         pallo.Image = LoadImage("p1");
@@ -50 +61 @@
         pallo.X = -240;
         pallo.Y = -200;
+        pallo.Destroyed += delegate { rajahdys.AddEffect(pallo.Position, 100); };
+        AddCollisionHandler(pallo, "vihu", PelaajaOsuu);
+
         Add(pallo);
         pallo.Add(pyssy);
 
         // Pelaaja 2 (oikean puoleinen)
-        pallo2 = PhysicsObject.CreateStaticObject(170, 170);
+        pallo2 = new Pelaaja(170, 170);
+        pallo2.MakeStatic();
         pallo2.Shape = Shape.Circle;
         pallo2.Image = LoadImage("p2");
@@ -64 +79 @@
         Add(pallo2);
         pallo2.Add(pyssy2);
+        pallo2.Destroyed += delegate { rajahdys.AddEffect(pallo2.Position, 100); };
+        AddCollisionHandler(pallo2, "vihu", PelaajaOsuu);
+        rajahdys = new ExplosionSystem(LoadImage("hitler"), 10);
+        Add(rajahdys);
+
 
         vasenReuna = Level.CreateLeftBorder();
@@ -175 +195 @@
                 tormaaja.Destroy();
                 if (kohde.Tag.ToString() == "vihu")
+                {
                     (kohde as Vihu).elamat.Value--;
-
+                    if ((kohde as Vihu).elamat.Value == 0)
+                    {
+                        rajahdys.AddEffect(kohde.Position, 1);
+                        laskuri.Value += 1;
+                        laskuri23.Value += 1;
+                        LuoPalloja(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(700, 200));
+                        LuoPallot(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(700, 200));
+                    }
+                }
+               
             });
         }
@@ -193 +223 @@
                 tormaaja.Destroy();
                 if (kohde.Tag.ToString() == "vihu")
+                {
                     (kohde as Vihu).elamat.Value--;
-
+                    if ((kohde as Vihu).elamat.Value == 0)
+                    {
+                        rajahdys.AddEffect(kohde.Position, 1);
+                        laskuri2.Value += 1;
+                        laskuri23.Value += 1;
+                        LuoPalloja(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(800, 200));
+                        LuoPallot(RandomGen.NextDouble(-400, 400), RandomGen.NextDouble(800, 200));
+                        
+                    }
+                }
             });
         }
@@ -203 +243 @@
     {
         Grenade kranaatti;
-        kranaatti = new Grenade(4.0);
+        kranaatti = new Grenade(10.0);
         kranaatti.Angle = Angle.RightAngle;
         pallo.Throw(kranaatti, Angle.Zero, 500);
@@ -211 +251 @@
     {
         Grenade kranaatti2;
-        kranaatti2 = new Grenade(4.0);
+        kranaatti2 = new Grenade(10.0);
         kranaatti2.Angle = Angle.RightAngle;
         pallo2.Throw(kranaatti2, Angle.Zero, 500);
 
     }
+
+    void LuoPistelaskuri()
+    {
+        
+        laskuri = new IntMeter(0);
+
+        Label pisteNaytto = new Label();
+        pisteNaytto.X = -400;
+        pisteNaytto.Y = -400;
+        pisteNaytto.TextColor = Color.Black;
+        pisteNaytto.Color = Color.White;
+
+        pisteNaytto.BindTo(laskuri);
+        pisteNaytto.Title = "p1: kills";
+        Add(pisteNaytto);
+}
+    void LuoPistelaskuri2()
+    {
+        
+        laskuri2 = new IntMeter(0);
+
+        Label pisteNaytto2 = new Label();
+        pisteNaytto2.X = 400;
+        pisteNaytto2.Y = -400;
+        pisteNaytto2.TextColor = Color.Black;
+        pisteNaytto2.Color = Color.White;
+
+        pisteNaytto2.BindTo(laskuri2);
+        pisteNaytto2.Title = "p2: kills"; 
+        Add(pisteNaytto2);
+    }
+    void LuoPistelaskuri3()
+    {
+        
+        laskuri23 = new IntMeter(0);
+
+        Label pisteNaytto23 = new Label();
+        pisteNaytto23.X = 0;
+        pisteNaytto23.Y = -400;
+        pisteNaytto23.TextColor = Color.Black;
+        pisteNaytto23.Color = Color.White;
+        
+        pisteNaytto23.BindTo(laskuri23);
+        pisteNaytto23.Title = "Total Kills";
+        Add(pisteNaytto23);
+    }
+    
+    void PelaajaOsuu(PhysicsObject pelaaja, PhysicsObject kohde)
+    {
+        (pelaaja as Pelaaja).hp.Value--;
+    }
+
 }
 
@@ -228 +320 @@
         elamat.LowerLimit += delegate { this.Destroy(); };
     }
-
-    public class Player : PhysicsObject
-    {
-        public IntMeter lifepojot;
-
-        public Player(double width, double height)
+}
+    
+
+
+
+public class Pelaaja : PhysicsObject
+    {
+        public IntMeter hp;
+        ExplosionSystem pum;
+
+        public Pelaaja(double width, double height)
             : base(width, height)
         {
-            lifepojot = new IntMeter(20, 0, 20);
-            lifepojot.LowerLimit += delegate { this.Destroy(); };
-        }
-    }
-}
-
-
+            hp = new IntMeter(20, 0, 20);
+            
+            hp.LowerLimit += delegate { this.Destroy(); };
+            
+
+        }
+    }
+
+    

2012/27/EemilK/Survive untill U die!/Survive untill U die!/Survive untill U die!Content/Survive untill U die!Content.contentproj

@@ -70 +70 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="hitler.png">
+      <Name>hitler</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="atom bomb.png">
+      <Name>atom bomb</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.