7 files changed, 84 insertions, 39 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index e8cff08..362af9c 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -62,10 +62,10 @@ public class Main extends JApplet {
                         view = new Window();
                 }
 
-                if(arguments.contains("--challenge")) {
+                if (arguments.contains("--challenge")) {
                         game.getPlayer().setMaxNbSteps(50);
                 }
-                
+
                 new GameEngine(game, view);
         }
 
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 63cf75b..b5c32ba 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -6,7 +6,9 @@ import java.util.Set;
 import esieequest.model.Game;
 import esieequest.model.commands.CommandWord;
 import esieequest.model.items.Inventory;
+import esieequest.model.map.Door;
 import esieequest.model.map.Room;
+import esieequest.model.map.TrapDoor;
 import esieequest.view.View;
 
 /**
@@ -106,13 +108,17 @@ class Performer {
          *            the direction of the new room
          */
         public void goTo(final String direction) {
-                final Room nextRoom = this.game.getPlayer().getCurrentRoom().getExit(direction);
-                if (nextRoom != null) {
-                        this.game.getPlayer().goToRoom(nextRoom);
-                        this.view.updateRoom(this.game.getPlayer().getCurrentRoom());
-                        this.walk();
-                } else {
+                final Door door = this.game.getPlayer().getCurrentRoom().getExit(direction);
+                if (door == null) {
                         this.echo(this.game.getNoExitMessage());
+                        return;
+                }
+                final Room nextRoom = door.getDestination();
+                this.game.getPlayer().goToRoom(nextRoom);
+                this.view.updateRoom(this.game.getPlayer().getCurrentRoom());
+                this.walk();
+                if (door.getClass() == TrapDoor.class) {
+                        this.game.getPlayer().clearRoomHistory();
                 }
         }
 
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index cc6157d..83fa143 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -4,7 +4,9 @@ import java.util.HashMap;
 
 import esieequest.model.entities.Player;
 import esieequest.model.items.Item;
+import esieequest.model.map.Door;
 import esieequest.model.map.Room;
+import esieequest.model.map.TrapDoor;
 
 /**
  * Represents the game.
@@ -54,20 +56,6 @@ public class Game {
         }
 
         /**
-         * Sets the exit room of a given room designated by its name.
-         * 
-         * @param roomName
-         *            the name of the room
-         * @param direction
-         *            the direction of the exit
-         * @param exitRoomName
-         *            the name of the exit room
-         */
-        private void setRoomExit(final String roomName, final String direction, final String exitRoomName) {
-                this.rooms.get(roomName).addExit(direction, this.rooms.get(exitRoomName));
-        }
-
-        /**
          * Creates all the rooms.
          */
         private void createRooms() {
@@ -101,15 +89,28 @@ public class Game {
 
                 this.createRoom("OffscriptItems", "somewhere implementing weight");
                 this.createRoom("OffscriptItemsStorageroom", "in a storage room");
-                this.createRoom("OffscriptTime", "somewhere implementing time");
-                this.createRoom("OffscriptTimeCountdownroom", "in a dangerous room");
                 this.createRoom("OffscriptTeleportation", "somewhere implementing teleportation");
                 this.createRoom("OffscriptTeleportationAnchorroom", "on a checkpoint");
                 this.createRoom("OffscriptAlea", "somewhere implementing alea");
                 this.createRoom("OffscriptAleaRandomizingroom", "in a weird room that will transport you somewhere else");
                 this.createRoom("OffscriptMovingcharacter", "somewhere implementing a moving character");
                 this.createRoom("OffscriptMovingcharacterSumobotroom", "in the Chirac-101's room");
+        }
 
+        /**
+         * Sets the exit room of a given room designated by its name.
+         * 
+         * @param roomName
+         *            the name of the room
+         * @param direction
+         *            the direction of the exit
+         * @param exitRoomName
+         *            the name of the exit room
+         */
+        private void setRoomExit(final String roomName, final String direction, final String exitRoomName) {
+                final Room room = this.rooms.get(exitRoomName);
+                final Door door = new Door(room);
+                this.rooms.get(roomName).addExit(direction, door);
         }
 
         /**
@@ -153,7 +154,6 @@ public class Game {
                 this.setRoomExit("WingStreet", "east", "ClubnixStreet");
                 this.setRoomExit("WingCorridorOne", "west", "WingStairsOne");
                 this.setRoomExit("WingCorridorOne", "south", "WingStreet");
-                this.setRoomExit("WingCorridorOne", "east", "OffscriptItems");
                 this.setRoomExit("WingStairsOne", "south", "WingStairsTwo");
                 this.setRoomExit("WingStairsOne", "up", "WingStairsTwo");
                 this.setRoomExit("WingStairsOne", "east", "WingCorridorOne");
@@ -166,14 +166,11 @@ public class Game {
                 this.setRoomExit("WingCorridorTwoOffice", "east", "WingOffice");
                 this.setRoomExit("WingOffice", "west", "WingCorridorTwoOffice");
 
+                this.rooms.get("WingCorridorOne").addExit("east", new TrapDoor(this.rooms.get("OffscriptItems")));
+
                 this.setRoomExit("OffscriptItems", "north", "OffscriptItemsStorageroom");
-                this.setRoomExit("OffscriptItems", "west", "WingCorridorOne");
-                this.setRoomExit("OffscriptItems", "east", "OffscriptTime");
+                this.setRoomExit("OffscriptItems", "east", "OffscriptTeleportation");
                 this.setRoomExit("OffscriptItemsStorageroom", "south", "OffscriptItems");
-                this.setRoomExit("OffscriptTime", "north", "OffscriptTimeCountdownroom");
-                this.setRoomExit("OffscriptTime", "west", "OffscriptTakeStorageroom");
-                this.setRoomExit("OffscriptTime", "east", "OffscriptTeleportation");
-                this.setRoomExit("OffscriptTimeCountdownroom", "south", "OffscriptTime");
                 this.setRoomExit("OffscriptTeleportation", "north", "OffscriptTeleportationAnchorroom");
                 this.setRoomExit("OffscriptTeleportation", "west", "OffscriptTime");
                 this.setRoomExit("OffscriptTeleportation", "east", "OffscriptAlea");
diff --git a/src/esieequest/model/entities/Player.java b/src/esieequest/model/entities/Player.java
index aaa6651..11a893f 100644
--- a/src/esieequest/model/entities/Player.java
+++ b/src/esieequest/model/entities/Player.java
@@ -62,6 +62,13 @@ public class Player {
         }
 
         /**
+         * Clears the previous rooms history.
+         */
+        public void clearRoomHistory() {
+                this.previousRooms.clear();
+        }
+
+        /**
          * Gets the player's inventory.
          * 
          * @return the player's inventory
@@ -81,14 +88,14 @@ public class Player {
          * @return the nbSteps
          */
         public int getNbSteps() {
-                return nbSteps;
+                return this.nbSteps;
         }
 
         /**
          * @param nbSteps
          *            the nbSteps to set
          */
-        public void setNbSteps(int nbSteps) {
+        public void setNbSteps(final int nbSteps) {
                 this.nbSteps = nbSteps;
         }
 
@@ -96,14 +103,14 @@ public class Player {
          * @return the maxNbSteps
          */
         public int getMaxNbSteps() {
-                return maxNbSteps;
+                return this.maxNbSteps;