Changeset 6619 for 2015

Timestamp:

2015-06-30 17:38:02 (8 years ago)

Author:

sieerinn

Message:

Aktiivisen kaman vaihto toimii.

Location:

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel

Files:

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

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

@@ -178 +178 @@
     public Monocle(Player player) : base(player)
     {
+        InventoryImage = TheLegendOfGabriel.MonocleImage;
     }
 

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

@@ -60 +60 @@
         player.Sword = new Sword(player);
         player.Inventory.Add(new Pistol(player));
-
+        player.Inventory.Add(new Monocle(player));
 
         AddCollisionHandler(player, "exit", CollidesWithExit);

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

@@ -19 +19 @@
             }
             return null;
+        }
+    }
+
+    public Item NextItem
+    {
+        get
+        {
+            return Inventory.Count > 1 ? GetItem(activeItemIndex + 1) : null;
+        }
+    }
+
+    public Item PrevItem
+    {
+        get
+        {
+            return Inventory.Count > 1 ? GetItem(activeItemIndex - 1) : null;
         }
     }
@@ -44 +60 @@
     }
 
+    private Item GetItem(int index)
+    {
+        if (index < 0)
+        {
+            index += Inventory.Count;
+        }
+        if (index >= Inventory.Count)
+        {
+            index -= Inventory.Count;
+        }
+        return Inventory[index];
+    }
+
     protected override void UpdateAnimations()
     {
-        if (!(ActiveItem != null && ActiveItem.OverrideAnimation))
+        bool itemBlocksAnimation = ActiveItem != null && ActiveItem.OverrideAnimation;
+        bool swordBlocksAnimation = Sword != null && Sword.OverrideAnimation;
+        if (!(itemBlocksAnimation || swordBlocksAnimation))
         {
-            base.UpdateAnimations();   
+            base.UpdateAnimations();
         }
     }
@@ -55 +86 @@
     {
         if (ActiveItem != null)
-            ActiveItem.UpdateItem(time);
+        {
+            ActiveItem.UpdateItem(time);   
+        }
+        if (Sword != null)
+        {
+            Sword.UpdateItem(time);
+        }
         base.UpdateCreature(time);
     }

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

@@ -42 +42 @@
     StoryItem[] storyItem = new StoryItem[3];
 
+    private Label currentItem;
+    private Label nextItem;
+    private Label prevItem;
+
     #region Resources
 
@@ -47 +51 @@
     public static Image LetterImage = LoadImage("letter");
     public static Image SmallSwordImage = LoadImage("smallsword");
+    public static Image MonocleImage = LoadImage("monocle");
 
     public static Image FrameImage = LoadImage("frame");
@@ -85 +90 @@
         LoadAnimations();
         StartGame();
-        Intro();
+        //Intro();
         BuildRightBar();
+        BuildInventoryCycle();
+        UpdateItemCycleImages();
+    }
+
+    void BuildInventoryCycle()
+    {
+        const int spacing = 20;
+
+        prevItem = new Label();
+        prevItem.Size = new Vector(60, 40);
+        prevItem.X = Screen.Left + 100;
+        prevItem.Y = Screen.Top - 50;
+        Add(prevItem);
+
+        currentItem = new Label();
+        currentItem.Size = prevItem.Size;
+        currentItem.Left = prevItem.Right + spacing;
+        currentItem.Y = prevItem.Y;
+        Add(currentItem);
+
+        nextItem = new Label();
+        nextItem.Size = prevItem.Size;
+        nextItem.Left = currentItem.Right + spacing;
+        nextItem.Y = prevItem.Y;
+        Add(nextItem);
     }
 
@@ -186 +216 @@
         Keyboard.Listen(Key.Down, ButtonState.Down, player.Move, null, Direction.Down);
 
-        Keyboard.Listen(Key.Space, ButtonState.Pressed, delegate { if (player.ActiveItem != null) player.ActiveItem.UseKeyPressed(); }, null);
-        Keyboard.Listen(Key.Space, ButtonState.Released, delegate { if (player.ActiveItem != null) player.ActiveItem.UseKeyReleased(); }, null);
-        Keyboard.Listen(Key.Space, ButtonState.Down, delegate { if (player.ActiveItem != null) player.ActiveItem.UseKeyDown(); }, null);
+        Keyboard.Listen(Key.X, ButtonState.Pressed, delegate { if (player.ActiveItem != null) player.ActiveItem.UseKeyPressed(); }, null);
+        Keyboard.Listen(Key.X, ButtonState.Released, delegate { if (player.ActiveItem != null) player.ActiveItem.UseKeyReleased(); }, null);
+        Keyboard.Listen(Key.X, ButtonState.Down, delegate { if (player.ActiveItem != null) player.ActiveItem.UseKeyDown(); }, null);
+
+        Keyboard.Listen(Key.Z, ButtonState.Pressed, delegate { if (player.Sword != null) player.Sword.UseKeyPressed(); }, null);
+        Keyboard.Listen(Key.Z, ButtonState.Released, delegate { if (player.Sword != null) player.Sword.UseKeyReleased(); }, null);
+        Keyboard.Listen(Key.Z, ButtonState.Down, delegate { if (player.Sword != null) player.Sword.UseKeyDown(); }, null);
+
+        Keyboard.Listen(Key.Space, ButtonState.Pressed, delegate { player.CycleItems(); UpdateItemCycleImages(); }, null);
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, null);
+    }
+
+    void UpdateItemCycleImages()
+    {
+        if (player.PrevItem != null) prevItem.Image = player.PrevItem.InventoryImage;
+        if (player.NextItem != null) nextItem.Image = player.NextItem.InventoryImage;
+        if (player.ActiveItem != null) currentItem.Image = player.ActiveItem.InventoryImage;
     }
 

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

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