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

fix conflicts

Browse Source
This commit is contained in:
jslightham
2019-05-29 12:55:16 -04:00
parent 28a4b723ff 8e73e9e024
commit e4a725cd22
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/rooms.dat
View File

@@ -167,11 +167,16 @@ Riddle:
Exit Rooms: S-Apsen Bedroom, E-Willow Bedroom Exit Rooms: S-Apsen 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. Except Sir Pellatt has other plans for you... It looks like there's something on the bed. Might be for you. Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. Except Sir Pellatt has other plans for you... There is faint writing on the west wall. Might want to take a look...
Locked: false Locked: false
<<<<<<< HEAD
Boarded: false Boarded: false
Items: Scroll 2 Items: Scroll 2
Riddle: Riddle:
=======
Items:
Riddle: "What letter comes next in this sequence: o,t,t,f,f?", "s"
>>>>>>> 8e73e9e0244c32a530f67daa085e1b453b1eca7d
Exit Rooms: E-Linen Closet, S-Another Sitting Area Exit Rooms: E-Linen Closet, S-Another Sitting Area
Room name: Silver Stairs (1st Floor) Room name: Silver Stairs (1st Floor)

2
src/com/bayviewglen/zork/Command.java
View File

@@ -108,4 +108,6 @@ class Command {
public boolean hasEnemy() { public boolean hasEnemy() {
return !enemy.equals(""); return !enemy.equals("");
} }
} }