Changeset 6310 for 2015/26

Timestamp:

2015-06-25 08:33:19 (8 years ago)

Author:

empaheik

Message:

Heinähanko + parannusten uudelleenpoimiminen + paranneltu Improvement-luokka tovereineen.

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (15 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRunContent/fork.png (added)
• HillbillyRunContent/level0.png (modified) (previous)
• HillbillyRunContent/level1.png (modified) (previous)

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

@@ -43 +43 @@
 
     public virtual void DoTheThing() { }
+
+    public SoundEffect sound;
 }
 
-//Luokka maajussien erikoisuuksille.
 public class MilkImprovement : Improvement
 {
-
-
     public override void DoTheThing()
     {
@@ -55 +54 @@
         Owner.PlayAnimation(Animations[1]);
         game.CreateMilkParticles(this.Owner, 10, 200, 300, new Vector(0, -30), "milkparticle");
+        this.sound.Play();
 
     }
 
     public MilkImprovement(double width, double height)
+        : base(width, height)
+    {
+
+    }
+}
+
+
+public class PitchForkImprovement : Improvement
+{
+    public override void DoTheThing()
+    {
+        HillbillyRun game = this.Game as HillbillyRun;
+        Owner.PlayAnimation(Animations[1]);
+        //game.CreateMilkParticles(this.Owner, 10, 200, 300, new Vector(0, -30), "milkparticle");
+        //TODO: hitting things w/ pitchfork
+
+    }
+
+    public PitchForkImprovement(double width, double height)
         : base(width, height)
     {
@@ -94 +113 @@
         improvement.Owner = this;
 
-        improvement.Destroy();
+        //improvement.Destroy();
     }
 
@@ -102 +121 @@
         {
             improvement.DoTheThing();
+            
         }
     }
@@ -153 +173 @@
     private Image cartImage = LoadImage("cart");
     private Image milkImage = LoadImage("tonkkaitem");
+    private Image pitchforkImage = LoadImage("fork");
 
     private Image cartWheelImage = LoadImage("cartwheel");
@@ -400 +421 @@
         level.SetTileMethod(Color.Harlequin, CreateCart);
         level.SetTileMethod(Color.White, CreateBlockObject);
+        //level.SetTileMethod(Color.DarkGray, (new AbstractTileMap<Color>.TileMethod[] { CreateMilk, CreatePitchfork })[levelNumber]);  // Vain jos jaksan vippastaa maitokannun pysymään mukana ClearAllin läpi hmm
         level.SetTileMethod(Color.DarkGray, CreateMilk);
+        level.SetTileMethod(Color.FromHexCode("A17FFF"), CreatePitchfork);
+
         level.SetTileMethod(Color.Gray, (new AbstractTileMap<Color>.TileMethod[] { CreateCrawly, CreateWorm })[levelNumber]); // ಠ_ಠ
         level.SetTileMethod(Color.Red, CreateFireMage);
@@ -407 +431 @@
         //level.SetTileMethod(Color.Orange, CreateDummy, Color.Orange); //TODO: CreateTombstone
 
-        level.SetTileMethod(Color.FromHexCode("FF6A00"), CreateTreeTrunk);
+        level.SetTileMethod(Color.FromHexCode("FF6A00"), CreateTreeTrunk);  //Pihhh jostain heksoista. Ikävästi haisee luovuttamiselta! :----D
         level.SetTileMethod(Color.FromHexCode("57007F"), CreateTreeRoot);
         level.SetTileMethod(Color.FromHexCode("00FF21"), CreateTreeBranch);
@@ -414 +438 @@
 
         level.Execute(TILE_SIZE, TILE_SIZE);
+    }
+
+    void CreatePitchfork(Vector position, double width, double height)
+    {
+        double size = 30;
+        double ratio = pitchforkImage.Width / pitchforkImage.Height;
+
+        Improvement fork = new PitchForkImprovement(size * ratio, size);
+        fork.Image = pitchforkImage;
+        fork.Animations = new List<Animation> { pitchforkWalk, pitchforkAttack };
+        fork.Position = position;
+        fork.Tag = "improvement";
+        Add(fork);
+
     }
 
@@ -507 +545 @@
         milk.Animations = new List<Animation> { milkWalk, milkThrow };
         milk.Position = position;
-        milk.Tag = "milk";
+        //milk.Tag = "milk";
+        milk.Tag = "improvement";
+        milk.sound = splash;
         Add(milk);
 
@@ -770 +810 @@
                 if (player.Improvement != null)
                 {
-                    Improvement parannus = new MilkImprovement(player.Improvement.Width, player.Improvement.Height);
-                    parannus.Image = player.Improvement.Image;
+                    Improvement parannus = player.Improvement;
+                    //parannus.Image = player.Improvement.Image;
                     parannus.Position = player.Position;
-                    parannus.Animations = player.Improvement.Animations;
-                    parannus.Tag = player.Improvement.Tag;
-                    parannus.Size = new Vector(60, 60);
-                    Add(parannus);
+                    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);
                 }
 
@@ -785 +828 @@
         };
 
-        AddCollisionHandler(player, "milk", CollectMilk);
-    }
+        AddCollisionHandler(player, "improvement", CollectImprovement);
+       // 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)
@@ -848 +905 @@
     public void CreateMilkParticles(HillBilly billy, int size, int xBase, int yBase, Vector position, String tag)
     {
-        splash.Play();
+        //splash.Play();
         for (int i = 0; i < 10; i++)
         {
@@ -881 +938 @@
         if (player.Improvement == null)
         {
+            
             CreateMilkParticles(player, 5, 100, 100, new Vector(0, player.Height/3), "tears");
             return;
@@ -894 +952 @@
     }
 
-    void CollectMilk(PhysicsObject player, PhysicsObject milk)
+    void CollectImprovement(PhysicsObject player, PhysicsObject milk)
     {
         HillBilly billy = player as HillBilly;
@@ -903 +961 @@
         billy.GainImprovement(milkI);
 
-        Remove(milk);
+        milk.IsVisible = false;
+        milk.IgnoresCollisionResponse = true;
+        milk.Tag = "none";
+
+        //Remove(milk);
         //billy.AnimWalk = new Animation(milkWalk);
         //billy.AnimIdle = new Animation(milkWalk.CurrentFrame);

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRunContent/HillbillyRunContent.contentproj

@@ -309 +309 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="fork.png">
+      <Name>fork</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.