Merge branch 'zuul-with-features' into 'master'

Zuul With Features

3 files changed, 19 insertions, 1 deletions

diff --git a/report/progression.tex b/report/progression.tex
index f31330a..2f25aea 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -62,8 +62,12 @@ the room since commit e510b08d0.
 
 \subsection{look}
 
+The look command has been added with the commit 698e3cd25.
+
 \subsection{eat}
 
+The eat command has been added with the commit 40b9b4816.
+
 
 \section{Zuul better v2}
 
diff --git a/src/esieequest/CommandWords.java b/src/esieequest/CommandWords.java
index 3a77015..3d8855d 100644
--- a/src/esieequest/CommandWords.java
+++ b/src/esieequest/CommandWords.java
@@ -12,7 +12,7 @@ package esieequest;
  */
 public class CommandWords {
         // a constant array that holds all valid command words
-        private static final String[] sValidCommands = { "go", "quit", "help" };
+        private static final String[] sValidCommands = { "go", "quit", "help", "look", "eat" };
 
         /**
          * Constructor - initialise the command words.
diff --git a/src/esieequest/Game.java b/src/esieequest/Game.java
index 638c9b8..350fa15 100644
--- a/src/esieequest/Game.java
+++ b/src/esieequest/Game.java
@@ -222,6 +222,14 @@ public class Game {
                 System.out.println("  go quit help");
         }
 
+        private void look() {
+                System.out.println(aCurrentRoom.getLongDescription());
+        }
+
+        private void eat() {
+                System.out.println("You have eaten now and you are not hungry any more.");
+        }
+
         /**
          * "Quit" was entered. Check the rest of the command to see whether we
          * really quit the game.
@@ -249,6 +257,12 @@ public class Game {
                         case "go":
                                 this.goRoom(pCommand);
                                 return false;
+                        case "look":
+                                this.look();
+                                return false;
+                        case "eat":
+                                this.eat();
+                                return false;
                         case "help":
                                 this.printHelp();
                                 return false;