diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 0d92e00dbbd0a347cdd9a7f03e94dff731554aba..9883848b82cb70715ad86a3a6df5414a78ee0208 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 bc8fb137df9f101bb354ddfc9b76acac781a25a8..35c1a18cb89651c04eb1af61bfe6b1ab13baa2d6 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 8fc4a4d37ffc3794da21278b0e7e7e8dbe091303..1d3da69423c8189fb22245a4f8d5717f3eb5fe2b 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 183ce3f36866a5918be8ec7e8e2e4ff99f62dac0..2682636e0144b8905cfc403e550010eb5ff1fa86 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 5b3bdc3e93b4b93b75c77fe5047baeeba7eee662..6815161183abdf4a645a1be4a7963eeea9022185 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 b635deabc9b1cac73bb434c7a2dac4b97f24e938..57797816a59ffdea6215d7aaaf651826dd514c83 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index fe995f24c681881710a124d2c448c80c3587f7c7..f6feff7a4a86dd2b895588b1211eaad6fc39b658 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index ded130549453c7be03cf16abfa899ad45ea7476b..6d88dc9a0edace933e7b9ca5f67bbdaddba48037 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/app/SimulatorMain.class b/build/classes/java/main/app/SimulatorMain.class
index 1d13229f73ef27c233a432bc89aa3dffc086246a..a2dee6a565c2ac303dd2d6027dbf08183edeeddf 100644
Binary files a/build/classes/java/main/app/SimulatorMain.class and b/build/classes/java/main/app/SimulatorMain.class differ
diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index da47fbe685528a3342e701a12205a8f5a891a554..5460b69e4ad124b6ba3858a79d483e32eb5cc8da 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/controller/PersistentToggleGroup.class b/build/classes/java/main/controller/PersistentToggleGroup.class
index 314954a9fd4ab6d48da5fec7067063879e670d62..da299736efc238eef36f74e7abed7e5b291eba8d 100644
Binary files a/build/classes/java/main/controller/PersistentToggleGroup.class and b/build/classes/java/main/controller/PersistentToggleGroup.class differ
diff --git a/build/classes/java/main/model/Behavior.class b/build/classes/java/main/model/Behavior.class
index c8a1c33b84f194553e3868714d53f714ee53745a..7b66ceda77beed63d4117f3a5a0e60d01e373d50 100644
Binary files a/build/classes/java/main/model/Behavior.class and b/build/classes/java/main/model/Behavior.class differ
diff --git a/build/classes/java/main/model/Board.class b/build/classes/java/main/model/Board.class
index a1f8169e45fef3872ae559ad22bdf5a3d6f63dfd..18242fdec83565452b8793a712481ec89a92e393 100644
Binary files a/build/classes/java/main/model/Board.class and b/build/classes/java/main/model/Board.class differ
diff --git a/build/classes/java/main/model/BoardData.class b/build/classes/java/main/model/BoardData.class
index df031351163a0a0b16469068925835628d0c7153..07eb07f10a711f6f8ef0f19cf60c4172975d4ba7 100644
Binary files a/build/classes/java/main/model/BoardData.class and b/build/classes/java/main/model/BoardData.class differ
diff --git a/build/classes/java/main/model/Cell.class b/build/classes/java/main/model/Cell.class
index a6ccc8b21b59ef78490a374f74eb5bfce3f932dc..c5b5ebd6bb02a92a57e1e05dacdf52857fba1e74 100644
Binary files a/build/classes/java/main/model/Cell.class and b/build/classes/java/main/model/Cell.class differ
diff --git a/build/classes/java/main/model/ChargeTarget.class b/build/classes/java/main/model/ChargeTarget.class
index 467dbcee06e169019b57fe86d0d620254f65c983..7d6138fb55f9758dc3a69a92972c313c6360a1f9 100644
Binary files a/build/classes/java/main/model/ChargeTarget.class and b/build/classes/java/main/model/ChargeTarget.class differ
diff --git a/build/classes/java/main/model/ChargerBehavior.class b/build/classes/java/main/model/ChargerBehavior.class
index 40e50666dab15c5d8701e1b2d3b0aac5d563703e..4238416ce3f365b11d891c5a082fe00394159839 100644
Binary files a/build/classes/java/main/model/ChargerBehavior.class and b/build/classes/java/main/model/ChargerBehavior.class differ
diff --git a/build/classes/java/main/model/Cloud.class b/build/classes/java/main/model/Cloud.class
index 99979c80b8f8bc01a75d26d2c31792331f8b08c6..8abe5c73fad43333b2acc6717f97fb586a2837cf 100644
Binary files a/build/classes/java/main/model/Cloud.class and b/build/classes/java/main/model/Cloud.class differ
diff --git a/build/classes/java/main/model/CloudBehavior.class b/build/classes/java/main/model/CloudBehavior.class
index 1c435f72cc41009d2d5d9f84aa67c2a43bcd51e1..c2d7aa58956927feef07442c96829a6a395b0877 100644
Binary files a/build/classes/java/main/model/CloudBehavior.class and b/build/classes/java/main/model/CloudBehavior.class differ
diff --git a/build/classes/java/main/model/ConnexElement.class b/build/classes/java/main/model/ConnexElement.class
index 553af90201a3b9b52c6e62b7503bf412dace9bcf..009ee88fb0b1b2fb782a0dcf081694bb509ef62e 100644
Binary files a/build/classes/java/main/model/ConnexElement.class and b/build/classes/java/main/model/ConnexElement.class differ
diff --git a/build/classes/java/main/model/Element.class b/build/classes/java/main/model/Element.class
index 3c37b9b5c664e7c261d89a5cf80c7b0842754dae..8e2eb1350365848b15dcaf78c2b55cde5c7ddfb1 100644
Binary files a/build/classes/java/main/model/Element.class and b/build/classes/java/main/model/Element.class differ
diff --git a/build/classes/java/main/model/ElementFactory.class b/build/classes/java/main/model/ElementFactory.class
index 8c69537429cd49c7b4d6915427103947d3b2bace..a42bd0eeaa1c91ee688eef0053f4f0bae0ad820c 100644
Binary files a/build/classes/java/main/model/ElementFactory.class and b/build/classes/java/main/model/ElementFactory.class differ
diff --git a/build/classes/java/main/model/FFBehavior.class b/build/classes/java/main/model/FFBehavior.class
index 841f978d80c0a780b8734d21e242fe4d9434b8b1..291fe9094bbfeaa70d5df89ff86cc3f4924868ba 100644
Binary files a/build/classes/java/main/model/FFBehavior.class and b/build/classes/java/main/model/FFBehavior.class differ
diff --git a/build/classes/java/main/model/FFBoard.class b/build/classes/java/main/model/FFBoard.class
index 164df9e0ea9152d7ff4ec2a85af2d7b0284069f9..07ae6a6b5b6269f978eae54e251a9faa5b1be31f 100644
Binary files a/build/classes/java/main/model/FFBoard.class and b/build/classes/java/main/model/FFBoard.class differ
diff --git a/build/classes/java/main/model/FFBoardData.class b/build/classes/java/main/model/FFBoardData.class
index 3486ddfcd169a48edd03bc4a1272f2b9df31734a..083bf54eef3faaf8e51274d1d229a5ee5f7d084d 100644
Binary files a/build/classes/java/main/model/FFBoardData.class and b/build/classes/java/main/model/FFBoardData.class differ
diff --git a/build/classes/java/main/model/FFUpdater.class b/build/classes/java/main/model/FFUpdater.class
index 176ed6d6e39f594306adc575db2ea8b0a8ddecf0..3e585d7404d70b661e216810cc914f7a9c8d105b 100644
Binary files a/build/classes/java/main/model/FFUpdater.class and b/build/classes/java/main/model/FFUpdater.class differ
diff --git a/build/classes/java/main/model/FFboardFiller.class b/build/classes/java/main/model/FFboardFiller.class
index 69706264fe913cc46c4410a6ca777db1457ee9a5..bf81cf59688ca0e6ead59ff7efa1739a918ca915 100644
Binary files a/build/classes/java/main/model/FFboardFiller.class and b/build/classes/java/main/model/FFboardFiller.class differ
diff --git a/build/classes/java/main/model/Fire.class b/build/classes/java/main/model/Fire.class
index 1dd7052a4bdca160584d7b5360e4dfc3bc94dbe5..360986a08a7cb0be7450bcd306c3e8e7a6573fd0 100644
Binary files a/build/classes/java/main/model/Fire.class and b/build/classes/java/main/model/Fire.class differ
diff --git a/build/classes/java/main/model/FireBehavior.class b/build/classes/java/main/model/FireBehavior.class
index a59a1df9ac8f798f422d5bd7b2781bd9340b87b6..a63c2a3b6535781cf1e152bbb4645a4accf42d73 100644
Binary files a/build/classes/java/main/model/FireBehavior.class and b/build/classes/java/main/model/FireBehavior.class differ
diff --git a/build/classes/java/main/model/FireFactory.class b/build/classes/java/main/model/FireFactory.class
index 59d6bccfdc7812f8331ffc923d803975f00ca81a..13b6a7ffccc0f19df29c8c02b35aa50668a243d6 100644
Binary files a/build/classes/java/main/model/FireFactory.class and b/build/classes/java/main/model/FireFactory.class differ
diff --git a/build/classes/java/main/model/FireFighter.class b/build/classes/java/main/model/FireFighter.class
index 5964bfc79171cfcba4143f82d20872379b4be94a..1e2297e2ca73c58649903e7346f5ad3fa4f6f0b8 100644
Binary files a/build/classes/java/main/model/FireFighter.class and b/build/classes/java/main/model/FireFighter.class differ
diff --git a/build/classes/java/main/model/FireFighterBehavior.class b/build/classes/java/main/model/FireFighterBehavior.class
index 14cd4a24bff338fd74d2f17bd44686d40421da64..2bca188bdc18f223c28a8b7a8294d8cb2036cb8f 100644
Binary files a/build/classes/java/main/model/FireFighterBehavior.class and b/build/classes/java/main/model/FireFighterBehavior.class differ
diff --git a/build/classes/java/main/model/Forest.class b/build/classes/java/main/model/Forest.class
index bfc79442f47547ff214af4a77b0b0b5153e769af..354d9304df5d6afe682c51ea4339f6f37a45017e 100644
Binary files a/build/classes/java/main/model/Forest.class and b/build/classes/java/main/model/Forest.class differ
diff --git a/build/classes/java/main/model/Land.class b/build/classes/java/main/model/Land.class
index 68ea065d9beec6041d0beb4ce3c08aa13505baeb..cc196ad2cb290b7506aebcb8074e7378df7e0631 100644
Binary files a/build/classes/java/main/model/Land.class and b/build/classes/java/main/model/Land.class differ
diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class
index ff226d67cd5a6c679a59329883f3e65397342b01..d3db593cc6c61187e3068ed32b7fe61f64ac09e4 100644
Binary files a/build/classes/java/main/model/ModelElement.class and b/build/classes/java/main/model/ModelElement.class differ
diff --git a/build/classes/java/main/model/MotorizedFireFighter.class b/build/classes/java/main/model/MotorizedFireFighter.class
index 32ce2aca05b23bd96ab7fc847112169e179ebbb7..8f8c31c07c776f0bb418023db3a336f14f691707 100644
Binary files a/build/classes/java/main/model/MotorizedFireFighter.class and b/build/classes/java/main/model/MotorizedFireFighter.class differ
diff --git a/build/classes/java/main/model/Mountain.class b/build/classes/java/main/model/Mountain.class
index a93d9d60573c29f1de41fd596f0611137abdb12e..55d91ac26b769014e955292d6c7e4faa355cd59e 100644
Binary files a/build/classes/java/main/model/Mountain.class and b/build/classes/java/main/model/Mountain.class differ
diff --git a/build/classes/java/main/model/Printable.class b/build/classes/java/main/model/Printable.class
index 6c3a303bd12db715502a540e39b80657771b2d69..4a4da6580c0bf74116ba0d997894b5afc5b6981a 100644
Binary files a/build/classes/java/main/model/Printable.class and b/build/classes/java/main/model/Printable.class differ
diff --git a/build/classes/java/main/model/QuickFire.class b/build/classes/java/main/model/QuickFire.class
index 963867da10a4b51fa8119736ffe5826c9d2b3260..1ac9b326dbb7181d986e03b52463b3233ce6b556 100644
Binary files a/build/classes/java/main/model/QuickFire.class and b/build/classes/java/main/model/QuickFire.class differ
diff --git a/build/classes/java/main/model/RemoverBehavior.class b/build/classes/java/main/model/RemoverBehavior.class
index dd637732c93a00b59e8054ce0ceee6174794e8a2..be0680b2517d2851ae5e140a9a5d233c854ae81a 100644
Binary files a/build/classes/java/main/model/RemoverBehavior.class and b/build/classes/java/main/model/RemoverBehavior.class differ
diff --git a/build/classes/java/main/model/Road.class b/build/classes/java/main/model/Road.class
index 2954c7d840fabb369957ca754c8a1279098a67c3..daf2775c54136c16ab148cd29c35c05003a30797 100644
Binary files a/build/classes/java/main/model/Road.class and b/build/classes/java/main/model/Road.class differ
diff --git a/build/classes/java/main/model/RoadFactory.class b/build/classes/java/main/model/RoadFactory.class
index 66b302a27af3bee8dfb698aa7aba072813cbfdce..a4a505e1971afaf8930b6866d401267bed2b6359 100644
Binary files a/build/classes/java/main/model/RoadFactory.class and b/build/classes/java/main/model/RoadFactory.class differ
diff --git a/build/classes/java/main/model/Rock.class b/build/classes/java/main/model/Rock.class
index 2dcd97f4e55156e20bb210d90e8e654202d41a80..41ee410a25e815c5d9cb896015db1ce726e96037 100644
Binary files a/build/classes/java/main/model/Rock.class and b/build/classes/java/main/model/Rock.class differ
diff --git a/build/classes/java/main/model/RockBehavior.class b/build/classes/java/main/model/RockBehavior.class
index 6bb980514734025b361828f12eb82e32484dfd76..8368e7bb46ff97155f4bdbaaeca48fcd19e2da9e 100644
Binary files a/build/classes/java/main/model/RockBehavior.class and b/build/classes/java/main/model/RockBehavior.class differ
diff --git a/build/classes/java/main/model/StandardFire.class b/build/classes/java/main/model/StandardFire.class
index 650aa056a75d2b256738db200ccb79eddd158914..81358e7c16260b8d1d77d2d7a0650163f6d5df8f 100644
Binary files a/build/classes/java/main/model/StandardFire.class and b/build/classes/java/main/model/StandardFire.class differ
diff --git a/build/classes/java/main/model/StandardFireFighter.class b/build/classes/java/main/model/StandardFireFighter.class
index 64cb2750980590568fcd3216325692b16f978c77..55c39846baf5e76796aa09fdd55f52ff13aa28bf 100644
Binary files a/build/classes/java/main/model/StandardFireFighter.class and b/build/classes/java/main/model/StandardFireFighter.class differ
diff --git a/build/classes/java/main/model/TangibleBehavior.class b/build/classes/java/main/model/TangibleBehavior.class
index 1944332ebc131f7a3deadf53fd22eb0186eb92ee..02e1e1bca2906667c62dbe82da8609e9e78ddf6a 100644
Binary files a/build/classes/java/main/model/TangibleBehavior.class and b/build/classes/java/main/model/TangibleBehavior.class differ
diff --git a/build/classes/java/main/model/Updatable.class b/build/classes/java/main/model/Updatable.class
index cbaa6878f9b5350a9ceca0fe8a50b1c0c1baa2ac..ca0085ffcc16197c036e8b623d6aa133f687c3a6 100644
Binary files a/build/classes/java/main/model/Updatable.class and b/build/classes/java/main/model/Updatable.class differ
diff --git a/build/classes/java/main/model/Updater.class b/build/classes/java/main/model/Updater.class
index 79de3b2c4f9b5ed24a3d33bf5211531a3b166e2a..5094364d480368e64c5c482badb41c0fe948d624 100644
Binary files a/build/classes/java/main/model/Updater.class and b/build/classes/java/main/model/Updater.class differ
diff --git a/build/classes/java/main/model/ZoneDependent.class b/build/classes/java/main/model/ZoneDependent.class
index 69efabaada60bf71dcb11bdb8056479bdfd1b606..2aae31c665e51fc937c9336a7923a3127d04148b 100644
Binary files a/build/classes/java/main/model/ZoneDependent.class and b/build/classes/java/main/model/ZoneDependent.class differ
diff --git a/build/classes/java/main/module-info.class b/build/classes/java/main/module-info.class
index a05e120336680c15a80138be7c30617ca4e5473c..f0b28b3b4966d6d1c1eac55f53fff160e8e01b67 100644
Binary files a/build/classes/java/main/module-info.class and b/build/classes/java/main/module-info.class differ
diff --git a/build/classes/java/main/util/Position.class b/build/classes/java/main/util/Position.class
index 89bcfc46acba6bd77f0f54570c0b935dce0be942..afa6140ff267268bf6756e3a97e89a7b9e3ad65c 100644
Binary files a/build/classes/java/main/util/Position.class and b/build/classes/java/main/util/Position.class differ
diff --git a/build/classes/java/main/util/TargetStrategy.class b/build/classes/java/main/util/TargetStrategy.class
index 29d1e02d75754f3461b19603c654e7b3c458f1cb..91ebbd6ca418ec914ccf852cf42b85aa1df23be1 100644
Binary files a/build/classes/java/main/util/TargetStrategy.class and b/build/classes/java/main/util/TargetStrategy.class differ
diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
index 831699ca3ca58a17f7b79bad1d1464aeb6d30a4c..05ec18aeff68513e99aa82d1e6ae68a3edf3cccd 100644
Binary files a/build/classes/java/main/view/FirefighterGrid.class and b/build/classes/java/main/view/FirefighterGrid.class differ
diff --git a/build/classes/java/main/view/Grid.class b/build/classes/java/main/view/Grid.class
index c4fa5e96b46909e2a89e512f2ad9c2d4d042260c..3db58592fb018dfd2fdd792ea9ad02a2a0d797c1 100644
Binary files a/build/classes/java/main/view/Grid.class and b/build/classes/java/main/view/Grid.class differ
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index 8d66f769cd36f6a121482fb2a77fe4639175b2a5..ac4ba6fa8c7ba43a1de3a562d2867c1f129d1fff 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/compileTransaction/stash-dir/FFBoard.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/FFBoard.class.uniqueId1
deleted file mode 100644
index 164df9e0ea9152d7ff4ec2a85af2d7b0284069f9..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FFBoard.class.uniqueId1 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FFboardFiller.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/FFboardFiller.class.uniqueId0
deleted file mode 100644
index f6ca48892a657868c312e0f149ec52a9a7fe3fc3..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FFboardFiller.class.uniqueId0 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId2
deleted file mode 100644
index a05e120336680c15a80138be7c30617ca4e5473c..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId2 and /dev/null differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 974d8fc4ebaec68d5de9f0f6c5d3d2ac5e2e393f..8b085a4b3b6c24c3e04d4010f27f51cd399e4834 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/RoadFactory.java b/src/main/java/model/RoadFactory.java
index 75da23fd9dd7bb8b4d5212955014c5cd483c99df..3211861223eb7b2ba7d6b92a9c52e1a13857205a 100644
--- a/src/main/java/model/RoadFactory.java
+++ b/src/main/java/model/RoadFactory.java
@@ -11,17 +11,16 @@ public class RoadFactory implements ElementFactory{
Random random = new Random();
public Element getNewElement(BoardData boardData, Position position){
- int[][] dir={{0,1},{0,-1},{1,0},{-1,0}};
+ int[][] dir={{0,1},{0,-1},{1,0},{-1,0},{1,1},{1,-1},{-1,1},{-1,-1}};
int[] currentDirection1,currentDirection2;
do{
- currentDirection1 = dir[random.nextInt(4)];
- currentDirection2 = dir[random.nextInt(4)];
+ currentDirection1 = dir[random.nextInt(8)];
+ currentDirection2 = dir[random.nextInt(8)];
}while(currentDirection1==currentDirection2);
for (int i = position.row(),j= position.column();
i < boardData.getRowCount() && i >= 0 && j < boardData.getColumnCount() && j >= 0 ;
i+=currentDirection1[0],j+=currentDirection1[1]) {
- System.out.println(i+","+j);
boardData.addElement(new Road(new Position(i,j)));
}
for (int i = position.row(),j= position.column();
diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java
index f49389cc22c0a8a03808bfe4ba2416e5f7057dde..102436b6218d61cdea74ae0d3255d40b2a23d065 100644
--- a/src/main/java/view/ViewElement.java
+++ b/src/main/java/view/ViewElement.java
@@ -8,12 +8,12 @@ import java.lang.reflect.InvocationTargetException;
public enum ViewElement {
ROAD(Color.BLACK, Road.class, Road.factory),
- FOREST(Color.DARKGREEN, Forest.class),
+ FOREST(Color.color(0.0,0.2,0.0), Forest.class),
ROCK(Color.GREEN, Rock.class),
- MOUNTAIN(Color.DARKGRAY, Mountain.class),
+ MOUNTAIN(Color.gray(0.2), Mountain.class),
FIREFIGHTER(Color.LIGHTBLUE, StandardFireFighter.class),
MOTORIZEDFIREFIGHTER(Color.DARKBLUE, MotorizedFireFighter.class),
- CLOUD(Color.LIGHTGRAY, Cloud.class),
+ CLOUD(Color.gray(0.8), Cloud.class),
FIRE(Color.RED,Fire.class,Fire.factory),
EMPTY(Color.WHITE, null);