diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin index 2c03c1aa334b9dd25fb6ba0f7f319b1dc09cc103..60f04fb8ed0dbf47c0d6b2b724f22156ab0d42d7 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 79610f3368aed3aa26a3b5db32da7fa515dd978f..9a511a813be5ebefe95f41960202ab7e488bf921 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 2ce4fff0fdc25123170c3ff693e782569880e95f..fc10cf49c3366adc3ff637427598ac9ff0c5c748 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 65bd0087b7ca40bb6be4f6ab1b6ed72b24766598..13f9e9815e8bb3d97985e796da0bdfd6435595c6 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 b7f6bb8ab7b77c5eba29cbf5f7708483764e18fb..89e08843a3feb4c048d7fe4eed654ca8396e1573 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 5cede1d8265b17ceb058585f3e7af8e79423ae87..f654f5f583e5ad45713c270e1cb7ee399ae5eebd 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 1374602b071f4ec880fa3f907b06b4dd53c9d4c7..a2598dc370e909f84aaaf23ab32fc2c5bcec98e7 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class index ace323de4b19d73995c1120f22494767675e7288..baeb228da53f85ea2c28489e1ffe6004e86806f4 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/distributions/firefighter-shadow.tar b/build/distributions/firefighter-shadow.tar index a5c7784ec2465e0063d63410fe13538dd65eda6e..178357991f6f71188dc2c1ad2ba836026b096b40 100644 Binary files a/build/distributions/firefighter-shadow.tar and b/build/distributions/firefighter-shadow.tar differ diff --git a/build/distributions/firefighter-shadow.zip b/build/distributions/firefighter-shadow.zip index 0c1caf97cb1e82cb07f2de702cb277531e05b4b1..9b89b6be4b10237a2bada99e39129d9e188f8118 100644 Binary files a/build/distributions/firefighter-shadow.zip and b/build/distributions/firefighter-shadow.zip differ diff --git a/build/distributions/firefighter.tar b/build/distributions/firefighter.tar index cb82184ff5ea66324b8a972a3b10b5e605e3e053..88f694969b7e8c574cde69e664dda0f85a08c8b4 100644 Binary files a/build/distributions/firefighter.tar and b/build/distributions/firefighter.tar differ diff --git a/build/distributions/firefighter.zip b/build/distributions/firefighter.zip index 0884f890ea02c128b9a67be3865e20efba7031af..1e63bed2700b6223a700e6b6670602e0ac763de0 100644 Binary files a/build/distributions/firefighter.zip and b/build/distributions/firefighter.zip differ diff --git a/build/libs/firefighter-all.jar b/build/libs/firefighter-all.jar index 619374e47ddcafe0763e346a06e42f6272b0da1b..1d729f153e7c9738808aa5a02ee8aec812ac4b2e 100644 Binary files a/build/libs/firefighter-all.jar and b/build/libs/firefighter-all.jar differ diff --git a/build/libs/firefighter.jar b/build/libs/firefighter.jar index af06c4dfce194c8db370026c2252a79fff7393a4..86fdb21d8a7b6b948ae4975f5f6a3d508df54d95 100644 Binary files a/build/libs/firefighter.jar and b/build/libs/firefighter.jar differ diff --git a/build/scripts/firefighter b/build/scripts/firefighter index f14c33053ef5daa948cb848df0d5f2d8fe4204a1..2d0d80b9a9480c8c5de330291d4133ac325cc1ec 100755 --- a/build/scripts/firefighter +++ b/build/scripts/firefighter @@ -115,7 +115,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/lib/firefighter.jar:$APP_HOME/lib/javafx-fxml-21-linux.jar:$APP_HOME/lib/javafx-controls-21-linux.jar:$APP_HOME/lib/javafx-graphics-21-linux.jar:$APP_HOME/lib/javafx-base-21-linux.jar +CLASSPATH=$APP_HOME/lib/firefighter.jar:$APP_HOME/lib/javafx-fxml-21-win.jar:$APP_HOME/lib/javafx-controls-21-win.jar:$APP_HOME/lib/javafx-graphics-21-win.jar:$APP_HOME/lib/javafx-base-21-win.jar # Determine the Java command to use to start the JVM. diff --git a/build/scripts/firefighter.bat b/build/scripts/firefighter.bat index 8a549278323de8af8270f8c39555b9d64b6caed5..857694a25003015075bc2c5b0a8c46e60790987d 100644 --- a/build/scripts/firefighter.bat +++ b/build/scripts/firefighter.bat @@ -70,7 +70,7 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\lib\firefighter.jar;%APP_HOME%\lib\javafx-fxml-21-linux.jar;%APP_HOME%\lib\javafx-controls-21-linux.jar;%APP_HOME%\lib\javafx-graphics-21-linux.jar;%APP_HOME%\lib\javafx-base-21-linux.jar +set CLASSPATH=%APP_HOME%\lib\firefighter.jar;%APP_HOME%\lib\javafx-fxml-21-win.jar;%APP_HOME%\lib\javafx-controls-21-win.jar;%APP_HOME%\lib\javafx-graphics-21-win.jar;%APP_HOME%\lib\javafx-base-21-win.jar @rem Execute firefighter diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java index 8900e4bd34e6c066eeb8bce3f24a9e03c274bf0e..0519f42993fb1dda8cd20a0ea295b2c74c4499bc 100644 --- a/src/main/java/app/SimulatorApplication.java +++ b/src/main/java/app/SimulatorApplication.java @@ -17,12 +17,12 @@ public class SimulatorApplication extends javafx.application.Application { private static final int COLUMN_COUNT = 20; private static final int BOX_WIDTH = 30; private static final int BOX_HEIGHT = 30; - public static final int INITIAL_FIRE_COUNT = 5; - public static final int INITIAL_FIREFIGHTER_COUNT = 4; + public static final int INITIAL_FIRE_COUNT = 4; + public static final int INITIAL_FIREFIGHTER_COUNT = 5; public static final int INITIAL_ROAD_COUNT = 10; public static final int INITIAL_CLOUD_COUNT = 3; 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 = 3; private Stage primaryStage;