diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java index 208894d573b35219c504240683bfec453883afbe..8b23525a1fc9569bd51214dcdd222efa41c4bfea 100644 --- a/src/main/java/model/Cloud.java +++ b/src/main/java/model/Cloud.java @@ -17,9 +17,7 @@ public class Cloud { // Déplacement aléatoire du nuage public void move() { List<Position> validNeighbors = neighbors.get(position); - if (!validNeighbors.isEmpty()) { this.position = validNeighbors.get(randomGenerator.nextInt(validNeighbors.size())); - } } // Éteindre les feux dans les cases adjacentes diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java index 7aef60a278a6aef1625fdcf2a0e600aea233dcf3..b5785cf285a099bfea4dcff322c62138efaa2dd0 100644 --- a/src/main/java/model/FirefighterBoard.java +++ b/src/main/java/model/FirefighterBoard.java @@ -123,7 +123,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> { if (step % 2 == 0){ modifiedPositions.addAll(fire.spreadFire(getMountainPositions())); } - // Déplacer les nuages et éteindre les feux for (Cloud cloud : clouds) { //cloud.moveAndExtinguishFire(fire); //cloud.extinguishFireCloud(fire); diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java index 91b328ad74e3bf399402e71e8068a9c3ab382708..6db418400e547653e55ec48a28adfd24532adef6 100644 --- a/src/test/java/model/FirefighterBoardTest.java +++ b/src/test/java/model/FirefighterBoardTest.java @@ -15,12 +15,12 @@ public class FirefighterBoardTest { } @Test void testRowCount(){ - Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3, 3, 3); + Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 3, 3, 3, 3); assertThat(board.rowCount()).isEqualTo(10); } @Test void testStepNumber(){ - Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3, 3, 3); + Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 3, 3, 3, 3); for(int index = 0; index < 10; index++){ assertThat(board.stepNumber()).isEqualTo(index); board.updateToNextGeneration();