diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index aa67273ed6d0dfc9fe1beb1c515dcb55d045aa53..767265b176175e8171d8d4c51229016f173d2e2c 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -89,6 +89,10 @@ public class Controller { if (element instanceof Cloud) { return ViewElement.CLOUD; } + if (element instanceof MotorizedFireFighter) + { + return ViewElement.MOTORIZED; + } } return ViewElement.EMPTY; diff --git a/src/main/java/model/BoardFireFighterBehavior.java b/src/main/java/model/BoardFireFighterBehavior.java index 60d83846ee592c58da536bc32acc680caa3cefd2..9c5c2cef955dc99130b9b74183c85f4994f213ea 100644 --- a/src/main/java/model/BoardFireFighterBehavior.java +++ b/src/main/java/model/BoardFireFighterBehavior.java @@ -49,6 +49,13 @@ public class BoardFireFighterBehavior implements BoardBehavior{ for (Cloud cloud : clouds) { 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{ List<Position> modifiedPositions = updateFirefighters(); modifiedPositions.addAll(updateFires()); modifiedPositions.addAll(updateClouds()); + modifiedPositions.addAll(updateMotorized()); incrementStep(); return modifiedPositions; } @@ -188,4 +196,8 @@ public class BoardFireFighterBehavior implements BoardBehavior{ public List<Position> getCloudPositions() { return cloudPositions; } + + public List<Position> getMotorizedFighters() { + return motorizedFighters; + } } diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java index 00e3d1b25f5151d063b02f2b535a195e8b57d086..b9f1e855b6f050a4e9a85413ba250436ff7ad8f7 100644 --- a/src/main/java/view/ViewElement.java +++ b/src/main/java/view/ViewElement.java @@ -3,7 +3,7 @@ package view; import javafx.scene.paint.Color; 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; ViewElement(Color color) { this.color = color;