diff --git a/MAVENProject/src/main/java/entity/Entity.java b/MAVENProject/src/main/java/entity/Entity.java index 7d59585c860f7b8b2d4a6a528e0a190cb923d996..071ced1771f6e4b538e5f98dd9479cf043fd9b62 100644 --- a/MAVENProject/src/main/java/entity/Entity.java +++ b/MAVENProject/src/main/java/entity/Entity.java @@ -18,7 +18,7 @@ public abstract class Entity { final double vitesseMax; HitBox hitBox; int attackStat; // nb de pv enleves par attaque - int maxLifePoints = 3; + int maxLifePoints = 10; int nbLifePoints = maxLifePoints; final double entityWIDTH; final double entityHEIGHT; diff --git a/MAVENProject/src/main/java/spotify/MP3.java b/MAVENProject/src/main/java/spotify/MP3.java new file mode 100644 index 0000000000000000000000000000000000000000..9ad56f8e1372f430629253cbea84bc76c6eee1a9 --- /dev/null +++ b/MAVENProject/src/main/java/spotify/MP3.java @@ -0,0 +1,42 @@ +package spotify; + +import java.io.File; +import java.net.URL; + +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Clip; + +public class MP3 { + String filePath; + public MP3(String musicPath){ + String fn = "Music/"; + URL url = getClass().getClassLoader().getResource(fn); + assert url != null; + String path = url.toString().substring(6)+"/"+musicPath; + filePath = path; + } + + public void displayMusic(){ + + File music = new File(new File(filePath).getAbsolutePath()); + try { + AudioInputStream audios = AudioSystem.getAudioInputStream(music); + //AudioFormat audioFormat = audios.getFormat(); + //DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); + //Clip clip = (Clip) AudioSystem.getLine(info); + //clip.addLineListener((LineListener) this); + Clip clip = AudioSystem.getClip(); + clip.open(audios); + + clip.start(); + clip.loop(Clip.LOOP_CONTINUOUSLY); + + } catch (Exception e) { + System.out.println("Error with playing sound."); + e.printStackTrace(); + } + + + } +} diff --git a/MAVENProject/src/main/java/start/Main.java b/MAVENProject/src/main/java/start/Main.java index 2f32ec436e408e915fe62c6e5cbf1bed1b0da739..62d92f2de4326320aef37fbbe885227dc2fe6dbb 100644 --- a/MAVENProject/src/main/java/start/Main.java +++ b/MAVENProject/src/main/java/start/Main.java @@ -1,6 +1,10 @@ package start; import jeu.Painter; +import spotify.MP3; + +import java.net.URL; + import engine.GameEngineGraphical; import jeu.Controller; import jeu.Jeu; @@ -17,6 +21,11 @@ public class Main { Painter painter = new Painter(); Controller controller = new Controller(); + //pour la musique + + MP3 mp3 = new MP3("cyberPacMusic1bon.wav"); + mp3.displayMusic(); + // classe qui lance le moteur de jeu generique GameEngineGraphical engine = new GameEngineGraphical(game, painter, controller); engine.run(); diff --git a/MAVENProject/src/main/resources/Music/cyberPacMusic1.mp3 b/MAVENProject/src/main/resources/Music/cyberPacMusic1.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..289874070f6fb3afe963ccc616647fd1aaab3506 Binary files /dev/null and b/MAVENProject/src/main/resources/Music/cyberPacMusic1.mp3 differ diff --git a/MAVENProject/src/main/resources/Music/cyberPacMusic1bon.wav b/MAVENProject/src/main/resources/Music/cyberPacMusic1bon.wav new file mode 100644 index 0000000000000000000000000000000000000000..ecd07ff25f77273e0f9b318bcbecd010c0cffda9 Binary files /dev/null and b/MAVENProject/src/main/resources/Music/cyberPacMusic1bon.wav differ