Fixed title screen & help screen

data/rooms.dat

@@ -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. 

data/words.dat

@@ -46,4 +46,12 @@ warm bread, item
 clothes, item
 sword, item
 blanket, item
+<<<<<<< HEAD
 die, verb
+=======
+butter, item
+novel, item
+mop, item
+bucket, item
+towels, item
+>>>>>>> branch 'master' of https://github.com/jslightham/Zork

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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;
@@ -17,6 +18,14 @@ public class Item {
 		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;
 	}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}

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);
+	}
+
+}