diff --git a/Images/Bombe.png b/Images/Bombe.png index 0ef4e39..3b92c29 100644 Binary files a/Images/Bombe.png and b/Images/Bombe.png differ diff --git a/Images/Corde.png b/Images/Corde.png index 61f7ed0..9fc0599 100644 Binary files a/Images/Corde.png and b/Images/Corde.png differ diff --git a/Images/Fantome.png b/Images/Fantome.png index e7d192f..608690d 100644 Binary files a/Images/Fantome.png and b/Images/Fantome.png differ diff --git a/Images/Vide.png b/Images/Vide.png index 60c9d68..c4629c8 100644 Binary files a/Images/Vide.png and b/Images/Vide.png differ diff --git a/Images/prof.png b/Images/prof.png index 4bed498..f8148d8 100644 Binary files a/Images/prof.png and b/Images/prof.png differ 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;