28 files changed, 189 insertions, 74 deletions

diff --git a/src/esieequest/controller/commands/BackCommand.java b/src/esieequest/controller/commands/BackCommand.java
index 847d396..d7ed8a3 100644
--- a/src/esieequest/controller/commands/BackCommand.java
+++ b/src/esieequest/controller/commands/BackCommand.java
@@ -15,7 +15,9 @@ public class BackCommand implements Executable {
 
                 game.getPlayer().goToPreviousRoom();
 
-                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer().getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer().canGoBack());
+                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
+                                .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
+                                .canGoBack());
 
         }
 
diff --git a/src/esieequest/controller/commands/Command.java b/src/esieequest/controller/commands/Command.java
index ca8909c..0879bef 100644
--- a/src/esieequest/controller/commands/Command.java
+++ b/src/esieequest/controller/commands/Command.java
@@ -94,7 +94,8 @@ public enum Command {
          * @return a String listing all the names of the Command-s
          */
         public static String listCommandsNamesString() {
-                return ListUtils.listToString(Command.listCommandsNames(), Text.HELP_PREFIX.toString(), null, Text.HELP_SUFFIX.toString());
+                return ListUtils.listToString(Command.listCommandsNames(), Text.HELP_PREFIX.toString(),
+                                null, Text.HELP_SUFFIX.toString());
         }
 
 }
diff --git a/src/esieequest/controller/commands/DropCommand.java b/src/esieequest/controller/commands/DropCommand.java
index ee71b1e..dbdf03c 100644
--- a/src/esieequest/controller/commands/DropCommand.java
+++ b/src/esieequest/controller/commands/DropCommand.java
@@ -31,7 +31,9 @@ public class DropCommand implements Executable {
                 final Item item = game.getPlayer().getInventory().takeItem(itemName);
                 game.getPlayer().getCurrentSide().getInventory().putItem(item);
 
-                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer().getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer().canGoBack());
+                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
+                                .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
+                                .canGoBack());
                 view.updateInventory(game.getPlayer().getInventory());
 
         }
diff --git a/src/esieequest/controller/commands/GoCommand.java b/src/esieequest/controller/commands/GoCommand.java
index 136379f..1078d49 100644
--- a/src/esieequest/controller/commands/GoCommand.java
+++ b/src/esieequest/controller/commands/GoCommand.java
@@ -39,7 +39,8 @@ public class GoCommand implements Executable {
                         return;
                 }
 
-                view.updateLocation(game.getPlayer().getCurrentRoom(), direction, game.getPlayer().getCurrentSide(), game.getPlayer().canGoBack());
+                view.updateLocation(game.getPlayer().getCurrentRoom(), direction, game.getPlayer()
+                                .getCurrentSide(), game.getPlayer().canGoBack());
 
                 // handle challenge mode
                 if (game.getPlayer().walk()) {
diff --git a/src/esieequest/controller/commands/InventoryCommand.java b/src/esieequest/controller/commands/InventoryCommand.java
index a6ce080..27936ce 100644
--- a/src/esieequest/controller/commands/InventoryCommand.java
+++ b/src/esieequest/controller/commands/InventoryCommand.java
@@ -13,7 +13,8 @@ public class InventoryCommand implements Executable {
         @Override
         public void execute(final String argument, final Game game, final Viewable view) {
 
-                view.echo(game.getPlayer().getInventory().listItemsNamesString() + game.getPlayer().getInventory().getWeightString());
+                view.echo(game.getPlayer().getInventory().listItemsNamesString()
+                                + game.getPlayer().getInventory().getWeightString());
 
         }
 
diff --git a/src/esieequest/controller/commands/LoadCommand.java b/src/esieequest/controller/commands/LoadCommand.java
index 8a69544..896d85b 100644
--- a/src/esieequest/controller/commands/LoadCommand.java
+++ b/src/esieequest/controller/commands/LoadCommand.java
@@ -24,7 +24,8 @@ public class LoadCommand implements Executable {
                 try {
                         datas = (JSONObject) JSONValue.parseWithException(jsonString);
                 } catch (final ParseException e) {
-                        view.echo(Text.PARSING_ERROR_PREFIX.toString() + e.getMessage() + Text.PARSING_ERROR_SUFFIX.toString());
+                        view.echo(Text.PARSING_ERROR_PREFIX.toString() + e.getMessage()
+                                        + Text.PARSING_ERROR_SUFFIX.toString());
                         return;
                 }
 
@@ -32,14 +33,17 @@ public class LoadCommand implements Executable {
                         game.newGame(false, false);
                         game.deserialise(datas);
                 } catch (final Exception e) {
-                        view.echo(Text.DESERIALISING_ERROR_PREFIX.toString() + e.getMessage() + Text.DESERIALISING_ERROR_SUFFIX.toString());
+                        view.echo(Text.DESERIALISING_ERROR_PREFIX.toString() + e.getMessage()
+                                        + Text.DESERIALISING_ERROR_SUFFIX.toString());
                         e.printStackTrace();
                         return;
                 }
 
                 // view.updateQuest();
                 // view.updateInventory(game.getPlayer().getItems());
-                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer().getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer().canGoBack());
+                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
+                                .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
+                                .canGoBack());
 
         }
 
diff --git a/src/esieequest/controller/commands/LookCommand.java b/src/esieequest/controller/commands/LookCommand.java
index ece4ddc..305934f 100644
--- a/src/esieequest/controller/commands/LookCommand.java
+++ b/src/esieequest/controller/commands/LookCommand.java
@@ -21,7 +21,9 @@ public class LookCommand implements Executable {
                 final ArrayList<String> informations = new ArrayList<String>();
 
                 informations.add(game.getPlayer().getCurrentRoom().getInformations());
-                informations.add(Text.DIRECTION_PREFIX + game.getPlayer().getCurrentDirection().name().toLowerCase() + Text.DIRECTION_SUFFIX);
+                informations.add(Text.DIRECTION_PREFIX
+                                + game.getPlayer().getCurrentDirection().name().toLowerCase()
+                                + Text.DIRECTION_SUFFIX);
 
                 view.echo(Joiner.on(Text.NEW_LINE.toString()).join(informations));
 
diff --git a/src/esieequest/controller/commands/NewCommand.java b/src/esieequest/controller/commands/NewCommand.java
index e0e45ab..3f0b4b9 100644
--- a/src/esieequest/controller/commands/NewCommand.java
+++ b/src/esieequest/controller/commands/NewCommand.java
@@ -24,7 +24,9 @@ public class NewCommand implements Executable {
 
                 view.enable();
 
-                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer().getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer().canGoBack());
+                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
+                                .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
+                                .canGoBack());
                 view.echo(Text.WELCOME.toString());
 
         }
diff --git a/src/esieequest/controller/commands/TakeCommand.java b/src/esieequest/controller/commands/TakeCommand.java
index b92f4e5..9f70f98 100644
--- a/src/esieequest/controller/commands/TakeCommand.java
+++ b/src/esieequest/controller/commands/TakeCommand.java
@@ -38,7 +38,8 @@ public class TakeCommand implements Executable {
 
                 // handle inventory weight limit
                 final int maximumWeight = game.getPlayer().getInventoryWeightLimit();
-                final int futureWeight = game.getPlayer().getInventory().getTotalWeight() + item.getWeight();
+                final int futureWeight = game.getPlayer().getInventory().getTotalWeight()
+                                + item.getWeight();
                 if (futureWeight > maximumWeight) {
                         view.echo(Text.INVENTORY_FULL.toString());
                         return;
@@ -47,7 +48,9 @@ public class TakeCommand implements Executable {
                 game.getPlayer().getCurrentRoom().removeItem(item);
                 game.getPlayer().getInventory().putItem(item);