Merge branch 'zuul-extended' into 'master'

Zuul Extended

21 files changed, 723 insertions, 76 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 59ac568..362af9c 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -62,6 +62,10 @@ public class Main extends JApplet {
                         view = new Window();
                 }
 
+                if (arguments.contains("--challenge")) {
+                        game.getPlayer().setMaxNbSteps(50);
+                }
+
                 new GameEngine(game, view);
         }
 
diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index 32adeda..1895099 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -48,6 +48,8 @@ class Interpreter {
         public void dispatch(final Command command) {
                 if (command.getAction() != null) {
                         switch (command.getAction()) {
+
+                        // game related:
                         case NEW:
                                 this.performer.newGame();
                                 return;
@@ -57,9 +59,17 @@ class Interpreter {
                         case SAVE:
                                 this.performer.saveGame();
                                 return;
+                        case QUIT:
+                                this.performer.quitGame();
+                                return;
                         case SOUND:
                                 this.performer.toggleSound();
                                 return;
+                        case HELP:
+                                this.performer.showHelp();
+                                return;
+
+                                // map related:
                         case GO:
                                 this.performer.goTo(command.getOption());
                                 return;
@@ -69,25 +79,32 @@ class Interpreter {
                         case LOOK:
                                 this.performer.look();
                                 return;
+                        case ALEA:
+                                this.performer.forceAlea(command.getOption());
+                                return;
+
+                                // items related:
                         case INVENTORY:
                                 this.performer.listItems();
                                 return;
                         case TAKE:
-                                this.performer.take(command.getOption());
+                                this.performer.takeItem(command.getOption());
                                 return;
                         case DROP:
-                                this.performer.drop(command.getOption());
+                                this.performer.dropItem(command.getOption());
                                 return;
-                        case HELP:
-                                this.performer.showHelp();
+                        case USE:
+                                this.performer.useItem(command.getOption());
                                 return;
-                        case QUIT:
-                                this.performer.quitGame();
+
+                                // characters related
+                        case TALK:
+                                this.performer.talk(command.getOption());
                                 return;
+
                         }
                 }
                 this.performer.echo("Unknown command.");
                 return;
         }
-
 }
diff --git a/src/esieequest/controller/Parser.java b/src/esieequest/controller/Parser.java
index 7b07efb..d13f940 100644
--- a/src/esieequest/controller/Parser.java
+++ b/src/esieequest/controller/Parser.java
@@ -25,7 +25,7 @@ class Parser {
          * @return the command
          */
         public Command getCommand(final String commandString) {
-                final String[] elements = commandString.split(" ");
+                final String[] elements = commandString.split(" ", 2);
 
                 CommandWord action = null;
                 String option = null;
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 7ba8c94..6526ef7 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -1,12 +1,23 @@
 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;
+import esieequest.model.map.Door;
+import esieequest.model.map.LockedDoor;
 import esieequest.model.map.Room;
+import esieequest.model.map.TransporterDoor;
+import esieequest.model.map.TrapDoor;
 import esieequest.view.View;
 
 /**
@@ -55,6 +66,7 @@ class Performer {
          */
         public void newGame() {
                 // this.loadGame(default game);
+                // TODO
                 this.view.enable();
                 this.echo(this.game.getWelcomeMessage());
         }
@@ -63,6 +75,7 @@ class Performer {
          * Loads a saved game.
          */
         public void loadGame() {
+                // TODO
                 this.notImplemented();
         }
 
@@ -70,6 +83,7 @@ class Performer {
          * Saves the current game.
          */
         public void saveGame() {
+                // TODO
                 this.notImplemented();
         }
 
@@ -77,6 +91,7 @@ class Performer {
          * Toggles the sound.
          */
         public void toggleSound() {
+                // TODO
                 this.notImplemented();
         }
 
@@ -106,12 +121,25 @@ class Performer {
          *            the direction of the new room
          */