1 files changed, 20 insertions, 49 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 62dfc94..cc6157d 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,7 +1,10 @@
 package esieequest.model;
 
 import java.util.HashMap;
-import java.util.Stack;
+
+import esieequest.model.entities.Player;
+import esieequest.model.items.Item;
+import esieequest.model.map.Room;
 
 /**
  * Represents the game.
@@ -12,17 +15,16 @@ import java.util.Stack;
 public class Game {
 
         private final HashMap<String, Room> rooms;
-        private Room currentRoom;
 
-        private final Stack<Room> previousRooms;
+        private final Player player;
 
         /**
          * The default constructor.
          */
         public Game() {
                 this.rooms = new HashMap<String, Room>();
-                this.currentRoom = null;
-                this.previousRooms = new Stack<Room>();
+
+                this.player = new Player(10);
 
                 this.createRooms();
                 this.linkRooms();
@@ -31,6 +33,15 @@ public class Game {
         }
 
         /**
+         * Returns the player
+         * 
+         * @return the player
+         */
+        public Player getPlayer() {
+                return this.player;
+        }
+
+        /**
          * Creates a new room.
          * 
          * @param name
@@ -180,19 +191,9 @@ public class Game {
          * Creates and adds items into rooms.
          */
         private void createItems() {
-                this.rooms.get("Cafeteria").addItem("Banana", new Item("A yellow banana", 12));
-                this.rooms.get("Cafeteria").addItem("Orange", new Item("An orange orange", 15));
-        }
-
-        /**
-         * Sets the current room and stacks previous rooms.
-         * 
-         * @param room
-         *            the destination room
-         */
-        public void goToRoom(final Room room) {
-                this.previousRooms.push(this.currentRoom);
-                this.currentRoom = room;
+                this.rooms.get("Cafeteria").getItems().putItem("banana", new Item("A yellow banana", 5));
+                this.rooms.get("Cafeteria").getItems().putItem("orange", new Item("An orange orange", 6));
+                this.rooms.get("Cafeteria").getItems().putItem("anti-matter", new Item("A block of anti-matter with a negative mass", -10));
         }
 
         /**
@@ -202,37 +203,7 @@ public class Game {
          *            the destination room name
          */
         public void goToRoom(final String roomName) {
-                this.currentRoom = this.rooms.get(roomName);
-        }
-
-        /**
-         * Sets the current room to the previous room.
-         */
-        public void goToPreviousRoom() {
-                if (!this.previousRooms.empty()) {
-                        this.currentRoom = this.previousRooms.pop();
-                }
-        }
-
-        /**
-         * Returns the current room.
-         * 
-         * @return the current room
-         */
-        public Room getCurrentRoom() {
-                return this.currentRoom;
-        }
-
-        /**
-         * Returns the current room's exit located in the given direction.
-         * 
-         * @param direction
-         *            the direction of the exit
-         * 
-         * @return the exit room
-         */
-        public Room getRoomExit(final String direction) {
-                return this.currentRoom.getExit(direction);
+                this.player.goToRoom(this.rooms.get(roomName));
         }
 
         /**