10 files changed, 129 insertions, 43 deletions

diff --git a/src/esieequest/controller/commands/DropCommand.java b/src/esieequest/controller/commands/DropCommand.java
index 09b2394..b253d98 100644
--- a/src/esieequest/controller/commands/DropCommand.java
+++ b/src/esieequest/controller/commands/DropCommand.java
@@ -31,6 +31,8 @@ public class DropCommand implements Executable {
                 final Item item = game.getPlayer().getInventory().takeItem(itemName);
                 game.getPlayer().getCurrentSide().getInventory().putItem(item);
 
+                view.updateInventory(game.getPlayer().getInventory());
+
         }
 
 }
diff --git a/src/esieequest/controller/commands/TakeCommand.java b/src/esieequest/controller/commands/TakeCommand.java
index 8b8a461..f83c218 100644
--- a/src/esieequest/controller/commands/TakeCommand.java
+++ b/src/esieequest/controller/commands/TakeCommand.java
@@ -47,6 +47,8 @@ public class TakeCommand implements Executable {
                 game.getPlayer().getCurrentRoom().removeItem(item);
                 game.getPlayer().getInventory().putItem(item);
 
+                view.updateInventory(game.getPlayer().getInventory());
+
         }
 
 }
diff --git a/src/esieequest/controller/commands/UseCommand.java b/src/esieequest/controller/commands/UseCommand.java
index 00fc234..3328c7c 100644
--- a/src/esieequest/controller/commands/UseCommand.java
+++ b/src/esieequest/controller/commands/UseCommand.java
@@ -15,7 +15,7 @@ public class UseCommand implements Executable {
         @Override
         public void execute(final String argument, final Game game, final Viewable view) {
 
-                final String itemName = argument;
+                final String itemName = argument.toLowerCase();
 
                 if (itemName == null) {
                         view.echo(Text.NO_ITEM_SPECIFIED.getText());
diff --git a/src/esieequest/model/Text.java b/src/esieequest/model/Text.java
index 1b47c6f..d46b4b1 100644
--- a/src/esieequest/model/Text.java
+++ b/src/esieequest/model/Text.java
@@ -53,6 +53,8 @@ public enum Text {
         INVENTORY_WEIGHT_PREFIX("Total inventory weight: "),
         INVENTORY_WEIGHT_SUFFIX("."),
         
+        INVENTORY_EMPTY("Your inventory is empty."),
+        
         // formatting
         LIST_SEPARATOR(", "),
         NEW_LINE("\n"),
diff --git a/src/esieequest/model/items/Inventory.java b/src/esieequest/model/items/Inventory.java
index 68d1838..a4a0e84 100644
--- a/src/esieequest/model/items/Inventory.java
+++ b/src/esieequest/model/items/Inventory.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
+import lombok.Getter;
 import net.pacien.util.IntrinsicMap;
 
 import org.json.simple.JSONArray;
@@ -21,6 +22,7 @@ import esieequest.model.Text;
  */
 public class Inventory implements SerialisableList {
 
+        @Getter
         private final IntrinsicMap<String, Item> items;
 
         /**
diff --git a/src/esieequest/view/Viewable.java b/src/esieequest/view/Viewable.java
index d2aeaff..0b23b8c 100644
--- a/src/esieequest/view/Viewable.java
+++ b/src/esieequest/view/Viewable.java
@@ -1,10 +1,8 @@
 package esieequest.view;
 
-import java.util.HashMap;
-
 import esieequest.controller.GameEngine;
 import esieequest.model.events.Quest;
-import esieequest.model.items.SimpleItem;
+import esieequest.model.items.Inventory;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
 import esieequest.model.map.Side;
@@ -73,6 +71,6 @@ public interface Viewable {
          * @param items
          *            the items
          */
-        public void updateInventory(final HashMap<String, SimpleItem> items);
+        public void updateInventory(final Inventory inventory);
 
 }
diff --git a/src/esieequest/view/app/UserInterface.java b/src/esieequest/view/app/UserInterface.java
index f492090..c4e072d 100644
--- a/src/esieequest/view/app/UserInterface.java
+++ b/src/esieequest/view/app/UserInterface.java
@@ -4,6 +4,7 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
@@ -12,6 +13,7 @@ import java.util.HashMap;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
@@ -21,8 +23,10 @@ import com.wordpress.tipsforjava.swing.StretchIcon;
 
 import esieequest.controller.GameEngine;
 import esieequest.controller.commands.Command;
+import esieequest.model.Text;
 import esieequest.model.events.Quest;
-import esieequest.model.items.SimpleItem;
+import esieequest.model.items.Inventory;
+import esieequest.model.items.Item;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Orientation;
 import esieequest.model.map.Room;
@@ -39,6 +43,8 @@ abstract class UserInterface implements Viewable, ActionListener {
         private GameEngine gameEngine;
 
         private JPanel layout;
+        private JPanel consolePanel;
+        private JPanel inventoryPanel;
 
         private JTextPane questTextPane;
         private JTextPane infoTextPane;
@@ -110,20 +116,28 @@ abstract class UserInterface implements Viewable, ActionListener {
                 this.layout.add(userPanel, BorderLayout.SOUTH);
                 userPanel.setLayout(new BorderLayout(0, 0));
 
-                final JPanel dispPanel = new JPanel();
+                final JLayeredPane dispPanel = new JLayeredPane();
                 dispPanel.setBorder(new EmptyBorder(5, 5, 5, 0));
                 userPanel.add(dispPanel, BorderLayout.CENTER);
                 dispPanel.setLayout(new BorderLayout(0, 0));
 
+                this.consolePanel = new JPanel();
+                dispPanel.add(this.consolePanel, BorderLayout.CENTER);
+                this.consolePanel.setLayout(new BorderLayout(0, 0));
+
                 this.infoTextPane = new JTextPane();
+                this.consolePanel.add(this.infoTextPane, BorderLayout.CENTER);
                 this.infoTextPane.setEditable(false);
                 this.infoTextPane.setText("Welcome to ESIEEquest!");
-                dispPanel.add(this.infoTextPane);
 
                 this.inputField = new JTextField();
-                dispPanel.add(this.inputField, BorderLayout.SOUTH);
+                this.consolePanel.add(this.inputField, BorderLayout.SOUTH);
                 this.inputField.setColumns(10);
 
+                this.inventoryPanel = new JPanel();
+                dispPanel.add(this.inventoryPanel, BorderLayout.NORTH);
+                this.inventoryPanel.setLayout(new GridLayout(4, 3, 0, 0));
+
                 final JPanel controlPanel = new JPanel();
                 controlPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
                 userPanel.add(controlPanel, BorderLayout.EAST);
@@ -142,7 +156,7 @@ abstract class UserInterface implements Viewable, ActionListener {
 
                 final JButton inventoryButton = new JButton("⇱");
                 inventoryButton.setFont(font);
-                inventoryButton.setToolTipText("Use item");
+                inventoryButton.setToolTipText("Open inventory");
                 topControlPanel.add(inventoryButton, BorderLayout.WEST);
 
                 final JButton actionButton = new JButton("⇲");