From 67839c569e6b00080a9309aeb358ddaa30a8d47a Mon Sep 17 00:00:00 2001
From: jslightham <31053827+jslightham@users.noreply.github.com>
Date: Fri, 31 May 2019 19:46:51 -0400
Subject: [PATCH] added lady pellatt
---
data/enemies.dat | 5 +++++
data/rooms.dat | 4 ++--
data/synonyms.dat | 2 +-
data/words.dat | 3 ++-
src/com/bayviewglen/zork/Game.java | 4 ++--
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/data/enemies.dat b/data/enemies.dat
index b147638..9a6e5f3 100644
--- a/data/enemies.dat
+++ b/data/enemies.dat
@@ -2,4 +2,9 @@ Enemy Name: Henry Pellatt
Description: The owner of the Castle
Starting Room: Circle Room
Damage Given: 25
+Loot: Crowbar
+Enemy Name: Lady Pellatt
+Description: The wife to the owner of the Castle
+Starting Room: Lady Pellatt's Bedroom
+Damage Given: 25
Loot: Crowbar
\ No newline at end of file
diff --git a/data/rooms.dat b/data/rooms.dat
index 17cc1d6..2e1714c 100644
--- a/data/rooms.dat
+++ b/data/rooms.dat
@@ -2,7 +2,7 @@ Room name: Circle Room
Room Description: You are in a circular room. The windows to the east are covered with boards that
let in just enough light to see. You spot a man in a tailored suit moving some crates around.
Locked: false
Boarded: false
-Items: Lightbulb,Candlestick,Sword
+Items: Lightbulb,Candlestick
Riddler: "Hello there. My name is Kevin and I am Sir Pellatt's butler. I understand that my master
Sir Pellatt has wrongfully imprisoned you. If you answer my riddle I can give you something to
help you with your escape - nothing comes for free you know!", "What goes moo?", "Cows", Lockpick
Exit Rooms: W-Apple Hallway
@@ -146,7 +146,7 @@ Room name: Evergreen Bedroom
Room Description: Oh look! Another bedroom! How exciting! This one's walls are even green this time.
Cool!
Locked: false
Boarded: false
-Items:
+Items:Sword
Riddler:
Exit Rooms: N-Silver Stairs (2nd Floor), W-Aspen Bedroom
diff --git a/data/synonyms.dat b/data/synonyms.dat
index 3267bc8..88fd225 100644
--- a/data/synonyms.dat
+++ b/data/synonyms.dat
@@ -45,7 +45,7 @@ absorb, eat
drink, eat
i, inventory
henry, henrypellatt
-pellatt, henrypellatt
+lady, ladypellatt
shaving, shavingcream
cream, shavingcream
water, waterbottle
diff --git a/data/words.dat b/data/words.dat
index 704478d..08032e7 100644
--- a/data/words.dat
+++ b/data/words.dat
@@ -64,4 +64,5 @@ clock, item
keyboard, item
lightbulb, item
craft, verb
-batteringram, item
\ No newline at end of file
+batteringram, item
+ladypellatt, enemy
\ No newline at end of file
diff --git a/src/com/bayviewglen/zork/Game.java b/src/com/bayviewglen/zork/Game.java
index 9d17876..1a975b9 100644
--- a/src/com/bayviewglen/zork/Game.java
+++ b/src/com/bayviewglen/zork/Game.java
@@ -304,7 +304,7 @@ class Game {
}else if(!command.hasDirection()){
System.out.println("In what direction do you want to go in?");
}else {
- System.out.println("What do you want to open the door with?");
+ System.out.println("What do you want to unlock the door with?");
}
boolean hasCrowbar = false;
for(int i =0; i