mehdi : added Mountain class

src/main/java/controller/Controller.java

@@ -94,6 +94,9 @@ public class Controller {
     if (squareState.contains(ModelElement.ROAD)) {
       return ViewElement.ROAD;
     }
+    if (squareState.contains(ModelElement.MOUNTAIN)) {
+      return ViewElement.MOUNTAIN;
+    }
     return ViewElement.EMPTY;
   }
 

src/main/java/model/FireFighter.java

@@ -6,6 +6,7 @@ import util.TargetStrategy;
 
 import java.util.ArrayList;
 
+import java.util.HashSet;
 import java.util.List;
 
 
@@ -29,17 +30,26 @@ public class FireFighter extends Extinguisher {
         Position currentPosition = this.getPosition();
         Position newPosition = targetStrategy.neighborClosestToFire(currentPosition, firefighterBoard.getFires().keySet(), this.neighbour.getNeighbors());
 
+
         this.setPosition(newPosition);
         modifiedPositions.add(currentPosition);
         modifiedPositions.add(newPosition);
 
         extinguish(firefighterBoard,newPosition);
 
+
+
         for (Position neighbor : this.neighbour.getNeighbors().get(newPosition)) {
             extinguish(firefighterBoard,neighbor);
             modifiedPositions.add(neighbor);
         }
 
+        for(Obstacle obstacle : firefighterBoard.getObstacles().values()){
+            if(obstacle instanceof Montain){
+                modifiedPositions.remove(obstacle.getPosition());
+            }
+        }
+
         return modifiedPositions;
     }
 

src/main/java/model/ModelElement.java

@@ -10,7 +10,8 @@ public enum ModelElement {
   FIREFIGHTER(10),
   FIRE(10),
   CLOUD(10),
-  ROAD(5);
+  ROAD(5),
+  MOUNTAIN(5);
   private final int initialNumber;
 
 
@@ -30,6 +31,7 @@ public enum ModelElement {
       case ROAD -> new Road(position);
       case FIREFIGHTER -> new FireFighter(position);
       case CLOUD -> new Cloud(position);
+      case MOUNTAIN -> new Montain(position);
       default -> throw new IllegalArgumentException("Unknown ModelElement: " + this);
       };
 

src/main/java/model/Montain.java

+package model;
+
+import util.Position;
+
+public class Montain extends Obstacle{
+    public Montain(Position position) {
+        super(position);
+        element = ModelElement.MOUNTAIN;
+    }
+
+
+}

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),CLOUD(Color.LIGHTSKYBLUE),ROAD(Color.GRAY), EMPTY(Color.WHITE);
+  FIREFIGHTER(Color.BLUE), FIRE(Color.RED),CLOUD(Color.LIGHTSKYBLUE),ROAD(Color.GRAY),MOUNTAIN(Color.BROWN), EMPTY(Color.WHITE);
   final Color color;
   ViewElement(Color color) {
     this.color = color;