Changeset 274

Timestamp:

2009-08-05 11:27:47 (10 years ago)

Author:

armahlam

Message:

 

Location:

arho_m

Files:

• Avaruuspeli2/Content/Content.contentproj (modified) (2 diffs)
• Avaruuspeli2/Content/alus.png (modified) (previous)
• Avaruuspeli2/Content/bgtex.png (added)
• Avaruuspeli2/Peli.cs (modified) (10 diffs)
• Pong/Peli.cs (modified) (1 diff)

arho_m/Avaruuspeli2/Content/Content.contentproj

@@ -1 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectGuid>7a1efcbb-b39d-4767-bcac-732d721d9524</ProjectGuid>
@@ -33 +33 @@
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.XImporter, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="bgtex.png">
+      <Name>bgtex</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. 

arho_m/Avaruuspeli2/Peli.cs

@@ -24 +24 @@
         BattleObject pelaaja1;
         PlasmaCannon ase;
-
         BarGauge hitpointNaytto;
-        Timer ajastin;
+        double vihu_interv = 0.5;
+        bool nopeuta_vihuja = true;
         #endregion
 
@@ -62 +62 @@
             lisaaNappaimet();
             Camera.Follow(pelaaja1);
-
-            MessageDisplay.Add("(Paina F1, niin saat näppäinohjeet.)");
         }
 
         Level luoKentta()
         {
-            Level kentta = new Level(this, 640, 480);
+            Level kentta = new Level(this, 800, 600);
             kentta.CreateBorder();
-            kentta.Background.CreateStars();
+            kentta.BackgroundColor = Color.Black;
+
+            Texture2D bgtex = Content.Load<Texture2D>("bgtex");
 
             lisaaPelaajat(kentta);
@@ -79 +79 @@
         private void lisaaPelaajat(Level kentta)
         {
-            // Pelaaja 1
             Texture2D alus = Content.Load<Texture2D>("alus");
-            pelaaja1 = new BattleObject(Shapes.CreateFromTexture(alus, new Vector2D(50, 40), 10), 10, 5);
+            IShape pelaaja_shape = Shapes.CreateFromTexture(alus, new Vector2D(50, 40), 8.0);
+
+            pelaaja1 = new BattleObject(pelaaja_shape, 15, 5);
             pelaaja1.Texture = alus;
+
             hitpointNaytto.BindTo(pelaaja1.HitPoints);
             pelaaja1.HitpointsReachedZero += new EventHandler(rajahdys);
@@ -96 +98 @@
             ase.SetOwner(pelaaja1, kentta);
             ase.Visible = true;
+            ase.Size = new Vector2D(0, 0);
             ase.Color = Color.SteelBlue;
-            ase.FireRate = 1000;
+            ase.FireRate = 8;
             ase.Power = new Meter<double>(5000, 5000, 5000);
             kentta.Objects.Add(ase);
+
+            Timer tm = new Timer();
+            tm.Interval = vihu_interv;
+            tm.Trigger += new Timer.TriggerHandler(spawnVihu);
+            tm.Start();
+            AddTimer(tm);
         }
         #endregion
@@ -110 +119 @@
 
             //Yleiset näppäimet
-            Controls.Listen(Keys.Enter, ButtonPosition.Pressed, UusiPeli, "Aloittaa uuden pelin");
+            Controls.Listen(Keys.Enter, ButtonPosition.Pressed, UusiPeli);
 
             // Pelaajan 1 näppäimet
-            Controls.Listen(Keys.Left, ButtonPosition.Down, LiikuX, null, 5.0);
-            Controls.Listen(Keys.Right, ButtonPosition.Down, LiikuX, null, -5.0);
-            Controls.Listen(Keys.Up, ButtonPosition.Down, LiikuY, null, 5.0);
-            Controls.Listen(Keys.Down, ButtonPosition.Down, LiikuY, null, -5.0);
+            const double nopeus = 850.0;
+            Controls.Listen(Keys.Left, ButtonPosition.Down, LiikuX, null, pelaaja1, -nopeus);
+            Controls.Listen(Keys.Right, ButtonPosition.Down, LiikuX, null, pelaaja1, nopeus);
+            Controls.Listen(Keys.Up, ButtonPosition.Down, LiikuY, null, pelaaja1, nopeus);
+            Controls.Listen(Keys.Down, ButtonPosition.Down, LiikuY, null, pelaaja1, -nopeus);
             Controls.Listen(Keys.Space, ButtonPosition.Down, Ammu);
-        }
-
-        // Näppäimiin liitetyt toiminnot alkavat tästä -->
-        private Boolean NaytaOhjeet(ControlEvent e)
-        {
-            ShowControlHelp(MessageDisplay);
-            return false;
         }
 
@@ -137 +140 @@
             // luodaan ammus
             Projectile ammus = ase.Use();
+            if (ammus == null)
+                return false;
+
             ammus.Position = ammus.Position + (Vector2D.FromLengthAndAngle(40, ase.Angle.Radian));
             ammus.Push(ammus.Velocity); //?
@@ -150 +156 @@
             PhysicsObject pelaaja = e.Parameter0.ToPhysicsObject();
             double nopeus = e.Parameter1.ToDouble();
-            pelaaja.Y += nopeus;
+
+            Vector2D v = new Vector2D(0, nopeus);
+            pelaaja.Hit(v);
+
             return false;
         }
@@ -158 +167 @@
             PhysicsObject pelaaja = e.Parameter0.ToPhysicsObject();
             double nopeus = e.Parameter1.ToDouble();
-            pelaaja.X += nopeus;
+
+            Vector2D v = new Vector2D(nopeus,0);
+            pelaaja.Hit(v);
+
             return false;
         }
@@ -170 +182 @@
         {
             PhysicsObject po = sender.ToPhysicsObject();
-            Explosion ex = new Explosion(po.Width * 2);
+            Explosion ex = new Explosion(po.Width * 1.25);
             ex.Position = po.Position;
-            ex.Force = 4000;
+            ex.Force = 2000;
             Level.Objects.Add(ex);
             po.Destroy();
+
+            if (po == pelaaja1)
+                ase.Destroy();
         }
 
@@ -186 +201 @@
             bo2.TakeDamage(new Damage(1));
         }
+
+        void spawnVihu(Timer t)
+        {
+            IShape shape;
+
+            int numero = RandomGen.NextInt(0, 1);
+            switch (numero)
+            {
+                case 0:
+                    shape = Shapes.CreateRectangle(40, 40);
+                    break;
+
+                case 1:
+                    shape = Shapes.CreateCircle(20.0);
+                    break;
+
+                default:
+                    return;
+            }
+
+            BattleObject bo = new BattleObject(shape, 25.0, 25);
+
+            bo.X = Level.Right - (bo.Width/2.0);
+            bo.Y = RandomGen.NextDouble(Level.Bottom, Level.Top);
+            bo.HitpointsReachedZero += new EventHandler(rajahdys);
+            AddCollisionHandler(bo, VihuTormHandler);
+
+            Vector2D v = new Vector2D(RandomGen.NextDouble(-12000,-6000), RandomGen.NextDouble(-4000,4000));
+            bo.Hit(v);
+
+            Level.Objects.Add(bo);
+
+            double kerroin = 1.4;
+
+            if (nopeuta_vihuja)
+                vihu_interv /= kerroin;
+            else
+                vihu_interv *= kerroin;
+
+            if (vihu_interv < 0.01 || vihu_interv > 0.5)
+                nopeuta_vihuja = !nopeuta_vihuja;
+
+            t.Interval = vihu_interv;
+        }
+
+        void VihuTormHandler(Collision c)
+        {
+            if (c.Other == Level.LeftBorder)
+                c.Obj.Destroy();
+        }
+
         #endregion
     }

arho_m/Pong/Peli.cs

@@ -46 +46 @@
             pallo.KineticFriction = 0.0;
             pallo.Restitution = 1.0;
+            pallo.LinearDamping = 1.0;
 
             Timer tm = new Timer();