Changeset 6631 for 2015

Timestamp:

2015-06-30 22:57:22 (8 years ago)

Author:

sieerinn

Message:

Miekan ääntä säädetty hiljaisemmaksi. Kranaatteja voi heitellä.

Location:

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel

Files:

• TheLegendOfGabriel/Item.cs (modified) (4 diffs)
• TheLegendOfGabriel/LevelCreation.cs (modified) (1 diff)
• TheLegendOfGabriel/TheLegendOfGabriel.cs (modified) (3 diffs)
• TheLegendOfGabrielContent/TheLegendOfGabrielContent.contentproj (modified) (1 diff)
• TheLegendOfGabrielContent/bullet.png (added)
• TheLegendOfGabrielContent/gran.png (modified) (previous)
• TheLegendOfGabrielContent/gransmall.png (added)
• TheLegendOfGabrielContent/swordsound.wav (modified) (previous)

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/Item.cs

@@ -4 +4 @@
 using System.Text;
 using Jypeli;
+using Jypeli.Assets;
 
 
@@ -194 +195 @@
     {
         // Pistoolilla voi ampua vain jos tähtäysanimaatio on ehtinyt loppuun.
-        if (player.Animation.CurrentFrameIndex == player.Animation.FrameCount - 1)
+        if (InUse && Usages.Value > 0 && player.Animation.CurrentFrameIndex == player.Animation.FrameCount - 1)
         {
             Usages.Value--;
@@ -200 +201 @@
 
             var bullet = new PhysicsObject(4, 4);
+            bullet.Image = TheLegendOfGabriel.BulletImage;
             bullet.Position = player.Position + ShootDirection.GetVector() * player.Width * 0.7;
             bullet.Hit(ShootDirection.GetVector() * 500);
@@ -219 +221 @@
 }
 
+class Grenade : Item
+{
+    public Grenade(Player player) : base(player)
+    {
+        Usages.MaxValue = 15;
+        Usages.Value = 15;
+        InventoryImage = TheLegendOfGabriel.GrenadeImage;
+    }
+
+    public override void UseKeyPressed()
+    {
+        if (Usages.Value > 0)
+        {
+            Usages.Value--;
+
+            var grenade = new PhysicsObject(6, 6);
+            grenade.Image = TheLegendOfGabriel.GrenadeSmallImage;
+            grenade.Position = player.Position + player.LastDirection.GetVector() * player.Width * 0.7;
+            grenade.Hit(player.LastDirection.GetVector() * 500);
+            grenade.ApplyTorque(9000);
+            grenade.LinearDamping = 0.9;
+            grenade.AngularDamping = 0.9;
+            Game.Instance.Add(grenade);
+
+            Timer.SingleShot(1.5, delegate
+            {
+                var expl = new Explosion(50);
+                expl.Position = grenade.Position;
+                Game.Instance.Add(expl);
+                grenade.Destroy();
+            });
+        }
+        base.UseKeyPressed();
+    }
+}
+
 class Monocle : Item
 {

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/LevelCreation.cs

@@ -66 +66 @@
         player.Inventory.Add(new Pistol(player));
         player.Inventory.Add(new Monocle(player));
+        player.Inventory.Add(new Grenade(player));
 
         AddCollisionHandler(player, "exit", CollidesWithExit);

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel.cs

@@ -86 +86 @@
 
     public static Image GunImage = LoadImage("gun");
+    public static Image BulletImage = LoadImage("bullet");
     public static Image LetterImage = LoadImage("letter");
     public static Image SmallSwordImage = LoadImage("smallsword");
@@ -91 +92 @@
     public static Image BigMonocleImage = LoadImage("bigmonocle");
     public static Image BigSwordImage = LoadImage("bigsword");
+    public static Image GrenadeImage = LoadImage("gran");
+    public static Image GrenadeSmallImage = LoadImage("gransmall");
 
     public static Image FrameImage = LoadImage("frame");
@@ -282 +285 @@
         //CreatePlayer(new Vector(-Level.Width/3, Level.Bottom + TILE_SIZE * 2));
         SetControls();
-        Camera.ZoomToLevel();
+        //Camera.ZoomToLevel();
+        Camera.Follow(player);
+        Camera.ZoomFactor = 2.0;
     }
 

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabrielContent/TheLegendOfGabrielContent.contentproj

@@ -243 +243 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="bullet.png">
+      <Name>bullet</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="gransmall.png">
+      <Name>gransmall</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.