Changeset 6623 for 2015

Timestamp:

2015-06-30 18:34:26 (8 years ago)

Author:

sieerinn

Message:

Inventoryjuttua päivitetty.

Location:

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel

Files:

• TheLegendOfGabriel/Item.cs (modified) (2 diffs)
• TheLegendOfGabriel/TheLegendOfGabriel.cs (modified) (7 diffs)
• TheLegendOfGabrielContent/TheLegendOfGabrielContent.contentproj (modified) (1 diff)
• TheLegendOfGabrielContent/activeitemframe.png (added)
• TheLegendOfGabrielContent/activeitemframez.png (added)
• TheLegendOfGabrielContent/bigmonocle.png (added)
• TheLegendOfGabrielContent/bigsword.png (added)

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

@@ -176 +176 @@
 class Monocle : Item
 {
+    private GameObject bigMonocle;
+
     public Monocle(Player player) : base(player)
     {
@@ -183 +185 @@
     public override void UpdateItem(Time time)
     {
+        if (bigMonocle != null)
+            bigMonocle.Position = player.Position;
         base.UpdateItem(time);
     }
 
+    public override void UseKeyPressed()
+    {
+        InUse = false;
+        CreateMonocle();
+        base.UseKeyPressed();
+    }
+
     public override void UseKeyReleased()
     {
         InUse = true;
+        if (bigMonocle != null)
+        {
+            bigMonocle.Destroy();
+            bigMonocle = null;
+        }
         base.UseKeyReleased();
     }
 
-    public override void UseKeyPressed()
-    {
-        InUse = false;
-        base.UseKeyPressed();
-    }
-}
+    private void CreateMonocle()
+    {
+        bigMonocle = new GameObject(150, 150);
+        bigMonocle.Image = TheLegendOfGabriel.BigMonocleImage;
+        bigMonocle.Position = player.Position;
+        Game.Instance.Add(bigMonocle, 3);
+    }
+}

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

@@ -45 +45 @@
     private Label nextItem;
     private Label prevItem;
+    private Label swordFrame;
 
     #region Resources
@@ -52 +53 @@
     public static Image SmallSwordImage = LoadImage("smallsword");
     public static Image MonocleImage = LoadImage("monocle");
+    public static Image BigMonocleImage = LoadImage("bigmonocle");
+    public static Image BigSwordImage = LoadImage("bigsword");
 
     public static Image FrameImage = LoadImage("frame");
+    public static Image ActiveItemFrameImageX = LoadImage("activeitemframe");
+    public static Image ActiveItemFrameImageZ = LoadImage("activeitemframez");
 
     [AssetName("walkright")]
@@ -96 +101 @@
     }
 
-void BuildInventoryCycle()
+    void BuildInventoryCycle()
     {
         const int spacing = 20;
@@ -117 +122 @@
         nextItem.Y = prevItem.Y;
         Add(nextItem);
+
+        var frame = new Label();
+        frame.Size = new Vector(60, 60);
+        frame.Image = ActiveItemFrameImageX;
+        frame.X = currentItem.X;
+        frame.Top = currentItem.Top;
+        Add(frame);
+
+        swordFrame = new Label();
+        swordFrame.Size = prevItem.Size;
+        swordFrame.Left = nextItem.Right + spacing * 2;
+        swordFrame.Top = currentItem.Top;
+        Add(swordFrame);
+
+        var frame2 = new Label();
+        frame2.Size = new Vector(60, 60);
+        frame2.Image = ActiveItemFrameImageZ;
+        frame2.X = swordFrame.X;
+        frame2.Top = swordFrame.Top;
+        Add(frame2);
     }
 
@@ -223 +248 @@
         Keyboard.Listen(Key.Z, ButtonState.Down, delegate { UseItem(player.Sword, player.ActiveItem, () => player.Sword.UseKeyDown()); }, null);
 
-        Keyboard.Listen(Key.Space, ButtonState.Pressed, delegate { player.CycleItems(); UpdateItemCycleImages(); }, null);
+        Keyboard.Listen(Key.Space, ButtonState.Pressed, CycleItems, null);
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, null);
@@ -240 +265 @@
             action();
         }
+    }
+
+    void CycleItems()
+    {
+        // Kaman vaihtossa simuloidaan että oltaisiin laskettu irti käyttönäppäimestä.
+        if (player.ActiveItem != null)
+        {
+            player.ActiveItem.UseKeyReleased();
+        }
+
+        player.CycleItems();
+        UpdateItemCycleImages();
     }
 
@@ -247 +284 @@
         if (player.NextItem != null) nextItem.Image = player.NextItem.InventoryImage;
         if (player.ActiveItem != null) currentItem.Image = player.ActiveItem.InventoryImage;
+
+        if (player.Sword != null)
+        {
+            swordFrame.Image = BigSwordImage;
+        }
     }
 

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

@@ -186 +186 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="bigmonocle.png">
+      <Name>bigmonocle</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="activeitemframe.png">
+      <Name>activeitemframe</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="activeitemframez.png">
+      <Name>activeitemframez</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="bigsword.png">
+      <Name>bigsword</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.