1 files changed, 10 insertions, 7 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 83fa143..6e6b191 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -3,6 +3,7 @@ package esieequest.model;
 import java.util.HashMap;
 
 import esieequest.model.entities.Player;
+import esieequest.model.items.Beamer;
 import esieequest.model.items.Item;
 import esieequest.model.map.Door;
 import esieequest.model.map.Room;
@@ -90,7 +91,7 @@ public class Game {
                 this.createRoom("OffscriptItems", "somewhere implementing weight");
                 this.createRoom("OffscriptItemsStorageroom", "in a storage room");
                 this.createRoom("OffscriptTeleportation", "somewhere implementing teleportation");
-                this.createRoom("OffscriptTeleportationAnchorroom", "on a checkpoint");
+                this.createRoom("OffscriptTeleportationBeamerroom", "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");
@@ -171,10 +172,10 @@ public class Game {
                 this.setRoomExit("OffscriptItems", "north", "OffscriptItemsStorageroom");
                 this.setRoomExit("OffscriptItems", "east", "OffscriptTeleportation");
                 this.setRoomExit("OffscriptItemsStorageroom", "south", "OffscriptItems");
-                this.setRoomExit("OffscriptTeleportation", "north", "OffscriptTeleportationAnchorroom");
-                this.setRoomExit("OffscriptTeleportation", "west", "OffscriptTime");
+                this.setRoomExit("OffscriptTeleportation", "north", "OffscriptTeleportationBeamerroom");
+                this.setRoomExit("OffscriptTeleportation", "west", "OffscriptItems");
                 this.setRoomExit("OffscriptTeleportation", "east", "OffscriptAlea");
-                this.setRoomExit("OffscriptTeleportationAnchorroom", "south", "OffscriptTeleportation");
+                this.setRoomExit("OffscriptTeleportationBeamerroom", "south", "OffscriptTeleportation");
                 this.setRoomExit("OffscriptAlea", "north", "OffscriptAleaRandomizingroom");
                 this.setRoomExit("OffscriptAlea", "west", "OffscriptTeleportation");
                 this.setRoomExit("OffscriptAlea", "east", "OffscriptMovingcharacter");
@@ -188,9 +189,11 @@ public class Game {
          * 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("OffscriptItemsStorageroom").getItems().putItem("Weighted Storage Cube", new Item("A Weighted Storage Cube.", 5));
+                this.rooms.get("OffscriptItemsStorageroom").getItems().putItem("Edgeless Safety Cube", new Item("An Edgeless Safety Cube.", 5));
+                this.rooms.get("OffscriptItemsStorageroom").getItems().putItem("Portable Black-hole", new Item("A portable black-hole that has a negative mass.", -10));
+
+                this.rooms.get("OffscriptTeleportationBeamerroom").getItems().putItem("Portable Quantum Tunelling Device", new Beamer("Basically a teleporter.", 2));
         }
 
         /**