From 671f6eacb0f050dea6fab3ab6a415172191bdbbb Mon Sep 17 00:00:00 2001 From: Luca Carnegie <41924665+lcarnegie@users.noreply.github.com> Date: Fri, 31 May 2019 20:59:14 -0400 Subject: [PATCH] Made warmbread class --- data/rooms.dat | 24 +++++++++---------- data/synonyms.dat | 4 +--- src/com/bayviewglen/zork/Items/Warmbread.java | 9 +++++++ 3 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 src/com/bayviewglen/zork/Items/Warmbread.java diff --git a/data/rooms.dat b/data/rooms.dat index dd396af..c319b7e 100644 --- a/data/rooms.dat +++ b/data/rooms.dat @@ -34,7 +34,7 @@ Room name: Bulb Room Room Description: You are in the Bulb Room. There is a ragged red rug with a noticeable lump in the middle.
One window facing north is bolted shut. Locked: false Boarded: false -Items:Garlic +Items: Garlic Riddler: Exit Rooms: E-Porcupine Stairs (2nd Floor), W-Lady Pellatt's Bedroom, S-Linen Closet @@ -58,7 +58,7 @@ Room name: Pipe Room Room Description: Welcome to the Pipe Room. A misty smell fills the room. Strange items
lay in a pile near the north wall. I suggest you take a look... Locked: false Boarded: false -Items:Clock,Lightbulb,Keyboard +Items: Clock, Lightbulb, Keyboard Riddler: Exit Rooms: W-Porcupine Stairs (2nd Floor), S-Landing, N-East Sitting Room, E-Round Room @@ -74,7 +74,7 @@ Room name: Elm Bedroom Room Description: You are in the Elm Bedroom. The walls are all wooden and a few windows face north.
A bed sits in the middle of the room. A few pillows are on the ground. It looks like someone was in here... Locked: false Boarded: false -Items:Water bottle,Pen,Book +Items: Pen, Book Riddler: Exit Rooms: S-Round Room, W-East Sitting Room @@ -82,7 +82,7 @@ Room name: East Sitting Room Room Description: Welcome to the East Sitting Room. Boring name for a not-so-boring room.
Take a look at the paintings, admire the art. Locked: false Boarded: false -Items:Painting +Items: Painting Riddler: Exit Rooms: S-Pipe Room, E-Elm Bedroom @@ -90,7 +90,7 @@ Room name: Oak Bedroom Room Description: You are now in the Oak Bedroom. The walls are covered with pink floral wallpaper
and a few socks are strewn about the room. A small four-post bedroom lies in the south-east corner. Locked: false Boarded: false -Items:Socks +Items: Socks Riddler: Exit Rooms: N-Round Room, W-Landing @@ -106,7 +106,7 @@ Room name: Sir Henry Mill Pellatt's Bedroom Room Description: Welcome to Sir Henry Mill Pellatt's Bedroom. As the master of this castle, Sir Pellatt
isn't in this room very often. Only some clothes, a bed, and a desk reside here. Oh, and don't touch his notebook. Locked: false Boarded: false -Items:Notebook +Items: Notebook Riddler: Exit Rooms: N-Porcupine Stairs (2nd Floor), E-Landing, S-Sir Henry Mill Pellatt's Bathroom, W-Linen Closet @@ -114,7 +114,7 @@ Room name: Sir Henry Mill Pellatt's Bathroom Room Description: You are now in Sir Henry Mill Pellatt's Bathroom. The floor mat is still quite wet.
Perhaps someone just took a shower. A half-empty shaving cream bottle lies on the counter, along with a toothbrush and some toothpaste. Locked: false Boarded: false -Items:Shaving Cream,Toothbrush,Toothpaste +Items: Shavingcream, Toothbrush, Toothpaste Riddler: Exit Rooms: N-Sir Henry Mill Pellatt's Bedroom @@ -122,7 +122,7 @@ Room name: Linen Closet Room Description: A whiff of lavender-scented laundry detergent enters your nostrils as you step into
a dark room. Ah, you must be in the Linen Closet. No one really comes in here other than the servants. I'm pretty sure Sir Pellatt and
Lady Pellatt don't even know this room exists. Locked: false Boarded: false -Items:Clothes +Items: Clothes Riddler: Exit Rooms: E-Sir Henry Mill Pellatt's Bedroom, W-Guest Bedroom, S-Willow Bedroom, N-Bulb Room @@ -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:Sword +Items: Sword Riddler: Exit Rooms: N-Silver Stairs (2nd Floor), W-Aspen Bedroom @@ -171,7 +171,7 @@ Room Description: Welcome to the guest bedroom, where guests like yourself stay Locked: false Boarded: false Items: -Riddler: "Hello there Kevin again with another riddle for you to solve. What are the next 3 letters in this sequence: ottffss?", "ent" +Riddler: "Hello there Kevin again with another riddle for you to solve.", "What are the next 3 letters in this sequence: ottffss?", "ent", Yogurt Exit Rooms: E-Linen Closet, S-Another Sitting Area, N-Lady Pellatt's Bedroom Room name: Silver Stairs (1st Floor) @@ -186,7 +186,7 @@ Room name: Food Supply Closet Room Description: You are now in the food supply closet. Its pretty full in here. A fridge filled with dairy such as milk,
cheese, and yogurt lies in front of the far wall. Cabinets lining the side walls contain snacks such as chips,
granola bars, and chocolate. Go eat something, you must be famished. Locked: false Boarded: false -Items:Milk,Cheese,Yogurt,Chips,Granola Bars,Chocolate +Items: Milk, Cheese, Yogurt, Chips, Granola Bars, Chocolate Riddler: Exit Rooms: N-Silver Stairs (1st Floor), W-Kitchen @@ -194,7 +194,7 @@ Room name: Kitchen Room Description: You are in the Kitchen. The stove, toaster, and microwave along the walls are all turned off.
A few pots are soaking in the sink. Warm bread rests in the oven and the sweet
smell of yeast fills the room. Locked: false Boarded: false -Items:Warm Bread +Items: Warmbread Riddler: Exit Rooms: E-Food Supply Closet, N-Supply Closet diff --git a/data/synonyms.dat b/data/synonyms.dat index 0480e44..a6fe87d 100644 --- a/data/synonyms.dat +++ b/data/synonyms.dat @@ -17,6 +17,7 @@ leave, quit move, go scram, go hightail, go +l, look glance, look glimpse, look peek, look @@ -47,11 +48,8 @@ drink, eat i, inventory henry, henrypellatt lady, ladypellatt -shaving, shavingcream cream, shavingcream water, waterbottle bottle, waterbottle -warm, warmbread bread, warmbread -battering, batteringram ram, batteringram \ No newline at end of file diff --git a/src/com/bayviewglen/zork/Items/Warmbread.java b/src/com/bayviewglen/zork/Items/Warmbread.java new file mode 100644 index 0000000..25b87c0 --- /dev/null +++ b/src/com/bayviewglen/zork/Items/Warmbread.java @@ -0,0 +1,9 @@ +package com.bayviewglen.zork.Items; + +public class Warmbread extends Item{ + + public Warmbread() { + super(45, "Warm Bread", "A freshly baked bun, with a crackly golden crust", true, 25, 1); + } + +}