jslightham/Zork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a removeRiddler() method.

Browse Source
This commit is contained in:
Luca Carnegie
2019-05-30 23:41:20 -04:00
parent 38a10f116d
commit 0da2e95425
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/rooms.dat
View File

@@ -2,8 +2,8 @@ Room name: Circle Room
Room Description: You are in a circular room. The windows to the east are covered with boards that<br>let in just enough light to see. You spot a man in a tailored suit moving some crates around. Room Description: You are in a circular room. The windows to the east are covered with boards that<br>let in just enough light to see. You spot a man in a tailored suit moving some crates around.
Locked: false Locked: false
Boarded: false Boarded: false
Items:Lockpick,Milk Items: Lightbulb,Candlestick
Riddler: "Hello there. My name is Kevin and I am Sir Pellatt's butler. I understand that my master<comma><br>Sir Pellatt has wrongfully imprisoned you. If you answer my riddle<comma> I can give you something to<br>help you with your escape - nothing comes for free you know!", "What goes moo?", "Cows", ShavingCream Riddler: "Hello there. My name is Kevin and I am Sir Pellatt's butler. I understand that my master<comma><br>Sir Pellatt has wrongfully imprisoned you. If you answer my riddle<comma> I can give you something to<br>help you with your escape - nothing comes for free you know!", "What goes moo?", "Cows", Lockpick
Exit Rooms: W-Apple Hallway Exit Rooms: W-Apple Hallway
Room name: Apple Hallway Room name: Apple Hallway

3
src/com/bayviewglen/zork/Game.java
View File

@@ -385,7 +385,7 @@ class Game {
if(player.addToInventory(prize)) { if(player.addToInventory(prize)) {
player.addToInventory(prize); player.addToInventory(prize);
System.out.println("A " + prizeName + " has been added to your inventory."); System.out.println("A " + prizeName + " has been added to your inventory.");
currentRoom.riddler = null; currentRoom.removeRiddler();
System.out.println("I've got to go find Mr. Pellatt now. Good luck with your escape!"); System.out.println("I've got to go find Mr. Pellatt now. Good luck with your escape!");
}else { }else {
System.out.println("Sorry, you can't carry any more "); System.out.println("Sorry, you can't carry any more ");
@@ -543,6 +543,7 @@ class Game {
return false; return false;
} }
// implementations of user commands: // implementations of user commands:
/** /**
* Print out some help information. Here we print some stupid, cryptic * Print out some help information. Here we print some stupid, cryptic

7
src/com/bayviewglen/zork/Room.java
View File

@@ -27,7 +27,7 @@ class Room {
private String description; private String description;
private HashMap<String, Room> exits; // stores exits of this room. private HashMap<String, Room> exits; // stores exits of this room.
private ArrayList<Item> items; private ArrayList<Item> items;
Riddler riddler; //needs to altered outside of the class so that riddler can be set to null. private Riddler riddler; //needs to altered outside of the class so that riddler can be set to null.
private boolean locked; // Otherwise you can repeatedly solve the riddle and get unlimited items private boolean locked; // Otherwise you can repeatedly solve the riddle and get unlimited items
private boolean boarded; private boolean boarded;
@@ -239,5 +239,10 @@ class Room {
public Riddler getRiddler() { public Riddler getRiddler() {
return riddler; return riddler;
} }
public void removeRiddler() {
riddler = null;
}
} }