diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin index a7ceb2d2fee40b4f263defccc2ca62f082cadcbf..4b2b232d6014176a132436daa367c116d399b3e6 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 534d1b04c0c6150b75e112148a044f08e9ebf183..6908cfd0b5aae04c4a2a1e855483ed99945119f4 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 6e7952b0b13f1422dfa166cef42647603f858fb6..d495e7a842fe87fb2c87a0d2c6c8658c0087c62d 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 ed68acb7bf0146ddc19cbc1a3568c00138fc3f23..5704671eade6aaaf9fd222d4053099773d436456 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 e3b936f1f85fc2752d4862106a148d6bc16b8a29..24099587cd19bf4d3f11064e66ce3b445421e1b1 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 e5afc705b8d5dfcefc9109e99578432e767b24d0..ddd37d4352461add0ef41adf87dac87d5223acd6 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 a46a68d2a3f544dacab62174944a8fc6e507c17b..c6949c5db30d34f39a15fc024f10e72ebe0dd2d0 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 02679c8af9d81f5f6e5c1ed10decb024a691ba4c..512cf272c882b47442e9f88abc2113d1a37fc039 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 1402839e1585aae532429bac1cbf860e3ac16636..b6f310615dab7bc112f147807fe635c2d2d217ce 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 a4128eee52cb73ba7c6a7a16731272fc0d9a23eb..ad5e48bc72e192051c4d9245a26063ab1c8c5aa9 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/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class index 768e7bbdc49e39ab1556792461ee8bf85906432e..c6622dc9bfccb1bfb8c231f1126d891a26fca602 100644 Binary files a/build/classes/java/main/view/ViewElement.class and b/build/classes/java/main/view/ViewElement.class differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 5b5a4363fb84636786f18191a2088586da8c789b..2eccc34b5dc9a494b36065cd0145c547e956965b 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/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java index 46c1e832531900390d46610fdbb4c5101d594a02..04b2acfe41b488e680720770f6cb6dc908db1a70 100644 --- a/src/main/java/model/FirefighterBoard.java +++ b/src/main/java/model/FirefighterBoard.java @@ -59,6 +59,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> { behavior.getCloudPositions().stream() .filter(pos -> pos.isAtPosition(position)) .forEach(pos -> result.add(new Cloud(pos))); + // Filtrage des éléments Motorized + behavior.getMotorizedFighters().stream() + .filter(pos -> pos.isAtPosition(position)) + .forEach(pos -> result.add(new MotorizedFireFighter(pos))); return result; } @@ -80,6 +84,8 @@ public class FirefighterBoard implements Board<List<ModelElement>> { behavior.getFirefighterPositions().add(position); // Ajouter un Firefighter } else if (element instanceof Cloud) { behavior.getCloudPositions().add(position); + } else if (element instanceof MotorizedFireFighter) { + behavior.getMotorizedFighters().add(position); } }