From 90fa0ae1620dc48764b7933624d8eea2ee51a01e Mon Sep 17 00:00:00 2001
From: Yiya Zhuang <79792524+adaiyaa@users.noreply.github.com>
Date: Tue, 4 May 2021 17:31:02 +1000
Subject: [PATCH] The entity classes are completed
The classes that represent entities (such as Player, Zombie, Sandwich, Treasure, ...) are completed. Now the ShadowTreasure is the only class that need to complete.
---
src/Player.java | 6 ++++--
src/Zombie.java | 8 +++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Player.java b/src/Player.java
index 4ef6408..309b0b6 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -1,3 +1,5 @@
+import java.util.ArrayList;
+
public class Player extends Entity implements Movable{
private Energy energy;
@@ -14,9 +16,9 @@ public class Player extends Entity implements Movable{
this.energy.add(amount);
}
- protected void eat(Sandwich sandwich) {
+ protected void eat(ArrayList<Sandwich> sandwiches, int index) {
this.updateEnergy(+5);
- sandwich.eaten();
+ sandwiches.get(index).eaten();
}
@Override
diff --git a/src/Zombie.java b/src/Zombie.java
index b0e61c4..18ca9b3 100644
--- a/src/Zombie.java
+++ b/src/Zombie.java
@@ -1,9 +1,15 @@
public class Zombie extends Entity{
+ private boolean dead = false;
+
protected Zombie(String filename, double x, double y) {
super(filename, x, y);
}
- protected void killed() {
+ protected boolean isDead() {
+ return dead;
+ }
+ protected void killed() {
+ dead = true;
}
}
\ No newline at end of file
--
GitLab