6 files changed, 436 insertions, 273 deletions

diff --git a/src/esieequest/Command.java b/src/esieequest/Command.java
index fd05930..14c3d32 100644
--- a/src/esieequest/Command.java
+++ b/src/esieequest/Command.java
@@ -1,8 +1,6 @@
 package esieequest;
 
 /**
- * A text command that triggers an action in the game.
- * 
  * This class holds information about a command that was issued by the user. A
  * command currently consists of two strings: a command word and a second word
  * (for example, if the command was "take map", then the two strings obviously
@@ -33,8 +31,8 @@ public class Command {
          * @param secondWord
          *            The second word of the command.
          */
-        public Command(final String pCommandWord, final String pSecondWord) {
-                this.aCommandWord = pCommandWord;
+        public Command(final String pFirstWord, final String pSecondWord) {
+                this.aCommandWord = pFirstWord;
                 this.aSecondWord = pSecondWord;
         }
 
diff --git a/src/esieequest/Game.java b/src/esieequest/Game.java
index 43db8f7..925f067 100644
--- a/src/esieequest/Game.java
+++ b/src/esieequest/Game.java
@@ -1,7 +1,5 @@
 package esieequest;
 
-import java.util.HashMap;
-
 /**
  * The game engine.
  * 
@@ -15,262 +13,15 @@ import java.util.HashMap;
  * @version February 2014
  */
 public class Game {
-        private HashMap<String, Room> aRooms;
-        private Room aCurrentRoom;
-        private Parser aParser;
+        private UserInterface aGui;
+        private GameEngine aEngine;
 
         /**
-         * Create the game and initialize its internal map.
+         * Create the game and initialise its internal map.
          */
         public Game() {
-                this.aRooms = new HashMap<String, Room>();
-                this.createRooms();
-                this.aParser = new Parser();
-                this.play();
-        }
-
-        /**
-         * Main play routine. Loops until end of play.
-         */
-        private void play() {
-                this.printWelcome();
-                boolean vFinished = false;
-                while (!vFinished) {
-                        Command vCommand = this.aParser.getCommand();
-                        vFinished = this.processCommand(vCommand);
-                }
-
-                System.out.println("Thank you for playing. Good bye.");
-        }
-
-        /**
-         * Create all the rooms and link their exits together.
-         */
-        private void createRooms() {
-                // create rooms
-                this.aRooms.put("AmphitheaterSeat", new Room("in the amphitheater"));
-                this.aRooms.put("AmphitheaterStage", new Room("on the amphitheater stage"));
-
-                this.aRooms.put("CafeteriaStreet", new Room("in the main corridor, in front of the cafeteria"));
-                this.aRooms.put("Cafeteria", new Room("at the cafeteria"));
-
-                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"));
-
-                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"));
-
-                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"));
-
-                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"));
-
-                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
-                this.aRooms.get("AmphitheaterSeat").setExit("north", this.aRooms.get("AmphitheaterStage"));
-                this.aRooms.get("AmphitheaterStage").setExit("west", this.aRooms.get("Cafeteria"));
-
-                this.aRooms.get("CafeteriaStreet").setExit("south", this.aRooms.get("Cafeteria"));
-                this.aRooms.get("CafeteriaStreet").setExit("east", this.aRooms.get("EsieespaceStreet"));
-                this.aRooms.get("Cafeteria").setExit("north", this.aRooms.get("CafeteriaStreet"));
-                this.aRooms.get("Cafeteria").setExit("east", this.aRooms.get("AmphitheaterStage"));
-
-                this.aRooms.get("EsieespaceStreet").setExit("west", this.aRooms.get("Cafeteria"));
-                this.aRooms.get("EsieespaceStreet").setExit("south", this.aRooms.get("EsieespaceFront"));
-                this.aRooms.get("EsieespaceStreet").setExit("east", this.aRooms.get("EntranceStreet"));
-                this.aRooms.get("EsieespaceFront").setExit("north", this.aRooms.get("EsieespaceStreet"));
-                this.aRooms.get("EsieespaceFront").setExit("east", this.aRooms.get("EsieespaceEntrance"));
-                this.aRooms.get("EsieespaceEntrance").setExit("north", this.aRooms.get("Esieespace"));
-                this.aRooms.get("EsieespaceEntrance").setExit("west", this.aRooms.get("EsieespaceFront"));
-                this.aRooms.get("Esieespace").setExit("south", this.aRooms.get("EsieespaceEntrance"));
-
-                this.aRooms.get("ClubnixStreet").setExit("west", this.aRooms.get("WingStreet"));
-                this.aRooms.get("ClubnixStreet").setExit("south", this.aRooms.get("ClubnixFront"));
-                this.aRooms.get("ClubnixFront").setExit("north", this.aRooms.get("ClubnixStreet"));
-                this.aRooms.get("ClubnixFront").setExit("east", this.aRooms.get("ClubnixEntrance"));
-                this.aRooms.get("ClubnixEntrance").setExit("north", this.aRooms.get("Clubnix"));
-                this.aRooms.get("ClubnixEntrance").setExit("west", this.aRooms.get("ClubnixFront"));
-                this.aRooms.get("Clubnix").setExit("south", this.aRooms.get("ClubnixEntrance"));
-
-                this.aRooms.get("EntranceStreet").setExit("west", this.aRooms.get("EsieespaceStreet"));
-                this.aRooms.get("EntranceStreet").setExit("south", this.aRooms.get("EntranceStairs"));
-                this.aRooms.get("EntranceStreet").setExit("east", this.aRooms.get("WingStreet"));
-                this.aRooms.get("EntranceStairs").setExit("north", this.aRooms.get("EntranceStreet"));
-                this.aRooms.get("EntranceStairs").setExit("south", this.aRooms.get("EntranceRoundabout"));
-                this.aRooms.get("EntranceRoundabout").setExit("north", this.aRooms.get("EntranceStairs"));
-
-                this.aRooms.get("WingStreet").setExit("north", this.aRooms.get("WingCorridorOne"));
-                this.aRooms.get("WingStreet").setExit("west", this.aRooms.get("EntranceStreet"));
-                this.aRooms.get("WingStreet").setExit("east", this.aRooms.get("ClubnixStreet"));
-                this.aRooms.get("WingCorridorOne").setExit("west", this.aRooms.get("WingStairsOne"));
-                this.aRooms.get("WingCorridorOne").setExit("south", this.aRooms.get("WingStreet"));
-                this.aRooms.get("WingCorridorOne").setExit("east", this.aRooms.get("OffscriptEat"));
-                this.aRooms.get("WingStairsOne").setExit("south", this.aRooms.get("WingStairsTwo"));
-                this.aRooms.get("WingStairsOne").setExit("up", this.aRooms.get("WingStairsTwo"));
-                this.aRooms.get("WingStairsOne").setExit("east", this.aRooms.get("WingCorridorOne"));
-                this.aRooms.get("WingStairsTwo").setExit("south", this.aRooms.get("WingStairsOne"));
-                this.aRooms.get("WingStairsTwo").setExit("down", this.aRooms.get("WingStairsOne"));
-                this.aRooms.get("WingStairsTwo").setExit("east", this.aRooms.get("WingCorridorTwo"));
-                this.aRooms.get("WingCorridorTwo").setExit("north", this.aRooms.get("WingCorridorTwoOffice"));
-                this.aRooms.get("WingCorridorTwoOffice").setExit("south", this.aRooms.get("WingCorridorTwo"));
-                this.aRooms.get("WingCorridorTwoOffice").setExit("east", this.aRooms.get("WingOffice"));
-                this.aRooms.get("WingOffice").setExit("west", this.aRooms.get("WingCorridorTwoOffice"));
-
-                this.aRooms.get("OffscriptEat").setExit("north", this.aRooms.get("OffscriptEatPantry"));
-                this.aRooms.get("OffscriptEat").setExit("west", this.aRooms.get("WingCorridorOne"));
-                this.aRooms.get("OffscriptEat").setExit("east", this.aRooms.get("OffscriptTake"));
-                this.aRooms.get("OffscriptEatPantry").setExit("south", this.aRooms.get("OffscriptEat"));
-                this.aRooms.get("OffscriptTake").setExit("north", this.aRooms.get("OffscriptTakeStorageroom"));
-                this.aRooms.get("OffscriptTake").setExit("west", this.aRooms.get("OffscriptEat"));
-                this.aRooms.get("OffscriptTake").setExit("east", this.aRooms.get("OffscriptTimeout"));
-                this.aRooms.get("OffscriptTakeStorageroom").setExit("south", this.aRooms.get("OffscriptTake"));
-                this.aRooms.get("OffscriptTimeout").setExit("north", this.aRooms.get("OffscriptTimeoutCountdownroom"));
-                this.aRooms.get("OffscriptTimeout").setExit("west", this.aRooms.get("OffscriptTakeStorageroom"));
-                this.aRooms.get("OffscriptTimeout").setExit("east", this.aRooms.get("OffscriptTrapdoor"));
-                this.aRooms.get("OffscriptTimeoutCountdownroom").setExit("south", this.aRooms.get("OffscriptTimeout"));
-                this.aRooms.get("OffscriptTrapdoor").setExit("north", this.aRooms.get("OffscriptTrapdoorDeadend"));
-                this.aRooms.get("OffscriptTrapdoor").setExit("west", this.aRooms.get("OffscriptTimeout"));
-                this.aRooms.get("OffscriptTrapdoor").setExit("east", this.aRooms.get("OffscriptBeamer"));
-                this.aRooms.get("OffscriptTrapdoorDeadend").setExit("south", this.aRooms.get("OffscriptTrapdoor"));
-                this.aRooms.get("OffscriptBeamer").setExit("north", this.aRooms.get("OffscriptBeamerAnchor"));
-                this.aRooms.get("OffscriptBeamer").setExit("west", this.aRooms.get("OffscriptTrapdoor"));
-                this.aRooms.get("OffscriptBeamer").setExit("east", this.aRooms.get("OffscriptLock"));
-                this.aRooms.get("OffscriptBeamerAnchor").setExit("south", this.aRooms.get("OffscriptBeamer"));
-                this.aRooms.get("OffscriptLock").setExit("north", this.aRooms.get("OffscriptLockLockedroom"));
-                this.aRooms.get("OffscriptLock").setExit("west", this.aRooms.get("OffscriptBeamer"));
-                this.aRooms.get("OffscriptLock").setExit("east", this.aRooms.get("OffscriptAlea"));
-                this.aRooms.get("OffscriptLockLockedroom").setExit("south", this.aRooms.get("OffscriptLock"));
-                this.aRooms.get("OffscriptAlea").setExit("north", this.aRooms.get("OffscriptAleaRoomrandomizer"));
-                this.aRooms.get("OffscriptAlea").setExit("west", this.aRooms.get("OffscriptLock"));
-                this.aRooms.get("OffscriptAlea").setExit("east", this.aRooms.get("OffscriptMovingcharacter"));
-                this.aRooms.get("OffscriptAleaRoomrandomizer").setExit("south", this.aRooms.get("OffscriptAlea"));
-                this.aRooms.get("OffscriptMovingcharacter").setExit("north", this.aRooms.get("OffscriptMovingcharacterMo"));
-                this.aRooms.get("OffscriptMovingcharacter").setExit("west", this.aRooms.get("OffscriptAlea"));
+                this.aEngine = new GameEngine();
+                this.aGui = new UserInterface(this.aEngine);
+                this.aEngine.setGUI(this.aGui);