From 2037c055f5b24a153593b8461b72c0f49327105e Mon Sep 17 00:00:00 2001
From: melizzzz <152108637+melizzzz@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:59:58 +0100
Subject: [PATCH] =?UTF-8?q?r=C3=A9glage=20de=20la=20classe=20cloud=20avec?=
 =?UTF-8?q?=20l'ajout=20d'une=20verification=20pour=20=C3=A9viter=20que=20?=
 =?UTF-8?q?les=20nuages=20se=20mangent=20:p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/model/Cloud.java               | 2 +-
 src/main/java/model/FireFighterScenario.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java
index 04d6a05..4a741ab 100644
--- a/src/main/java/model/Cloud.java
+++ b/src/main/java/model/Cloud.java
@@ -31,7 +31,7 @@ public class Cloud implements Entity{
     @Override
     public List<Position> nextTurn(Board<Square> b) {
         List<Position> adjacentPositions = PositionUtil.generateAdjacentPositions(position, b);
-
+        adjacentPositions.removeIf( p -> b.doesSquareContainEntity(p, Cloud.class));
         // Filtrer pour obtenir uniquement les positions qui ne contiennent pas de pompier
         adjacentPositions.removeIf(p -> b.doesSquareContainEntity(p, FireFighter.class));
 
diff --git a/src/main/java/model/FireFighterScenario.java b/src/main/java/model/FireFighterScenario.java
index 7542286..091276f 100644
--- a/src/main/java/model/FireFighterScenario.java
+++ b/src/main/java/model/FireFighterScenario.java
@@ -68,7 +68,7 @@ public class FireFighterScenario extends EntityScenario implements Board<Square>
             }
           }
 
-          if (fireFighterCount < initialFireFightersCount && random.nextInt(100) < chance) {
+          if (cloudCount < intialCloudCount && random.nextInt(100) < chance) {
             setSquare(new Square(pos, new Cloud(pos, this, 1)));
             cloudCount++;
             if (fireCount == initialFireCount && fireFighterCount == initialFireFightersCount && cloudCount == initialCloudCount) {
-- 
GitLab