Skip to content
Snippets Groups Projects
Commit e9051696 authored by ousseyn01's avatar ousseyn01
Browse files

No change

parent 2daa757f
Branches
No related tags found
No related merge requests found
...@@ -21,17 +21,6 @@ public class Fire { ...@@ -21,17 +21,6 @@ public class Fire {
return firePositions; 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) { public List<Position> spreadFire(Set<Position> mountains) {
List<Position> newFires = new ArrayList<>(); List<Position> newFires = new ArrayList<>();
for (Position firePosition : firePositions) { for (Position firePosition : firePositions) {
......
...@@ -7,7 +7,7 @@ import java.util.List; ...@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
public class Firefighter { public class Firefighter implements BoardElement {
private Position position; private Position position;
public Firefighter(Position position) { public Firefighter(Position position) {
...@@ -16,10 +16,12 @@ public class Firefighter { ...@@ -16,10 +16,12 @@ public class Firefighter {
//this.neighbors = neighbors; //this.neighbors = neighbors;
} }
@Override
public Position getPosition() { public Position getPosition() {
return position; return position;
} }
@Override
public void setPosition(Position position) { public void setPosition(Position position) {
this.position = position; this.position = position;
} }
......
...@@ -124,8 +124,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> { ...@@ -124,8 +124,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
modifiedPositions.addAll(fire.spreadFire(getMountainPositions())); modifiedPositions.addAll(fire.spreadFire(getMountainPositions()));
} }
for (Cloud cloud : clouds) { for (Cloud cloud : clouds) {
//cloud.moveAndExtinguishFire(fire);
//cloud.extinguishFireCloud(fire);
cloud.move(); cloud.move();
cloud.protectFromFire(fire); cloud.protectFromFire(fire);
cloud.extinguishSurroundingFires(fire); cloud.extinguishSurroundingFires(fire);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment