Changeset 6383 for 2015/26

Timestamp:

2015-06-25 16:35:24 (8 years ago)

Author:

empaheik

Message:

Parannukset voi pudotella + poimia uudelleen epämääräisillä painikkeilla.

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (15 diffs)
• HillbillyRunContent/level1.png (modified) (previous)

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun.cs

@@ -42 +42 @@
     private HillBilly owner;
 
-    public virtual void DoTheThing() { }
+    public virtual void DoTheThing(HillbillyRun game) { }
 
     public SoundEffect sound;
+
+    public void Rid()
+    {
+        Owner.AnimWalk = Owner.Animations[0];
+        Owner.AnimIdle = Owner.Animations[1];
+        Owner.Improvement = null;
+        Owner = null;
+    }
 }
 
 public class MilkImprovement : Improvement
 {
-    public override void DoTheThing()
-    {
-        HillbillyRun game = this.Game as HillbillyRun;
+    public override void DoTheThing(HillbillyRun game)
+    {
+        //HillbillyRun game = this.Game as HillbillyRun;
         Owner.PlayAnimation(Animations[1]);
         game.CreateMilkParticles(this.Owner, 10, 200, 300, new Vector(0, -30), "milkparticle");
         this.sound.Play();
-
     }
 
@@ -68 +75 @@
 public class PitchForkImprovement : Improvement
 {
-    public override void DoTheThing()
-    {
-        HillbillyRun game = this.Game as HillbillyRun;
-        Owner.PlayAnimation(Animations[1]);
+    public override void DoTheThing(HillbillyRun game)
+    {
+        //HillbillyRun game = this.Game as HillbillyRun;
         //game.CreateMilkParticles(this.Owner, 10, 200, 300, new Vector(0, -30), "milkparticle");
         //TODO: hitting things w/ pitchfork
-
+        game.ForkThings(Owner);
     }
 
@@ -83 +89 @@
     }
 }
-
 #endregion
 
 public class HillBilly : PlatformCharacter
 {
+    public List<Animation> Animations { get; set; }
+
     private IntMeter lifeCounter = new IntMeter(4, 0, 4);
     public IntMeter Life
@@ -108 +115 @@
     public void GainImprovement(Improvement improvement)
     {
+
         this.AnimWalk = improvement.Animations[0];
         this.AnimIdle = new Animation(improvement.Animations[0].CurrentFrame);
@@ -116 +124 @@
     }
 
-    public void UseImprovement(Improvement improvement)
-    {
-        if (Animation != improvement.Animations[1])
-        {
-            improvement.DoTheThing();
-            
+    public void UseImprovement()
+    {
+        HillbillyRun game = this.Game as HillbillyRun;
+        if (this.Improvement == null)
+        {
+            game.CreateMilkParticles(this, 5, 100, 100, new Vector(0, Height / 3), "tears");
+        }
+        else if (Animation != this.Improvement.Animations[1])
+        {
+            this.Improvement.DoTheThing(game);
         }
     }
@@ -573 +585 @@
         brain.FallsOffPlatforms = false;
         worm.Brain = brain;
+
+        AddCollisionHandler(worm, "pitchfork", delegate(PhysicsObject w, PhysicsObject p) { w.Destroy(); });
     }
 
@@ -775 +789 @@
         player.AnimJump = new Animation(playerJump);
         player.AnimFall = new Animation(playerFall);
+        player.Animations = new List<Animation>();
+        player.Animations.Add(normalWalk);
+        player.Animations.Add(playerIdle);
         player.AnimFall.StopOnLastFrame = true;
         players.Add(player);
@@ -809 +826 @@
                 players.Remove(player);
 
-                if (player.Improvement != null)
-                {
-                    Improvement parannus = player.Improvement;
-                    //parannus.Image = player.Improvement.Image;
-                    parannus.Position = player.Position;
-                    parannus.IsVisible = true;
-                    parannus.IgnoresCollisionResponse = false;
-                    parannus.Tag = "improvement";
-                    //parannus.Animations = player.Improvement.Animations;
-                    //parannus.Tag = player.Improvement.Tag;
-                    //parannus.Size = new Vector(60, 60);
-                    //Add(parannus);
-                }
+                //if (player.Improvement != null)
+                //{
+                    GetRidOfImprovement(player);
+                    //Improvement parannus = player.Improvement;
+                    //parannus.Position = player.Position;
+                    //parannus.IsVisible = true;
+                    //parannus.IgnoresCollisionResponse = false;
+                    //parannus.Tag = "improvement";
+                //}
 
                 player.Destroy();
@@ -832 +845 @@
        // AddCollisionHandler(player, "improvement", CollectImprovement);
     }
-
-    //void CollectImprovement(PhysicsObject player, PhysicsObject fork)
-    //{
-    //    //TODO: Collecting the fork
-    //    HillBilly billy = player as HillBilly;
-    //    if (billy == null)
-    //        return;
-
-    //    Improvement forkI = fork as Improvement;
-    //    billy.GainImprovement(forkI);
-
-    //    Remove(fork);
-    //}
 
     void CreateGroundTop(Vector position, double width, double height)
@@ -890 +890 @@
         Keyboard.Listen(Key.D, ButtonState.Down, delegate { startingPlayers[0].Walk(PLAYER_SPEED); }, "Player 1 moves right");
         Keyboard.Listen(Key.W, ButtonState.Down, delegate { startingPlayers[0].Jump(PLAYER_SPEED * 2); }, "Player 1 jumps");    //Just PLAYER_SPEED felt alright as well
-        Keyboard.Listen(Key.E, ButtonState.Pressed, UseImprovement, "Player 1 uses their tools", startingPlayers[0]);
+        Keyboard.Listen(Key.E, ButtonState.Pressed, delegate { startingPlayers[0].UseImprovement(); }, "Player 1 uses their tools");
+        Keyboard.Listen(Key.Tab, ButtonState.Pressed, GetRidOfImprovement, "Player 1 throws their tools away", startingPlayers[0]);
 
         Keyboard.Listen(Key.Left, ButtonState.Down, delegate { startingPlayers[1].Walk(-PLAYER_SPEED); }, "Player 2 moves left");
         Keyboard.Listen(Key.Right, ButtonState.Down, delegate { startingPlayers[1].Walk(PLAYER_SPEED); }, "Player 2 moves right");
         Keyboard.Listen(Key.Up, ButtonState.Down, delegate { startingPlayers[1].Jump(PLAYER_SPEED * 2); }, "Player 2 jumps");
-        Keyboard.Listen(Key.RightShift, ButtonState.Pressed, UseImprovement, "Player 2 uses their tools", startingPlayers[1]);
+        Keyboard.Listen(Key.RightShift, ButtonState.Pressed, delegate { startingPlayers[1].UseImprovement(); }, "Player 2 uses their tools");
+        Keyboard.Listen(Key.Enter, ButtonState.Pressed, GetRidOfImprovement, "Player 1 throws their tools away", startingPlayers[1]);
 
         Keyboard.Listen(Key.F12, ButtonState.Pressed, NextLevel, null);
@@ -902 +904 @@
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Show help");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Exit game");
+    }
+
+    void GetRidOfImprovement(HillBilly player)
+    {
+        if(player.Improvement != null)
+        {
+            Improvement parannus = player.Improvement;
+            parannus.Position = player.Position + player.FacingDirection.GetVector() * 100;
+            parannus.IsVisible = true;
+            parannus.IgnoresCollisionResponse = false;
+            parannus.Tag = "improvement";
+            player.Improvement.Rid();
+        }
     }
 
@@ -935 +950 @@
     }
 
-    private void UseImprovement(HillBilly player)
-    {
-        if (player.Improvement == null)
-        {
+    //private void UseImprovement(HillBilly player)
+    //{
+    //    if (player.Improvement == null)
+    //    {
             
-            CreateMilkParticles(player, 5, 100, 100, new Vector(0, player.Height/3), "tears");
-            return;
-        }
-
-        player.UseImprovement(player.Improvement);
-    }
+    //        CreateMilkParticles(player, 5, 100, 100, new Vector(0, player.Height/3), "tears");
+    //        return;
+    //    }
+
+    //    player.UseImprovement(player.Improvement);
+    //}
 
     void Loss()
@@ -956 +971 @@
     {
         HillBilly billy = player as HillBilly;
-        if (billy == null)
+        if (billy == null || billy.Improvement != null)
             return;
 
@@ -999 +1014 @@
         }
     }
+
+    public void ForkThings(HillBilly Owner)
+    {
+        PhysicsObject evilClone = new PhysicsObject(Owner.Width, Owner.Height * 0.7);
+        evilClone.Position = Owner.Position + Owner.FacingDirection.GetVector() * 40 + new Vector(0, -(Owner.Height * 0.3));
+        evilClone.Color = Color.Red;
+        evilClone.IsVisible = false;
+        evilClone.Tag = "pitchfork";
+        evilClone.IgnoresCollisionResponse = true;
+        evilClone.IgnoresPhysicsLogics = true;
+        evilClone.LifetimeLeft = TimeSpan.FromSeconds(Owner.Animation.FPS * Owner.Animation.FrameCount);
+        Add(evilClone);
+
+        Owner.PlayAnimation(Owner.Improvement.Animations[1], evilClone.Destroy);
+    }
+    
 
     protected override void Update(Time time)
@@ -1039 +1070 @@
      */
     #endregion
+
+
 }