1 files changed, 17 insertions, 7 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 59b4a32..c9d7933 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,6 +1,7 @@
 package esieequest.model;
 
 import java.util.HashMap;
+import java.util.Set;
 
 /**
  * 
@@ -166,7 +167,8 @@ public class Game {
         }
 
         private void createItems() {
-                this.rooms.get("Cafeteria").setItem(new Item("Banana", 12));
+                this.rooms.get("Cafeteria").addItem("Banana", new Item("A yellow banana", 12));
+                this.rooms.get("Cafeteria").addItem("Orange", new Item("An orange orange", 15));
         }
 
         public void setRunning(boolean state) {
@@ -197,6 +199,14 @@ public class Game {
                 return this.currentRoom.getImageName();
         }
 
+        public String getItemDescription(String itemName) {
+                return this.currentRoom.getItem(itemName).getDescription();
+        }
+
+        public Set<String> getItemList() {
+                return this.currentRoom.getItemList();
+        }
+
         public String getEatMessage() {
                 return "oNommNommNomm...";
         }
@@ -217,12 +227,12 @@ public class Game {
                 return "There is no exit.";
         }
 
-        public String getItemDescription() {
-                if (this.currentRoom.getItem() != null) {
-                        return "This room contain : " + this.currentRoom.getItem().getDescription();
-                } else {
-                        return "";
-                }
+        public String getCommandListPrefix() {
+                return "Available commands:";
+        }
+
+        public String getItemListPrefix() {
+                return "This room contains:";
         }
 
 }