From 81c8b92f1eee5803e240176610a5f3372b66be75 Mon Sep 17 00:00:00 2001
From: elacey <elacey@elaceysp4.bayviewglen.ca>
Date: Wed, 29 May 2019 13:24:48 -0400
Subject: [PATCH] New items and classes added

---
 data/words.dat                                | 5 ++++-
 src/com/bayviewglen/zork/Items/Clock.java     | 9 +++++++++
 src/com/bayviewglen/zork/Items/Keyboard.java  | 9 +++++++++
 src/com/bayviewglen/zork/Items/Lightbulb.java | 9 +++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/com/bayviewglen/zork/Items/Clock.java
 create mode 100644 src/com/bayviewglen/zork/Items/Keyboard.java
 create mode 100644 src/com/bayviewglen/zork/Items/Lightbulb.java

diff --git a/data/words.dat b/data/words.dat
index 16ceeac..6345e32 100644
--- a/data/words.dat
+++ b/data/words.dat
@@ -58,4 +58,7 @@ i, verb
 unlock, verb
 drop, verb
 henrypellatt, enemy
-attack, verb
\ No newline at end of file
+attack, verb
+clock, item
+keyboard, item
+lightbulb, item
\ No newline at end of file
diff --git a/src/com/bayviewglen/zork/Items/Clock.java b/src/com/bayviewglen/zork/Items/Clock.java
new file mode 100644
index 0000000..0d229a2
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Clock.java
@@ -0,0 +1,9 @@
+package com.bayviewglen.zork.Items;
+
+public class Clock extends Item{
+	
+	public Clock() {
+		super(34, "Clock", "An antique clock that is no longer working is propped up against the wall", false, 20, 10);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Keyboard.java b/src/com/bayviewglen/zork/Items/Keyboard.java
new file mode 100644
index 0000000..979e908
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Keyboard.java
@@ -0,0 +1,9 @@
+package com.bayviewglen.zork.Items;
+
+public class Keyboard extends Item{
+	
+	public Keyboard() {
+		super(36, "Keyboard", "An unplugged keyboard for a desktop computer is neatly placed by a wall", false, 20, 10);
+	}
+
+}
diff --git a/src/com/bayviewglen/zork/Items/Lightbulb.java b/src/com/bayviewglen/zork/Items/Lightbulb.java
new file mode 100644
index 0000000..cb5c058
--- /dev/null
+++ b/src/com/bayviewglen/zork/Items/Lightbulb.java
@@ -0,0 +1,9 @@
+package com.bayviewglen.zork.Items;
+
+public class Lightbulb extends Item{
+	
+	public Lightbulb() {
+		super(35, "Lightbulb", "An incandescent light bulb rolls around on the floor", false, 20, 5);
+	}
+
+}