From 36d33e232c3786d219f84fea48a58e5ce1d288ff Mon Sep 17 00:00:00 2001
From: m19023837 <chadi.mansour@etu.univ-amu.fr>
Date: Thu, 28 Nov 2024 14:03:55 +0100
Subject: [PATCH] Rocks added but needs to be updated for the fire burning it
 function

---
 .../executionHistory/executionHistory.bin     | Bin 94827 -> 94827 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/8.10.2/fileHashes/fileHashes.bin      | Bin 25097 -> 25097 bytes
 .gradle/8.10.2/fileHashes/fileHashes.lock     | Bin 17 -> 17 bytes
 .../8.10.2/fileHashes/resourceHashesCache.bin | Bin 24787 -> 25093 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../java/main/app/SimulatorApplication.class  | Bin 3221 -> 3261 bytes
 .../java/main/controller/Controller.class     | Bin 3657 -> 3691 bytes
 .../java/main/model/FirefighterBoard$1.class  | Bin 811 -> 858 bytes
 .../java/main/model/FirefighterBoard.class    | Bin 9498 -> 9885 bytes
 .../java/main/model/ModelElement.class        | Bin 1524 -> 1592 bytes
 .../main/model/SimpleFireSpreadStrategy.class | Bin 2725 -> 3228 bytes
 .../java/main/view/FirefighterGrid.class      | Bin 2799 -> 2869 bytes
 .../compileJava/previous-compilation-data.bin | Bin 21344 -> 21348 bytes
 src/main/java/app/SimulatorApplication.java   |   3 ++-
 src/main/java/controller/Controller.java      |   4 +--
 src/main/java/model/FirefighterBoard.java     |  23 +++++++++++++++---
 src/main/java/model/Initializer.java          |  14 ++++++++++-
 src/main/java/model/ModelElement.java         |   2 +-
 .../java/model/SimpleFireSpreadStrategy.java  |   7 +++++-
 src/main/java/view/FirefighterGrid.java       |  10 +++++---
 21 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index f567d5f7ce5b11998269acfd4c7d8a9f89b82b5a..051fd35cbd1aaf2f2f60edf3b880204cfcc98c2e 100644
GIT binary patch
delta 722
zcmaF;g!T0k)(y^Gb|(2*MX5%4MkPgQl{pzk*_ml3W|<|$*`>Jxr@lC|Uop-5d~Hg8
zecY#Gesh>Ggf=&J?dB0mIPko2j^rbsU0pGM;^u_dG0vO3{;A~V^yw^&LUn1f+chSy
zJ|3x)I`ylF#s$XNlM|ndZJs>iGLw+jk*76FGW{zeXBO``6Sn6u<DBUalNiM&$IoWn
zJbAVZqrjhYI!oo>yfS6>xxBgcV5{Wh{d1aybZ;r$C<x@5x=O3&*O7a<+>A4(8>TY~
zZ%&^p$|xXLkjs8(!L}E-mzUR=JXYr4+%wOIS!n<MiO;WpIUxEZe#N#obJue)&YFHu
zgHd$z|Am>10^FHv9mV^v`!3pU78}jAU37BA;$`BcR&v{vZ9Z(g8}fKt=R1w7t-aT#
zZ8zFG*>s79bPt%ljhUH2K=xg&+OFamYwfv0Fa1?bE1g`iL_vJpGdufDkuftuW;DE2
zQ%=2bc;<s?+l^jNUcbazAa?D_jOY{743xF_mz#vz9iRMbNeIiL-fPn)2QBrNn)Li@
zXr70GTff2njwKuSh2MSoX4-b6TWpNer{^Uzipektlvs({&M)#kJ-c9ft4Uo;$Q!VV
zxxS2xCL4w-PUc&t?=kn2;|8rhL)+Qgg2K|6uRPrVcJ3-I#>u|<DXBTGIjOm+c_n(u
zIf=!^3<7ISPj4=@unN04`G!zPtXk5B9*{?O@GwrB%org$dDb!;i7cNf4o^N9h%Vp3
z|M|eSLs`GUcFvKU{BD`9Kxp-;gbB$3SpkZR9%pU3Ghwp!a#fa=S8t|G4p}};;%EI^
ziA%FieRy@_Q`F;@A5&Upfr4VI*yQ`^a+4KSSSUwM&k10aGVzgIq>w%BRrX0{27#?k
zmg}QuCC|}U7m3>$|9Jl7iz%9$m#o;&C_X>`J4fEusMH%;zXkQ=tXnp{0tL^L%~h*D
G9tQxwzE%$a

delta 722
zcmaF;g!T0k)(y^Gc4g*8$(3a$85L>CX=S-(g(YU`Md=xZ=|v_266}!;-Fz?D8Yk9o
zaCi~JGM@=UXmexNZXO}s{N!i1I~PufRo!vGZ;rhm<Gji1pGs~{pU%Q4wBlQSfX-iA
zmF;_CQq+Qi!x(2zPJAx5dGd_QOhPL-6!!_d+;}X(!TZmqLM~>;Iny5|F^Wx&pUt{?
z@@yGKfhvz1k);gkKWi?pa!~)pmOgp^oMxdb>oQdTm!@>uZQC`Cqq|U$amIARbVlLL
z>2pOH1+G0h6Ucfj+)jt{DASa#2d<lY=J_xS-FIr+CiK(p%+i}TI_ysV=VhEV{h$V;
z=;r?mGZ_Vz|LFW)uW)bH$|H&XEcK_3POezIOkBvyUbKY&+?yxIe5`itkh*j9^r@-a
zjiydEU7{g<7R=tp%*-GVo{@W^j!PuYAz{7Vx39_HCRZ#`5EndpbV*0!Vl$s5=Yy|q
zFlc&u?cUVwMkgn)Ut%qA)%xnWO^q*a@wtbU{`^?QJo(p>5SH_A7f+oWwA5dUPiI+l
zMrWB@*$Uwc4ZVqGAMQPwy4`3s8{_opdC81oG7JK@I4-+#s2)skXx?ijCDp(3FIdGa
zFUCca4MP<t^DWc&P}iF38@#YcUyc1mx3ACjsa^L$hHO!1oa~#QlA7b1lbV~FSE84k
zlUQ8LAP`tNNoM|}vW}jOx4BvjB@X_0y?E+&qc7Zy(<U=Uh)$lh%tk^u*wkW6f5#bz
zHRt|>264>U{}!a=kND(w%X9@!ORUM?{eGA7xg&G!{}@UfovgiFm1W}nCsQYfET1NE
zxAKVByz8qy+8X1he4Q=hy7D?GDBg=szMn2PSz(2Rvh?O1lPwKi+}51+NXqx*w5`kx
z0!OT4JxlIsC8Rtm{xQ9Io%H03DVm#?tk};ee&_#-ncLNt-gw~l=S+sE<@_yRpFP-I
Iwd&(>0Ft9pEC2ui

diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 41256fd6bdd2feeb94411d3f9c8abf8dd3f964bf..0be82c63efdc8504b711e35446e2a45e13b056e2 100644
GIT binary patch
literal 17
UcmZRsO8#f>m)m%p0Sp*f0W&WICjbBd

literal 17
UcmZRsO8#f>m)m%p0Rnyk05l;58UO$Q

diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index d5a8d63e3c99c5de7f76ef64fcf34933be1ab73d..27b724348ee342ec8d4b5724953555a9bdf2bde5 100644
GIT binary patch
delta 682
zcmeA?!q|C)af5DH&^33j*d0ua+u5F)do^`c|7KudoLqF3&6fcTIQB9yFz6XGFfeE`
zFfb^Buz+fgLiF5;hBtKiyH^~1WBCQ5qbVM&fq~=g<od8O1wPlMr_L@<nN-f2Yc%h=
zhb>sq4UR;JB3rh}|2@?vTZcC(?2UaNbb-11QO*0`R~Qb*I)WA6HkblY$f-a1Zg`o(
z?Y_0bY<s5964dnRF?pXk9jxf0n<_*Rqxs}mZ?(xYBLWmsW?OP>uYO(n?kLkO%foEn
zzzVN@aEB=5*}IuDl7~@Y+cP`+O_4D(LS{6)RZ~vA09JK_=P*PSU-sm;K5CPrqvRAy
zt>m^T+kDt~H{|iQ&UYGD!3wXowL%o~?42CwtHx4vwXJ7zwXfdfk5K^%Sw2%7o_sJ6
zUA}|=^MP%LvcNiSoBW3Am@_#sTAlf7+oH+c(NYQ}R-(4^i+oSdE|}hGQr8j!Rs05`
zSZ(g)T0gbPucMn3)|#H)Txwwzc5(6zp^#X$B(TD(Z3Ym9Y!;JyW6BgJJ^vb-=V9R1
zZ?L~($;N%*U`4l0?m`qXM@?3aby4_P|5oDCtWzIe-S`ysxaG$bu%a8hED%N9rjzXh
z)F!WuHD<nT$})L&fRw`g{O=rjTcc8MX#Ez{le2CCYq)J{1kn(jGPyBMZL@RSEvBG`
zXZ+Vr9s65oaOH<#n&00ru*!>WRuGk<A2CzX+)s`hwE7HfXKxD%OJlzB6s+TF+Xko(
Jt;zX`vjE6*>t6r>

delta 686
zcmeA?!q|C)af5DH(8r4NzItCojF>XNRdO>N+s?qiIJs!;hl31Yz%iMDfkDrhfq_Aj
zfq_90gas0B6^hvktUk+c=bm=#ui0a;j!g?bfHg31ESg*&R;F-JVbAF~DUbKa9TWN~
zzIm1`Skd-nbr40C2PXgbRGVxa-lQ<gB35{B4ac;*-fk_$Pit?06)u0*3{l7tHu-LN
znL=o#=Pah;r(1Z`?B?>HsVo31nj3l*qKHvxa;&%7<e3ox3a7Z&PkU056&DyjebKcW
z+Du@D8_gC$6!Q3Q=8WWFR1iFRbV*0!Vl$s5=Yy|qFlYj++P*p!qKeOR@>?IZ$<a}A
z3PM))q9y$2-aI+xW3^+4)E%(GO-qkL6!J`+9O$dYQnYF5*~!(udXqm!1t<syn_6t?
z?>OVI=G>pqAdWd;9V@==hv?w`GdVF@oq5H#^OL)yr4(*)Tz2J9J(%Foyw^%fs(&R|
z@lO3(h+<W#$+doJlV3+SDFjwdl9@lLtfOb+ZLStWiGyH;E581KC}jOIxi_Xvflp^y
zbVg^HTiFWX3k|)AW?)4-^$Q@1n6)P>$GRxotvup2@A_(ww#N7=UuVm>f)#CFy%M5`
z>-}W=0JX_$V~v@2>Q9_JJ3va|&i@xPx2r9^@xblRnG8|O`Ctt@^|wGY1Sd>xj8og}
z9CwQ;C{{;t<)#z<7nQWyQW6Ccbs#FWIUy>ApJApXb*-ts!3&G@)!1Kj`}$m;3eln8
Q1=X=-^2ZqA$xVsv06uu>N&o-=

diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index 6795a91ed07dcef1a1806b94068b6e52bc41e914..e68c6953a46e5070226bdc0295ae1d3dd8787e56 100644
GIT binary patch
literal 17
UcmZRUE=)E0=%H|g0Ss8X04Ki#(*OVf

literal 17
UcmZRUE=)E0=%H|g0Ss6@0VjR~k^lez

diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 349443662d1a52034982aba983801e0138f4ff52..efa19decb6e32ae5cef9eac1e52b8b7bcfa7c061 100644
GIT binary patch
delta 536
zcmcb7kg@d$;|3E6#zUJ;B^p=+c88lz@fJ6VW&nf4$D7y6bTab02JA3lDVqWoV@UWq
zSywJV;6bI<b*3FEn;?RTwVO-j1Q-Qg9eq-`QTb2<L^R>@<XZU$0>9sVlS!AA34sVE
z&fgrWaD!FA^YNY?jt$4lprQvStE$c9&)M@-%H_2+RLpYoR<!~~jm&r*m+x0s1VBZ_
z|3g9M(zWNd9V=c56_4I5t5L<sB;>eJ@rU?EgBz@y9X%#V)EhG}Fi0{mFbIOMKwX;b
zc8$rak4NgHPW>vPae;w>K@L^LCaKxWt~~K+p7_u~pYv8zFQ$q==X93Jzj<ZK>~nc@
z>%mr#;b>;)-cq_z5Xd!kl~zstuOs(zxiJl~J#>1b-xIM`u~VzI&5fKFiK!yt!1KmA
zl8=0Lb;bONn-gM(sbc^BiO;WpIUxEZe#N#obJufVs?a)O^0a12rhi4`%;Ftq!uCAI
ZR3cZ9%YJCVwimaTm)Dp)R^|t(0064dp+W!v

delta 69
zcmZoY!g%>0;|3E6#+{o@B^p>ZpOtB3oSY`-zWJye2jk?Y@;5eLRk*-9d9T{U&1vfC
bjGO;z6frUhW^PpcA->UI1KVatk4X{$;%*!D

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9d683f8b3c97ae148796b21c6603b9159514adfb..d0e0f9f97184b7335603179be1962ff8f3a3232d 100644
GIT binary patch
literal 17
VcmZR+;bwJ3Kx+R{1~6dU2LLe71f2i?

literal 17
VcmZR+;bwJ3Kx+R{1~6cp3IH&s1atrZ

diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index dc15d24f41d9b56ad21c677748caa45a03a443f0..b735608fdbebd05cb7e9eb1ca39511b3fbfe80a5 100644
GIT binary patch
delta 753
zcmbO#xmS|w)W2Q(7#J9w7?yA3%4cTg)$rV0&HRaxPuSDXGsM%;CqBsE**kc0Dr-Jt
z<L0ZZsf>(MCtI`2%1`HF;9!`+!_dpnC&19h&&DvDi(wAKTy}<eJPh+07HlqO7iMHx
z%*dcR*^xth@&yj|$!FQw+1MGDGBU_Pg(MmICcom?$SlcFF}aUZ-L8^>fkB^vk%5tc
zfq_+PI|JiJ1_lNuhAIXI1~#xDFGDp00|O73&B{>2Pz#n<V^C*cWT>3{nbW!+q*jW7
zje&tdo`ID?fq{=fkwJ<<i9v}$nL(351*~6;fr){EK?|xM#Nq~<$;eR0pw7U=0CI*O
z0~1&kpO*GE1{JMs3>sS77_<@Y5n^CrU|`T-U}ex`;AGHZ;APMTnQg%UF`N%>I3EMV
z@OlOY1{MZJh6V;E1}z3Qs5NsKxWNY5On%B`UeB?O!3SZ590NN81A`s|2ZKI?0D}R8
zD1#w`0)sJw27?KMHG>(*ItDF>Zm4Y>3?>Xs49yIT3<3-~3@r?;3``6f3?d9|4DAfe
z49G6f1qUd|qcIH3V2{e|W|%ySTOJ&M5YJgM@Gw|0h%i_)NHf@gZG-qt25K7*g8)MZ
zLni|x11CclLp&%77#J9g;qkYFAqL?YF0du`3@i)|V54Ah*v-(xz#zZ{N=0A;VnIG;
z07o#(4u%AT0gwcsh@_c?p`T#_0|Nsy!$fd0n8Yv{nmA@LFf&YHn8q-ZVIczp0~Z4$
M!y<+y49gfK0sFjXLI3~&

delta 688
zcmdlhIaQMD)W2Q(7#J9w7?y41%4cTc(b!zW{E2aL3u`)K!{#@vsf@N$7#YMhe6kYD
z64NU5Q_E8GO7vYpq_t)kKO4g|E(Q*U={yWQ47~yjz5Hwpv$z;$Gt6OUn9IX3k754i
zK6YV7mPL#Vs*^8p$Z@Io<mYFX7O*ocnS7SRn2~ofBj?7+hd8C|Di|0T^cff#7#SEC
zShcn@Fm7aEU|?dXWME)m0}JvpR536x@POH@4Al%ZV0kqLbp}R;ipf%3)~+D6QVeVi
z3=DD%tPJuDd<+T<QVfa=N(@R2nheTd{bCGE3=9lfQ2ihlH`q)@hFS)71}27z$+NiR
zgFz+<F|aT&FsL)IGH5VxGH5dJGH4;0zy~*hj{#yr9RmXc3j-rVJp&Vi76Ti|ECvRK
z*$iA@bF3%xaGTd}WAH(EOOAn^fq_AnfrCMhL4ZM@L6pIOL4m=DL4(1V!HU5YY?&5B
zGt@E;24jXsh9(9^1_1_bhGvEq1||j#24RL)hBgLf24n~5f&&c{rZEi6U@yz;W(b&k
zm|M;k;WrBg9tKMW5e6#;X$EVsb&$}Jfm+AIAi&Vh(80jSz{$|b5DyM#IUX@>kO^F1
zL+uz?80^71Ve!(%(9OUgzy(STVD<4lqMji2kT_I8Qp>{7$I#Efz`)Ef0UVPP874vF
fcP0Zf!(@i33^N!OFfcH1F)%VLWLV6wltB^z(3xR|

diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index 00792338e3a8a4002978bd91ac30ddd07c212774..d065bd5dfaab8640cbea20806d61f79d0867da45 100644
GIT binary patch
delta 390
zcmX>p^IC@M)W2Q(7#J9w7*<c@3TNil@Z6YupOu+c!*j9=+jJhm%)HE!%*33a{N(J(
zm)X8B&YXOLT~>ZJ7XvTD93F;=43h*HCh@Z|%;#cQz_5^=VG$3*VumG~SvZ6lS(Y<0
zs7_wbA<I{+;*+1BU0T4-u#%BM4kR==ne&A#9|Jc7Hv<DhhSqKd_DES#7ExAFHc@s_
z4pB}~uE}X!sr6C}>I_;8S`5Jq+6>VQdJORl`V8p|1`Kr!3=9Pjy$tmX4GbWV!O+Ce
z%)kgTkD-O3nSlw+YGr6<U<R|=7@8Saz^rzLW(HO;tAnALfep;+WN2n!2eY~uni)92
ztZpHOW(H0$vxlLXfs28Op?7i+cNSyc<h|S>ljC^ACad$9GfvnX&r`+7Jdt72<U71J
zhLahlFfcMOGfZV*U|?dH#xR|Mfq{pCkzpPKGs6sqSqyU-mNGCfa4|44EMr)~u!=zv
E0FmWVMgRZ+

delta 356
zcmaDYb5e%u)W2Q(7#J9w7*<W>3TNWd*qCykm5E1VvK!m<$sgI?FwU5Kk6l)N78e6A
z!)zXg2@Dej7$)+wG0fv)n9s0)onavl!y<;oo258}85x&N*5lM-S;5F4H`$O=ZgLgp
zb7>|9ZU!y}28J}P-3;uJvZ5@atfFk9?4lf^oRjOgQtKrc)EP7wv={;zv>759^cZ3p
z^chka3>fM_dLTL(>KPgsKp>5wiJ_T+5iHZf(9FODX0<XjGcbc$Z4Au}EMQhULo)*_
znAO41%)ka_buu(Fu!C7$49yH2U{*H=Lo)*>0~15f<Pz>I#@@;IxkD!3<K~*&#lth%
zlgE6rF^|~hX*{Wn%o7+UPX5PhV>pRnG6N$6Gs6@H1_maEsSMK?7#MgM7#Zd=Ff&YN
Yn8`4QVF?2R0~Z4$!%~Lj3@aHV0a>C+_5c6?

diff --git a/build/classes/java/main/model/FirefighterBoard$1.class b/build/classes/java/main/model/FirefighterBoard$1.class
index 50363e95c461a5ed1a144909bef70c30f2caf46d..c678800e340a424d63f8419f3426761f04bc6d45 100644
GIT binary patch
delta 229
zcmZ3@c8iVc)W2Q(7#J9w7)&>EIWvlKGB7cy@Gz({2rx3R2KhUC2eUJ%PYz(5&1f|F
z4Woss8Uq6ZqksehHv<od#lXR!!Jx^&$e_i*z;K&^nSqgkfgyFWCsT;<CI<FR49eRW
z1O?dqmou<<Z)9MbynsnFKZGHHA(=sxftf*@fq{VytRs^_hk=2CiGhJZmw|ynfq^HS
zok5hr7YpGB5@TRt&;zU2XE0!3U|?Y|WME)028$Rnm@qIfa4|44a4;}1FbHq}0A4p7
ABLDyZ

delta 162
zcmcb`wwjIW)W2Q(7#J9w7>qV@IWsb|GpI~XVw}yWKlvY{g{m?G0|TRg1Oqn%4~WIU
z!Jx{Z#=yv+&cML1kAazik%56BbaFIP2=hh;*2#yMG-a6?G#D5d*uXN044MoK3``6R
z3|b5f4AKl-lLeS1br@I}w86qU47v;q3@i+K3=9kgU=ckALk0#0E(S&h4h9AW1_2HL
DaRC!8

diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index 6dfe63690e08e385f5a68dbef03a51342697a22e..d90530e8d72b19736694ba88f2525b738af4bb8d 100644
GIT binary patch
literal 9885
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

literal 9498
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

diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class
index 873561ee1e63e20eb4cddda40a1cc402c0e986a1..ef86abea6c0b56da02b5a42cfd91a39108401c81 100644
GIT binary patch
delta 774
zcmeyuy@QAA)W2Q(7#J9w7-A=KtrBKqWMB>QclHkEWME{F;$e_xkeRqug<Fn6o}EF4
zhe3fsapDt2Ze<1)b_P`*1~mrt$pVa_9LfxuJPcY4+LLn`)!1}-81xwQC(mS55;9_B
zU`fg;P32->WH14#FrD1TBsTdmqg0#)BLj0$Y6=Gf4+n!aBLhcDVo`Q_QEDXz13w3Y
z9U}t^gd@bk;K<0pTAq<vlFGp#%E92m$iSLZlwY35!63oG;Lgavm6MsCQQ`y=0$Jn9
z!{Ei>z1f4wmyuPOfq{W@@+@Y9dIw1c2?jO>1_mLJ+ZY%Gq(DAnU|?Wl;AHS&@Md6S
z@MU0NP-0+Y00FK|43gUzWDhXNZD3$vU}W$Es|3lhFmN)cG59kufz_KZFoAV&2{CHz
zU{E^1zz9;$grYuxfq}t+2cnE2kU^h;fgy;2fq|8gfuVtcfr&wj!IXg+Y?=oHGXo0)
z0|Sqiw#;@04K3ZR3_2SbKx+IZH?j!VgG>@*U;?RN2nPFxfdL%W49s97d6^j)1Q;Ng
zfq@|etTmK@ks*vB9O^-R21c+;Shcn==%Blmj{#%@#Hp+h8w9vOp$XB<!{7;a9s`4+
z0Q+QlR`vQw0k%yHV!<GDP{W9WA%Y<iqKl!IffW>_428QH7$b!Yn1u|tGZ=4XU<Px|
zScJ^MTy`+ml2ynG%;f@eZP<it!CYQ2*PdO-0n8NubDi8cgq*>AVKCoSfKA8^%op3i
h;IWxO5)^h2cX5G3jg=vbfrWty8Zc1|(cl1z0RX**YB&G@

delta 716
zcmdnN^M#x1)W2Q(7#J9w7{VuVtzwj%cwB{Bnn8x0L6V0-mO*afH$`p*21RxTB_0N4
z29?Q5jG-I~3~D?K>I@o_>lxM9w0Ib_8FVJEW>gZ=XJlYW$|+6dVqj!21gS8Ze4o+4
z+mw-kxhOS-gMo*G!Ge*2BPFpYJH05il7oStgTb1Sfd#@5;$X02WMD1N$Sg_aU=ZbC
zaAag)O)APS&jXp~%){Wq;JP`N$(NB;fq{X6WAc7xgL(!bkmU>v0#XbT43Z2C3~UUX
z3~mgr42%r!3=9lP42%pQz_p1%Y#W2r0S4&}3=9m63?5*WAUPHWP6lNLPX;EidJ_gF
zunsOEMy(wT@&_0gLF$=M)O#^7Fz`TBG1PlA=rAxa_%JXqure|*G%zqQF{m>bF))Ko
z^I%|RU;(Mt(w5oIpsJ<2l|geO14s?Xem(|f1_lOB1~vvR25ts!29UX83``*P489C(
zAZIgxgO-6AYymGb1A_nq1T!!&_<;-xXYglWWC&mgg!)&Xff4L7R;?`zn&?jF16u)c
zIxEBq0WMIWLNz;q9m~L=CBQb>hgH2Eq#re?I2eK$f}yHw8CbziOx(@D7%8O7ETp%c
z!C*53Gni}4B4h&QvV*y1tU~5sE*F?<$tGk4=JJBMHta&SV6Fg|YtJF%0OIO12=8EU
i+RPvZ3Nna0xWK`~$`HlC!oUOx0frEUP*6xPgaH5;1X|Sq

diff --git a/build/classes/java/main/model/SimpleFireSpreadStrategy.class b/build/classes/java/main/model/SimpleFireSpreadStrategy.class
index 595ad5f73d206af2527a6fdd05093fffdca17a2e..99f37d9599a845f4357686ac641025aef33c3430 100644
GIT binary patch
delta 1697
zcmZ1~I!BW0)W2Q(7#J9w7#b&XZK&sAWDv~FFU>1S%*+eOFU~B<%+D+4WZ+;B<zWzG
z;9+FoEy_<!L6MQ*VUPsL@D=4JXBVSLN%JtsFvv18uoRc17BDg}dU7$yGbpe#DDp5U
zF(@-Kh-M|0CF+-!Waj8Q=jY_4CQp2(!KgZ!pHV_bg@Ku!L4%P&5TV2)u{a|*wS<d7
zoq?H~L7PE`ok5p}L61RyaxkMAw;_WOJA*L~g9(G_<SC5m&V~%;JPZ~LmW&K6d8rj8
zj0_?gnm%B|auV~>_5G8wQj<%p*%_=E8F;}ifVrHDfrG)8hry1)e)2y?V-9TwM;-<z
z2It9^OzJAG436v!Zj20kV1vNgd@_qmxEVYcJlPq%co@7Hd?vRr#qhc^=zz@e=V1t7
z2%P+uNrOY1A()3DgdudYEVG;h$ob(s3=s^Wj0_yf`QYF#W@m_+Y{#s_7&AGW*^(oY
zA&!TEl_7re8fGcR#L35*+Zg>P`?1JR_Ggir9L2)V9GqG*Ifo@q9~57p=t2ZNBZHVv
zesW??SYlCTVp2|ONM%842#CSRa8zURb7qCftgMb;8pM9itgzXQRgsa0J1?~y76_A5
z*{0PeFt9NQF>o{RFfcMCF)%PNF(fkxG4L}8!1*Z*LJY!a@?vOwNi@C;gDe9B0~-S)
z11m!+0~13U0|Ub&1||k}1_lN-t?dkqTH0F~*tK-F)-&*G>275Z)RJV`${?a8$-0$6
zTuYQ~D}&TV1_lOZhI9r71|<d#1_lN`1{MZ>22KV620jKs24Myv21y2C26+Y%22}=8
zh71M<1`mkw44DjB3?QHe^%etz8rVZjAj=uD8F(0&!7Pv`>RG@{ko#G|ERf6D7;+dG
z7)%%-BHRqg42)noeufkVm?6n<Ly{R_W+XGPLc=hZfsrAPK^f}vUkuD(v!b-NFi5c$
z%w%BS!63I`H-k##_Id_2pWO`Vk=q$GeYLhQu<vBhVr1~s-N|6U$S{*ZLU$*F86(31
z1}iHTElC!gZ45Tc|33w()7i=3z{C))t+SKC1w?OPU|?VYhn5xt7Xt%>Bm*ad6az1V
z41*|xEQ2hAJcBiZ0)rESB7-Y~5<>ukGD8G|3PT1%Jp+Rl0}F#S13N=LLjl+)QP2Ps
zWpHIEWGG@_WRPXBWhiFgVPFD>ix>kF14OO_E|<)}#8Aq>z#zoH%=?c)lAXbook5$O
z!SEM@EHp&Q7??oW4H_bM7?>H@7#J8_>$SEp@M`a1klV@N&dhLt!4>3pUq%Ki7D*Op
zAgF*?&`@C2l4RY+;5U<jM@N!%CqobuL-_LlH$X`R;&~~ssp<@Z3>pmj44MoU3|b71
z3_1)h47%VX0*X_81|f!Wh5~SmxYk2G%fR3Y4ggR@yFxuH$Y8=y!BE7&4EHujRWSp|
zvk<uw24=9g`5Bo1LVazh{)>SL>gP%ZCQ#A9zz9zNJq%3X)MKT!g+WkzCqoz$!z_k+
z0j(_zA`sq823F=ZT3Z;zVO$|ldSNe^#lX(8oPmXT4a*vMo)7~&U!OsW!GJ-A!H7YV
z!I;5<!4&LCPy{hBSiyZ}#Zbjiz`zK0DF*|q6r-dABLf2?Lp6gkgD)g+nlLbf(>T{|
zhR8^v=<N)#`@v-aDEonOF~~Sj76X+M3=CXQqao!*83Q9j4MQy`W+x|biRmNs*n^z|
S(Zh<Or;dRUl=K*w7#aZZ9u#8$

delta 1270
zcmbOuxm1+v)W2Q(7#J9w7>XxyZIBdUWMC;SNiASxVD#i-5MvN$XOQ4wkYtdWtj1_9
zFT=<noRwIXs9#!=nWOJmRFqihlUZEC#URbV%+4S`xq(qkK#qZ#n?Z>|nVms}he4G=
zZSpckGj0tAO?Cz?9tLd&oypG`)j2d6^mrKb84M<iF)2tJF*5Li4GhRH&Me8y&*Ng?
zU@+lfFl8{C9LQwMp~PUp!(ho^HMxgLUB!mMf}O#Zk%1544v-VL8SEJx*clvo7@QcK
zCtqiZ;k98<2ASi=!{E-~G1-AxgF}hIi-*CR!Dn&-vm7%!gWu$3%sPw#lP@z{D*G}7
z@i4G51T!*-YWRRn&PmKm*AFf!%FIi*)(m532%W6Y(#EJXc^ixTWG2?w$;GUaOsN`^
z-?M5@-pOjV*`H03adI8|l==_`W(FY!ZU!C(Musp31_maEa0Vd;eg*+JKY~GsL6|{=
zfq{XIfsuigA(DZKA&P;4p@V^mfrWvAK}2gi1EZGqRt9!0ovjSKTC!Ui1UE7;FfcPj
zGcYiSF|aZ)FmN-lFz_&NGVn6+G4L@6Gw?ISFfcG^F|gEw3}A?5h+_Z&5vW5L7(~EM
zU;@j6EN5nj2O9<v;bsVDU<AwYGej^jK^>mJz{rruAO&^aF9v3?)lpho7z9}hW-_qv
zU=ZD~n?X8qJA<sxZU(u??F<UO^;%mP*mp80GBWt-?qpDBWSGeyp}UhomyzKBgP|3R
zmL!YLHU{J6|DS@?>Fi`MXJQD~*4fEm4Wc(NFfg!yeW}I3#lXNI%)rSY!obTQ#vsZd
z&LGPm$zaVO#o)vs&EU!)!w|qA%MigJ2lF|DH3K_CQU*gZI1r<tVIa!j%8<g4%D~7V
z%V5ip#=yhC1ot^aE*&lx&cMWw!N9;E#K6q^k3o{1!G@hdiJd{?7lSM`L^2teK&cWG
zB9j}rgzH6jGT1RQ9AK~kdDexI!HPwa1?p=R5DV&URxL@^Z49n68F+LgS$8scGBJcN
z|9=A%rx4#tF|aW(FeowzGAJ?VGbl4yFsLv%GN>`QFsOrlXTreBpwA%0kj0P;jsjPx
z=js_4Tp5xWlEHE33iX{Jg9$@6Ln;Gu41?rAzJti6Gcbew$<M(27wSz7^<VI4&tYI<
zaA)vfU<9X1GX_QmP$FSsSp!bZpfm_dw+sxL4E3NyCkBy*Iti5EAueKM$c3jJ69#6m
z8@YBf_(lr(Z)XVHk7k%2*rT9K!@$4=H4Bn`G8q^d@)+_#Va~w7pwGYvHi;FKeoR3L
Zh6$WtAWkwyGKCezlmZ4uhC;BNMF1grvzq__

diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
index 09f09cb8b7734d04883d1aa19b58d938f72c765a..2b66bfdf17fed85e7539d1b0a714e09803e4efaa 100644
GIT binary patch
delta 849
zcmaDax>bzp)W2Q(7#J9w7&dR@iestgWC&uY=3%H|2xnwq4f1#P4(4QtWT@j|sAq^}
zWZ?1fboU4e_KtM&33cUS@MUP^VQ6A#W@KPXPc3oI&tYU>*3k3>Nwo4Xw812T^2@mx
zbQwB$7&;jY85uazGIMf*Qj<$SCU^5N^ngs}1e@$`733HRQrpMF(9e*_$iP{gS`u7R
zl%Jgn5}nAyFbQM=S20)!WCj-l2g4K|hN%qGCVykG7oEYwFcV}Pi#yby**pw$HhZyN
zV`Q8=S&>~#eI5e?0~-S)0|Ns$!+Zt?1|Be*m0<zHLIwr~MutTUiy0Uh=1z`dw_}_)
zc`my;KS-4w0~-SagDyzb<jd^l!b`wr%w=F;;$`3j$uUYymgO*Dd@|XOL$^Lfl64b9
z(lQ2K?M)1++Zf`OGX#M|G9V(^U=at9NFGF_5G<kx5-EX*l!HZNKq6HTky@|_m-Z$G
zkbZ4RmTe3TT3Z+dGTK4R7OgD|!Wr!#fp#tTEeyi#+ZfulH!*Z=W9Y@J7NT^*^8b=r
z+S?c=Z)9L#U||4-Q5u8fWPMKOdJ~5A45kb_8O#|DFjzA@VX$F%&0x#O&tS(W#Nfy%
z&fo+NMH2>A1{a3Y3`-f7F|aWBG8|%9&JfPP%3#fKg<%E5N(N>I21W@`=rJ%b@G^2U
ztYTQrz{s!$8vYPfYZ;gs)-f<JXftqe{AG}5XV7J5u%G;rQ$R<M?LR{x0~0#~2Rnl<
z0|NsSD7rzh#K6FCfq@fbIzyQDCWh(T7<wnGa49g(n(WG@mNu(}iE;V=dmukCgZ-q$
zz`?-4;Ksnt;Lae(;K885;Lf1O;Kg9U;LYIA;KdNi;0yMR76S_dCxa@(dIlZ_CI$lr
eRfY{<76U^V)DIvQ#1HExU*r;J2id{Iun7Pu*SkUh

delta 827
zcmdlg_Fk0h)W2Q(7#J9w7}jp&iestgV(?|C=3%H|sAXheOHVCv&d*_FVAjy|1WDBM
zFf_m<g7V9`7<3t$co>=)3>g_X(lT>$f>M)9I2j@tT6q}S7-AV2IDI_bJwn`r93w$W
zJ9rp684?*8IEzzDf=i0>vr|E$-8>9EAOpCHK|=hgATziaI2ihP82T9|OjcyI7oEhz
zFd1YV3(TacJPgw|m$F`Cw42Vrz@X2-$iT?Jz`&}toq=&90|NsS!wd!n1~#xDH^WQ@
z1_mB5o0VY}!)yiy21bTC409P68KzI}WVd6SG5G|$IzLF29RnK!1A{I|)#QKd=EC#9
zW=v;bVEn|u36f)Eo9w}1z<6nLC5LW(kR<CShNNW-yxN->QnxY0EoX25iDW=TvcV#H
zAdx(XNFi861|(7f5h(|YaA|L10IAlNWZA}0rL~1YAfp|`tkc@UAe_+-5&#jx?b{d{
zwKp-eY-4B#DK#aawrlx+Z7uC>485QbVF8Co9E14e98TwYQ-*a6mJF8|tQc-GSTp=(
zuwi6iuxDgtZ~%vu2?HyG3&T!^`3wsfSQva6HZUw?2xnkrux2>Ku!vzX12Y2yBO54;
z7#J9M8GbS>VOYw*$gm6=$`Dn{8JHPXFfcG^F>rGHWsqlQ&}C<^|Hoj)&fvk$VC>7z
z5F{ulD9HAoA&`NIoq>a$K^Git{R|U8(ZayMaDjmnWD!G{_9ljj+Zfs>XK^VoPMO@z
zrB*+sg^6+b|9c>BF@wFO#K6J8z~I8b&fv-*$l%7H!QjfE$Kb(W!Qjc@&)~rj%HR$5
zm=*&I11Ezj!%7Ao1||jr233YtU={;I7}Pr;7Q{Os#|tp9{9)i^{KcU1hk+49F)%W$
KW?%)SuQdR{kg(DK

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index a8677ee28dfc53505bfb2ab19387baa449307753..687f3d658c2b5616b6cc79b89347e94a27d1cf12 100644
GIT binary patch
delta 206
zcmaE`jPc1b#tAk8C03%g^NV~>&n}qWYEst{GSSCSVAAuip?Mw#Zv6)PJC<zR7e28!
z*D%Xxio=r+2BOP%@P9tA?NFAiC!-ugcV1>mW@1ieRcevI+)s`hwE7HfXKxD%OJlzB
zbh0+1yuh|+cJ`YhV`hZRXn3opoO)q$6r+y7&-%9#mu8*%@ao2=sK+forc9p3XezMQ
z^z`OZ3#+h;lWz!x#HuAtzRh?`pwvoko3hP^jdw#HZ|i)gadq=irdVcPHtm<+l9yiJ
PVv;WY=gwwrHd9{!>*-&X

delta 202
zcmaE|jPb!T#tAk8w>U1la;P3maA@9ZB_-9ra-xr+0H4mX=#0)Xx3U$&7aDpK%_jEd
z8VU!ST5Rd>IODM9+@H`OjybZPjB*U!d6^}di8+~7sYL?nT2p<47Z&NOvA^i{^|?NE
zvNof<fZ)-iOF9}CoB1p`AAEI#LDS?YMje5>l}EhhU0?0d))+tK>ued<$<r831p+H4
z$;_Wr*3q-^Hdl+G#KFn88E**)S=o!0@Sl70<d~1ujvZ2WHXmh*W#(kne)%nV>Gdrp
JoAudDeF5OuROJ8w

diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index cb0f20e..acce2f1 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -22,6 +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_ROCKS_COUNT = 5;
 
     private Stage primaryStage;
     private Parent view;
@@ -49,7 +50,7 @@ public class SimulatorApplication extends javafx.application.Application {
 
         Controller controller = loader.getController();
         controller.initialize(BOX_WIDTH, BOX_HEIGHT, COLUMN_COUNT, ROW_COUNT,
-                INITIAL_FIRE_COUNT, INITIAL_FIREFIGHTER_COUNT, INITIAL_ROAD_COUNT,INITIAL_CLOUD_COUNT, INITIAL_MOUTAIN_COUNT);
+                INITIAL_FIRE_COUNT, INITIAL_FIREFIGHTER_COUNT, INITIAL_ROAD_COUNT,INITIAL_CLOUD_COUNT, INITIAL_MOUTAIN_COUNT, INITIAL_ROCKS_COUNT);
     }
 
     private void showScene() {
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 1b7d8c4..fd265eb 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -33,9 +33,9 @@ public class Controller {
   @FXML
   private FirefighterGrid grid;
 
-  public void initialize(int boxWidth, int boxHeight, int columns, int rows, int fireCount, int firefighterCount, int initialRoadCount,int initialcloudCount, int initialMountainsCount) {
+  public void initialize(int boxWidth, int boxHeight, int columns, int rows, int fireCount, int firefighterCount, int initialRoadCount,int initialcloudCount, int initialMountainsCount, int initialRocksCount) {
     // Initialize the simulation board and connect it to the grid
-    board = new FirefighterBoard(columns, rows, fireCount, firefighterCount, initialRoadCount,initialcloudCount, initialMountainsCount);
+    board = new FirefighterBoard(columns, rows, fireCount, firefighterCount, initialRoadCount,initialcloudCount, initialMountainsCount, initialRocksCount);
     grid.initialize(columns, rows, boxWidth, boxHeight, board);
 
     // Initialize timeline for automatic progression
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index cdc229d..55c698b 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -14,6 +14,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     private final int initialRoadCount;
     private final int initialcloudCount;
     private final int initialmountainsCount;
+    private final int initialrocksCount;
 
     private List<Position> firefighterPositions;
     private Set<Position> firePositions;
@@ -22,11 +23,12 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     private final Position[][] positions;
     private List<Position> cloudPositions;
     private Set<Position> moutainsPositions;
+    private Set<Position> rocksPositions;
 
     private int step = 0;
 
     // Constructor for FirefighterBoard
-    public FirefighterBoard(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount, int initialRoadCount, int initialcloudCount, int initialmountainsCount) {
+    public FirefighterBoard(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount, int initialRoadCount, int initialcloudCount, int initialmountainsCount, int initialrocksCount) {
         this.columnCount = columnCount;
         this.rowCount = rowCount;
         this.initialFireCount = initialFireCount;
@@ -34,6 +36,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
         this.initialRoadCount = initialRoadCount;
         this.initialcloudCount = initialcloudCount;
         this.initialmountainsCount = initialmountainsCount;
+        this.initialrocksCount = initialrocksCount;
 
         this.positions = new Position[rowCount][columnCount];
         this.firefighterPositions = new ArrayList<>();
@@ -42,6 +45,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
         this.cloudPositions = new ArrayList<>();
         this.moutainsPositions = new HashSet<>();
         this.roadPositions = new HashSet<>();
+        this.rocksPositions = new HashSet<>();
 
         initializeBoard();
     }
@@ -70,6 +74,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
         for (int i = 0; i < initialmountainsCount; i++) {
             moutainsPositions.add(new Position(random.nextInt(rowCount), random.nextInt(columnCount)));
         }
+        // Initialize rocks positions
+        for (int i = 0; i < initialrocksCount; i++) {
+            rocksPositions.add(new Position(random.nextInt(rowCount), random.nextInt(columnCount)));
+        }
 
 
         // Initialize neighbors map
@@ -120,6 +128,11 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
                         result.add(ModelElement.MOUTAIN);
                     }
                 }
+                case ROCKS -> {
+                    if (rocksPositions.contains(position)) {
+                        result.add(ModelElement.ROCKS);
+                    }
+                }
                 default ->{
                 }
             }
@@ -145,12 +158,13 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     @Override
     public void reset() {
         step = 0;
-        Initializer initializer = new Initializer(columnCount,rowCount,initialFireCount,initialFirefighterCount, initialRoadCount,initialcloudCount, initialmountainsCount);
+        Initializer initializer = new Initializer(columnCount,rowCount,initialFireCount,initialFirefighterCount, initialRoadCount,initialcloudCount, initialmountainsCount, initialrocksCount);
         resetPos(firePositions,initializer.getFirePositions());
         resetPos(firefighterPositions,initializer.getFirefighterPositions());
         resetPos(cloudPositions,initializer.getCloudPositions());
         resetPos(moutainsPositions,initializer.getMountainsPositions());
         resetPos(roadPositions,initializer.getRoadPositions());
+        resetPos(rocksPositions,initializer.getRoadPositions());
 
         neighbors.clear();
         neighbors.putAll(initializer.getNeighbors());
@@ -187,7 +201,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
 
         for(ModelElement element : elements) {
             Strategy strategy = switch(element) {
-                case FIRE -> new SimpleFireSpreadStrategy(firePositions, neighbors,moutainsPositions,roadPositions, step);
+                case FIRE -> new SimpleFireSpreadStrategy(firePositions, neighbors,moutainsPositions,roadPositions, rocksPositions,step);
                 case FIREFIGHTER -> new FirefighterMovementStrategy(firefighterPositions,firePositions,neighbors);
                 case CLOUD -> new CloudStrategy(cloudPositions,firePositions,neighbors,rowCount,columnCount);
                 default -> throw new IllegalStateException("Type de modèle inconnu : " + element);
@@ -249,6 +263,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
         for (Position moutainPosition : moutainsPositions){
             updatedElements.add(new Pair<>(moutainPosition, ModelElement.MOUTAIN));
         }
+        for (Position rockPosition : rocksPositions){
+            updatedElements.add(new Pair<>(rockPosition,ModelElement.ROCKS));
+        }
 
         return updatedElements;
     }
diff --git a/src/main/java/model/Initializer.java b/src/main/java/model/Initializer.java
index 575b4dc..07cff90 100644
--- a/src/main/java/model/Initializer.java
+++ b/src/main/java/model/Initializer.java
@@ -14,6 +14,7 @@ public class Initializer {
     private final int initialRoadCount;
     private final int initialcloudCount;
     private final int initialMoutainCount;
+    private final int initialRocksCount;
 
 
     private final Position[][] positions;
@@ -23,12 +24,13 @@ public class Initializer {
     private final Set<Position> firePositions;
     private final List<Position> cloudPositions;
     private final Set<Position> mountainsPositions;
+    private final Set<Position> rocksPositions;
     private int step = 0;
 
     private final Random randomGenerator = new Random();
 
 
-    public Initializer(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount, int initialRoadCount,int initialcloudCount, int initialMoutainCount) {
+    public Initializer(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount, int initialRoadCount,int initialcloudCount, int initialMoutainCount,int initialRocksCount) {
         this.columnCount = columnCount;
         this.rowCount = rowCount;
         this.initialFireCount = initialFireCount;
@@ -36,6 +38,7 @@ public class Initializer {
         this.initialRoadCount = initialRoadCount;
         this.initialcloudCount = initialcloudCount;
         this.initialMoutainCount = initialMoutainCount;
+        this.initialRocksCount = initialRocksCount;
 
         this.positions = new Position[rowCount][columnCount];
         this.neighbors = new HashMap<>();
@@ -44,6 +47,10 @@ public class Initializer {
         this.RoadPositions = new ArrayList<>();
         this.cloudPositions = new ArrayList<>();
         this.mountainsPositions = new HashSet<>();
+        this.rocksPositions = new HashSet<>();
+        initializePositions();
+        initializeNeighbors();
+        initializeElements();
 
     }
     private void initializePositions() {
@@ -71,6 +78,7 @@ public class Initializer {
         initializeRoadPositions();
         initializeCloudsPositions();
         initializeMoutainsPositions();
+        initializeRocksPositions();
 
     }
     private void initializeFirePositions() {
@@ -85,6 +93,7 @@ public class Initializer {
         addRandomPositions(cloudPositions, initialcloudCount);
     }
     private void initializeMoutainsPositions() {addRandomPositions(mountainsPositions, initialMoutainCount);}
+    private void initializeRocksPositions() {addRandomPositions(rocksPositions, initialRocksCount);}
 
 
     private void addRandomPositions(Collection<Position> targetCollection, int count) {
@@ -142,6 +151,9 @@ public class Initializer {
     public Set<Position> getMountainsPositions() {
         return mountainsPositions;
     }
+    public Set<Position> getRocksPositions() {
+        return rocksPositions;
+    }
     public int getStep() {return step;}
 
 }
diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java
index e3b3844..8db860b 100644
--- a/src/main/java/model/ModelElement.java
+++ b/src/main/java/model/ModelElement.java
@@ -2,7 +2,7 @@ package model;
 
 
 public enum ModelElement {
-  FIREFIGHTER("blue"), FIRE("red"), CLOUD("darkgrey"),ROAD("grey"),EMPTY("white"), MOUTAIN("brown");
+  FIREFIGHTER("blue"), FIRE("red"), CLOUD("darkgrey"),ROAD("grey"),EMPTY("white"), MOUTAIN("brown"), ROCKS("lightBrown");
 
   private final String color;
 
diff --git a/src/main/java/model/SimpleFireSpreadStrategy.java b/src/main/java/model/SimpleFireSpreadStrategy.java
index 0f7c42b..84e2c39 100644
--- a/src/main/java/model/SimpleFireSpreadStrategy.java
+++ b/src/main/java/model/SimpleFireSpreadStrategy.java
@@ -8,13 +8,15 @@ public class SimpleFireSpreadStrategy implements Strategy {
     private final Map<Position, List<Position>> neighbors;
     private final Set<Position> mountainPositions;
     private final Set<Position> roadPositions;
+    private final Set<Position> rocksPositions;
     private final int step;
 
-    public SimpleFireSpreadStrategy(Set<Position> firePositions, Map<Position, List<Position>> neighbors,Set<Position> moutainsPositions,Set<Position> roadPositions, int step) {
+    public SimpleFireSpreadStrategy(Set<Position> firePositions, Map<Position, List<Position>> neighbors,Set<Position> moutainsPositions,Set<Position> roadPositions,Set<Position> rocksPositions, int step) {
         this.firePositions = firePositions;
         this.neighbors = neighbors;
         this.mountainPositions = moutainsPositions;
         this.roadPositions = roadPositions;
+        this.rocksPositions = rocksPositions;
         this.step = step;
     }
 
@@ -45,6 +47,9 @@ public class SimpleFireSpreadStrategy implements Strategy {
         if(mountainPositions.contains(newPosition) || roadPositions.contains(newPosition)){
             return false;
         }
+        if (rocksPositions.contains(newPosition)){
+            return step % 4 ==0;
+        }
         return true;
     }
 
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index 39af292..16c1969 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -41,14 +41,16 @@ public class FirefighterGrid extends Canvas {
             // Set the color based on the element type
             if (element == ModelElement.FIRE) {
                 gc.setFill(Color.RED);  // Fire is red
-            }else if (element == ModelElement.FIREFIGHTER) {
+            } else if (element == ModelElement.FIREFIGHTER) {
                 gc.setFill(Color.BLUE);  // Firefighter is blue
-            }else if (element== ModelElement.ROAD){
+            } else if (element == ModelElement.ROAD) {
                 gc.setFill(Color.WHITE);
-            }else if (element == ModelElement.CLOUD) {
+            } else if (element == ModelElement.CLOUD) {
                 gc.setFill(Color.YELLOW);
-            }else if (element == ModelElement.MOUTAIN) {
+            } else if (element == ModelElement.MOUTAIN) {
                 gc.setFill(Color.GREEN);
+            } else if (element == ModelElement.ROCKS) {
+                gc.setFill(Color.LIGHTSKYBLUE);
             } else {
                 gc.setFill(Color.WHITE);  // Empty space is white
             }
-- 
GitLab