29 files changed, 431 insertions, 171 deletions

diff --git a/report/progression.tex b/report/progression.tex
index 24c5d7a..94cc5b5 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -266,20 +266,48 @@ to win the game.
 
 \subsection{Player}
 
+The current room and the previous rooms were moved from Game to Player with
+commit 92f671b84.
+
 \subsection{take, drop}
 
+The take and drop commands were implemented as part of the commit number
+5ddb6df63. An Inventory interface, used by the Room and Player classes, was
+added. Items are stored using HashMaps, and a moveItem procedure was added to
+the Performer.
+
 \subsection{Carry several items}
 
+Multiple items carrying was already implemented in the commit number 5ddb6df63.
+
 \subsection{ItemList}
 
+The ItemList was implemented as the Inventory class in commit number db2c22c9b.
+The Inventory is no longer an interface.
+
 \subsection{Maximum weight}
 
+The maximum carryable weight was implement with the commit number b8771ccb2.
+In order to achieve this, a getTotalWeight() function was added to the Inventory
+class.
+
 \subsection{Inventory}
 
+The player's inventory items listing was implemented with the commit number
+a3f6ce16e, using the recently added listing utility class.
+
 \subsection{Magic cookie}
 
+Since there are already too many commands, the carryable weight
+expansion was implemented in a smarter way using a negative weight
+item in the commit number 35ee3b1ee.
+We could have instead increased the maximum carryable weight with a setter on
+the Player class, called by the Performer with the ``eat'' command.
+
 \subsection{Tests}
 
+The commands test file was updated in the commit number 7b610fc05.
+
 
 \section{Zuul with enums}
 
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.
+         *