Skip to content
Snippets Groups Projects
Commit f77fdb87 authored by Sarah CHERCHEM's avatar Sarah CHERCHEM
Browse files

BoardFireFighterBehavior : add the methode getMotorizedFighters

parent 26c3bac0
No related branches found
No related tags found
No related merge requests found
...@@ -89,6 +89,10 @@ public class Controller { ...@@ -89,6 +89,10 @@ public class Controller {
if (element instanceof Cloud) { if (element instanceof Cloud) {
return ViewElement.CLOUD; return ViewElement.CLOUD;
} }
if (element instanceof MotorizedFireFighter)
{
return ViewElement.MOTORIZED;
}
} }
return ViewElement.EMPTY; return ViewElement.EMPTY;
......
...@@ -49,6 +49,13 @@ public class BoardFireFighterBehavior implements BoardBehavior{ ...@@ -49,6 +49,13 @@ public class BoardFireFighterBehavior implements BoardBehavior{
for (Cloud cloud : clouds) { for (Cloud cloud : clouds) {
cloudPositions.add(cloud.getPosition()); cloudPositions.add(cloud.getPosition());
} }
// Pompiers motorisés
motorizedFighters = new ArrayList<>();
List<MotorizedFireFighter> motorizedFirefighters = motorizedFactory.createElements(rowCount, columnCount);
for (MotorizedFireFighter motorizedFirefighter : motorizedFirefighters) {
motorizedFighters.add(motorizedFirefighter.getPosition());
}
} }
...@@ -157,6 +164,7 @@ public class BoardFireFighterBehavior implements BoardBehavior{ ...@@ -157,6 +164,7 @@ public class BoardFireFighterBehavior implements BoardBehavior{
List<Position> modifiedPositions = updateFirefighters(); List<Position> modifiedPositions = updateFirefighters();
modifiedPositions.addAll(updateFires()); modifiedPositions.addAll(updateFires());
modifiedPositions.addAll(updateClouds()); modifiedPositions.addAll(updateClouds());
modifiedPositions.addAll(updateMotorized());
incrementStep(); incrementStep();
return modifiedPositions; return modifiedPositions;
} }
...@@ -188,4 +196,8 @@ public class BoardFireFighterBehavior implements BoardBehavior{ ...@@ -188,4 +196,8 @@ public class BoardFireFighterBehavior implements BoardBehavior{
public List<Position> getCloudPositions() { public List<Position> getCloudPositions() {
return cloudPositions; return cloudPositions;
} }
public List<Position> getMotorizedFighters() {
return motorizedFighters;
}
} }
...@@ -3,7 +3,7 @@ package view; ...@@ -3,7 +3,7 @@ package view;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
public enum ViewElement { public enum ViewElement {
FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE) , CLOUD(Color.GRAY), MOUNTAIN(Color.GREEN), ROCKY(Color.BLACK); FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE) , CLOUD(Color.GRAY),MOTORIZED(Color.BLACK) , MOUNTAIN(Color.GREEN), ROCKY(Color.BLACK);
final Color color; final Color color;
ViewElement(Color color) { ViewElement(Color color) {
this.color = color; this.color = color;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment