From 73279ff5151a170ff441e33b47b6bb2416c507b2 Mon Sep 17 00:00:00 2001 From: elacey Date: Fri, 10 May 2019 14:00:31 -0400 Subject: [PATCH 1/4] Item Classes for 6 objects --- src/com/bayviewglen/zork/Items/Base.java | 8 ++++++++ src/com/bayviewglen/zork/Items/Crowbar.java | 8 ++++++++ src/com/bayviewglen/zork/Items/Cylinder.java | 8 ++++++++ src/com/bayviewglen/zork/Items/Key.java | 8 ++++++++ src/com/bayviewglen/zork/Items/Lockpick.java | 8 ++++++++ src/com/bayviewglen/zork/Items/Point.java | 8 ++++++++ 6 files changed, 48 insertions(+) create mode 100644 src/com/bayviewglen/zork/Items/Base.java create mode 100644 src/com/bayviewglen/zork/Items/Crowbar.java create mode 100644 src/com/bayviewglen/zork/Items/Cylinder.java create mode 100644 src/com/bayviewglen/zork/Items/Key.java create mode 100644 src/com/bayviewglen/zork/Items/Lockpick.java create mode 100644 src/com/bayviewglen/zork/Items/Point.java diff --git a/src/com/bayviewglen/zork/Items/Base.java b/src/com/bayviewglen/zork/Items/Base.java new file mode 100644 index 0000000..e896aae --- /dev/null +++ b/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); + } + +} diff --git a/src/com/bayviewglen/zork/Items/Crowbar.java b/src/com/bayviewglen/zork/Items/Crowbar.java new file mode 100644 index 0000000..95c5ea4 --- /dev/null +++ b/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); + } + +} diff --git a/src/com/bayviewglen/zork/Items/Cylinder.java b/src/com/bayviewglen/zork/Items/Cylinder.java new file mode 100644 index 0000000..d45ba50 --- /dev/null +++ b/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); + } + +} diff --git a/src/com/bayviewglen/zork/Items/Key.java b/src/com/bayviewglen/zork/Items/Key.java new file mode 100644 index 0000000..9c2d703 --- /dev/null +++ b/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); + } + +} diff --git a/src/com/bayviewglen/zork/Items/Lockpick.java b/src/com/bayviewglen/zork/Items/Lockpick.java new file mode 100644 index 0000000..5f7fc6b --- /dev/null +++ b/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); + } + +} diff --git a/src/com/bayviewglen/zork/Items/Point.java b/src/com/bayviewglen/zork/Items/Point.java new file mode 100644 index 0000000..746e3f9 --- /dev/null +++ b/src/com/bayviewglen/zork/Items/Point.java @@ -0,0 +1,8 @@ +package com.bayviewglen.zork.Items; +public class Point extends Item{ + + public Point() { + super(6, "Point", "A part of the battering ram that is attatched to the cylinder and smashes the door", false, 100, 1); + } + +} From fd9505f1cdde6418a74bbf5a9fc19083522c6b5a Mon Sep 17 00:00:00 2001 From: elacey Date: Fri, 10 May 2019 14:03:34 -0400 Subject: [PATCH 2/4] Fixed item id --- src/com/bayviewglen/zork/Items/Point.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/bayviewglen/zork/Items/Point.java b/src/com/bayviewglen/zork/Items/Point.java index 746e3f9..7e87b26 100644 --- a/src/com/bayviewglen/zork/Items/Point.java +++ b/src/com/bayviewglen/zork/Items/Point.java @@ -2,7 +2,7 @@ package com.bayviewglen.zork.Items; public class Point extends Item{ public Point() { - super(6, "Point", "A part of the battering ram that is attatched to the cylinder and smashes the door", false, 100, 1); + super(7, "Point", "A part of the battering ram that is attatched to the cylinder and smashes the door", false, 100, 1); } } From b103875cece9b11f2b354c09dc28dfc342a7d43b Mon Sep 17 00:00:00 2001 From: elacey Date: Fri, 10 May 2019 15:37:36 -0400 Subject: [PATCH 3/4] Two more items and their classes added. --- data/words.dat | 4 +++- src/com/bayviewglen/zork/Items/Garlic.java | 8 ++++++++ src/com/bayviewglen/zork/Items/Robes.java | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/com/bayviewglen/zork/Items/Garlic.java create mode 100644 src/com/bayviewglen/zork/Items/Robes.java diff --git a/data/words.dat b/data/words.dat index 856128c..29b492b 100644 --- a/data/words.dat +++ b/data/words.dat @@ -23,4 +23,6 @@ key, item crowbar, item base, item cylinder, item -point, item \ No newline at end of file +point, item +garlic, item +robes, item \ No newline at end of file diff --git a/src/com/bayviewglen/zork/Items/Garlic.java b/src/com/bayviewglen/zork/Items/Garlic.java new file mode 100644 index 0000000..54db832 --- /dev/null +++ b/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); + } + +} diff --git a/src/com/bayviewglen/zork/Items/Robes.java b/src/com/bayviewglen/zork/Items/Robes.java new file mode 100644 index 0000000..80fe03d --- /dev/null +++ b/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 Pelatt", false, 50, 1); + } + +} From 029d8d7cf5a38624cd089a914b6955b0eee58dd7 Mon Sep 17 00:00:00 2001 From: elacey Date: Fri, 10 May 2019 15:39:51 -0400 Subject: [PATCH 4/4] Fixed spelling error. --- src/com/bayviewglen/zork/Items/Robes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/bayviewglen/zork/Items/Robes.java b/src/com/bayviewglen/zork/Items/Robes.java index 80fe03d..8d9d031 100644 --- a/src/com/bayviewglen/zork/Items/Robes.java +++ b/src/com/bayviewglen/zork/Items/Robes.java @@ -2,7 +2,7 @@ package com.bayviewglen.zork.Items; public class Robes extends Item{ public Robes(){ - super(9, "Robes", "Worn out robes that belonged to Henry Pelatt", false, 50, 1); + super(9, "Robes", "Worn out robes that belonged to Henry Pellatt", false, 50, 1); } }