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:
Johnathon Slightham
2019-05-29 12:57:42 -04:00
committed by GitHub
parent e4a725cd22
commit f55e19a76f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/rooms.dat
View File

@@ -3,7 +3,7 @@ Room Description: You are in a circular room. The windows to the east are covere
Locked: false Locked: false
Boarded: false Boarded: false
Items:Lockpick,Milk Items:Lockpick,Milk
Riddle: "Who is never hungry during Christmas?", "The turkey because he is always stuffed." Riddle: "Who is never hungry during Christmas?", "The turkey because he is always stuffed."
Exit Rooms: W-Apple Hallway Exit Rooms: W-Apple Hallway
Room name: Apple Hallway Room name: Apple Hallway
@@ -169,14 +169,9 @@ 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... There is faint writing on the west wall. Might want to take a look... 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:
=======
Items:
Riddle: "What letter comes next in this sequence: o,t,t,f,f?", "s" 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)
@@ -289,4 +284,4 @@ Locked: false
Boarded: false Boarded: false
Items:Key Items:Key
Riddle: Riddle:
Exit Rooms: N-Library, E-Entry, W-Serving and Breakfast Room Exit Rooms: N-Library, E-Entry, W-Serving and Breakfast Room