diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java index 0541ba068b6c1e93c220f5f7922ed6e7f67a6844..8540201fe067149bc4a6f77ba3c388337cf43c63 100644 --- a/src/main/java/model/Fire.java +++ b/src/main/java/model/Fire.java @@ -21,17 +21,6 @@ public class Fire { return firePositions; } - /*public List<Position> spreadFire() { - List<Position> modifiedPositions = new ArrayList<>(); - - List<Position> newFirePositions = new ArrayList<>(); - for (Position fire : firePositions) { - newFirePositions.addAll(neighbors.get(fire)); - } - firePositions.addAll(newFirePositions); - modifiedPositions.addAll(newFirePositions); - return newFirePositions; - }*/ public List<Position> spreadFire(Set<Position> mountains) { List<Position> newFires = new ArrayList<>(); for (Position firePosition : firePositions) { diff --git a/src/main/java/model/Firefighter.java b/src/main/java/model/Firefighter.java index 04111689c1dea1a6ead9516253c851e9be1fe5d4..3b93fda3acca6c650e72e7ecc0a122b6e2b1f164 100644 --- a/src/main/java/model/Firefighter.java +++ b/src/main/java/model/Firefighter.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class Firefighter { +public class Firefighter implements BoardElement { private Position position; public Firefighter(Position position) { @@ -16,10 +16,12 @@ public class Firefighter { //this.neighbors = neighbors; } + @Override public Position getPosition() { return position; } + @Override public void setPosition(Position position) { this.position = position; } diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java index b5785cf285a099bfea4dcff322c62138efaa2dd0..353e06495a142990311f21682724d64fe7a030a7 100644 --- a/src/main/java/model/FirefighterBoard.java +++ b/src/main/java/model/FirefighterBoard.java @@ -124,8 +124,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> { modifiedPositions.addAll(fire.spreadFire(getMountainPositions())); } for (Cloud cloud : clouds) { - //cloud.moveAndExtinguishFire(fire); - //cloud.extinguishFireCloud(fire); cloud.move(); cloud.protectFromFire(fire); cloud.extinguishSurroundingFires(fire);