4 files changed, 184 insertions, 165 deletions

diff --git a/src/esieequest/CommandWords.java b/src/esieequest/CommandWords.java
index 3d8855d..e2d50f5 100644
--- a/src/esieequest/CommandWords.java
+++ b/src/esieequest/CommandWords.java
@@ -1,25 +1,23 @@
 package esieequest;
 
 /**
- * This class is part of the "World of Zuul" application. "World of Zuul" is a
- * very simple, text based adventure game.
- * 
  * This class holds an enumeration table of all command words known to the game.
- * It is used to recognise commands as they are typed in.
+ * It is used to recognize commands as they are typed in.
+ * 
+ * @author Pacien TRAN-GIRARD
+ * @author Benoit LUBRANO DI SBARAGLIONE
  * 
- * @author Michael Kolling and David J. Barnes + D.Bureau
- * @version 2008.03.30 + 2013.09.15
+ * @version February 2014
  */
 public class CommandWords {
-        // a constant array that holds all valid command words
         private static final String[] sValidCommands = { "go", "quit", "help", "look", "eat" };
 
         /**
-         * Constructor - initialise the command words.
+         * Constructor - initialize the command words.
          */
         public CommandWords() {
-                // nothing to do at the moment...
-        } // CommandWords()
+
+        }
 
         /**
          * Check whether a given String is a valid command word.
@@ -30,8 +28,18 @@ public class CommandWords {
                 for (int i = 0; i < sValidCommands.length; i++) {
                         if (sValidCommands[i].equals(pString))
                                 return true;
-                } // for
-                        // if we get here, the string was not found in the commands
+                }
                 return false;
-        } // isCommand()
-} // CommandWords
+        }
+
+        /**
+         * Print all valid commands to System.out.
+         */
+        public String getCommandList() {
+                StringBuilder vStrBuilder = new StringBuilder();
+                for (String vCommand : sValidCommands) {
+                        vStrBuilder.append(" ").append(vCommand);
+                }
+                return vStrBuilder.toString();
+        }
+}
diff --git a/src/esieequest/Game.java b/src/esieequest/Game.java
index 350fa15..43db8f7 100644
--- a/src/esieequest/Game.java
+++ b/src/esieequest/Game.java
@@ -1,5 +1,7 @@
 package esieequest;
 
+import java.util.HashMap;
+
 /**
  * The game engine.
  * 
@@ -13,6 +15,7 @@ package esieequest;
  * @version February 2014
  */
 public class Game {
+        private HashMap<String, Room> aRooms;
         private Room aCurrentRoom;
         private Parser aParser;
 
@@ -20,9 +23,9 @@ public class Game {
          * Create the game and initialize its internal map.
          */
         public Game() {
+                this.aRooms = new HashMap<String, Room>();
                 this.createRooms();
-                this.printWelcome();
-                this.printLocationInfo();
+                this.aParser = new Parser();
                 this.play();
         }
 
@@ -30,7 +33,7 @@ public class Game {
          * Main play routine. Loops until end of play.
          */
         private void play() {
-                aParser = new Parser();
+                this.printWelcome();
                 boolean vFinished = false;
                 while (!vFinished) {
                         Command vCommand = this.aParser.getCommand();
@@ -45,134 +48,134 @@ public class Game {
          */
         private void createRooms() {
                 // create rooms
-                Room vAmphitheaterSeat = new Room("in the amphitheater");
-                Room vAmphitheaterStage = new Room("on the amphitheater stage");
+                this.aRooms.put("AmphitheaterSeat", new Room("in the amphitheater"));
+                this.aRooms.put("AmphitheaterStage", new Room("on the amphitheater stage"));
 
-                Room vCafeteriaStreet = new Room("in the main corridor, in front of the cafeteria");
-                Room vCafeteria = new Room("at the cafeteria");
+                this.aRooms.put("CafeteriaStreet", new Room("in the main corridor, in front of the cafeteria"));
+                this.aRooms.put("Cafeteria", new Room("at the cafeteria"));
 
-                Room vEsieespaceStreet = new Room("in the main corridor, in front of the ESIEEspace HQ");
-                Room vEsieespaceFront = new Room("in front of the ESIEEspace HQ");
-                Room vEsieespaceEntrance = new Room("at the ESIEEspace HQ entrance");
-                Room vEsieespace = new Room("in the ESIEEspace HQ");
+                this.aRooms.put("EsieespaceStreet", new Room("in the main corridor, in front of the ESIEEspace HQ"));
+                this.aRooms.put("EsieespaceFront", new Room("in front of the ESIEEspace HQ"));
+                this.aRooms.put("EsieespaceEntrance", new Room("at the ESIEEspace HQ entrance"));
+                this.aRooms.put("Esieespace", new Room("in the ESIEEspace HQ"));
 
-                Room vClubnixStreet = new Room("in the main corridor, in front of the Club*Nix");
-                Room vClubnixFront = new Room("in front of the Club*Nix");
-                Room vClubnixEntrance = new Room("at the Club*Nix entrance");
-                Room vClubnix = new Room("in the Club*Nix");
+                this.aRooms.put("ClubnixStreet", new Room("in the main corridor, in front of the Club*Nix"));
+                this.aRooms.put("ClubnixFront", new Room("in front of the Club*Nix"));
+                this.aRooms.put("ClubnixEntrance", new Room("at the Club*Nix entrance"));
+                this.aRooms.put("Clubnix", new Room("in the Club*Nix"));
 
-                Room vEntranceStreet = new Room("in the main corridor, at the reception");
-                Room vEntranceStairs = new Room("on the main entrance stairs");
-                Room vEntranceRoundabout = new Room("on the roundabout");
+                this.aRooms.put("EntranceStreet", new Room("in the main corridor, at the reception"));
+                this.aRooms.put("EntranceStairs", new Room("on the main entrance stairs"));
+                this.aRooms.put("EntranceRoundabout", new Room("on the roundabout"));
 
-                Room vWingStreet = new Room("in font of wing #3");
-                Room vWingCorridorOne = new Room("in the corridor in wing #3, on the ground floor");
-                Room vWingStairsOne = new Room("in the stairwell on the ground floor");
-                Room vWingStairsTwo = new Room("in the stairwell on the first floor");
-                Room vWingCorridorTwo = new Room("in the corridor in wind #3, on the first floor");
-                Room vWingCorridorTwoOffice = new Room("in front of the office #3254");
-                Room vWingOffice = new Room("in the office #3254");
+                this.aRooms.put("WingStreet", new Room("in font of wing #3"));
+                this.aRooms.put("WingCorridorOne", new Room("in the corridor in wing #3, on the ground floor"));
+                this.aRooms.put("WingStairsOne", new Room("in the stairwell on the ground floor"));
+                this.aRooms.put("WingStairsTwo", new Room("in the stairwell on the first floor"));
+                this.aRooms.put("WingCorridorTwo", new Room("in the corridor in wind #3, on the first floor"));
+                this.aRooms.put("WingCorridorTwoOffice", new Room("in front of the office #3254"));
+                this.aRooms.put("WingOffice", new Room("in the office #3254"));
 
-                Room vOffscriptEat = new Room("somewhere implementing hunger");
-                Room vOffscriptEatPantry = new Room("in the pantry");
-                Room vOffscriptTake = new Room("somewhere implementing weight");
-                Room vOffscriptTakeStorageroom = new Room("in a storage room");
-                Room vOffscriptTimeout = new Room("somewhere implementing time");
-                Room vOffscriptTimeoutCountdownroom = new Room("in a dangerous room");
-                Room vOffscriptTrapdoor = new Room("somewhere implementing a trap");
-                Room vOffscriptTrapdoorDeadend = new Room("trapped");
-                Room vOffscriptBeamer = new Room("somewhere implementing teleportation");
-                Room vOffscriptBeamerAnchor = new Room("on a checkpoint");
-                Room vOffscriptLock = new Room("somewhere implementing a doorlock");
-                Room vOffscriptLockLockedroom = new Room("in a locked room that is not anymore");
-                Room vOffscriptAlea = new Room("somewhere implementing alea");
-                Room vOffscriptAleaRoomrandomizer = new Room("in a weird room that will transport you somewhere else");
-                Room vOffscriptMovingcharacter = new Room("somewhere implementing a moving character");
-                Room vOffscriptMovingcharacterMo = new Room("in M-O's room");
+                this.aRooms.put("OffscriptEat", new Room("somewhere implementing hunger"));
+                this.aRooms.put("OffscriptEatPantry", new Room("in the pantry"));
+                this.aRooms.put("OffscriptTake", new Room("somewhere implementing weight"));
+                this.aRooms.put("OffscriptTakeStorageroom", new Room("in a storage room"));
+                this.aRooms.put("OffscriptTimeout", new Room("somewhere implementing time"));
+                this.aRooms.put("OffscriptTimeoutCountdownroom", new Room("in a dangerous room"));
+                this.aRooms.put("OffscriptTrapdoor", new Room("somewhere implementing a trap"));
+                this.aRooms.put("OffscriptTrapdoorDeadend", new Room("trapped"));
+                this.aRooms.put("OffscriptBeamer", new Room("somewhere implementing teleportation"));
+                this.aRooms.put("OffscriptBeamerAnchor", new Room("on a checkpoint"));
+                this.aRooms.put("OffscriptLock", new Room("somewhere implementing a doorlock"));
+                this.aRooms.put("OffscriptLockLockedroom", new Room("in a locked room that is not anymore"));
+                this.aRooms.put("OffscriptAlea", new Room("somewhere implementing alea"));
+                this.aRooms.put("OffscriptAleaRoomrandomizer", new Room("in a weird room that will transport you somewhere else"));
+                this.aRooms.put("OffscriptMovingcharacter", new Room("somewhere implementing a moving character"));
+                this.aRooms.put("OffscriptMovingcharacterMo", new Room("in M-O's room"));
 
-                // connect rooms (N, W, S, E)
-                vAmphitheaterSeat.setExit("north", vAmphitheaterStage);
-                vAmphitheaterStage.setExit("west", vCafeteria);
+                // connect rooms
+                this.aRooms.get("AmphitheaterSeat").setExit("north", this.aRooms.get("AmphitheaterStage"));
+                this.aRooms.get("AmphitheaterStage").setExit("west", this.aRooms.get("Cafeteria"));
 
-                vCafeteriaStreet.setExit("south", vCafeteria);
-                vCafeteriaStreet.setExit("east", vEsieespaceStreet);
+                this.aRooms.get("CafeteriaStreet").setExit("south", this.aRooms.get("Cafeteria"));
+                this.aRooms.get("CafeteriaStreet").setExit("east", this.aRooms.get("EsieespaceStreet"));