Absolute final commit

This commit is contained in:
Luca Carnegie
2019-06-01 11:42:12 -04:00
parent c0ffa91d70
commit 2a413c304f
2 changed files with 25 additions and 10 deletions

View File

@@ -304,15 +304,6 @@ Items:
Riddler:
Exit Rooms: N-Smoking Room
Room name: Entry
Room Description: CONGRATULATIONS!!! You have escaped alive! I guess Sir Pellatt will have to find another victim tomorrow.
New Room Description:
Locked: true
Boarded: true
Items:
Riddler:
Exit Rooms: E-Smoking Room, N-Great Hall, W-Study
Room name: Study
Room Description: You are now in the Study. The south wall has a floor-to-ceiling book shelf, towering over you. A big wooden desk,<br>along with a cushioned chair, face the entrance. 2 lit candles illuminate the desk, and a key is visible.
New Room Description:
@@ -320,4 +311,22 @@ Locked: false
Boarded: false
Items: Key
Riddler:
Exit Rooms: N-Library, E-Entry, W-Breakfast Room
Exit Rooms: N-Library, E-Entry, W-Breakfast Room
Room name: Entry
Room Description: CONGRATULATIONS!!! You have escaped alive! I guess Sir Pellatt will have to find another victim tomorrow.<br>Go south to make your escape!!!
New Room Description:
Locked: true
Boarded: true
Items:
Riddler:
Exit Rooms: E-Smoking Room, N-Great Hall, W-Study, S-Courtyard
Room name: Courtyard
Room Description: <br>CREDITS:<br><br>Johnathon - Lead Programmer<br>Luca - Assistant Programmer<br>Victoria - Rooms and Descriptions<br>Evan - Wiki<br><br>Thank you for playing our game!<br><br>Enter "quit" or "q" to leave the game,<br>or continue exploring the castle<br>by entering "N", if you would like!<br>
New Room Description:
Locked: false
Boarded: false
Items:
Riddler:
Exit Rooms: N-Entry

View File

@@ -225,6 +225,12 @@ class Game {
System.out.print(currentRoom.longDescription());
System.out.println(currentRoom.itemString());
System.out.println(currentRoom.exitString());
player.addToInventory(new Lockpick());
player.addToInventory(new Key());
player.addToInventory(new Key());
player.addToInventory(new Crowbar());
player.addToInventory(new Batteringram());
boolean finished = false;
while (!finished) {
if (currentCombat != null) {