15 files changed, 197 insertions, 40 deletions

diff --git a/src/esieequest/controller/commands/TalkCommand.java b/src/esieequest/controller/commands/TalkCommand.java
index 228f954..39c4932 100644
--- a/src/esieequest/controller/commands/TalkCommand.java
+++ b/src/esieequest/controller/commands/TalkCommand.java
@@ -19,7 +19,7 @@ public class TalkCommand implements Executable {
                         return;
                 }
 
-                view.echo(game.getPlayer().getCurrentSide().getCharacter().talk());
+                game.getPlayer().getCurrentSide().getCharacter().talk(game, view);
 
         }
 
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 27237bf..2a6a31b 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -176,7 +176,7 @@ public class Game implements SerialisableObject {
                 // scenario
                 this.i(Room.AMPHITHEATER_STAGE, Direction.SOUTH, Item.NOTE);
                 this.i(Room.CAFETERIA, Direction.WEST, Item.BANANA);
-                this.i(Room.ESIEESPACE, Direction.NORTH, Item.TRANSPONDER);
+                this.i(Room.ESIEESPACE, Direction.NORTH, Item.PORTABLE_CONSOLE);
                 this.i(Room.CLUBNIX, Direction.NORTH, Item.DISK);
 
         }
diff --git a/src/esieequest/model/characters/Athanase.java b/src/esieequest/model/characters/Athanase.java
index b4527c8..698b7ae 100644
--- a/src/esieequest/model/characters/Athanase.java
+++ b/src/esieequest/model/characters/Athanase.java
@@ -1,8 +1,10 @@
 package esieequest.model.characters;
 
-import net.pacien.util.CleanJSONObject;
-
-import org.json.simple.JSONObject;
+import esieequest.model.Game;
+import esieequest.model.events.Quest;
+import esieequest.model.items.Inventory;
+import esieequest.model.items.Item;
+import esieequest.view.Viewable;
 
 /**
  * Athanase the mathgorilla.
@@ -12,27 +14,69 @@ import org.json.simple.JSONObject;
 public class Athanase extends SimpleCharacter {
 
         /**
-         * Creates Athanase.
+         * Instantiates Athanase.
          */
         public Athanase() {
                 super("Athanase");
         }
 
         @Override
-        public String talk() {
-                // TODO: require items
-                return "Who are you? Where did Leila go? I'm so hungry...";
-        }
+        public void talk(final Game game, final Viewable view) {
+                final Quest currentQuest = game.getPlayer().getCurrentQuest();
+                final Inventory playersInventory = game.getPlayer().getInventory();
+                switch (currentQuest) {
 
-        @Override
-        public JSONObject serialise() {
-                // TODO: save state (received items)
-                return new CleanJSONObject();
-        }
+                case WHAT_HAPPENED:
+                        view.echo("Who are you? Where did Leila go? Somethin happened... But... Can't think... I'm hungry... So hungry...");
+                        game.getPlayer().setCurrentQuest(Quest.FEED_ATHANASE);
+                        view.updateQuest(Quest.FEED_ATHANASE);
+                        break;
+
+                case FEED_ATHANASE:
+                        if (playersInventory.hasItem(Item.BANANA)) {
+                                playersInventory.removeItem(Item.BANANA);
+                                view.updateInventory(playersInventory);
+                                view.echo("Ooooh! You have a banana! *nomz* WAIT!... It tastes like... an EMERGENCY BANANA! That means... Hmmm..."
+                                                + "\n"
+                                                + "They turned it ON... Their stupid machine... It was not ready. It was a beta... Obviously it crashed... WITH THE ENTIRE UNIVERSE"
+                                                + "\n" + "I think we have to restart everything...");
+                                game.getPlayer().setCurrentQuest(Quest.FIND_DISK);
+                                view.updateQuest(Quest.FIND_DISK);
+                        } else {
+                                view.echo("ME=HUNGRY => ¬(ME CAN HELP YOU)");
+                        }
+                        break;
+
+                case FIND_DISK:
+                        if (playersInventory.hasItem(Item.DISK)) {
+                                view.echo("Fantastic! You have the bootloader disk! Now we need a remote console to connect to the Universe... They have a portable one at the Esieespace...");
+                                game.getPlayer().setCurrentQuest(Quest.FIND_CONSOLE);
+                                view.updateQuest(Quest.FIND_CONSOLE);
+                        } else {
+                                view.echo("Hopefully the Club*nix guys made an emergency boot disk, just in case... FIND IT and bring it!");
+                        }
+                        break;
+
+                case FIND_CONSOLE:
+                        if (playersInventory.hasItem(Item.PORTABLE_CONSOLE)) {
+                                view.echo("Yaaaay! You found it! We have the software, we have the hardware... I think we are ready for the complete reboot.");
+                                game.getPlayer().setCurrentQuest(Quest.INSTALL_CONSOLE);
+                                view.updateQuest(Quest.INSTALL_CONSOLE);
+                        } else {
+                                view.echo("We need the Portable Remote Console to connect to the Universe... Find it at the Esieespace HQ.");
+                        }
+                        break;
+
+                case INSTALL_CONSOLE:
+                        if (playersInventory.hasItem(Item.PORTABLE_CONSOLE)) {
+                                view.echo("The Universe is far away... Well... Not exactly... Sort of... Complicated. Find an antenna or something that may act as an amplifier and connect the Portable Console to contact the Universe.");
+                        } else {
+                                view.echo("Well... You have installed the console? Have you turned it ON and inserted the disk? Because you should.");
+                        }
+                        break;
+
+                }
 
-        @Override
-        public void deserialise(final JSONObject o) {
-                return;
         }
 
 }
diff --git a/src/esieequest/model/characters/Character.java b/src/esieequest/model/characters/Character.java
index c46c5bf..452226d 100644
--- a/src/esieequest/model/characters/Character.java
+++ b/src/esieequest/model/characters/Character.java
@@ -5,8 +5,10 @@ import org.json.simple.JSONObject;
 
 import esieequest.controller.utils.EnumUtils;
 import esieequest.controller.utils.SerialisableObject;
+import esieequest.model.Game;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
+import esieequest.view.Viewable;
 
 public enum Character implements SerialisableObject {
 
@@ -32,8 +34,8 @@ public enum Character implements SerialisableObject {
                 return this.character.getName();
         }
 
-        public String talk() {
-                return this.character.talk();
+        public void talk(final Game game, final Viewable view) {
+                this.character.talk(game, view);
         }
 
         /**
diff --git a/src/esieequest/model/characters/SimpleCharacter.java b/src/esieequest/model/characters/SimpleCharacter.java
index b855089..baaf650 100644
--- a/src/esieequest/model/characters/SimpleCharacter.java
+++ b/src/esieequest/model/characters/SimpleCharacter.java
@@ -6,6 +6,8 @@ import net.pacien.util.CleanJSONObject;
 import org.json.simple.JSONObject;
 
 import esieequest.controller.utils.SerialisableObject;
+import esieequest.model.Game;
+import esieequest.view.Viewable;
 
 /**
  * A character that can talk with the player.
@@ -32,7 +34,7 @@ public abstract class SimpleCharacter implements SerialisableObject {
          * 
          * @return what the Character says
          */
-        public abstract String talk();
+        public abstract void talk(final Game game, final Viewable view);
 
         @Override
         public JSONObject serialise() {
diff --git a/src/esieequest/model/characters/Sumobot.java b/src/esieequest/model/characters/Sumobot.java
index c779ad8..fb4e7b3 100644
--- a/src/esieequest/model/characters/Sumobot.java
+++ b/src/esieequest/model/characters/Sumobot.java
@@ -3,8 +3,10 @@ package esieequest.model.characters;
 import java.util.HashSet;
 import java.util.Random;