8 files changed, 87 insertions, 67 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 9b572e7..94f0a59 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -14,6 +14,7 @@ import esieequest.model.doors.HiddenDoor;
 import esieequest.model.doors.LockedDoor;
 import esieequest.model.doors.TransporterDoor;
 import esieequest.model.doors.TrapDoor;
+import esieequest.model.events.Quest;
 import esieequest.model.items.Item;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
@@ -30,6 +31,7 @@ public class Game implements SerialisableObject {
         public static final int CHALLENGE_STEPS_LIMIT = 50;
         public static final Direction DEFAULT_DIRECTION = Direction.NORTH;
         public static final Room DEFAULT_ROOM = Room.AMPHITHEATER_SEAT;
+        public static final Quest DEFAULT_QUEST = Quest.WHAT_HAPPENED;
 
         private static final String CHALLENGE_LABEL = "L";
         private final boolean challenge;
@@ -67,7 +69,7 @@ public class Game implements SerialisableObject {
                 Room.createAllSides();
                 this.connectRooms();
 
-                this.setPlayer(new Player(Game.DEFAULT_ROOM, Game.DEFAULT_DIRECTION, Game.DEFAULT_INVENTORY_LIMIT, challengeMode ? Game.CHALLENGE_STEPS_LIMIT : Game.DEFAULT_STEPS_LIMIT));
+                this.setPlayer(new Player(Game.DEFAULT_QUEST, Game.DEFAULT_ROOM, Game.DEFAULT_DIRECTION, Game.DEFAULT_INVENTORY_LIMIT, challengeMode ? Game.CHALLENGE_STEPS_LIMIT : Game.DEFAULT_STEPS_LIMIT));
 
                 if (populate) {
                         this.addItems();
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
index a0066dc..ea8af35 100644
--- a/src/esieequest/model/Player.java
+++ b/src/esieequest/model/Player.java
@@ -11,6 +11,7 @@ import org.json.simple.JSONObject;
 
 import esieequest.controller.utils.EnumUtils;
 import esieequest.controller.utils.SerialisableObject;
+import esieequest.model.events.Quest;
 import esieequest.model.items.Inventory;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
@@ -24,6 +25,11 @@ import esieequest.model.map.Side;
  */
 public class Player implements SerialisableObject {
 
+        private static final String CURRENT_QUEST_LABEL = "Q";
+        @Getter
+        @Setter
+        private Quest currentQuest;
+
         private static final String CURRENT_ROOM_LABEL = "R";
         @Getter
         @Setter
@@ -64,7 +70,8 @@ public class Player implements SerialisableObject {
          * @param nbStepsLimit
          *            the maximum number of steps
          */
-        public Player(final Room currentRoom, final Direction currentDirection, final int carryWeightLimit, final int nbStepsLimit) {
+        public Player(final Quest currentQuest, final Room currentRoom, final Direction currentDirection, final int carryWeightLimit, final int nbStepsLimit) {
+                this.currentQuest = currentQuest;
                 this.currentRoom = currentRoom;
                 this.previousRooms = new Stack<>();
                 this.currentDirection = currentDirection;
@@ -122,6 +129,7 @@ public class Player implements SerialisableObject {
         public JSONObject serialise() {
                 final CleanJSONObject o = new CleanJSONObject();
 
+                o.put(Player.CURRENT_QUEST_LABEL, this.currentQuest.name());
                 o.put(Player.CURRENT_ROOM_LABEL, this.currentRoom.name());
                 o.put(Player.PREVIOUS_ROOMS_LABEL, EnumUtils.nameAll(this.previousRooms.toArray(new Room[0])));
 
@@ -139,6 +147,7 @@ public class Player implements SerialisableObject {
         @Override
         public void deserialise(final JSONObject o) {
 
+                this.currentQuest = Quest.valueOf((String) o.get(Player.CURRENT_QUEST_LABEL));
                 this.currentRoom = Room.valueOf((String) o.get(Player.CURRENT_ROOM_LABEL));
 
                 this.previousRooms.clear();
diff --git a/src/esieequest/model/Text.java b/src/esieequest/model/Text.java
index 84253b3..a72ff4a 100644
--- a/src/esieequest/model/Text.java
+++ b/src/esieequest/model/Text.java
@@ -25,6 +25,8 @@ public enum Text {
         BEAMER_ROOM_MEMORISED("The coordinates of the current location have been memorised: "),
         BEAMER_TELEPORTED("Zap! You have reached your destination. The device's memory has been cleared."),
         
+        CURRENT_QUEST_PREFIX("Current quest: "),
+        
         // objects
         NOTE_PREFIX("It is written: "),
         NOTE_ATHANASE("In case of logical trouble: find Athanase, office #3254."),
@@ -59,6 +61,7 @@ public enum Text {
                 
         // formatting
         LIST_SEPARATOR(", "),
+        FILENAME_SEPARATOR("_"),
         NEW_LINE("\n"),
         SPACE(" "),
         
diff --git a/src/esieequest/model/events/Quest.java b/src/esieequest/model/events/Quest.java
index 30c4aa0..54cbb4a 100644
--- a/src/esieequest/model/events/Quest.java
+++ b/src/esieequest/model/events/Quest.java
@@ -1,26 +1,31 @@
 package esieequest.model.events;
 
+import lombok.Getter;
+
 /**
  * A quest that can be completed in the game.
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class Quest {
+public enum Quest {
 
-        private String title;
+        // @formatter:off
+        
+        WHAT_HAPPENED("What happened?!?!"),
+        FIND_ATHANASE("Find Athanase"),
+        FEED_ATHAnASE("Feed Athanase"),
+        FIND_DISK("Find the Disk"),
+        FIND_TRANSPONDER("Find the Transponder"),
+        ACTIVATE_TRANSPONDER("Activate the Transponder"),
+        
+        ;
+        
+        // @formatter:on
 
-        /**
-         * @return the title
-         */
-        public String getTitle() {
-                return this.title;
-        }
+        @Getter
+        private String title;
 
-        /**
-         * @param title
-         *            the title to set
-         */
-        public void setTitle(final String title) {
+        Quest(final String title) {
                 this.title = title;
         }
 
diff --git a/src/esieequest/view/Viewable.java b/src/esieequest/view/Viewable.java
index 0b23b8c..d4da79b 100644
--- a/src/esieequest/view/Viewable.java
+++ b/src/esieequest/view/Viewable.java
@@ -33,6 +33,11 @@ public interface Viewable {
         public void enable();
 
         /**
+         * Disables the user interface.
+         */
+        public void disable();
+
+        /**
          * Displays a message.
          * 
          * @param message
@@ -41,9 +46,12 @@ public interface Viewable {
         public void echo(final String message);
 
         /**
-         * Disables the user interface.
+         * Updates the view to match the current quest.
+         * 
+         * @param quest
+         *            the current quest to display
          */
-        public void disable();
+        public void updateQuest(final Quest quest);
 
         /**
          * Updates the view to match the current location.
@@ -58,14 +66,6 @@ public interface Viewable {
         public void updateLocation(final Room room, final Direction direction, final Side side);
 
         /**
-         * Updates the view to match the current quest.
-         * 
-         * @param quest
-         *            the current quest to display
-         */
-        public void updateQuest(final Quest quest);
-
-        /**
          * Updates the view to display the items contained in the inventory
          *