6 files changed, 150 insertions, 36 deletions

diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index 8326607..ae76059 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -77,20 +77,16 @@ public class GameEngine {
 
                 final String argument = input.getArgument();
 
-                this.executePreRoutines();
                 command.execute(argument, this.game, this.view);
-                this.executeAfterRoutines();
+                this.executeRoutines();
         }
 
         /**
          * Performs routine actions executed every time a Command is entered.
          */
-        private void executePreRoutines() {
-                MovingCharacter.moveAll();
-        }
-
-        private void executeAfterRoutines() {
+        private void executeRoutines() {
                 this.checkStalemate();
+                MovingCharacter.moveAll(this.game);
         }
 
         private void checkStalemate() {
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
index e9c3c7f..c06f5b2 100644
--- a/src/esieequest/model/Player.java
+++ b/src/esieequest/model/Player.java
@@ -36,6 +36,7 @@ public class Player implements SerialisableObject {
         private Room currentRoom;
 
         private static final String PREVIOUS_ROOMS_LABEL = "H";
+        @Getter
         private final Stack<Room> previousRooms;
 
         private static final String CURRENT_DIRECTION_LABEL = "D";
diff --git a/src/esieequest/model/characters/FollowingCharacter.java b/src/esieequest/model/characters/FollowingCharacter.java
new file mode 100644
index 0000000..ab1a62e
--- /dev/null
+++ b/src/esieequest/model/characters/FollowingCharacter.java
@@ -0,0 +1,52 @@
+package esieequest.model.characters;
+
+import java.util.Stack;
+
+import esieequest.model.Game;
+import esieequest.model.map.Direction;
+import esieequest.model.map.Room;
+
+/**
+ * A MovingCharacter that follows the Player.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public abstract class FollowingCharacter extends MovingCharacter {
+
+        /**
+         * Instantiates a FollowingCharacter.
+         * 
+         * @param name
+         *            the name
+         * @param room
+         *            the initial Room
+         * @param direction
+         *            the initial Direction
+         */
+        public FollowingCharacter(final String name, final Room room, final Direction direction) {
+                super(name, room, direction);
+        }
+
+        @Override
+        public void move(final Game game) {
+                if (!this.isMobile()) {
+                        return;
+                }
+
+                final Stack<Room> playerHistory = game.getPlayer().getPreviousRooms();
+
+                if (playerHistory.size() < 2) {
+                        return;
+                }
+
+                final Room previousRoom = playerHistory.elementAt(playerHistory.size() - 1);
+                final Room previousPreviousRoom = playerHistory.elementAt(playerHistory.size() - 2);
+
+                if (previousPreviousRoom == this.getCurrentRoom()) {
+                        return;
+                }
+
+                this.changePosition(previousRoom, game.getPlayer().getCurrentDirection().getOpposite());
+        }
+
+}
diff --git a/src/esieequest/model/characters/MovingCharacter.java b/src/esieequest/model/characters/MovingCharacter.java
index 94aeaf1..2304f94 100644
--- a/src/esieequest/model/characters/MovingCharacter.java
+++ b/src/esieequest/model/characters/MovingCharacter.java
@@ -2,7 +2,6 @@ package esieequest.model.characters;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -10,6 +9,7 @@ import net.pacien.util.CleanJSONObject;
 
 import org.json.simple.JSONObject;
 
+import esieequest.model.Game;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
 
@@ -29,16 +29,18 @@ public abstract class MovingCharacter extends SimpleCharacter {
         /**
          * Moves all the MovingCharacter in the map.
          */
-        public static void moveAll() {
+        public static void moveAll(final Game game) {
                 for (final MovingCharacter movingCharacter : MovingCharacter.instances) {
-                        movingCharacter.move();
+                        movingCharacter.move(game);
                 }
         }
 
         private static final String CURRENT_ROOM_LABEL = "C";
+        @Getter
         private Room currentRoom;
 
         private static final String CURRENT_DIRECTION_LABEL = "D";
+        @Getter
         private Direction currentDirection;
 
         private static final String MOBILE_LABEL = "M";
@@ -66,38 +68,49 @@ public abstract class MovingCharacter extends SimpleCharacter {
         }
 
         /**
-         * Moves the MovingCharacter to a randomly chosen adjacent Room, if he can
-         * move and if the destination Room is not currently occupied by another
-         * Character.
+         * Changes the position of the MovingCharacter.
+         * 
+         * @param room
+         *            the new Room
+         * @param direction
+         *            the new Direction
          */
-        public void move() {
-                if (!this.mobile) {
-                        return;
-                }
-
-                final List<Direction> possibleDirections = this.currentRoom.listExitsDirections();
-
-                if (possibleDirections.size() < 1) {
-                        return;
-                }
-
-                final int randomIndex = (new Random()).nextInt(possibleDirections.size());
-                final Direction direction = possibleDirections.get(randomIndex);
-                final Room destination = this.currentRoom.getSide(direction).getDoor().getDestination();
-
-                if (destination.getSide(direction).hasCharacter()) {
+        public void changePosition(final Room room, final Direction direction) {
+                if (room.getSide(direction).hasCharacter()) {
                         return;
                 }
 
                 this.currentRoom.getSide(this.currentDirection).setCharacter(null);
+                this.currentRoom = room;
+                this.currentDirection = direction;
+                this.currentRoom.getSide(this.currentDirection).setCharacter(Character.getCharacter(this));
+        }
+
+        /**
+         * Changes the Room of the MovingCharacter.
+         * 
+         * @param room
+         *            the Room
+         */
+        public void changeRoom(final Room room) {
+                this.changePosition(room, this.currentDirection);
+        }
 
-                final Direction newDirection = direction.getOpposite();
-                final Character character = Character.getCharacter(this);
-                destination.getSide(newDirection).setCharacter(character);
-                this.currentRoom = destination;
-                this.currentDirection = newDirection;
+        /**
+         * Changes the Direction of the MovingCharacter.
+         * 
+         * @param direction
+         *            the Direction
+         */
+        public void changeDirection(final Direction direction) {