8 files changed, 182 insertions, 2 deletions

diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index 5f9dafa..1895099 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -96,6 +96,12 @@ class Interpreter {
                         case USE:
                                 this.performer.useItem(command.getOption());
                                 return;
+
+                                // characters related
+                        case TALK:
+                                this.performer.talk(command.getOption());
+                                return;
+
                         }
                 }
                 this.performer.echo("Unknown command.");
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 17d2cd8..6526ef7 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -1,10 +1,15 @@
 package esieequest.controller;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Random;
 import java.util.Set;
 
 import esieequest.model.Game;
 import esieequest.model.commands.CommandWord;
+import esieequest.model.entities.Character;
+import esieequest.model.entities.MovingCharacter;
 import esieequest.model.items.Beamer;
 import esieequest.model.items.Inventory;
 import esieequest.model.items.Item;
@@ -156,6 +161,46 @@ class Performer {
                         this.echo("You died of exhaustion...");
                         this.quitGame();
                 }
+
+                this.moveMovingCharacters();
+        }
+
+        /**
+         * Moves all MovingCharacters that can to adjacent rooms.
+         */
+        private void moveMovingCharacters() {
+                final HashMap<Room, Room> movingCharactersPositions = new HashMap<Room, Room>();
+                final Collection<Room> rooms = this.game.getRooms().values();
+                for (final Room room : rooms) {
+                        if (room.getCharacter() == null) {
+                                continue;
+                        }
+                        if (room.getCharacter() instanceof MovingCharacter) {
+                                if (!((MovingCharacter) room.getCharacter()).canMove()) {
+                                        continue;
+                                }
+                                final int randomIndex = new Random().nextInt(room.getExits().values().size());
+                                final Room destinationRoom = ((Door) room.getExits().values().toArray()[randomIndex]).getDestination();
+                                movingCharactersPositions.put(room, destinationRoom);
+                        }
+                }
+
+                for (final Room source : movingCharactersPositions.keySet()) {
+                        this.swapCharacters(source, movingCharactersPositions.get(source));
+                }
+        }
+
+        /**
+         * Swaps the characters in the given rooms.
+         * 
+         * @param source
+         * @param destination
+         */
+        private void swapCharacters(final Room source, final Room destination) {
+                final Character characterS = source.getCharacter();
+                final Character characterD = destination.getCharacter();
+                destination.setCharacter(characterS);
+                source.setCharacter(characterD);
         }
 
         /**
@@ -267,4 +312,9 @@ class Performer {
                         }
                 }
         }
+
+        public void talk(final String message) {
+                this.echo(this.game.getPlayer().getCurrentRoom().getCharacter().talk());
+        }
+
 }
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 17fad02..87d3d51 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 import esieequest.model.entities.Player;
+import esieequest.model.entities.Sumobot;
 import esieequest.model.items.Beamer;
 import esieequest.model.items.Item;
 import esieequest.model.items.KeyCard;
@@ -37,6 +38,7 @@ public class Game {
                 this.createRooms();
                 this.linkRooms();
                 this.createItems();
+                this.createCharacters();
                 this.goToRoom("AmphitheaterSeat");
         }
 
@@ -204,6 +206,10 @@ public class Game {
                 this.rooms.get("Dead-end").getItems().putItem("KeyCard", keyCard);
         }
 
+        private void createCharacters() {
+                this.rooms.get("Locked room").setCharacter(new Sumobot());
+        }
+
         /**
          * Sets the current room designated by its name.
          * 
diff --git a/src/esieequest/model/entities/Character.java b/src/esieequest/model/entities/Character.java
new file mode 100644
index 0000000..03b1cfa
--- /dev/null
+++ b/src/esieequest/model/entities/Character.java
@@ -0,0 +1,25 @@
+package esieequest.model.entities;
+
+/**
+ * A character that can talk with the player.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public abstract class Character {
+
+        private final String name;
+
+        public Character(final String name) {
+                this.name = name;
+        }
+
+        public abstract String talk();
+
+        /**
+         * @return the name
+         */
+        public String getName() {
+                return this.name;
+        }
+
+}
diff --git a/src/esieequest/model/entities/MovingCharacter.java b/src/esieequest/model/entities/MovingCharacter.java
new file mode 100644
index 0000000..5265a28
--- /dev/null
+++ b/src/esieequest/model/entities/MovingCharacter.java
@@ -0,0 +1,33 @@
+package esieequest.model.entities;
+
+/**
+ * A character that can move from rooms to rooms.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public abstract class MovingCharacter extends Character {
+
+        private boolean canMove;
+
+        public MovingCharacter(final String name) {
+                super(name);
+
+                this.canMove = false;
+        }
+
+        /**
+         * @return the canMove
+         */
+        public boolean canMove() {
+                return this.canMove;
+        }
+
+        /**
+         * @param canMove
+         *            the canMove to set
+         */
+        public void setCanMove(final boolean canMove) {
+                this.canMove = canMove;
+        }
+
+}
diff --git a/src/esieequest/model/entities/Sumobot.java b/src/esieequest/model/entities/Sumobot.java
new file mode 100644
index 0000000..a700a71
--- /dev/null
+++ b/src/esieequest/model/entities/Sumobot.java
@@ -0,0 +1,32 @@
+package esieequest.model.entities;
+
+import java.util.HashSet;
+import java.util.Random;
+
+public class Sumobot extends MovingCharacter {
+
+        private final Random randomGenerator;
+        private final HashSet<String> messages;
+
+        public Sumobot() {
+                super("Sumobot DK-02");
+
+                this.randomGenerator = new Random();
+
+                this.messages = new HashSet<String>();