From f5eb7bdad2c8d52b48e3ec7e63e4c882c3341034 Mon Sep 17 00:00:00 2001
From: m19023837 <chadi.mansour@etu.univ-amu.fr>
Date: Thu, 28 Nov 2024 15:28:12 +0100
Subject: [PATCH] correcting

---
 .../executionHistory/executionHistory.bin     | Bin 139599 -> 139599 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/8.10.2/fileHashes/fileHashes.bin      | Bin 26097 -> 26097 bytes
 .gradle/8.10.2/fileHashes/fileHashes.lock     | Bin 17 -> 17 bytes
 .../8.10.2/fileHashes/resourceHashesCache.bin | Bin 26691 -> 26759 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../java/main/app/SimulatorApplication.class  | Bin 3311 -> 3311 bytes
 .../java/main/model/FirefighterBoard.class    | Bin 9801 -> 9689 bytes
 .../compileJava/previous-compilation-data.bin | Bin 21452 -> 21452 bytes
 src/main/java/app/SimulatorApplication.java   |   2 +-
 src/main/java/model/FirefighterBoard.java     |   3 +--
 11 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index f7dac1e23abd3daef8a6c2631dbbe09a15cb204c..d26b7edfcd4cf9bbf2930e7fc6f1fbb625bf4bb3 100644
GIT binary patch
delta 384
zcmX?qh~xYrjt$OTc4o;X`PqqPB`HP86-Bu@Ik}Z)sio!>d6l^W>nr;{-s%-&JF`>o
z$Fw*P#YIdQLYo`AcJm0GT_v+xQD3>!Zi-Sy-zGC}#(C2XWEdqkr%(USEOcnggzX&1
z&WBs)ru;XYYTw2<XS$&^quAv5*{qu<&u-)p`1MkLp@W}JicHN-n;W5=Ow-$J80#k+
z__9o1zC>Bre)?nOX^I~h8@x`>HCXV3<!HyU$#<9NN_8xox!q_RGc$w0?zwwxxE7t*
zxHNy>`COLcM<%N*HQ-vZb=}PEM%!f>=S-G=Aw9Wr=@aJTTh~oaSSByURD3pH;!n=q
z+(>nUl(-|U7r;tydNVGXY#6GzdDk*`MghL3vp=uWRjBQ}qZr&OFS={8;0jgdr(4%e
zwp_8C;|^Fum&D}z>2j0VR(cD}J7@T@RVaGXrQBR`qp9k%Hz%%q!6>XT=Vr?e$(i0w
Z7Z{2byl*?)v29&*%<Anis~JC+0szZktsnpZ

delta 384
zcmX?qh~xYrjt$OTcBK{hNfkxLW>r-gNmT_^W@U+q=~=1eiRGmNofgN7ma}^<{H!4O
z;*jmNQy-Wxgf=&J?dB0W70-X(Z1?}F-%Ka+?KIx~WSlqMK!#CrbNclE%tG}n4&i}v
z5jHmu9#NFouQQu*&U8a-MzP89vspJ!p54eHkd>a5{!vWb&t&)3B_|$BG)!-^VXU8Q
z;L9?3`4VN}Y_=ecKF1fQ7x1z!oBL%??a}j{lkYCkl{()!bGy+tW@ZL~j}r~DZEM;d
zJyFWzZs}ioaI(r$1Fr287R=mkv|W~Q&Sd!)(vvHfK4E@5VZr2tW%5!zO?NcsYkvBu
z6FTMYm)#7{UW1jM^kG~y*)UXb^R8v?i~<K!`QP4fR(~0xzT!^`_tpBzf-6*+yCyD}
zY`J1N$2YKsE{Vza)8!_!t@IXXc6j>u%1WUJx4vr~W=goeW^>}o7mUL0GFR^GKW@em
Zmet+8Zu99oS0*lKj#<4uW;NsIQUGanvyK1&

diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 888d9e28c71779fc7ea8fb00a4ce9f00363c2b0a..49d38ce06c0e990758eb248c37106da680575bca 100644
GIT binary patch
literal 17
UcmZRsO8#f>m)m%p0Sp-J0W)a?VE_OC

literal 17
UcmZRsO8#f>m)m%p0Sp)|0W)I+TL1t6

diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index b3f153f42dbe1965ebb8efa814fc6f8a2b3db7ba..a75277f71d8c90f49f83adb06ec2e4dc568e73c1 100644
GIT binary patch
delta 237
zcmex(n(^al#trdd5{l3EO;hX;WlGlOh&G<0F@b@BadNR{gZJd}usVgs$$PB#GQ|sL
za;hBT2v}PLmeiiE$N&a*8k7Hfs%^Fof6v6MJ!{Ei-6$Uk`{|FBrzw75Z16fg*I>aD
z7O)P@7T3uWqx6|ITYM&0`|3^p7_~)#srYQZ#GjnIxsmDyDRD<y!3wo!T>zWRpn7w1
zt)JTF*U`F+%-XY#PnM2NWY(T_XL3E5emZ$}fRuv9oSQ8>BxiazU0^6$@V@OZ#Dv)#
S5EFvWOm2)*+w2^-jvWAtO;wKo

delta 237
zcmex(n(^al#trdd61$csy(xH9Uvo7p)Lklp(SU)0adNTZzq-lgVRZ^B%-V@+^PYUX
zYj9X6tDCtGEUCeKoB<5%q9*_MRNHJF{+@|hgTs8XZj_HiHd~NJpW}<u3wT+V&Hb{c
z7OX=l{pjS0QTohE>1QTa`|3^p7_~*Ar|FL7e9ccEbwa1y{j!_k8CanPM>g1G1~t#g
zwSH=wUq|aQGHY-oPnM2NWY*v)n_Lg3yC%;LkWz4$xpHU!aWjsvtnTi0n@`_?ns5bT
RLhzZ%jd5z5o#WQA0{{W3S1$kn

diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index 8bd90179692335950fbced9a09de552d08a1d46b..15a12a274dae0bfed0e54976eea62f716ea9f313 100644
GIT binary patch
literal 17
VcmZRUE=)E0=%H|g0Swrt0stq>1K$7u

literal 17
UcmZRUE=)E0=%H|g0Swsc0VlQt$p8QV

diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 1611dbceb6eb7b4c5c30a8da9951016d5659d02e..d5e5c59d82330ed3f4165e56deffc79d7c05e941 100644
GIT binary patch
delta 143
zcmX?nfwBD};|3E6#?PBgB_6N~+_?W}d6@p%H4I>ok-C{zVFjN+-S^G;{1pLOU_piq
z=gDjJv>9)1RQw^n(ZGRmv!e%-f{QT&1A`<31A`z43!GggvszJKxzlcnQbyk<Gj9e4
b202s}hqg@E&T;H~xOHyIf5WNvZ6Fl@%Qz{Q

delta 40
xcmZp_$awey;|3E6#*dp#B_6PE)>T-*H~FcaGULjPia*3R8Wb>YcJyFU0034O4|M<l

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 290ad14c351962a4d852abb814a948352c64aef0..07e47e892fe0ae663d910f9f90050a2992264529 100644
GIT binary patch
literal 17
VcmZR+;bwJ3Kx+R{1~6bM1pqLJ1XTb4

literal 17
VcmZR+;bwJ3Kx+R{1~6bs2LLd71V;b>

diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index eadcb283719be38f0c73cf3c649f55673d10ee0e..dca601056c92248e6d1d362ac5a32c00ccbdf758 100644
GIT binary patch
delta 21
ccmaDa`Cf8E4=W?{=3dqptc+}%%eX5U0b8C2Jpcdz

delta 21
ccmaDa`Cf8E4=W?n=3dqptc<Li%eX5U0b7d)I{*Lx

diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index ca42845dd5040257614039eb61ef71df52c822a2..208834a7ab675a90bb96e24c4f98f0fa85bec350 100644
GIT binary patch
delta 2962
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

delta 3069
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
Q1IP^=j0KEEj3o?`0BQnVQ~&?~

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index cf72eab79aa673dfa0bd015910595c9e6381803e..cd3f45fa4bfe9b48393c1c7229ebd0484e14dc8a 100644
GIT binary patch
delta 64
zcmX@Jobk+Z#tAk8OvPvOCH~~x&5cwyNQpbry3uDMlYss7$I8<bKQK0Uot|s3;0ep-
Ww@jtX>>JA^v|oNp-kiyn><a*hQX8oN

delta 64
zcmX@Jobk+Z#tAk8JxzBs=WBlYs1rKn?w8#R&o=r@WD>|`3)1Lwd~tdKFYB_oU-r~)
We#=zK%>MFQvi8Pu@y(fR$-V&Q_Z`>(

diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index 4fa02fd..18534c7 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 a593e4c..74eb05a 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){
-- 
GitLab