Changeset 3548 for 2012/27

Timestamp:

2012-07-04 14:58:59 (11 years ago)

Author:

eekrkolu

Message:

Talletus.

Location:

2012/27/EemilK

Files:

• Survive untill U die!/Survive untill U die!/Survive untill U die!/Survive_untill_U_die_.cs (modified) (5 diffs)
• Survive untill U die!/Survive untill U die!/Survive untill U die!Content/Survive untill U die!Content.contentproj (modified) (1 diff)
• Survive untill U die!/Survive untill U die!/Survive untill U die!Content/nazi.png (added)
• Survive untill U die!/Survive untill U die!/Survive untill U die!Content/p1.png (added)
• Survive untill U die!/Survive untill U die!/Survive untill U die!Content/p2.png (added)
• pong/pong/pong/pong.cs (modified) (3 diffs)

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

@@ -11 +11 @@
     Vector oikealle = new Vector(100, 0);
     Vector vasemmalle = new Vector(-100, 0);
+    Vector ylos = new Vector(0, 1);
     PhysicsObject vihollinen;
     PhysicsObject enemy;
     PhysicsObject pallo;
     PhysicsObject pallo2;
+    AssaultRifle pyssy;
+    AssaultRifle pyssy2;
+
     Image kuva = LoadImage("lawn_summer_rf_0001_large");
     public override void Begin()
@@ -28 +32 @@
 
 
-        // TODO: Kirjoita ohjelmakoodisi tähän
+        pyssy = new AssaultRifle(20, 20);
+        pyssy.InfiniteAmmo = true;
+        pyssy2 = new AssaultRifle(20, 20);
+        pyssy2.Angle = Angle.RightAngle;
+        pyssy2.InfiniteAmmo = true;
         Level.Background.Image = kuva;
+
+        // Pelaaja 1 (vasemman puoleinen)
         pallo = PhysicsObject.CreateStaticObject(170, 170);
         pallo.Shape = Shape.Circle;
+        pallo.Image = LoadImage("p1");
+        pallo.Angle = Angle.RightAngle;
+        pallo.RotateImage = false;
         pallo.Tag = "pallo";
         pallo.X = -240;
         pallo.Y = -200;
-        pallo.Color = Color.Blue;
         Add(pallo);
-        pallo2 =PhysicsObject.CreateStaticObject(170,170);
+        pallo.Add(pyssy);
+
+        // Pelaaja 2 (oikean puoleinen)
+        pallo2 = PhysicsObject.CreateStaticObject(170, 170);
         pallo2.Shape = Shape.Circle;
+        pallo2.Image = LoadImage("p2");
         pallo2.Tag = "pallo2";
         pallo2.X = 240;
         pallo2.Y = -200;
-        pallo2.Color = Color.Red;
         Add(pallo2);
+        pallo2.Add(pyssy2);
+
         Level.CreateBorders();
         Camera.ZoomToLevel();
@@ -51 +68 @@
         Keyboard.Listen(Key.A, ButtonState.Released, Liiku2, null, pallo, Vector.Zero);
         Keyboard.Listen(Key.Right, ButtonState.Down, Liiku3, "pelaaja2: oikealle", pallo2, oikealle);
-        Keyboard.Listen(Key.Right, ButtonState.Released,Liiku3, null, pallo2, Vector.Zero);
+        Keyboard.Listen(Key.Right, ButtonState.Released, Liiku3, null, pallo2, Vector.Zero);
         Keyboard.Listen(Key.Left, ButtonState.Down, Liiku4, "pelaaja2: vasemmalle", pallo2, vasemmalle);
         Keyboard.Listen(Key.Left, ButtonState.Released, Liiku4, null, pallo2, Vector.Zero);
+        Keyboard.Listen(Key.W, ButtonState.Down, AmmuAseella, "pelaaja1: Ammu");
+        Keyboard.Listen(Key.Up, ButtonState.Down, AmmuAseella2, "pelaaja2: Ammu");
+        Keyboard.Listen(Key.Q, ButtonState.Down, heitaKranu, "pelaaja1: heitä Kranu");
+
         PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
     }
     void LuoPalloja(double x, double y)
-  {
-        vihollinen = new PhysicsObject(70,70) ;
-        vihollinen.Shape = Shape.Octagon;
-        vihollinen.Color = Color.Brown;
+    {
+        vihollinen = new PhysicsObject(70, 70);
+        vihollinen.Shape = Shape.Circle;
+        vihollinen.Image = LoadImage("nazi");
         vihollinen.X = x;
         vihollinen.Y = y;
-        vihollinen.Restitution = 1.0;  
+        vihollinen.Restitution = 1.0;
         Add(vihollinen);
 
@@ -72 +93 @@
         aivot.Speed = 10;
 
-  }
+    }
     void LuoPallot(double x, double y)
     {
-        enemy = new PhysicsObject (70, 70);
-        enemy.Shape = Shape.Octagon;
-        enemy.Color = Color.Brown;
+        enemy = new PhysicsObject(70, 70);
+        enemy.Shape = Shape.Circle;
+        enemy.Image = LoadImage("nazi");
         enemy.X = x;
         enemy.Y = y;
@@ -127 +148 @@
         pallo2.Velocity = vasemmalle;
     }
+    void AmmuAseella()
+    {
+        PhysicsObject panos = pyssy.Shoot();
+
+        if (panos != null)
+        {
+            panos.Size *= 3;
+            AddCollisionHandler(panos, CollisionHandler.DestroyObject);
+        }
+    }
+    void AmmuAseella2()
+    {
+
+        PhysicsObject ammus2 = pyssy2.Shoot();
+        if (ammus2 != null)
+        {
+            ammus2.Size *= 3;
+            AddCollisionHandler(ammus2, CollisionHandler.DestroyObject);
+        }
+    }
+
+
+    void heitaKranu()
+    {
+        Grenade kranaatti;
+        kranaatti = new Grenade(4.0);
+        kranaatti.Angle = Angle.RightAngle;
+        pallo.Throw(kranaatti, Angle.Zero, 500);
+
+    }
 }
 

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

@@ -51 +51 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="p1.png">
+      <Name>p1</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="p2.png">
+      <Name>p2</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="nazi.png">
+      <Name>nazi</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. 

2012/27/EemilK/pong/pong/pong/pong.cs

@@ -8 +8 @@
 
 public class pong : PhysicsGame
+
 {
     Vector nopeusYlos = new Vector(0, 200);
@@ -19 +20 @@
     IntMeter Pelaajan2Pisteet;
     public override void Begin()
-    {
+
         // TODO: Kirjoita ohjelmakoodisi tähän
         LuoKentta();
@@ -40 +41 @@
         pallo.MomentOfInertia = Double.PositiveInfinity;
         Add(pallo);
+ }
+    void muut()
+{
         maila1 = luoMaila(Level.Left + 20.0, 0.0);
         maila2 = luoMaila(Level.Right - 20.0, 0.0);