Skip to content
Snippets Groups Projects
Commit 7d8f0ad2 authored by AREZKI Celia's avatar AREZKI Celia
Browse files

BoardFireFighterBehavior : DISPLAY the clouds on board

parent e137d5a1
No related branches found
No related tags found
No related merge requests found
File deleted
File deleted
File deleted
No preview for this file type
......@@ -18,7 +18,7 @@ public class SimulatorApplication extends javafx.application.Application {
private static final int BOX_WIDTH = 50;
private static final int BOX_HEIGHT = 50;
public static final int INITIAL_FIRE_COUNT = 3;
public static final int INITIAL_FIREFIGHTER_COUNT = 6;
public static final int INITIAL_FIREFIGHTER_COUNT = 0;
public static final int INITIAL_CLOUD_COUNT = 3;
private Stage primaryStage;
......
......@@ -86,6 +86,10 @@ public class Controller {
if (element instanceof Fire) {
return ViewElement.FIRE;
}
if (element instanceof Cloud) {
return ViewElement.CLOUD;
}
}
return ViewElement.EMPTY;
}
......
......@@ -141,4 +141,7 @@ public class BoardFireFighterBehavior implements BoardBehavior{
return modifiedPositions;
}
public List<Position> getCloudPositions() {
return cloudPositions;
}
}
......@@ -55,6 +55,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
behavior.getFirefighterPositions().stream()
.filter(pos -> pos.isAtPosition(position)) // Vérifier si la position correspond
.forEach(pos -> result.add(new FireFighter(pos))); // Créer un objet Firefighter à partir de Position
// Filtrage des éléments Cloud
behavior.getCloudPositions().stream()
.filter(pos -> pos.isAtPosition(position))
.forEach(pos -> result.add(new Cloud(pos)));
return result;
}
......@@ -74,6 +78,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
behavior.getFirePositions().add(position); // Ajouter un Fire
} else if (element instanceof FireFighter) {
behavior.getFirefighterPositions().add(position); // Ajouter un Firefighter
} else if (element instanceof Cloud) {
behavior.getCloudPositions().add(position);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment