From 904e5bdefa1682f7fe634cec66439c6b79018aa1 Mon Sep 17 00:00:00 2001
From: elacey <elacey@elaceysp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:21:27 -0400
Subject: [PATCH 1/7] Item classes added

---
 src/com/bayviewglen/zork/Items/Blanket.java     | 8 ++++++++
 src/com/bayviewglen/zork/Items/Cheese.java      | 8 ++++++++
 src/com/bayviewglen/zork/Items/Chips.java       | 9 +++++++++
 src/com/bayviewglen/zork/Items/Chocolate.java   | 8 ++++++++
 src/com/bayviewglen/zork/Items/Clothes.java     | 8 ++++++++
 src/com/bayviewglen/zork/Items/GranolaBars.java | 8 ++++++++
 src/com/bayviewglen/zork/Items/Milk.java        | 8 ++++++++
 src/com/bayviewglen/zork/Items/WarmBread.java   | 8 ++++++++
 src/com/bayviewglen/zork/Items/Yogurt.java      | 8 ++++++++
 9 files changed, 73 insertions(+)
 create mode 100644 src/com/bayviewglen/zork/Items/Blanket.java
 create mode 100644 src/com/bayviewglen/zork/Items/Cheese.java
 create mode 100644 src/com/bayviewglen/zork/Items/Chips.java
 create mode 100644 src/com/bayviewglen/zork/Items/Chocolate.java
 create mode 100644 src/com/bayviewglen/zork/Items/Clothes.java
 create mode 100644 src/com/bayviewglen/zork/Items/GranolaBars.java
 create mode 100644 src/com/bayviewglen/zork/Items/Milk.java
 create mode 100644 src/com/bayviewglen/zork/Items/WarmBread.java
 create mode 100644 src/com/bayviewglen/zork/Items/Yogurt.java

diff --git a/src/com/bayviewglen/zork/Items/Blanket.java b/src/com/bayviewglen/zork/Items/Blanket.java
new file mode 100644
index 0000000..06f4d04
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Blanket.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Blanket extends Item{
+	
+	public Blanket(){
+		super(27, "Blanket", "A cotton blanket which is nicely folded", false, 50, 30);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Cheese.java b/src/com/bayviewglen/zork/Items/Cheese.java
new file mode 100644
index 0000000..594ea89
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Cheese.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Cheese extends Item{
+	
+	public Cheese(){
+		super(20, "Cheese", "A block of swiss cheese which has started to mold after being left out", true, 20, 1);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Chips.java b/src/com/bayviewglen/zork/Items/Chips.java
new file mode 100644
index 0000000..4a5771b
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Chips.java
@@ -0,0 +1,9 @@
+package com.bayviewglen.zork.Items;
+
+public class Chips extends Item{
+	
+	public Chips(){
+		super(22, "Chips", "A sealed bag of jalapeno falovured chips on the counter beside the milk", true, 20, 1);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Chocolate.java b/src/com/bayviewglen/zork/Items/Chocolate.java
new file mode 100644
index 0000000..1cae4a5
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Chocolate.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Chocolate extends Item{
+	
+	public Chocolate(){
+		super(24, "Chocolate", "A piece of dark chocolate on a napkin by the milk and the chips", true, 10, 1);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Clothes.java b/src/com/bayviewglen/zork/Items/Clothes.java
new file mode 100644
index 0000000..1b1c695
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Clothes.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Clothes extends Item{
+	
+	public Clothes(){
+		super(26, "Clothes", "Clothes belonging to Mr. and Mrs. Pellatt lay scattered on the floor", false, 50, 20);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/GranolaBars.java b/src/com/bayviewglen/zork/Items/GranolaBars.java
new file mode 100644
index 0000000..84e85b9
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/GranolaBars.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class GranolaBars extends Item{
+	
+	public GranolaBars(){
+		super(23, "Granola Bars", "A pack of 6 granola bars ripped open with little to no care", true, 20, 6);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Milk.java b/src/com/bayviewglen/zork/Items/Milk.java
new file mode 100644
index 0000000..65d90e3
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Milk.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Milk extends Item{
+	
+	public Milk(){
+		super(19, "Milk", "A opened carton of skimmed milk two days away from expiring", true, 20, 1);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/WarmBread.java b/src/com/bayviewglen/zork/Items/WarmBread.java
new file mode 100644
index 0000000..20b71de
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/WarmBread.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class WarmBread extends Item{
+	
+	public WarmBread(){
+		super(25, "Warm Bread", "A fresh loaf of bread sits just outside of the oven still warm to the touch", true, 30, 10);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Yogurt.java b/src/com/bayviewglen/zork/Items/Yogurt.java
new file mode 100644
index 0000000..395a6dd
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Yogurt.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Yogurt extends Item{
+	
+	public Yogurt(){
+		super(21, "Yogurt", "A tub of vanilla greek yogurt with a spoon still inside", true, 20, 1);
+	}
+
+}

From cd0a0c42204b9401b1785df4539db72c36189852 Mon Sep 17 00:00:00 2001
From: vleevalerio <vleevalerio@vvaleriosp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:24:18 -0400
Subject: [PATCH 2/7] fixed something

---
 data/rooms.dat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/rooms.dat b/data/rooms.dat
index f1871da..9a861e9 100644
--- a/data/rooms.dat
+++ b/data/rooms.dat
@@ -46,7 +46,7 @@ Exit Rooms: W-Pipe Room, N-Elm Bedroom, S-Oak Bedroom
 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
-Items: Water bottle,Pen,Book
+Items: Water bottle,Pen,Novel
 Exit Rooms: S-Round Room, W-East Sitting Room
 Room name: East Sitting Room
 Room Description: Welcome to the East Sitting Room. Boring name but not so boring room. Take a look at the paintings, admire the art. It might be helpful later on. 

From 220d9b12684784edb375a456fbcc37d6c77561ef Mon Sep 17 00:00:00 2001
From: vleevalerio <vleevalerio@vvaleriosp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:26:19 -0400
Subject: [PATCH 3/7] fixed more things

---
 data/rooms.dat | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/rooms.dat b/data/rooms.dat
index 9a861e9..6db5cfd 100644
--- a/data/rooms.dat
+++ b/data/rooms.dat
@@ -46,7 +46,7 @@ Exit Rooms: W-Pipe Room, N-Elm Bedroom, S-Oak Bedroom
 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
-Items: Water bottle,Pen,Novel
+Items: Water bottle,Pen,Book
 Exit Rooms: S-Round Room, W-East Sitting Room
 Room name: East Sitting Room
 Room Description: Welcome to the East Sitting Room. Boring name but not so boring room. Take a look at the paintings, admire the art. It might be helpful later on. 
@@ -144,9 +144,9 @@ Locked: false
 Items:Scroll 3
 Exit Rooms: E-Dining Room
 Room name: Library
-Room Description: You are in the Library. Intricate designs are carved into the tall arced ceiling. Thousands and thousands of books stretch from the floor to the ceiling. A few blue couches with a lantern on a small side table sit in the far northwest corner of the room. An open book with a dusty leather cover rests on the table.
+Room Description: You are in the Library. Intricate designs are carved into the tall arced ceiling. Thousands and thousands of books stretch from the floor to the ceiling. A few blue couches with a lantern on a small side table sit in the far northwest corner of the room. An open novel with a dusty leather cover rests on the table.
 Locked: false
-Items:Book
+Items:Novel
 Exit Rooms: W-Dining Room, S-Study, E-Great Hall
 Room name: Great Hall
 Room Description: You are in the Great Hall. This empty room gives off an eerie feeling. On the north wall, there is a fire place that looks like it is about to burn out. I don't think someone is going to light it again. 

From 31983e88a71723097faf5ab8df9a73ba41380aa6 Mon Sep 17 00:00:00 2001
From: elacey <elacey@elaceysp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:37:47 -0400
Subject: [PATCH 4/7] More items

---
 src/com/bayviewglen/zork/Items/Bucket.java | 8 ++++++++
 src/com/bayviewglen/zork/Items/Butter.java | 8 ++++++++
 src/com/bayviewglen/zork/Items/Mop.java    | 8 ++++++++
 src/com/bayviewglen/zork/Items/Novel.java  | 8 ++++++++
 src/com/bayviewglen/zork/Items/Towels.java | 8 ++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 src/com/bayviewglen/zork/Items/Bucket.java
 create mode 100644 src/com/bayviewglen/zork/Items/Butter.java
 create mode 100644 src/com/bayviewglen/zork/Items/Mop.java
 create mode 100644 src/com/bayviewglen/zork/Items/Novel.java
 create mode 100644 src/com/bayviewglen/zork/Items/Towels.java

diff --git a/src/com/bayviewglen/zork/Items/Bucket.java b/src/com/bayviewglen/zork/Items/Bucket.java
new file mode 100644
index 0000000..686c323
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Bucket.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Bucket extends Item{
+	
+	public Bucket(){
+		super(31, "Bucket", "A bucket filled with soapy water with rust on the bottom after constant use", false, 20, 20);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Butter.java b/src/com/bayviewglen/zork/Items/Butter.java
new file mode 100644
index 0000000..9c71fa6
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Butter.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Butter extends Item{
+	
+	public Butter(){
+		super(29, "Butter", "I can't believe it's not butter!", true, 20, 10);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Mop.java b/src/com/bayviewglen/zork/Items/Mop.java
new file mode 100644
index 0000000..00ce68c
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Mop.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Mop extends Item{
+	
+	public Mop(){
+		super(30, "Mop", "A mop which was used recently by a maid and is still damp", false, 50, 30);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Novel.java b/src/com/bayviewglen/zork/Items/Novel.java
new file mode 100644
index 0000000..d33ae62
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Novel.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Novel extends Item{
+	
+	public Novel(){
+		super(28, "Novel", "An auto-biography about Kevin DesLauriers", false, 50, 10);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Towels.java b/src/com/bayviewglen/zork/Items/Towels.java
new file mode 100644
index 0000000..55c3d25
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Towels.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Towels extends Item{
+	
+	public Towels(){
+		super(32, "Towels", "A few towels used to dry the floors after they are mopped", false, 50, 20);
+	}
+
+}

From c311ada15e8083f4b23fed0163f80d7ac0b5a8e4 Mon Sep 17 00:00:00 2001
From: elacey <elacey@elaceysp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:43:34 -0400
Subject: [PATCH 5/7] Added new constructor for weapons

---
 src/com/bayviewglen/zork/Items/Item.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/bayviewglen/zork/Items/Item.java b/src/com/bayviewglen/zork/Items/Item.java
index 7e4abcc..7d5c64f 100644
--- a/src/com/bayviewglen/zork/Items/Item.java
+++ b/src/com/bayviewglen/zork/Items/Item.java
@@ -7,6 +7,7 @@ public class Item {
 	private boolean isConsumable;
 	private int health;
 	private int weight;
+	private int damage;
 	
 	public Item(int id, String name, String description, boolean isConsumable, int health, int weight) {
 		this.id = id;
@@ -16,6 +17,14 @@ public class Item {
 		this.health = health;
 		this.weight = weight;
 	}
+	
+	public Item(int id, String name, String description, int weight, int damage) {
+		this.id = id;
+		this.name = name;
+		this.description = description;
+		this.weight = weight;
+		this.damage = damage;
+	}
 
 	public String getDescription() {
 		return description;

From d1337bdea7c5ecba3faa0b829d42e26da6ba2008 Mon Sep 17 00:00:00 2001
From: elacey <elacey@elaceysp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:46:12 -0400
Subject: [PATCH 6/7] Sword item added

---
 src/com/bayviewglen/zork/Items/Sword.java | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/com/bayviewglen/zork/Items/Sword.java

diff --git a/src/com/bayviewglen/zork/Items/Sword.java b/src/com/bayviewglen/zork/Items/Sword.java
new file mode 100644
index 0000000..89f655c
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Sword.java
@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Sword extends Item{
+	
+	public Sword(){
+		super(33, "Sword", "A steel, double-edged sword which seems to have been sharpened recently", 20, 50);
+	}
+
+}

From cf185c25aa202fc099e1c79f180fa7603e8c0e15 Mon Sep 17 00:00:00 2001
From: elacey <elacey@elaceysp4.bayviewglen.ca>
Date: Thu, 23 May 2019 13:48:25 -0400
Subject: [PATCH 7/7] more words

---
 data/words.dat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/words.dat b/data/words.dat
index 4f9020e..f646132 100644
--- a/data/words.dat
+++ b/data/words.dat
@@ -46,4 +46,9 @@ chocolate, item
 warm bread, item
 clothes, item
 sword, item
-blanket, item
\ No newline at end of file
+blanket, item
+butter, item
+novel, item
+mop, item
+bucket, item
+towels, item
\ No newline at end of file