Merge remote-tracking branch 'origin/master'

data/words.dat

@@ -23,4 +23,6 @@ key, item
 crowbar, item
 base, item
 cylinder, item
-point, item
+point, item
+garlic, item
+robes, item

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Base extends Item{
+	
+	public Base(){
+		super(5, "Base", "A base for an ancient battering ram", false, 100, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Crowbar extends Item{
+	
+	public Crowbar() {
+		super(4, "Crowbar", "A pointed metal object used to open a jammed wooden door", false, 100, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Cylinder extends Item{
+	
+	public Cylinder(){
+		super(6, "Cylinder", "A part of a battering ram meant to lay on the base and have a point attatched to the end", false, 100, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Garlic extends Item{
+	
+	public Garlic() {
+		super(8, "Garlic", "An uncut piece of garlic with a strong aura", true, 20, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Key extends Item{
+	
+	public Key(){
+		super(3, "Key", "A rusted key used to open a locked door", false, 100, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Lockpick extends Item{
+	
+	public Lockpick(){
+		super(2, "Lockpick", "A fragile tool used to open a locked door", false, 1, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Point extends Item{
+	
+	public Point() {
+		super(7, "Point", "A part of the battering ram that is attatched to the cylinder and smashes the door", false, 100, 1);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.bayviewglen.zork.Items;
+public class Robes extends Item{
+	
+	public Robes(){
+		super(9, "Robes", "Worn out robes that belonged to Henry Pellatt", false, 50, 1);
+	}
+
+}