1 files changed, 14 insertions, 12 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 830b48c..6267d1a 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -7,9 +7,7 @@ import esieequest.model.doors.HiddenDoor;
 import esieequest.model.doors.LockedDoor;
 import esieequest.model.doors.TransporterDoor;
 import esieequest.model.doors.TrapDoor;
-import esieequest.model.items.Beamer;
 import esieequest.model.items.Item;
-import esieequest.model.items.KeyCard;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
 
@@ -86,8 +84,15 @@ public class Game {
                 this.d(Room.SECRET_CORRIDOR_ENTRANCE, Direction.SOUTH, Room.SECRET_LAB);
                 this.d(Room.SECRET_CORRIDOR_ENTRANCE, Direction.EAST, Room.SECRET_CORRIDOR_END);
                 this.d(Room.SECRET_CORRIDOR_END, Direction.NORTH, new TrapDoor(Room.DEAD_END));
-                this.d(Room.SECRET_CORRIDOR_END, Direction.SOUTH, new LockedDoor(Room.LOCKED_ROOM));
-                this.d(Room.LOCKED_ROOM, Direction.NORTH, new LockedDoor(Room.SECRET_CORRIDOR_END));
+
+                final LockedDoor lockedDoorEnter = new LockedDoor(Room.LOCKED_ROOM);
+                lockedDoorEnter.setKey(Item.KEYCARD);
+                this.d(Room.SECRET_CORRIDOR_END, Direction.SOUTH, lockedDoorEnter);
+
+                final LockedDoor lockedDoorExit = new LockedDoor(Room.SECRET_CORRIDOR_END);
+                lockedDoorExit.setKey(Item.KEYCARD);
+                this.d(Room.LOCKED_ROOM, Direction.NORTH, lockedDoorExit);
+
                 this.d(Room.SECRET_CORRIDOR_END, Direction.EAST, new TransporterDoor(Room.values()));
         }
 
@@ -124,16 +129,13 @@ public class Game {
          * Adds Item-s in the map.
          */
         private void addItems() {
-                this.i(Room.STORAGE_ROOM, Direction.WEST, new Item("Weighted Storage Cube", 5, true));
-                this.i(Room.STORAGE_ROOM, Direction.EAST, new Item("Edgeless Safety Cube", 5, true));
-                this.i(Room.STORAGE_ROOM, Direction.NORTH, new Item("Portable black-hole", -10, false));
+                this.i(Room.STORAGE_ROOM, Direction.WEST, Item.STORAGE_CUBE);
+                this.i(Room.STORAGE_ROOM, Direction.EAST, Item.SAFETY_CUBE);
+                this.i(Room.STORAGE_ROOM, Direction.NORTH, Item.BLACK_HOLE);
 
-                this.i(Room.SECRET_LAB, Direction.SOUTH, new Beamer("Beamer"));
+                this.i(Room.SECRET_LAB, Direction.SOUTH, Item.BEAMER);
 
-                KeyCard keyCard = new KeyCard("KeyCard");
-                this.i(Room.DEAD_END, Direction.NORTH, keyCard);
-                ((LockedDoor) Room.SECRET_CORRIDOR_END.getSide(Direction.SOUTH).getDoor()).setKey(keyCard);
-                ((LockedDoor) Room.LOCKED_ROOM.getSide(Direction.NORTH).getDoor()).setKey(keyCard);
+                this.i(Room.DEAD_END, Direction.NORTH, Item.KEYCARD);
         }
 
         /**