task1

src/main/java/model/Element/FireFigther.java

@@ -11,23 +11,18 @@ import static util.Tools.*;
 public class FireFigther implements ModelElement{
     @Override
     public void update(Position position, Map<Position, List<ModelElement>> board, int step, int columnCount, int rowCount) {
-            for (Position position1 : neighbors(position, rowCount, columnCount)) {
-                if (board.containsKey(position1)) {
-                    if (board.get(position1).contains(new Fire())) {
-                        extinguish(position1,board);
 
-                    }
-
-                }
 
-            }
-            Position newPositionStep = neighborClosestTo(position,board,rowCount,columnCount);
-            extinguish(newPositionStep,board);
+        if(!extinguishneighbor(position,board,columnCount,rowCount)) {
+            Position newPositionStep = neighborClosestTo(position,board,rowCount,columnCount,new Fire(),List.of(new Mountain()));
             removeElement(position, board, new FireFigther());
             addElement(newPositionStep, board, new FireFigther());
+            extinguishneighbor(newPositionStep,board,columnCount,rowCount);
+        }
 
     }
 
+
     @Override
     public ViewElement getViewElement() {
         return ViewElement.FIREFIGHTER;

src/main/java/model/Element/ModelElement.java

@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.Map;
 
 public interface ModelElement {
-  void update (Position position,Map<Position,List<ModelElement>>board,int step,int columnCount, int rowCount);
 
 
+    void update(Position position, Map<Position, List<ModelElement>> board, int step, int columnCount, int rowCount);
 
     ViewElement getViewElement();
 }

src/main/java/model/Element/MotorisedFirefigther.java

@@ -12,24 +12,16 @@ import static util.Tools.removeElement;
 public class MotorisedFirefigther implements ModelElement{
     @Override
     public void update(Position position, Map<Position, List<ModelElement>> board, int step, int columnCount, int rowCount) {
-        for (Position position1 : neighbors(position, rowCount, columnCount)) {
-            if (board.containsKey(position1)) {
-                if (board.get(position1).contains(new Fire())) {
-                    extinguish(position,board);
-                    return;
-                }
-
-            }
 
-        }
+        if(!extinguishneighbor(position,board,columnCount,rowCount)) {
+            Fire fire = new Fire();
+            Position newPositionStep = neighborClosestTo(position,board,rowCount,columnCount,fire,List.of(new Mountain()));
+            Position newPositionTwoStep= neighborClosestTo(newPositionStep,board,rowCount,columnCount,fire,List.of(new Mountain()));
             MotorisedFirefigther motorisedFirefigther=new MotorisedFirefigther();
-        Position newPositionStep = neighborClosestTo(position,board,rowCount,columnCount);
-        Position newPositionTwoStep= neighborClosestTo(newPositionStep,board,rowCount,columnCount);
-        extinguish(newPositionTwoStep,board);
             removeElement(position,board,motorisedFirefigther);
             addElement(newPositionTwoStep,board,motorisedFirefigther);
-
-
+            extinguishneighbor(newPositionTwoStep,board,columnCount,rowCount);
+        }
 
     }
 

src/main/java/model/Element/Road.java

@@ -13,7 +13,6 @@ public class Road implements ModelElement{
     public void update(Position position, Map<Position, List<ModelElement>> board, int step, int columnCount, int rowCount) {
 
     }
-
     @Override
     public ViewElement getViewElement() {
         return ViewElement.Road;

src/main/java/model/FirefighterBoard.java

@@ -61,6 +61,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   }
 
   public Map<Position, List<ModelElement>> updateToNextGeneration() {
+
     Map<Position, List<ModelElement>> copieBord=new HashMap<>();
     for (Position positionCopie:board.keySet()
     ) {