Merge remote-tracking branch 'origin/master'

data/words.dat

@@ -25,4 +25,7 @@ base, item
 cylinder, item
 point, item
 garlic, item
-robes, item
+robes, item
+water bottle, item
+pen, item
+book, item

src/com/bayviewglen/zork/Items/Book.java

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Book extends Item{
+	
+	public Book(){
+		super(12, "Book", "A dust covered book with water stains around the edges", false, 50, 1);
+	}
+
+}

src/com/bayviewglen/zork/Items/Candlestick.java

@@ -2,7 +2,7 @@ package com.bayviewglen.zork.Items;
 public class Candlestick extends Item{
 
     public Candlestick(){
-        super(1, "Candlestick", "A slender stick of wax with a small wick of cotton sticking out of the top", true, 100, 1);
+        super(1, "Candlestick", "A slender stick of wax with a small wick of cotton sticking out of the top", false, 100, 1);
     }
 
     

src/com/bayviewglen/zork/Items/Pen.java

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Pen extends Item{
+	
+	public Pen(){
+		super(11, "Pen", "An old-fashioned feathered pen with ink dried on the tip", false, 10, 1);
+	}
+
+}

src/com/bayviewglen/zork/Items/WaterBottle.java

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class WaterBottle extends Item{
+	
+	public WaterBottle() {
+		super(10, "Water Bottle", "A plastic water bottle half filled with filthy water", true, 10, 1);
+	}
+
+}