Changed Welcome message and fixed rooms.dat again.

data/rooms.dat

@@ -1,4 +1,12 @@
-<<<<<<< HEAD
+/*
+Hey Victoria! Luca here. 
+Great job with the room-making. I like your descriptions a lot. Just a few notes with this rooms file:
+1. Please, please, PLEASE make absolutely sure that your direction are in UPPER CASE when you are making the exits, otherwise it breaks the game. 
+2. Try to keep everything consistent w/ the stuff that is already on this page. 
+3. If you want, you can look at images of Casa Loma for inspiration, but I trust you have great descriptive writing skills, judging by the descriptions below. 
+
+That's all from me... Oh, make sure to delete this comment after you're done reading it. It will break the game... 
+*/
 Room name: Circle Room
 Room Description: You are in the circular room. The windows to the west are bolted shut and curtains cover them.<br>To the east, a hallway. A scroll hangs on the north wall. Writing is visible.   
 Items: Scroll,Lockpick
@@ -30,47 +38,12 @@ Exit Rooms: S-Lady Pellatt's Bedroom
 Room name: Pipe Room
 Room Description: Welcome to the Pipe Room. A misty smell fills the room. Strange items lay in a pile near the north wall. I suggest you take a look...
 Items:
-Exit Rooms: W-Porcupine Stairs , S-Landing, N-East Sitting Room, E-Round Room
+Exit Rooms: W-Porcupine Stairs , S-Landing, N-East Sitting Room, E-Round Room
-=======
+Room name: Round Room
-Room Name: Circle Room
-Room Description: You are in the circular room. The windows to the west are bolted shut and curtains cover them. To the east, a hallway. A scroll hangs on the north wall. Writing is visible.   
-Items: Scroll 1,Lockpick
-Exit Rooms: w-Apple Hallway
-Room Name: Apple Hallway
-Room Description: You are in an empty hallway. Many closed doors surround you. To the west is the Circle Room and north is the Porcupine Stairs. The door to the stairs is locked. There is no key to the door. 
-Items: 
-Exit Rooms: e-Circle Room, n-Porcupine Stairs
-Room Name: Porcupine Stairs (3rd floor)
-Room Description: You are in the Porcupine Stairs. The stone, cold walls are trapped in darkness. Below you is the second floor and above you is the third floor. 
-Items:
-Exit Rooms: down-Second floor, s-Apple Hallway
-Room Name: Porcupine Stairs (2nd floor)
-Room Description: You are now on the second floor. The hallway is completely deserted. A few doors are left slightly ajar. 
-Items:
-Exit Rooms: s-Sir Henry Mill Pellatt's Bedroom, w-Bulb Room, e-Pipe Room
-Room Name: Bulb Room
-Room Description: You are in the Bulb Room. There is a ragged red rug with a noticeable lump in the middle. One window facing north is bolted shut. 
-Items: Garlic
-Exit Rooms: s-linen closet, e-Porcupine Stairs (2nd floor), w-Lady Pellat's Bedroom
-Room Name: Lady Pellatt's Bedroom
-Room Description: You are now in Lady Pellatt's Bedroom. A four-post bed with elegant pink bedsheets lies in the middle of the room. A golden wardrobe sits along the east wall with a few robes hanging out.
-Items: Robes
-Exit Rooms: n-Sitting Area, s-Guest Bedroom, e-Bulb Room
-Room Name: Sitting Area
-Room Description: You are in a room with multiple chairs and fake plants. There are several windows, all of which are shut. A few scratches can be noted on the chairs.
-Items:
-Exit Rooms: s-Lady Pellatt's Bedroom
-Room Name: Pipe Room
-Room Description: Welcome to the Pipe Room. A misty smell fills the room. Strange items lay in a pile near the north wall. I suggest you take a look...
-Items:
-Exit Rooms: w-Porcupine Stairs (2nd floor), s-Landing, n-East Sitting Room, e-Round Room
-Room Name: Round Room
 Room Description: You are now into the Round Room. Nothing is out of the ordinary in here...
-Items: hula hoop 
+Items: 
-Exit Rooms: w-Pipe Room, n-Elm Bedroom, s-Oak Bedroom
+Exit Rooms: W-Pipe Room, N-Elm Bedroom, S-Oak Bedroom
-Room Name: Elm Bedroom
+Room name: Elm Bedroom
 Room Description: You are in the Elm Bedroom. The walls are all wooden and a few windows face north. A bed sits in the middle of the room. A few pillows are on the ground. It looks like someone was in here...
 Items: water bottle,pen,book
-Exit Rooms: s-Round Room, w-East Sitting Room
+Exit Rooms: S-Round Room, W-East Sitting Room
-
->>>>>>> branch 'master' of https://github.com/jslightham/Zork

src/com/bayviewglen/zork/Game.java

@@ -141,8 +141,8 @@ class Game {
 	 */
 	private void printWelcome() {
 		System.out.println("Welcome to ESCAPE CASA LOMA!\n-----");
-		System.out.println("A new, fresh take on the escape-room franchise,\nby Johnathon, Luca, Victoria and Evan ");
+		System.out.println("A new, fresh take on the escape-room,\nby Johnathon, Luca, Victoria and Evan ");
-		System.out.println("Type 'help' if you need help, and enjoy the game!");
+		System.out.println("\nType 'help' if you need help, consult the wiki \non GitHub if you are confused and enjoy the game!");
 		System.out.println("\n---------------------\n");
 		System.out.println(currentRoom.longDescription());
 	}