From 03a4d492b3a44d92e8481e3df29aca575a3b91b4 Mon Sep 17 00:00:00 2001 From: Pacien TRAN-GIRARD Date: Sun, 16 Mar 2014 14:26:00 +0100 Subject: Update map --- src/esieequest/model/Game.java | 76 ++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java index d5e7bfd..f7b773b 100644 --- a/src/esieequest/model/Game.java +++ b/src/esieequest/model/Game.java @@ -51,8 +51,7 @@ public class Game { * @param exitRoomName * the name of the exit room */ - private void setRoomExit(final String roomName, final String direction, - final String exitRoomName) { + private void setRoomExit(final String roomName, final String direction, final String exitRoomName) { this.rooms.get(roomName).addExit(direction, this.rooms.get(exitRoomName)); } @@ -84,27 +83,20 @@ public class Game { this.createRoom("WingCorridorOne", "in the corridor in wing #3, on the ground floor"); this.createRoom("WingStairsOne", "in the stairwell on the ground floor"); this.createRoom("WingStairsTwo", "in the stairwell on the first floor"); - this.createRoom("WingCorridorTwo", "in the corridor in wind #3, on the first floor"); + this.createRoom("WingCorridorTwo", "in the corridor in wing #3, on the first floor"); this.createRoom("WingCorridorTwoOffice", "in front of the office #3254"); this.createRoom("WingOffice", "in the office #3254"); - this.createRoom("OffscriptEat", "somewhere implementing hunger"); - this.createRoom("OffscriptEatPantry", "in the pantry"); - this.createRoom("OffscriptTake", "somewhere implementing weight"); - this.createRoom("OffscriptTakeStorageroom", "in a storage room"); - this.createRoom("OffscriptTimeout", "somewhere implementing time"); - this.createRoom("OffscriptTimeoutCountdownroom", "in a dangerous room"); - this.createRoom("OffscriptTrapdoor", "somewhere implementing a trap"); - this.createRoom("OffscriptTrapdoorDeadend", "trapped"); - this.createRoom("OffscriptBeamer", "somewhere implementing teleportation"); - this.createRoom("OffscriptBeamerAnchor", "on a checkpoint"); - this.createRoom("OffscriptLock", "somewhere implementing a doorlock"); - this.createRoom("OffscriptLockLockedroom", "in a locked room that is not anymore"); + 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("OffscriptAleaRoomrandomizer", - "in a weird room that will transport you somewhere else"); + this.createRoom("OffscriptAleaRandomizingroom", "in a weird room that will transport you somewhere else"); this.createRoom("OffscriptMovingcharacter", "somewhere implementing a moving character"); - this.createRoom("OffscriptMovingcharacterMo", "in M-O's room"); + this.createRoom("OffscriptMovingcharacterSumobotroom", "in the Chirac-101's room"); } @@ -149,7 +141,7 @@ public class Game { this.setRoomExit("WingStreet", "east", "ClubnixStreet"); this.setRoomExit("WingCorridorOne", "west", "WingStairsOne"); this.setRoomExit("WingCorridorOne", "south", "WingStreet"); - this.setRoomExit("WingCorridorOne", "east", "OffscriptEat"); + this.setRoomExit("WingCorridorOne", "east", "OffscriptItems"); this.setRoomExit("WingStairsOne", "south", "WingStairsTwo"); this.setRoomExit("WingStairsOne", "up", "WingStairsTwo"); this.setRoomExit("WingStairsOne", "east", "WingCorridorOne"); @@ -157,40 +149,30 @@ public class Game { this.setRoomExit("WingStairsTwo", "down", "WingStairsOne"); this.setRoomExit("WingStairsTwo", "east", "WingCorridorTwo"); this.setRoomExit("WingCorridorTwo", "north", "WingCorridorTwoOffice"); + this.setRoomExit("WingCorridorTwo", "west", "WingStairsTwo"); this.setRoomExit("WingCorridorTwoOffice", "south", "WingCorridorTwo"); this.setRoomExit("WingCorridorTwoOffice", "east", "WingOffice"); this.setRoomExit("WingOffice", "west", "WingCorridorTwoOffice"); - this.setRoomExit("OffscriptEat", "north", "OffscriptEatPantry"); - this.setRoomExit("OffscriptEat", "west", "WingCorridorOne"); - this.setRoomExit("OffscriptEat", "east", "OffscriptTake"); - this.setRoomExit("OffscriptEatPantry", "south", "OffscriptEat"); - this.setRoomExit("OffscriptTake", "north", "OffscriptTakeStorageroom"); - this.setRoomExit("OffscriptTake", "west", "OffscriptEat"); - this.setRoomExit("OffscriptTake", "east", "OffscriptTimeout"); - this.setRoomExit("OffscriptTakeStorageroom", "south", "OffscriptTake"); - this.setRoomExit("OffscriptTimeout", "north", "OffscriptTimeoutCountdownroom"); - this.setRoomExit("OffscriptTimeout", "west", "OffscriptTakeStorageroom"); - this.setRoomExit("OffscriptTimeout", "east", "OffscriptTrapdoor"); - this.setRoomExit("OffscriptTimeoutCountdownroom", "south", "OffscriptTimeout"); - this.setRoomExit("OffscriptTrapdoor", "north", "OffscriptTrapdoorDeadend"); - this.setRoomExit("OffscriptTrapdoor", "west", "OffscriptTimeout"); - this.setRoomExit("OffscriptTrapdoor", "east", "OffscriptBeamer"); - this.setRoomExit("OffscriptTrapdoorDeadend", "south", "OffscriptTrapdoor"); - this.setRoomExit("OffscriptBeamer", "north", "OffscriptBeamerAnchor"); - this.setRoomExit("OffscriptBeamer", "west", "OffscriptTrapdoor"); - this.setRoomExit("OffscriptBeamer", "east", "OffscriptLock"); - this.setRoomExit("OffscriptBeamerAnchor", "south", "OffscriptBeamer"); - this.setRoomExit("OffscriptLock", "north", "OffscriptLockLockedroom"); - this.setRoomExit("OffscriptLock", "west", "OffscriptBeamer"); - this.setRoomExit("OffscriptLock", "east", "OffscriptAlea"); - this.setRoomExit("OffscriptLockLockedroom", "south", "OffscriptLock"); - this.setRoomExit("OffscriptAlea", "north", "OffscriptAleaRoomrandomizer"); - this.setRoomExit("OffscriptAlea", "west", "OffscriptLock"); + 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("OffscriptAleaRoomrandomizer", "south", "OffscriptAlea"); - this.setRoomExit("OffscriptMovingcharacter", "north", "OffscriptMovingcharacterMo"); + this.setRoomExit("OffscriptAleaRandomizingroom", "south", "OffscriptAlea"); + this.setRoomExit("OffscriptMovingcharacter", "north", "OffscriptMovingcharacterSumobotroom"); this.setRoomExit("OffscriptMovingcharacter", "west", "OffscriptAlea"); + this.setRoomExit("OffscriptMovingcharacterSumobotroom", "south", "OffscriptMovingcharacter"); } /** -- cgit v1.2.3