From da78afe88cd48082f9d2f26ee71e1d2972ac2082 Mon Sep 17 00:00:00 2001
From: Amaury Joly <joly.amaury@hotmail.fr>
Date: Sun, 6 Dec 2020 10:33:16 +0100
Subject: [PATCH] Monde sombre + implementation lecture des bombes (dans
 LectureFichier) + update fichier map

---
 Images/Bombe.png                             | Bin 758 -> 668 bytes
 Images/Corde.png                             | Bin 176 -> 155 bytes
 Images/Fantome.png                           | Bin 289 -> 235 bytes
 Images/Vide.png                              | Bin 183 -> 126 bytes
 Images/prof.png                              | Bin 582 -> 535 bytes
 Map/test.gyro                                |   4 ++--
 src/VueControleur/VueControleurGyromite.java |   3 ++-
 src/modele/calculs/IO/LecteurFichier.java    |   5 +++++
 8 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Images/Bombe.png b/Images/Bombe.png
index 0ef4e394ac8f46e5bff1202353b78c1d74fc27ab..3b92c29c124963197c9144b44dc94f1de2989113 100644
GIT binary patch
delta 627
zcmV-(0*w9k1)K$t83+Ra0062?t-z5XAAbR2P)t-s0000K4gfJI04^i|5extY1Ogls
z0D^UZmxDr^h*@)HY6AlT6%Yc0aX7W3j<BDAaA7bC2LTHR0Wc!~Vo?D%E&@3;GBz<N
zJ~RSOKL7{@0W2vri-Me+ihqA;7rw8rpOv#YHbhKFTBVw@u%C{1VF;s>n~8v&B7Y$%
zIWZi#r<u>f=)tqP*2?{@nsYriA5ljsw4#gA#P7hcv(v})v7m%3Cl)X$0F{0sqmNOR
zgi%RFRD5U=H7o)~Is%h?8=i|%Q%zKMWEmzP0E=?~cw+zt1_W+f0E2A+6%qqFF94N@
zgPxP7q?o3vm~1mB07gGJyQ`zLrGKN0gruO4YHnp*dTm^|siTpIq^zH#Iy5XgGa;sv
zU7LwrQchrgY7>-wAEJ+4TvlL=eqJsp8W9fxP(uKNYyee80XHrI4h#Yk4*^R)0Eln^
zTT1~sFaZt>0SycRBpv|>2LcNU0tyKN)O~Z400009a7bBm000ic000ic0e=-JN`L?W
z0K-W{K~yMHW55j<nV4CiObB3QW9Q)HVubR*fSZSxk6%C#$^!x+HenG_F>wh=Ha01U
zh_sBXoV<dflCp}bnz{y9NK;E&M^{hZz|hFp#MBHdWNu+;Wo=_?XK(4?=;RC$a&d8W
zbGNl~aq;jJ!71bg67u%(^<V=D`GbW50t17BLqfy!0>dLBqrgJZF)^`m@wRpeF^NgZ
zDPSSujK?CBn&y(8k(rg9<C2?~UjP<jC@d-}DrR6P0aB$95mdmy001NxG0G^L(S`s3
N002ovPDHLkV1nJ-<RAb5

delta 718
zcmV;<0x|uZ1@;Ay83+ad005nmUGkA3AAbM|a7bBm000id000id0mpBsWB>pHi%CR5
zR5(wql-o-bQ5?rVGqdZ3mDTmOuD2A~OjMGTFnX}WjHD8zAYX()2%*0qdh4ZE=|y@I
zEs25zyJ#e(q@t41VwksD@8-H*5?5Ducbc8uW)m%t{J=2hoZs(!=Xbty&Jko;=6@*o
zr%+CsDCcIwjvKyAz~q8Y2!{4?ppYR_FCS0#Qd?V(<ZVT#H?!!>;8DwcMrIBc6NB$P
zc)T#TBCzUsOnSy;63p2+mtV8Aeqg%Fo{Ex8l5B~U2@iwZ9A!C^0%BMJUayM?X^fP3
znUS$T?vz7h<)=rhP7|uWRwrLPUw?te^^w`{4V08OFg35^VPidUv58by-N2xqps)K5
zd8Z!Wmd!kAZRAboGgVBhHJm;yaSId`*HK#0L{iFCjQaQJ7)LLEB06G}OzTZ9RX(Ml
zsG0<$O&PZZXa7-ARhcN4oz28(I?2W+v~@`oW_8l>VI7kZu9RAci95}%2Y+66OJtdQ
z7_cq!u0LSDPE`rw+We+I&Nb-l(qT<hW(AAh-kM`^_Bq=-(A^^uUE)*6fAja>a7Z*E
zQ`G+bl%0Q%x?9cE)HHL<dOJ88BGDL{qb)5yxrTz`3u@b~lpmidU<mJJ$Tmt;1Qh0*
zm3R|gWkq*W1X9d0ui9JGe1AWhki$8OV=?fBO&9bINaUrq(bu=Cnw=bzhTFY_N3m^i
zNMiSd56AMfn(s#wT5}FCXYW_rezRY+>qxyGGJDH4rNo<5vpe2Ogzfs+*ib_%M{oB3
zq6yi?MLv%Oj*cM`D$jY9zR1iEk*{`v!QntmFG2YkANF~HiRn-sdpizoszoPfCWrdN
z6C$hYyQ)G`f?l?!hc@A;U1Z4_i1|72J~}+`3m+T!YS`q1wg3PC07*qoM6N<$g1)&|
ACjbBd

diff --git a/Images/Corde.png b/Images/Corde.png
index 61f7ed05eb0c280ea07ac261d82a3f0dc245f7e3..9fc05990b290270b256a2b5f2086785b78a58395 100644
GIT binary patch
delta 110
zcmdnMIGb^T1SbnK0|P_;9*2Vy6&0fR1AIbUfqXe%0r?;S8BcyWKY{)Ue-{FUI14-?
ziy0XB4uLSEsD@VqP*Bv<#W6(Uaxw#>GMj{il}<7n5HKXhFz<NuqGK&k0fVQjpUXO@
GgeCxvA{wax

delta 131
zcmbQuxPftk1Sba@0|Ud{NwJ?MDk|i27I;J!GcfQS24TkI`72U@lCGXEjv*HQ$$$R;
zw`aCXxTErU{><iy4?}JyyR8slOGrscNod-n$+nnH5CyaF{`&n{Uf{95tE7a41j7_1
WUjAJV4t4<zWbkzLb6Mw<&;$SsohtPJ

diff --git a/Images/Fantome.png b/Images/Fantome.png
index e7d192fe787697d2871532e3859b62ddac05b3f3..608690d33fb49ae182882578a08a22434b8b843c 100644
GIT binary patch
delta 219
zcmZ3;^qO&kL_G^L0|P_;9*2WKim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rbbwEY
zE0E6C*Wc{#AE~ZB*VQ%0z#t_lDK<JfCo3y<Ug~+EG-rWFWHAE+w=f7ZGR&GI0Thh%
zba4!kxE$Mek+Z=-z?nHu$lBqc--W~Vg&|Dt1^@N+?@jIcS!Kh-+0gogYpLZ_t*di0
z7Jk#yES)ncYiDuNk*rCv2Mj!$9_Ib2e(%Pu6@9L5$+<K7pW|!T<YuIZZQZ?drW?=}
N22WQ%mvv4FO#p6WOH%*<

delta 274
zcmV+t0qy?l0ignr7=H)`0001;l3nru000JJOGiWivj9&3PcwmEM*si-32;bRa{vGf
z6951U69E94oEQKA00(qQO+^Rf0~Zk|3!9uoXaE2Ju1Q2eR5;76l*<i+Fc3s%BG*7A
zNIB3#EK>~)q#;(&0*6TMX*mQEBM{)vTx~zi?(CWfq#j@m41dlkE@VZx-Uk4N0N@_v
z2*&Ur2C{?2lye5-9Vf58$Jn-~Fy=T3^(X<cA~dOwtFFVdX{a8604CJ|L^fk%Qlf?|
z4XzV=G&rZ@`y0+@nl!uFM@eVLZ$(&ij+nY*yMa{yx0k(ZMYccpKib5<LSoAN4d<d6
Y`J`SH8}aIO01E&B07*qoM6N<$g4x_>DF6Tf

diff --git a/Images/Vide.png b/Images/Vide.png
index 60c9d689f9d1147129cc630a35a0cb6979478725..c4629c871c8eadf7f7e8c684e90313ff93b6a293 100644
GIT binary patch
delta 58
zcmdnaST{kEgNcEGLFmJ&r4toRHH1A~978PplO<ReCy4Ygu_PogFtCU+FkTAM4+AP=
N@O1TaS?83{1OUPd4#WTe

delta 115
zcmb>1&NxAmgN=cKVeX{ZPZJeQ6WNly-CY>|gW!U_%O?Y6*h@TpUD+RT%kW6DN|@)q
z0Sc*mx;Tbd_$UA2XW<E9@ClfeWRNA0h>RUnn<XR|etu<9s&{$h1k}Rd>FVdQ&MBb@
E0OoKaDF6Tf

diff --git a/Images/prof.png b/Images/prof.png
index 4bed498f086cc7037e87c275f3871d60c8b3d6ab..f8148d8a43a8632559833f97a19532dadb611864 100644
GIT binary patch
delta 448
zcmV;x0YCo61eXMmL4V{>OjJbx002E57)c@>aWpI7XjcDsV{&nEmrX<9ZC(F{bpLo{
zO-)V2#KiyQ;QzI%v9Yo7dT9UT;7(3Xjf;!_lZ5|=bw?~I-)L8fLOB1AfB*XV_?L+N
zc4A5+9pHX&|L5fYjeX#MaG7{>Y;0`c-QEB8^#7ib|9@=%o*9r+Q&ZsJ;Q#;s|LW)e
z)Xo3<`&3j^WMpKK$0UC~K0evm+5dTEa&mIut)>6t;1CdO92~SCA8<4@yd@<iIXO8(
zLPAMNNj*J1G}_QP00009a7bBm000ic000ic0Tn1pfB*mhyh%hsR47w@h}RB+P!I(d
z^(r>(*aflQwfBOGUEu%!M<A=w7biK%nSnnDK7rmFe}D!2^gVxqAu${Yi=iMnKr|MY
z63K*=ilwOlWU@IqFXyrua)&~(RIZdu#R9oQwWg>{Rq9o87fof1sT!F}quFYAx~*n|
z9H7UsKNun+A5noZPNuW@Vu?7W;-uAjv)$=mX@5YJj!ehHo(h1$k!z<jH^^Ns*Ne9=
qZugtF509s5*<c)7=JP@22Y?r{%@vC5UZZFL0000<MNUMnLSTZ%=GXuL

delta 495
zcmbQva*SnyWBthhpAc6D28Jpt!$+Cn|I3q~K7RD4vEYAg_W!n${}n0AmoNVh1WzCQ
z-@0n!#*H7VGX6h#uwuoE*DqiGpWO1lz0_St^L|G7)BL#q{q_HU{roY#<8N8g6gR8?
z6B_<MfAYV#_W#6&|0fULxN+nEpFjV<efd9c;{W=b|MMo?ym|BgEB5FAubln=`}f3~
zD)lurH9vm*_+Od&^y$<8ClCBTy66An2Qo5SOicC!1_oAFR|B2-XXnv}K+3r!$S)Y=
zF3JFdV-m}IpmCf99+AcM3=DjSL74G){)!Z!=yp#R#}JL+)U(%xnhXS30~9$nB`xe&
zBqaD|ZxZ{N|MgQ^0!sE6&)!)rw@LNW^f?xN-qCJ0P95n}CkBWu?NXW6Iwxg?*48TD
zOb27-MOnKp8kP7i<yPK&cjK<G<+);4Uf-5TtiGV#VPUbaW9|}Tsn}ijGHgEH$@DWi
zkh8DB;-{<RwAEkJcK=@Z_hE(A@A#6POd94-4u72_xbygZn|b;>F1HGDHYrHXnsUg%
nr%i3)3)%Jy>Ze{<x709jr#ZXN?ma33^aF#ZtDnm{r-UW|W-%iv

diff --git a/Map/test.gyro b/Map/test.gyro
index 1068175..84955cc 100644
--- a/Map/test.gyro
+++ b/Map/test.gyro
@@ -1,10 +1,10 @@
 mmmmmmmmmmmmmmmmmmmm
-m c    c           m
+m c b  c           m
 m cmmmmc           m
 m c    c           m
 mcc                m
 mcc h              m
 mcmmm              m
 mc                 m
-mc           i     m
+mc    b      i     m
 mmmmmmmmmmmmmmmmmmmm
\ No newline at end of file
diff --git a/src/VueControleur/VueControleurGyromite.java b/src/VueControleur/VueControleurGyromite.java
index 3703b42..e33d37e 100644
--- a/src/VueControleur/VueControleurGyromite.java
+++ b/src/VueControleur/VueControleurGyromite.java
@@ -1,6 +1,6 @@
 package VueControleur;
 
-import java.awt.GridLayout;
+import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
@@ -137,6 +137,7 @@ public class VueControleurGyromite extends JFrame implements Observer {
                 grilleJLabels.add(jlab);
             }
         }
+        grilleJLabels.setBackground(Color.BLACK);
         add(grilleJLabels);
     }
 
diff --git a/src/modele/calculs/IO/LecteurFichier.java b/src/modele/calculs/IO/LecteurFichier.java
index e773b86..c13e3be 100644
--- a/src/modele/calculs/IO/LecteurFichier.java
+++ b/src/modele/calculs/IO/LecteurFichier.java
@@ -45,6 +45,11 @@ public class LecteurFichier {
                     case 'c':
                         _jeu.addEntite(new Corde(_jeu), x, y);
                         break;
+                    case 'b':
+                        Bombe b = new Bombe(_jeu);
+                        r_i.addEntiteDynamique(b);
+                        _jeu.addEntite(b, x, y);
+                        break;
                     case '\n':
                         y++;
                         x = -1;