Merge branch 'master' of https://github.com/jslightham/Zork
This commit is contained in:
@@ -164,7 +164,7 @@ Locked: false
|
|||||||
Boarded: false
|
Boarded: false
|
||||||
Items:
|
Items:
|
||||||
Riddler:
|
Riddler:
|
||||||
Exit Rooms: S-Apsen Bedroom, E-Willow Bedroom
|
Exit Rooms: S-Aspen Bedroom, E-Willow Bedroom
|
||||||
|
|
||||||
Room name: Guest Bedroom
|
Room name: Guest Bedroom
|
||||||
Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. There is another tailored<br>man in the corner. He seems to have something he would like to tell you.
|
Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. There is another tailored<br>man in the corner. He seems to have something he would like to tell you.
|
||||||
|
|||||||
@@ -281,7 +281,7 @@ class Game {
|
|||||||
if (command.hasDirection() && (hasLockPick || hasKey)) {
|
if (command.hasDirection() && (hasLockPick || hasKey)) {
|
||||||
Room nextRoom = currentRoom.nextRoom(command.getDirection());
|
Room nextRoom = currentRoom.nextRoom(command.getDirection());
|
||||||
try {
|
try {
|
||||||
if(nextRoom.getLocked()) {
|
if(nextRoom.getLocked()) {
|
||||||
nextRoom.setLocked(false);
|
nextRoom.setLocked(false);
|
||||||
if(hasLockPick) {
|
if(hasLockPick) {
|
||||||
player.removeFromInventory(new Lockpick());
|
player.removeFromInventory(new Lockpick());
|
||||||
|
|||||||
Reference in New Issue
Block a user