1 files changed, 68 insertions, 47 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index cc6157d..87d3d51 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,10 +1,19 @@
 package esieequest.model;
 
 import java.util.HashMap;
+import java.util.HashSet;
 
 import esieequest.model.entities.Player;
+import esieequest.model.entities.Sumobot;
+import esieequest.model.items.Beamer;
 import esieequest.model.items.Item;
+import esieequest.model.items.KeyCard;
+import esieequest.model.map.Door;
+import esieequest.model.map.HiddenDoor;
+import esieequest.model.map.LockedDoor;
 import esieequest.model.map.Room;
+import esieequest.model.map.TransporterDoor;
+import esieequest.model.map.TrapDoor;
 
 /**
  * Represents the game.
@@ -29,6 +38,7 @@ public class Game {
                 this.createRooms();
                 this.linkRooms();
                 this.createItems();
+                this.createCharacters();
                 this.goToRoom("AmphitheaterSeat");
         }
 
@@ -54,20 +64,6 @@ public class Game {
         }
 
         /**
-         * Sets the exit room of a given room designated by its name.
-         * 
-         * @param roomName
-         *            the name of the room
-         * @param direction
-         *            the direction of the exit
-         * @param exitRoomName
-         *            the name of the exit room
-         */
-        private void setRoomExit(final String roomName, final String direction, final String exitRoomName) {
-                this.rooms.get(roomName).addExit(direction, this.rooms.get(exitRoomName));
-        }
-
-        /**
          * Creates all the rooms.
          */
         private void createRooms() {
@@ -99,20 +95,33 @@ public class Game {
                 this.createRoom("WingCorridorTwoOffice", "in front of the office #3254");
                 this.createRoom("WingOffice", "in the office #3254");
 
-                this.createRoom("OffscriptItems", "somewhere implementing weight");
-                this.createRoom("OffscriptItemsStorageroom", "in a storage room");
-                this.createRoom("OffscriptTime", "somewhere implementing time");
-                this.createRoom("OffscriptTimeCountdownroom", "in a dangerous room");
-                this.createRoom("OffscriptTeleportation", "somewhere implementing teleportation");
-                this.createRoom("OffscriptTeleportationAnchorroom", "on a checkpoint");
-                this.createRoom("OffscriptAlea", "somewhere implementing alea");
-                this.createRoom("OffscriptAleaRandomizingroom", "in a weird room that will transport you somewhere else");
-                this.createRoom("OffscriptMovingcharacter", "somewhere implementing a moving character");
-                this.createRoom("OffscriptMovingcharacterSumobotroom", "in the Chirac-101's room");
+                // off-script rooms
+                this.createRoom("Secret corridor 1", "in a secret corridor");
+                this.createRoom("Secret corridor 2", "at the end of a secret corridor");
+                this.createRoom("Storage room", "in a storage room");
+                this.createRoom("Secret lab", "in a secret lab");
+                this.createRoom("Dead-end", "in a dead end");
+                this.createRoom("Locked room", "in a locked room");
 
         }
 
         /**
+         * Sets the exit room of a given room designated by its name.
+         * 
+         * @param roomName
+         *            the name of the room
+         * @param direction
+         *            the direction of the exit
+         * @param exitRoomName
+         *            the name of the exit room
+         */
+        private void setRoomExit(final String roomName, final String direction, final String exitRoomName) {
+                final Room room = this.rooms.get(exitRoomName);
+                final Door door = new Door(room);
+                this.rooms.get(roomName).addExit(direction, door);
+        }
+
+        /**
          * Connects all the rooms.
          */
         private void linkRooms() {
@@ -153,7 +162,6 @@ public class Game {
                 this.setRoomExit("WingStreet", "east", "ClubnixStreet");
                 this.setRoomExit("WingCorridorOne", "west", "WingStairsOne");
                 this.setRoomExit("WingCorridorOne", "south", "WingStreet");
-                this.setRoomExit("WingCorridorOne", "east", "OffscriptItems");
                 this.setRoomExit("WingStairsOne", "south", "WingStairsTwo");
                 this.setRoomExit("WingStairsOne", "up", "WingStairsTwo");
                 this.setRoomExit("WingStairsOne", "east", "WingCorridorOne");
@@ -165,35 +173,41 @@ public class Game {
                 this.setRoomExit("WingCorridorTwoOffice", "south", "WingCorridorTwo");
                 this.setRoomExit("WingCorridorTwoOffice", "east", "WingOffice");
                 this.setRoomExit("WingOffice", "west", "WingCorridorTwoOffice");
+                this.rooms.get("WingCorridorOne").addExit("east", new HiddenDoor(this.rooms.get("Secret corridor 1")));
+
+                this.setRoomExit("Secret corridor 1", "west", "WingCorridorOne");
+                this.setRoomExit("Secret corridor 1", "east", "Secret corridor 2");
+                this.setRoomExit("Secret corridor 2", "west", "Secret corridor 1");
 
-                this.setRoomExit("OffscriptItems", "north", "OffscriptItemsStorageroom");
-                this.setRoomExit("OffscriptItems", "west", "WingCorridorOne");
-                this.setRoomExit("OffscriptItems", "east", "OffscriptTime");
-                this.setRoomExit("OffscriptItemsStorageroom", "south", "OffscriptItems");
-                this.setRoomExit("OffscriptTime", "north", "OffscriptTimeCountdownroom");
-                this.setRoomExit("OffscriptTime", "west", "OffscriptTakeStorageroom");
-                this.setRoomExit("OffscriptTime", "east", "OffscriptTeleportation");
-                this.setRoomExit("OffscriptTimeCountdownroom", "south", "OffscriptTime");
-                this.setRoomExit("OffscriptTeleportation", "north", "OffscriptTeleportationAnchorroom");
-                this.setRoomExit("OffscriptTeleportation", "west", "OffscriptTime");
-                this.setRoomExit("OffscriptTeleportation", "east", "OffscriptAlea");
-                this.setRoomExit("OffscriptTeleportationAnchorroom", "south", "OffscriptTeleportation");
-                this.setRoomExit("OffscriptAlea", "north", "OffscriptAleaRandomizingroom");
-                this.setRoomExit("OffscriptAlea", "west", "OffscriptTeleportation");
-                this.setRoomExit("OffscriptAlea", "east", "OffscriptMovingcharacter");
-                this.setRoomExit("OffscriptAleaRandomizingroom", "south", "OffscriptAlea");
-                this.setRoomExit("OffscriptMovingcharacter", "north", "OffscriptMovingcharacterSumobotroom");
-                this.setRoomExit("OffscriptMovingcharacter", "west", "OffscriptAlea");
-                this.setRoomExit("OffscriptMovingcharacterSumobotroom", "south", "OffscriptMovingcharacter");
+                this.setRoomExit("Secret corridor 1", "north", "Storage room");
+                this.setRoomExit("Storage room", "south", "Secret corridor 1");
+                this.setRoomExit("Secret corridor 1", "south", "Secret lab");
+                this.setRoomExit("Secret lab", "north", "Secret corridor 1");
+
+                this.rooms.get("Secret corridor 2").addExit("north", new TrapDoor(this.rooms.get("Dead-end")));
+                this.rooms.get("Secret corridor 2").addExit("south", new LockedDoor(this.rooms.get("Locked room")));
+                this.rooms.get("Locked room").addExit("north", new LockedDoor(this.rooms.get("Secret corridor 2")));
+                this.rooms.get("Secret corridor 2").addExit("east", new TransporterDoor(new HashSet<Room>(this.rooms.values())));
         }
 
         /**
          * Creates and adds items into rooms.
          */
         private void createItems() {
-                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));
+                this.rooms.get("Storage room").getItems().putItem("Weighted Storage Cube", new Item("A Weighted Storage Cube.", 5, true));
+                this.rooms.get("Storage room").getItems().putItem("Edgeless Safety Cube", new Item("An Edgeless Safety Cube.", 5, true));
+                this.rooms.get("Storage room").getItems().putItem("Portable Black-hole", new Item("A portable black-hole that has a negative mass.", -10, false));
+
+                this.rooms.get("Secret lab").getItems().putItem("Portable Quantum Tunneling Device", new Beamer("Basically a teleporter."));
+
+                final KeyCard keyCard = new KeyCard("A KeyCard that opens a locked door.");
+                ((LockedDoor) this.rooms.get("Secret corridor 2").getExit("south")).setKey(keyCard);
+                ((LockedDoor) this.rooms.get("Locked room").getExit("north")).setKey(keyCard);
+                this.rooms.get("Dead-end").getItems().putItem("KeyCard", keyCard);
+        }
+
+        private void createCharacters() {
+                this.rooms.get("Locked room").setCharacter(new Sumobot());
         }
 
         /**
@@ -260,4 +274,11 @@ public class Game {
                 return "Available commands:";
         }
 
+        /**
+         * @return the rooms
+         */
+        public HashMap<String, Room> getRooms() {
+                return this.rooms;
+        }
+
 }