1 files changed, 34 insertions, 22 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 668a7f9..eb74f85 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -11,27 +11,27 @@ import java.util.HashMap;
  */
 public class Game {
 
-        private boolean aRunning;
-        private HashMap<String, Room> aRooms;
-        private Room aCurrentRoom;
+        private boolean running;
+        private HashMap<String, Room> rooms;
+        private Room currentRoom;
 
         public Game() {
-                this.aRunning = false;
-                this.aRooms = new HashMap<String, Room>();
-                this.aCurrentRoom = null;
+                this.running = false;
+                this.rooms = new HashMap<String, Room>();
+                this.currentRoom = null;
 
                 this.createRooms();
                 this.linkRooms();
+                this.createItems();
                 this.goToRoom("AmphitheaterSeat");
         }
 
-        private void createRoom(final String pName, final String pDescription) {
-                this.aRooms.put(pName, new Room(pDescription));
+        private void createRoom(String name, String description) {
+                this.rooms.put(name, new Room(description));
         }
 
-        private void setRoomExit(final String pRoomName, final String pDirection,
-                        final String pExitRoomName) {
-                this.aRooms.get(pRoomName).setExit(pDirection, this.aRooms.get(pExitRoomName));
+        private void setRoomExit(String roomName, String direction, String exitRoomName) {
+                this.rooms.get(roomName).setExit(direction, this.rooms.get(exitRoomName));
         }
 
         private void createRooms() {
@@ -165,32 +165,36 @@ public class Game {
                 this.setRoomExit("OffscriptMovingcharacter", "west", "OffscriptAlea");
         }
 
-        public void setRunning(final boolean pState) {
-                this.aRunning = pState;
+        private void createItems() {
+                this.rooms.get("Cafeteria").setItem(new Item("Banana", 12));
+        }
+
+        public void setRunning(boolean state) {
+                this.running = state;
         }
 
         public boolean isRunning() {
-                return this.aRunning;
+                return this.running;
         }
 
-        public void goToRoom(final Room pRoom) {
-                this.aCurrentRoom = pRoom;
+        public void goToRoom(Room room) {
+                this.currentRoom = room;
         }
 
-        public void goToRoom(final String pRoomName) {
-                this.aCurrentRoom = this.aRooms.get(pRoomName);
+        public void goToRoom(String roomName) {
+                this.currentRoom = this.rooms.get(roomName);
         }
 
-        public Room getRoomExit(final String pDirection) {
-                return this.aCurrentRoom.getExit(pDirection);
+        public Room getRoomExit(String direction) {
+                return this.currentRoom.getExit(direction);
         }
 
         public String getLocationInfo() {
-                return this.aCurrentRoom.getLongDescription();
+                return this.currentRoom.getLongDescription();
         }
 
         public String getLocationImageName() {
-                return this.aCurrentRoom.getImageName();
+                return this.currentRoom.getImageName();
         }
 
         public String getEatMessage() {
@@ -213,4 +217,12 @@ public class Game {
                 return "There is no exit.";
         }
 
+        public String getItemDescription() {
+                if (this.currentRoom != null) {
+                        return "This room contain : " + this.currentRoom.getItem().getDescription();
+                } else {
+                        return "";
+                }
+        }
+
 }