diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin index f7dac1e23abd3daef8a6c2631dbbe09a15cb204c..d26b7edfcd4cf9bbf2930e7fc6f1fbb625bf4bb3 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 888d9e28c71779fc7ea8fb00a4ce9f00363c2b0a..49d38ce06c0e990758eb248c37106da680575bca 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 b3f153f42dbe1965ebb8efa814fc6f8a2b3db7ba..a75277f71d8c90f49f83adb06ec2e4dc568e73c1 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 8bd90179692335950fbced9a09de552d08a1d46b..15a12a274dae0bfed0e54976eea62f716ea9f313 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 1611dbceb6eb7b4c5c30a8da9951016d5659d02e..d5e5c59d82330ed3f4165e56deffc79d7c05e941 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 290ad14c351962a4d852abb814a948352c64aef0..07e47e892fe0ae663d910f9f90050a2992264529 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 eadcb283719be38f0c73cf3c649f55673d10ee0e..dca601056c92248e6d1d362ac5a32c00ccbdf758 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/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class index ca42845dd5040257614039eb61ef71df52c822a2..208834a7ab675a90bb96e24c4f98f0fa85bec350 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/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index cf72eab79aa673dfa0bd015910595c9e6381803e..cd3f45fa4bfe9b48393c1c7229ebd0484e14dc8a 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 4fa02fdd7bd885a96f6f2afbce76c95dbfe91db2..18534c73fd9becd05871a9c40031c1d2d333f044 100644 --- a/src/main/java/app/SimulatorApplication.java +++ b/src/main/java/app/SimulatorApplication.java @@ -22,7 +22,7 @@ public class SimulatorApplication extends javafx.application.Application { public static final int INITIAL_ROAD_COUNT = 10; public static final int INITIAL_CLOUD_COUNT = 5; public static final int INITIAL_MOUTAIN_COUNT = 5; - public static final int INITIAL_FIRE_TRUCK_COUNT = 2; + public static final int INITIAL_FIRE_TRUCK_COUNT = 3; public static final int INITIAL_ROCKS_COUNT = 5; private Stage primaryStage; diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java index a593e4c4c9c460a48961564a2130306204f415f8..74eb05a8d545f3fb8d28376a6290fb996ac7a293 100644 --- a/src/main/java/model/FirefighterBoard.java +++ b/src/main/java/model/FirefighterBoard.java @@ -180,7 +180,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> { resetPos(cloudPositions,initializer.getCloudPositions()); resetPos(moutainsPositions,initializer.getMountainsPositions()); resetPos(roadPositions,initializer.getRoadPositions()); - resetPos(rocksPositions,initializer.getRoadPositions()); + resetPos(rocksPositions,initializer.getRocksPositions()); resetPos(fireTruckPositions,initializer.getFireTruckPositions()); neighbors.clear(); @@ -261,7 +261,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> { updatedElements.add(new Pair<>(moutainPosition, ModelElement.MOUTAIN)); } for (Position FireTruckPosition : fireTruckPositions){ - System.out.println(FireTruckPosition); updatedElements.add(new Pair<>(FireTruckPosition, ModelElement.FIRETRUCK)); } for (Position rockPosition : rocksPositions){