Changeset 6386

Timestamp:

2015-06-25 17:51:22 (7 years ago)

Author:

sieerinn

Message:

Kolmatta kenttää tehty. Vipu ja portti lisätty.

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (7 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRunContent/gate.png (added)
• HillbillyRunContent/level2.png (added)
• HillbillyRunContent/lever_left.png (added)
• HillbillyRunContent/lever_right.png (added)

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

@@ -176 +176 @@
 
     # region Images
-    private Image[] groundImages = LoadImages("ground", "ground_forest");    //Näitä ei tosin kaikkia kenties jaksa tehdä erilaisiksi levelistä riippuen
-    private Image[] groundTopImages = LoadImages("ground_top", "ground_top_forest");
-    private Image[] foregroundDecorations = LoadImages("viljaa", "grass");
+    private Image[] groundImages = LoadImages("ground", "ground_forest", "ground");    //Näitä ei tosin kaikkia kenties jaksa tehdä erilaisiksi levelistä riippuen
+    private Image[] groundTopImages = LoadImages("ground_top", "ground_top_forest", "ground_top");
+    private Image[] foregroundDecorations = LoadImages("viljaa", "grass", "grass");
     private Image[] blockImages = LoadImages("box2", "rock");
 
@@ -197 +197 @@
     private Image forestBackgroundImage = LoadImage("forestbackground");
     private Image swingTrapImage = LoadImage("tukki");
+
+    private Image gateImage = LoadImage("gate");
+    private Image leverLeftImage = LoadImage("lever_left");
+    private Image leverRightImage = LoadImage("lever_right");
 
     private Animation crawl;
@@ -435 +439 @@
         level.SetTileMethod(Color.FromHexCode("A17FFF"), CreatePitchfork);
 
-        level.SetTileMethod(Color.Gray, (new AbstractTileMap<Color>.TileMethod[] { CreateCrawly, CreateWorm })[levelNumber]); // ಠ_ಠ
-        level.SetTileMethod(Color.Red, (new AbstractTileMap<Color>.TileMethod[] { CreateFireMage, CreateShroom })[levelNumber]);
+        level.SetTileMethod(Color.Gray, (new AbstractTileMap<Color>.TileMethod[] { CreateCrawly, CreateWorm, null })[levelNumber]); // ಠ_ಠ
+        level.SetTileMethod(Color.Red, (new AbstractTileMap<Color>.TileMethod[] { CreateFireMage, CreateShroom, null })[levelNumber]);
         level.SetTileMethod(Color.White, CreateBlockObject);
         level.SetTileMethod(Color.DarkGray, CreateMilk);
@@ -448 +452 @@
         level.SetTileMethod(Color.FromHexCode("5B7F00"), CreateSwingTrap);
 
+        level.SetTileMethod(Color.FromHexCode("7FBA00"), CreateGate);
+        level.SetTileMethod(Color.FromHexCode("4C7F00"), CreateLevel);
+
         level.Optimize(Color.Brown);    //Color.Black   //Tekee jännittäviä asioita wheatille, jos optimoidaan (tietysti). Jotenn. 
 
         level.Execute(TILE_SIZE, TILE_SIZE);
+    }
+
+    void CreateGate(Vector position, double width, double height)
+    {
+        PhysicsObject gate = PhysicsObject.CreateStaticObject(width, height);
+        gate.Image = gateImage;
+        gate.Color = Color.HotPink;
+        gate.Position = position;
+        gate.Y -= height / 2.0;
+        gate.Tag = "gate";
+        Add(gate);
+    }
+
+    void CreateLevel(Vector position, double width, double height)
+    {
+        PhysicsObject lever = PhysicsObject.CreateStaticObject(width * 0.5, height);
+        lever.Image = leverLeftImage;
+        lever.Color = Color.Green;
+        lever.Position = position;
+        lever.Y -= height / 2.0;
+        lever.IgnoresCollisionResponse = true;
+        Add(lever);
+
+        AddCollisionHandler(lever, "player", delegate(PhysicsObject p, PhysicsObject l)
+        {
+            if (lever.Image == leverLeftImage)
+            {
+                lever.Image = leverRightImage;
+                GetObjectsWithTag("gate").ForEach(g => g.Destroy());
+            }
+        });
     }
 
@@ -934 +972 @@
             {
                 players.Remove(player);
-
                 GetRidOfImprovement(player);
-
                 player.Destroy();
-
-
             }
         };
@@ -1008 +1042 @@
     void GetRidOfImprovement(HillBilly player)
     {
-        if(player.Improvement != null)
+        if (player.Improvement != null)
         {
             Improvement parannus = player.Improvement;
@@ -1116 +1150 @@
         }
     }
-    
+
 
     protected override void Update(Time time)

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

@@ -324 +324 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GameThumbnail.png">
-      <Name>GameThumbnail</Name>
+    <Compile Include="level2.png">
+      <Name>level2</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="lever_left.png">
+      <Name>lever_left</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="lever_right.png">
+      <Name>lever_right</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="gate.png">
+      <Name>gate</Name>
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>