diff --git a/MAVENProject/pom.xml b/MAVENProject/pom.xml
index 372289e333c89132aa2d301bf805342bdc9c5771..7fb5714476bf788c3e899257dbc6844ee8753a4b 100644
--- a/MAVENProject/pom.xml
+++ b/MAVENProject/pom.xml
@@ -14,6 +14,13 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ </dependency>
+ </dependencies>
<build>
<pluginManagement>
@@ -34,16 +41,4 @@
</resource>
</resources>
</build>
-
-
- <dependencies>
-
-
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>junit4-runner</artifactId>
- <version>5.0.0-ALPHA</version>
- </dependency>
-
- </dependencies>
</project>
\ No newline at end of file
diff --git a/MAVENProject/src/main/java/engine/MenuPanel.java b/MAVENProject/src/main/java/engine/MenuPanel.java
index c8e0d2888eef8a0045c67d4b94b3905e65d2c451..b305d91af1a840d90a99be77b9ecf2ae56126974 100644
--- a/MAVENProject/src/main/java/engine/MenuPanel.java
+++ b/MAVENProject/src/main/java/engine/MenuPanel.java
@@ -87,7 +87,11 @@ public class MenuPanel {
}
public void menuChoice(){
+ JLabel label = new JLabel("<html>déplacement touches directionnelles<br>attaque touche 'q'<br>saut touche 'espace'</html>");
+ label.setFont(new Font("Arial", Font.BOLD, 24));
+ label.setForeground(Color.RED);
gameChoice = new Panel();
+ gameChoice.add(label);
button1 = new JButton("Personnage Distance");
button2 = new JButton("Personnage Melee");
gameChoice.add(button1,BorderLayout.CENTER);
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 6556ea562effa016d2733c33d4d0af33f4d81512..f8f7992824286c83e43e20a86edd5dc1db91acf6 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -62,7 +62,7 @@ public class Jeu implements Game{
private boolean characterAttacking = false; //boolean necessaire pour rendre l'animation d'attaque prioritaire
//liste des coeurs drop par les monstres
- private static List<Hearth> hearthList = new ArrayList<>();
+ private static final List<Hearth> hearthList = new ArrayList<>();
//Sol du niveau 1 :
@@ -88,8 +88,7 @@ public class Jeu implements Game{
public final static int TILES_IN_HEIGHT = 60;
public final static int TILES_SIZE = (int) (TILES_DEFAULT_SIZE*SCALE);
- private static final LevelManager levelManager = new LevelManager();
- ;
+ public static final LevelManager levelManager = new LevelManager();
public Jeu(String source) {
@@ -227,7 +226,7 @@ public class Jeu implements Game{
@Override
public boolean isFinished() {
- if(gameCharacter.death() || getMonsterList().get(getMonsterList().size()-1).death()){
+ if(gameCharacter.death() || getMonsterList().get(levelManager.getIndexBoss()).death()){
return true;
}
// le jeu n'est jamais fini
diff --git a/MAVENProject/src/main/java/start/Main.java b/MAVENProject/src/main/java/start/Main.java
index 617b07b6230abf3841aad4c9b396e5ef50542af2..44acc255e1c3427ddb62b700e953cefc3bb5c639 100644
--- a/MAVENProject/src/main/java/start/Main.java
+++ b/MAVENProject/src/main/java/start/Main.java
@@ -43,13 +43,18 @@ public class Main {
mp3.stopMusic();
- mp3 = new MP3("failsound.wav");
- mp3.displayMusic();
if(getGameCharacter().death() ){
+ mp3 = new MP3("failsound.wav");
+
+ mp3.displayMusic();
menu.menufin();
mp3.stopMusic();
}
- if (getMonsterList().get(getMonsterList().size()-1).death()){
+ if (getMonsterList().get(levelManager.getIndexBoss()).death()){
+ mp3 = new MP3("audio.wav");
+
+
+ mp3.displayMusic();
menu.menufinVicory();
mp3.stopMusic();
}
diff --git a/MAVENProject/src/main/resources/Music/audio.wav b/MAVENProject/src/main/resources/Music/audio.wav
new file mode 100644
index 0000000000000000000000000000000000000000..2d7e2f57a81d0b9e26e8dd3b530044b77ea4ed56
Binary files /dev/null and b/MAVENProject/src/main/resources/Music/audio.wav differ