Changeset 6384 for 2015/26

Timestamp:

2015-06-25 16:47:08 (8 years ago)

Author:

sieerinn

Message:

Heiluri on valmis.

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (8 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRunContent/level1.png (modified) (previous)
• HillbillyRunContent/tukki.png (added)

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

@@ -167 +167 @@
     public const double TILE_SIZE = 70;
 
-    public String[] names = new String[] { "Adolfiina", "Rasputiina", "Hermanniina", "Joosefiina"};
-        
+    public String[] names = new String[] { "Adolfiina", "Rasputiina", "Hermanniina", "Joosefiina" };
+
     private double cameraTargetX; // Sijainti jossa kameran pitäisi olla.
     private Vector cameraTarget;
@@ -196 +196 @@
     private Image treeBranchImage = LoadImage("bigtreebranch");
     private Image forestBackgroundImage = LoadImage("forestbackground");
+    private Image swingTrapImage = LoadImage("tukki");
 
     private Animation crawl;
@@ -444 +445 @@
 
         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("57007F"), CreateTreeRoot);   // Heksojen käytössä ei ole mitään hävettävää :P
         level.SetTileMethod(Color.FromHexCode("00FF21"), CreateTreeBranch);
+        level.SetTileMethod(Color.FromHexCode("5B7F00"), CreateSwingTrap);
 
         level.Optimize(Color.Brown);    //Color.Black   //Tekee jännittäviä asioita wheatille, jos optimoidaan (tietysti). Jotenn. 
 
         level.Execute(TILE_SIZE, TILE_SIZE);
+    }
+
+    void CreateSwingTrap(Vector position, double width, double height)
+    {
+        const double swingArc = 30; // Heiluu 30 astetta edestakaisin.
+        const double swingSpeed = 1.5;
+        const double ropeLength = 400;
+        var center = position + new Vector(0, ropeLength);
+
+        // Ajastukset heilutteluun.
+        double deltaTime = 1 / 60.0;
+        double time = 0.0;
+
+        PhysicsObject swing = PhysicsObject.CreateStaticObject(width, height);
+        swing.Image = swingTrapImage;
+        swing.Position = position;
+        Add(swing);
+
+        GameObject rope = new GameObject(ropeLength, 10);
+        rope.Color = new Color(10, 30, 10);
+        Add(rope);
+
+        var updateTimer = new Timer { Interval = deltaTime };
+        updateTimer.Timeout += delegate
+        {
+            time += deltaTime;
+
+            // Heilurin kulma on sinimuotoinen funktio ajan suhteen.
+            var angle = Angle.FromDegrees(-90.0 + Math.Sin(time * swingSpeed) * swingArc);
+            swing.Position = center + angle.GetVector() * ropeLength;
+            swing.Angle = angle;
+
+            // Päivitetään narun sijainti ja kulma.
+            rope.Angle = angle;
+            rope.Position = center + angle.GetVector() * ropeLength * 0.5;
+        };
+        updateTimer.Start();
     }
 
@@ -490 +529 @@
         Add(roots, -1);
     }
-    
+
     void CreateFlame(Vector position, double width, double height, bool suuri)
     {
@@ -697 +736 @@
         };
 
-        attackBrain.DistanceToTarget.AddTrigger(Window.Width / 2, TriggerDirection.Down, delegate() 
-        { 
-            castTimer.Start(); 
-            attackBrain.DistanceToTarget.RemoveTriggers(Window.Width/2);
+        attackBrain.DistanceToTarget.AddTrigger(Window.Width / 2, TriggerDirection.Down, delegate()
+        {
+            castTimer.Start();
+            attackBrain.DistanceToTarget.RemoveTriggers(Window.Width / 2);
         });
 
@@ -716 +755 @@
                     CreatePitchfork(mage.Position, TILE_SIZE, TILE_SIZE);
                     mage.Destroy();
-                    Timer.SingleShot(6, NextLevel); 
+                    Timer.SingleShot(6, NextLevel);
                 }
                 Timer.SingleShot(0.5, delegate { immune = false; });
@@ -843 +882 @@
 
         AddCollisionHandler(player, "improvement", CollectImprovement);
-       // AddCollisionHandler(player, "improvement", CollectImprovement);
+        // AddCollisionHandler(player, "improvement", CollectImprovement);
     }
 
@@ -953 +992 @@
     //{
     //    if (player.Improvement == null)
-    //    {
-            
+    //    { 
     //        CreateMilkParticles(player, 5, 100, 100, new Vector(0, player.Height/3), "tears");
     //        return;
     //    }
-
     //    player.UseImprovement(player.Improvement);
     //}

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

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