diff --git a/data/rooms.dat b/data/rooms.dat
index 063f510..980143c 100644
--- a/data/rooms.dat
+++ b/data/rooms.dat
@@ -1,5 +1,5 @@
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.
+Room Description: You are in a circular room (No corners). The windows to the west are bolted shut and curtains cover them.
To the east, a dimly lit hallway beckons you. However, a scroll hangs on the wall a few paces away. Writing is visible on it.
Locked: false
Items:Lockpick,Milk,Scroll
Exit Rooms: W-Apple Hallway
@@ -49,7 +49,7 @@ Locked: false
Items: Water bottle,Pen,Book
Exit Rooms: S-Round Room, W-East Sitting Room
Room name: East Sitting Room
-Room Description: Welcome to the East Sitting Room. Boring name but not so boring room. Take a look at the paintings, admire the art. It might be helpful later on.
+Room Description: Welcome to the East Sitting Room. Boring name but not so boring room. Take a look at the paintings, admire the art.
Locked: false
Items:Painting
Exit Rooms: S-Pipe Room, E-Elm Bedroom
diff --git a/src/com/bayviewglen/zork/Game.java b/src/com/bayviewglen/zork/Game.java
index 5caa3cd..74588b3 100644
--- a/src/com/bayviewglen/zork/Game.java
+++ b/src/com/bayviewglen/zork/Game.java
@@ -168,12 +168,14 @@ class Game {
System.out.print("> ");
String i = in.nextLine();
if(i.toLowerCase().equals("play")) {
- return true;
+ return true;
}else if(i.toLowerCase().equals("quit")) {
+ in.close();
return false;
}
System.out.println("That is not a valid response. Type \"play\" to play the game. If you wish to close the game, type \"quit\".");
}
+ in.close();
return false;
@@ -191,6 +193,7 @@ class Game {
System.out.println("---------------------\n");
System.out.print(currentRoom.longDescription());
System.out.println(currentRoom.exitString());
+ System.out.println(currentRoom.itemString());
boolean finished = false;
while (!finished) {
if(currentCombat != null) {
diff --git a/src/com/bayviewglen/zork/Room.java b/src/com/bayviewglen/zork/Room.java
index 93bf97f..b57bbeb 100644
--- a/src/com/bayviewglen/zork/Room.java
+++ b/src/com/bayviewglen/zork/Room.java
@@ -1,4 +1,3 @@
-
package com.bayviewglen.zork;
/*
@@ -172,6 +171,14 @@ class Room {
returnString += " " + iter.next();
return returnString;
}
+
+ public String itemString(){
+ String items = "Items in Room: " + this.items.get(0).getName();
+ for(int i = 1; i < this.items.size(); i++) {
+ items += ", " + this.items.get(i).getName();
+ }
+ return items;
+ }
/**
* Return the room that is reached if we go from this room in direction