diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 066a3208ceddcdac825f5689f970262442804311..37f13357df6b407f997ab86d84b72576c29f29df 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.bin and b/.gradle/8.10.2/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 0ae370630cf65fd132bc941ac061cc5767a6de71..363ba77866067b5504306e4f45f45d4ae2a127f0 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.lock and b/.gradle/8.10.2/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index 34447f0e773a3b79ccb5b0a71af44a232848b187..f320096ffc8b26d13ba7eeefc3260bf7888f28c4 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.bin and b/.gradle/8.10.2/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index edb9dca39fe2c5a79a4adf435261c9c416a1e69d..01fae74c2ca3c616b36fc8e76a957cef1796d5de 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.lock and b/.gradle/8.10.2/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 5ab1230688a6843b29e92f76a43cdc7cacb56539..88570c3d2ba4a30fe0cd4c773a419367187ea0e8 100644
Binary files a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index e6da59880e28485439a94794f8d5653a46f3f7c6..950049cb433493e9e98aa43cfbfb033f13f855f7 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index 0945559258306b09c37b530b8c44adfb1b4b4489..2480ab48b12df0492a27234fdb5e80ebc956a289 100644
Binary files a/build/classes/java/main/app/SimulatorApplication.class and b/build/classes/java/main/app/SimulatorApplication.class differ
diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index d804fd9ea7c85c723b33fd680353024a4e86a2c5..8cefcf715c582ae430a0e9d49ab558cfba9fccaa 100644
Binary files a/build/classes/java/main/controller/Controller.class and b/build/classes/java/main/controller/Controller.class differ
diff --git a/build/classes/java/main/model/BoardFireFighterBehavior.class b/build/classes/java/main/model/BoardFireFighterBehavior.class
index b9ef504834819f3781921e7b20febd003c44c462..abdd4060612aa38dc83ab7671d23c3902bc58437 100644
Binary files a/build/classes/java/main/model/BoardFireFighterBehavior.class and b/build/classes/java/main/model/BoardFireFighterBehavior.class differ
diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index 0b9afd6be5a804a1c89f12eab1389af1d69f21ae..a9431595c0512fa7d8447213160c4adef990b8b0 100644
Binary files a/build/classes/java/main/model/FirefighterBoard.class and b/build/classes/java/main/model/FirefighterBoard.class differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BoardElement.class.uniqueId11 b/build/tmp/compileJava/compileTransaction/stash-dir/BoardElement.class.uniqueId11
deleted file mode 100644
index 6e971176d712579acab06c447882d46aa45dac8c..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/BoardElement.class.uniqueId11 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BoardFireFighterBehavior.class.uniqueId7 b/build/tmp/compileJava/compileTransaction/stash-dir/BoardFireFighterBehavior.class.uniqueId7
deleted file mode 100644
index 4425eab866794825409e1769e300724889f524a4..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/BoardFireFighterBehavior.class.uniqueId7 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BoardFirefighterProperties.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/BoardFirefighterProperties.class.uniqueId2
deleted file mode 100644
index c969e4c95df28e1d35fdb7a0cbc180e06078d99f..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/BoardFirefighterProperties.class.uniqueId2 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CloudController.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/CloudController.class.uniqueId4
deleted file mode 100644
index 6b710f405f76d5cc93b7c904046cfd5243cf4de8..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CloudController.class.uniqueId4 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Controller.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/Controller.class.uniqueId6
deleted file mode 100644
index d804fd9ea7c85c723b33fd680353024a4e86a2c5..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Controller.class.uniqueId6 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ElementFactory.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/ElementFactory.class.uniqueId5
deleted file mode 100644
index fc2bd74472da9eb0ad654c8764a26baf67bdf15d..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ElementFactory.class.uniqueId5 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Fire.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/Fire.class.uniqueId0
deleted file mode 100644
index 7640b9f3da1f719d50b859737ee64835e1b4ff99..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Fire.class.uniqueId0 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FireFactory.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/FireFactory.class.uniqueId1
deleted file mode 100644
index 29aeaab4ba7eae21e639a38143cf64f3fb1a1cd1..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FireFactory.class.uniqueId1 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FireFighter.class.uniqueId10 b/build/tmp/compileJava/compileTransaction/stash-dir/FireFighter.class.uniqueId10
deleted file mode 100644
index 6a9fddbd22bf77ca244173120fa183fe11a127e6..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FireFighter.class.uniqueId10 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FirefighterBoard.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/FirefighterBoard.class.uniqueId3
deleted file mode 100644
index e13a1a687ea35b042a928275d9776d2164d12ffe..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FirefighterBoard.class.uniqueId3 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FirefighterFactory.class.uniqueId9 b/build/tmp/compileJava/compileTransaction/stash-dir/FirefighterFactory.class.uniqueId9
deleted file mode 100644
index d96573056f043971cb5a3b763938d1d6f4f943e6..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FirefighterFactory.class.uniqueId9 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelElement.class.uniqueId8 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelElement.class.uniqueId8
deleted file mode 100644
index 155b653963166f37418e8bdaf6c396a855faacdd..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ModelElement.class.uniqueId8 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId12 b/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId12
deleted file mode 100644
index a05e120336680c15a80138be7c30617ca4e5473c..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId12 and /dev/null differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index ecd3f1653e88e81f701967a0f7d23ff8b3073231..0a5907e7f3d3e82fa066c6e994dcccdab16f8dc2 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index a115fc893d72d08b8a3a977ce3a6ec251cec827c..fdd1f57ab3da3c0eedfe29567e0f9c6d87442fe3 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -18,7 +18,7 @@ public class SimulatorApplication extends javafx.application.Application {
private static final int BOX_WIDTH = 50;
private static final int BOX_HEIGHT = 50;
public static final int INITIAL_FIRE_COUNT = 3;
- public static final int INITIAL_FIREFIGHTER_COUNT = 6;
+ public static final int INITIAL_FIREFIGHTER_COUNT = 0;
public static final int INITIAL_CLOUD_COUNT = 3;
private Stage primaryStage;
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 3dfc3b39d846385ab86d73755aa137978520975e..3d202dd1f795a5165fe3da033a06393081e5450e 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -86,6 +86,10 @@ public class Controller {
if (element instanceof Fire) {
return ViewElement.FIRE;
}
+ if (element instanceof Cloud) {
+ return ViewElement.CLOUD;
+ }
+
}
return ViewElement.EMPTY;
}
diff --git a/src/main/java/model/BoardFireFighterBehavior.java b/src/main/java/model/BoardFireFighterBehavior.java
index 7f610f52253e2fc30d985c08978d7203a2db9fb6..8e17ecd4dc335f543f2277443ab8a70f16f3cb00 100644
--- a/src/main/java/model/BoardFireFighterBehavior.java
+++ b/src/main/java/model/BoardFireFighterBehavior.java
@@ -141,4 +141,7 @@ public class BoardFireFighterBehavior implements BoardBehavior{
return modifiedPositions;
}
+ public List<Position> getCloudPositions() {
+ return cloudPositions;
+ }
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 9f5486ab36768ffec4fc025a011584f89ca2ac00..f015bf3a64cc25056431315ad07f85d7d46347b3 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -55,6 +55,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
behavior.getFirefighterPositions().stream()
.filter(pos -> pos.isAtPosition(position)) // Vérifier si la position correspond
.forEach(pos -> result.add(new FireFighter(pos))); // Créer un objet Firefighter à partir de Position
+ // Filtrage des éléments Cloud
+ behavior.getCloudPositions().stream()
+ .filter(pos -> pos.isAtPosition(position))
+ .forEach(pos -> result.add(new Cloud(pos)));
return result;
}
@@ -74,6 +78,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
behavior.getFirePositions().add(position); // Ajouter un Fire
} else if (element instanceof FireFighter) {
behavior.getFirefighterPositions().add(position); // Ajouter un Firefighter
+ } else if (element instanceof Cloud) {
+ behavior.getCloudPositions().add(position);
+
}
}