Changeset 6701

Timestamp:

2015-07-01 17:42:14 (8 years ago)

Author:

sieerinn

Message:

Pelaajalla näkyy taas sydämmet, monokkeli toimii.

Location:

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel

Files:

• TheLegendOfGabriel/Item.cs (modified) (2 diffs)
• TheLegendOfGabriel/LevelCreation.cs (modified) (3 diffs)
• TheLegendOfGabriel/TheLegendOfGabriel.cs (modified) (4 diffs)
• TheLegendOfGabrielContent/TheLegendOfGabrielContent.contentproj (modified) (1 diff)

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

@@ -298 +298 @@
     }
 
+    public override void UseKeyDown()
+    {
+        if (bigMonocle == null)
+            return;
+
+        foreach (var tile in Game.Instance.GetObjectsWithTag("cover"))
+        {
+            tile.IsVisible = Vector.Distance(player.Position, tile.Position) > bigMonocle.Width * 0.5;
+        }
+        base.UseKeyDown();
+    }
+
     public override void UseKeyReleased()
     {
@@ -311 +323 @@
             bigMonocle.Destroy();
             bigMonocle = null;
+        }
+        foreach (var tile in Game.Instance.GetObjectsWithTag("cover"))
+        {
+            tile.IsVisible = true;
         }
         base.CancelUse();

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

@@ -35 +35 @@
         level.SetObjectMethod("exit", CreateExit);
         level.SetTileMethod("decoration", CreateDecoration);
+        level.SetTileMethod("cover", CreateCover);
         //level.SetObjectMethod("player", CreatePlayer);
         level.SetObjectMethod("blockade", CreateBlock);
@@ -97 +98 @@
     }
 
+    void CreateCover(Vector position, double width, double height, Image image, string layername, Dictionary<string, string> properties)
+    {
+        var tile = new GameObject(width, height);
+        tile.Tag = "cover";
+        tile.Image = image;
+        tile.Position = position;
+        Add(tile, 3);
+    }
+
     /// <summary>
     /// Luo tavallisen tiilen.
     /// </summary>
-    void CreateBasicTile(Vector position, double width, double height, Image image, int layer, Dictionary<string, string> properties)
+    GameObject CreateBasicTile(Vector position, double width, double height, Image image, int layer, Dictionary<string, string> properties)
     {
         var tile = properties.ContainsKey("collide") ? new PhysicsObject(width, height) : new GameObject(width, height);
@@ -106 +116 @@
         tile.Position = position;
         Add(tile, layer);
+        return tile;
     }
 

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

@@ -100 +100 @@
     public static Image ActiveItemFrameImageZ = LoadImage("activeitemframez");
 
-    //public static Image PlayerHealthImage = LoadImage("playerhealth");
-    //public static Image PlayerHealthEmptyImage = LoadImage("playerhealthempty");
+    public static Image PlayerHealthImage = LoadImage("playerhealth");
+    public static Image PlayerHealthEmptyImage = LoadImage("playerhealthempty");
 
     [AssetName("walkright")]
@@ -159 +159 @@
         bar.Right = Screen.Right - 50;
         bar.Top = Screen.Top - 50;
-        //bar.Image = PlayerHealthEmptyImage;
-        //bar.BarImage = PlayerHealthImage;
+        bar.Image = PlayerHealthEmptyImage;
+        bar.BarImage = PlayerHealthImage;
         bar.BindTo(player.Health);
         Add(bar);
@@ -222 +222 @@
             }
             member.Add(inner);
-
-            // Gameobjektit ei liiku mukana jos kamera liikkuu joten tein kehyksistä Labeleita.
-            /*  
-            GameObject member = new GameObject(FrameImage);
-            member.Position = new Vector(Level.Right + FrameImage.Width, Level.Top - Level.Width * 0.25 - FrameImage.Height * i * 1.5);
-            Add(member);
-
-            GameObject inner = new GameObject(TILE_SIZE, TILE_SIZE);
-            inner.Color = Color.Black;
-            if (storyItem[i] != null)
-            {
-                inner.Image = storyItem[i].InventoryImage;
-                Mouse.ListenOn(inner, MouseButton.Left, ButtonState.Pressed, ShowTextItem, "View those precious memories", storyItem[i]);
-            }
-            member.Add(inner);
-            */
         }
     }
@@ -297 +281 @@
         frame = new GameObject(LetterImage);
         frame.Image = LetterImage;
-        //frame.Width = Window.Width * 0.25;
-        //frame.Height = Window.Height * 0.25;
+        frame.Width = Window.Width * 0.25;
+        frame.Height = Window.Height * 0.25;
         frame.Width = Level.Width * 0.25;
         frame.Height = Level.Height * 0.25;

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabrielContent/TheLegendOfGabrielContent.contentproj

@@ -265 +265 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="playerhealth.png">
+      <Name>playerhealth</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="playerhealthempty.png">
+      <Name>playerhealthempty</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="hobocave.tmx">
+      <Name>hobocave</Name>
+      <Importer>TextFileImporter</Importer>
+      <Processor>TextFileContentProcessor</Processor>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </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.