diff --git a/Java-Knight/src/main/java/org/project/entity/Entity.java b/Java-Knight/src/main/java/org/project/entity/Entity.java index 3f71e80..ea83da8 100644 --- a/Java-Knight/src/main/java/org/project/entity/Entity.java +++ b/Java-Knight/src/main/java/org/project/entity/Entity.java @@ -36,4 +36,9 @@ public interface Entity { void setDefendRate(double defendRate); Weapon getWeapon(); + + default boolean isAlive() { + int hp = getHP(); + return hp > 0; + } } diff --git a/Java-Knight/src/main/java/org/project/location/Location.java b/Java-Knight/src/main/java/org/project/location/Location.java index b0b4b98..54c73c5 100644 --- a/Java-Knight/src/main/java/org/project/location/Location.java +++ b/Java-Knight/src/main/java/org/project/location/Location.java @@ -9,19 +9,14 @@ public class Location { private ArrayList enemies; - public Location(ArrayList locations, ArrayList enemies) { - this.locations = locations; + public Location(ArrayList enemies) { this.enemies = enemies; } public String getName() { return name; } - - public ArrayList getLocations() { - return locations; - } - + public ArrayList getEnemies() { return enemies; }