Merge branch 'zuul-with-items' into 'master'

Zuul With Items

27 files changed, 387 insertions, 171 deletions

diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index 586b329..5c60f6d 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -1,7 +1,7 @@
 package esieequest.controller;
 
 import esieequest.model.Game;
-import esieequest.model.command.Command;
+import esieequest.model.commands.Command;
 import esieequest.view.View;
 
 /**
@@ -69,8 +69,14 @@ class Interpreter {
                         case "look":
                                 this.performer.look();
                                 return;
-                        case "eat":
-                                this.performer.eat();
+                        case "inventory":
+                                this.performer.listItems();
+                                return;
+                        case "take":
+                                this.performer.take(command.getOption());
+                                return;
+                        case "drop":
+                                this.performer.drop(command.getOption());
                                 return;
                         case "help":
                                 this.performer.showHelp();
@@ -83,4 +89,5 @@ class Interpreter {
                 this.performer.echo("Unknown command.");
                 return;
         }
+
 }
diff --git a/src/esieequest/controller/Parser.java b/src/esieequest/controller/Parser.java
index 0f97fd1..452c27c 100644
--- a/src/esieequest/controller/Parser.java
+++ b/src/esieequest/controller/Parser.java
@@ -1,6 +1,6 @@
 package esieequest.controller;
 
-import esieequest.model.command.Command;
+import esieequest.model.commands.Command;
 
 /**
  * The command parser.
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 27cbf14..8f8afeb 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -1,7 +1,8 @@
 package esieequest.controller;
 
 import esieequest.model.Game;
-import esieequest.model.Room;
+import esieequest.model.items.Inventory;
+import esieequest.model.map.Room;
 import esieequest.view.View;
 
 /**
@@ -99,10 +100,10 @@ class Performer {
          *            the direction of the new room
          */
         public void goTo(final String direction) {
-                final Room nextRoom = this.game.getRoomExit(direction);
+                final Room nextRoom = this.game.getPlayer().getCurrentRoom().getExit(direction);
                 if (nextRoom != null) {
-                        this.game.goToRoom(nextRoom);
-                        this.view.updateRoom(this.game.getCurrentRoom());
+                        this.game.getPlayer().goToRoom(nextRoom);
+                        this.view.updateRoom(this.game.getPlayer().getCurrentRoom());
                 } else {
                         this.echo(this.game.getNoExitMessage());
                 }
@@ -112,22 +113,69 @@ class Performer {
          * Changes the current room to the previous one.
          */
         public void goBack() {
-                this.game.goToPreviousRoom();
-                this.view.updateRoom(this.game.getCurrentRoom());
+                this.game.getPlayer().goToPreviousRoom();
+                this.view.updateRoom(this.game.getPlayer().getCurrentRoom());
         }
 
         /**
          * Displays informations about the current place.
          */
         public void look() {
-                this.echo(this.game.getCurrentRoom().getInformations());
+                this.echo(this.game.getPlayer().getCurrentRoom().getInformations());
         }
 
         /**
-         * Displays a special message.
+         * Moves an item from the current Room to the Player's inventory.
+         * 
+         * @param itemName
+         *            the item's name
+         */
+        public void take(final String itemName) {
+                int weight = this.game.getPlayer().getInventory().getTotalWeight();
+                weight += this.game.getPlayer().getCurrentRoom().getItems().getItemWeight(itemName);
+                final int maxWeight = this.game.getPlayer().getMaxCarryWeight();
+
+                if (weight >= maxWeight) {
+                        this.echo("Maximum inventory weight reached. Cannot pick up item.");
+                        return;
+                }
+
+                this.moveItem(this.game.getPlayer().getCurrentRoom().getItems(), this.game.getPlayer().getInventory(), itemName);
+        }
+
+        /**
+         * Moves an item from the Player's inventory to the current Room.
+         * 
+         * @param itemName
+         *            the item's name
+         */
+        public void drop(final String itemName) {
+                this.moveItem(this.game.getPlayer().getInventory(), this.game.getPlayer().getCurrentRoom().getItems(), itemName);
+        }
+
+        /**
+         * Moves a given item referred by its name from an inventory to another.
+         * 
+         * @param source
+         *            the source inventory
+         * @param dest
+         *            the destination inventory
+         * @param itemName
+         *            the item's name
+         */
+        private void moveItem(final Inventory source, final Inventory dest, final String itemName) {
+                if (!source.hasItem(itemName)) {
+                        this.echo("No such item.");
+                        return;
+                }
+                dest.putItem(itemName, source.takeItem(itemName));
+        }
+
+        /**
+         * Lists the items contained in the player's inventory.
          */
-        public void eat() {
-                this.echo(this.game.getEatMessage());
+        public void listItems() {
+                this.echo(Utils.list(this.game.getPlayer().getInventory().getItemList(), "Items:", "No item in your inventory."));
         }
 
 }
diff --git a/src/esieequest/controller/Utils.java b/src/esieequest/controller/Utils.java
new file mode 100644
index 0000000..139798c
--- /dev/null
+++ b/src/esieequest/controller/Utils.java
@@ -0,0 +1,40 @@
+package esieequest.controller;
+
+import java.util.Set;
+
+public class Utils {
+
+        /**
+         * 
+         * @param elements
+         *            the elements
+         * @param prefix
+         *            the prefix of the list