Changeset 6550

Timestamp:

2015-06-30 08:09:02 (6 years ago)

Author:

sieerinn

Message:

Pistoolia aloiteltu.

Location:

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel

Files:

• Creature.cs (modified) (2 diffs)
• Item.cs (modified) (1 diff)
• LevelCreation.cs (modified) (2 diffs)

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

@@ -4 +4 @@
 class Creature : PhysicsObject
 {
-    public double MovementSpeed { get; set; }
+    public DoubleMeter MovementSpeed { get; set; }
 
     public Dictionary<Direction, Animation> MoveAnimations { get; set; }
@@ -13 +13 @@
         : base(width, height)
     {
+        MovementSpeed = new DoubleMeter(2000, 0, 2000);
         LastDirection = Direction.Down;
         MoveAnimations = new Dictionary<Direction, Animation>();

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

@@ -106 +106 @@
     }
 }
+
+class Pistol : Item
+{
+    private bool isCharging;
+
+    public Direction ShootDirection { get; set; }
+
+    // Montako sekuntia pistoolilla on tähdätty. Täydellä latauksella voisi ampua isomman ammuksen.
+    public DoubleMeter Charge { get; set; }
+
+    public override bool OverrideAnimation
+    {
+        get { return InUse; }
+    }
+
+    public Pistol(Player player)
+        : base(player)
+    {
+        Charge = new DoubleMeter(0, 0, 4);
+    }
+
+    public override void UpdateItem(Time time)
+    {
+        if (isCharging)
+        {
+            Charge.Value += time.SinceLastUpdate.TotalSeconds;
+        }
+        base.UpdateItem(time);
+    }
+
+    public override void UseKeyPressed()
+    {
+        InUse = true;
+        isCharging = true; // Ase alkaa latautumaan.
+        Charge.Value = Charge.MinValue; // Aseen lataus aluksi nollaan.
+
+        // Hidastetaan pelaajaa samalla kun se tähtää.
+        player.MovementSpeed.Value = player.MovementSpeed.MaxValue * 0.333;
+
+        // TODO: Tee pistoolin ampumiselle animaatio.
+        ShootDirection = player.Velocity.Angle.MainDirection;
+        player.Animation = new Animation(player.SwingAnimations[ShootDirection]);
+        player.Animation.StopOnLastFrame = true;
+        player.Animation.Start(1);
+        base.UseKeyPressed();
+    }
+
+    public override void UseKeyReleased()
+    {
+        // Pistoolilla voi ampua vain jos tähtäysanimaatio on ehtinyt loppuun.
+        if (player.Animation.CurrentFrameIndex == player.Animation.FrameCount - 1)
+        {
+            var bullet = new PhysicsObject(4, 4);
+            bullet.Position = player.Position + ShootDirection.GetVector() * player.Width * 0.7;
+            bullet.Hit(ShootDirection.GetVector() * 500);
+            Game.Instance.Add(bullet);
+        }
+
+        InUse = false;
+        isCharging = false;
+        player.MovementSpeed.Value = player.MovementSpeed.MaxValue;
+        player.SetWalkAnimation();
+
+        base.UseKeyReleased();
+    }
+}

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

@@ -41 +41 @@
         player = new Player();
         player.CanRotate = false;
-        player.MovementSpeed = 2300;
+        player.MovementSpeed = new DoubleMeter(2300, 0, 2300);
         player.Position = position;
         player.MoveAnimations[Direction.Left] = playerWalkLeft;
@@ -55 +55 @@
 
         player.ActiveItem = new Sword(player);
+        //player.ActiveItem = new Pistol(player);
+
 
         AddCollisionHandler(player, "exit", CollidesWithExit);