8 files changed, 164 insertions, 60 deletions

diff --git a/src/esieequest/controller/Callback.java b/src/esieequest/controller/Callback.java
new file mode 100644
index 0000000..ef03b72
--- /dev/null
+++ b/src/esieequest/controller/Callback.java
@@ -0,0 +1,15 @@
+package esieequest.controller;
+
+/**
+ * The Callback interface.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public interface Callback {
+
+        /**
+         * Will be run after the execution of the function.
+         */
+        public void call();
+
+}
diff --git a/src/esieequest/controller/commands/NewCommand.java b/src/esieequest/controller/commands/NewCommand.java
index 3f0b4b9..7283989 100644
--- a/src/esieequest/controller/commands/NewCommand.java
+++ b/src/esieequest/controller/commands/NewCommand.java
@@ -1,7 +1,9 @@
 package esieequest.controller.commands;
 
+import esieequest.controller.Callback;
 import esieequest.model.Game;
 import esieequest.model.Text;
+import esieequest.model.events.Scene;
 import esieequest.view.Viewable;
 
 /**
@@ -22,13 +24,22 @@ public class NewCommand implements Executable {
 
                 game.newGame(true, challengeMode);
 
-                view.enable();
-
-                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
-                                .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
-                                .canGoBack());
                 view.echo(Text.WELCOME.toString());
 
-        }
+                Scene.INTRO.setCallback(new Callback() {
+                        @Override
+                        public void call() {
+                                view.updateQuest(game.getPlayer().getCurrentQuest());
+
+                                view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
+                                                .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
+                                                .canGoBack());
 
+                                view.enable();
+                        }
+                });
+
+                view.playScene(Scene.INTRO);
+
+        }
 }
diff --git a/src/esieequest/model/events/Quest.java b/src/esieequest/model/events/Quest.java
index 54cbb4a..ac523e2 100644
--- a/src/esieequest/model/events/Quest.java
+++ b/src/esieequest/model/events/Quest.java
@@ -13,7 +13,7 @@ public enum Quest {
         
         WHAT_HAPPENED("What happened?!?!"),
         FIND_ATHANASE("Find Athanase"),
-        FEED_ATHAnASE("Feed Athanase"),
+        FEED_ATHANASE("Feed Athanase"),
         FIND_DISK("Find the Disk"),
         FIND_TRANSPONDER("Find the Transponder"),
         ACTIVATE_TRANSPONDER("Activate the Transponder"),
diff --git a/src/esieequest/model/events/Scene.java b/src/esieequest/model/events/Scene.java
new file mode 100644
index 0000000..eebd9f6
--- /dev/null
+++ b/src/esieequest/model/events/Scene.java
@@ -0,0 +1,48 @@
+package esieequest.model.events;
+
+import lombok.Getter;
+import lombok.Setter;
+import esieequest.controller.Callback;
+
+/**
+ * Represents an animated Scene that can be played.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public enum Scene {
+
+        // @formatter:off
+        
+        INTRO("Testing is the future...", "...", 2500),
+        END("...and the future starts with you!", "...", 2500),
+        
+        ;
+        
+        // @formatter:on
+
+        @Getter
+        private final String title;
+
+        @Getter
+        private final String text;
+
+        @Getter
+        private final int duration;
+
+        @Getter
+        @Setter
+        private Callback callback;
+
+        Scene(final String title, final String text, final int duration) {
+                this.title = title;
+                this.text = text;
+                this.duration = duration;
+                this.callback = new Callback() {
+                        @Override
+                        public void call() {
+                                return;
+                        }
+                };
+        }
+
+}
diff --git a/src/esieequest/view/Viewable.java b/src/esieequest/view/Viewable.java
index dc12973..845b4ea 100644
--- a/src/esieequest/view/Viewable.java
+++ b/src/esieequest/view/Viewable.java
@@ -2,6 +2,7 @@ package esieequest.view;
 
 import esieequest.controller.GameEngine;
 import esieequest.model.events.Quest;
+import esieequest.model.events.Scene;
 import esieequest.model.items.Inventory;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
@@ -74,4 +75,12 @@ public interface Viewable {
          */
         public void updateInventory(final Inventory inventory);
 
+        /**
+         * Plays the given Scene.
+         * 
+         * @param scene
+         *            the Scene to play
+         */
+        public void playScene(final Scene scene);
+
 }
diff --git a/src/esieequest/view/app/UserInterface.java b/src/esieequest/view/app/UserInterface.java
index 0b0a44b..cb8d6aa 100644
--- a/src/esieequest/view/app/UserInterface.java
+++ b/src/esieequest/view/app/UserInterface.java
@@ -14,9 +14,7 @@ import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
 import java.net.URL;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
@@ -36,6 +34,7 @@ import esieequest.controller.GameEngine;
 import esieequest.controller.commands.Command;
 import esieequest.model.Text;
 import esieequest.model.events.Quest;
+import esieequest.model.events.Scene;
 import esieequest.model.items.Inventory;
 import esieequest.model.items.Item;
 import esieequest.model.map.Direction;
@@ -67,11 +66,10 @@ abstract class UserInterface implements Viewable, ActionListener {
         private JPanel questPanel;
         private JPanel gamePanel;
 
-        private final Set<JButton> gameButtons;
-
         private JButton newButton;
         private JButton soundButton;
         private JPanel filePanel;
+        private JButton loadButton;
         private JButton saveButton;
 
         private JPanel imagePanel;
@@ -89,8 +87,6 @@ abstract class UserInterface implements Viewable, ActionListener {
         private JTextPane infoTextPane;
         private JTextField inputField;
 
-        private final Set<JButton> controlButtons;
-
         private JButton forwardButton;
         private JButton inventoryButton;
         private JButton actionButton;
@@ -102,9 +98,6 @@ abstract class UserInterface implements Viewable, ActionListener {
          * The default constructor.
          */
         public UserInterface() {
-                this.gameButtons = new HashSet<>();
-                this.controlButtons = new HashSet<>();
-
                 this.buildUI();
                 this.setActionListener(this);
                 this.bindKeys();
@@ -141,28 +134,24 @@ abstract class UserInterface implements Viewable, ActionListener {