diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java index 941af4d..1c5797d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -131,6 +131,11 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL soundPool = builder.build(); } soundPool.setOnLoadCompleteListener(this); + soundMap=new HashMap<>(); + soundMap.put("fight",soundPool.load(cont,R.raw.combat_sfx,1)); + soundMap.put("card",soundPool.load(cont,R.raw.carte_jouer_sfx,1)); + + int startSound; @@ -152,6 +157,7 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL break; } backgroundMusicPlayer = MediaPlayer.create(cont,startSound); + backgroundMusicPlayer.setVolume(0.5F,0.5F); backgroundMusicPlayer.setOnCompletionListener(this); backgroundMusicPlayer.setScreenOnWhilePlaying(true); backgroundMusicPlayer.start(); @@ -331,6 +337,7 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL //ajout la card au terain cardPlayed.getDrawableCard().setDraggable(false); board.setEnemyCard(zone,cardPlayed); + playSound("card"); break; case Command.MEULE: @@ -527,6 +534,10 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL e.printStackTrace(); } } + if(requestPlaceCardResult) + { + playSound("card"); + } return requestPlaceCardResult; } @@ -559,6 +570,8 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL } } + playSound("fight"); + return true; } @@ -623,13 +636,32 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL @Override public void onLoadComplete(final SoundPool soundPool, int sampleId, int status) { + soundPoolLoaded=true; + Log.e("sound","ready"); + } + public void playSound(String sound) + { + if(soundPoolLoaded){ + if(soundMap.get(sound) != null) + { + soundPool.play(soundMap.get(sound),1.0f,1.0f,1,0,1f); + Log.i("sound","playing " + sound); + + }else{ + Log.i("sound","not found " + sound); + + } + } } @Override public void onCompletion(MediaPlayer mp) { mp.reset(); backgroundMusicPlayer = MediaPlayer.create(cont, loopMusic); + backgroundMusicPlayer.setVolume(0.5F,0.5F); + backgroundMusicPlayer.setOnCompletionListener(this); + backgroundMusicPlayer.setScreenOnWhilePlaying(true); backgroundMusicPlayer.start(); backgroundMusicPlayer.setLooping(true); } diff --git a/app/src/main/res/raw/carte_jouer_sfx.mp3 b/app/src/main/res/raw/carte_jouer_sfx.mp3 new file mode 100644 index 0000000..34732b1 Binary files /dev/null and b/app/src/main/res/raw/carte_jouer_sfx.mp3 differ diff --git a/app/src/main/res/raw/combat_sfx.mp3 b/app/src/main/res/raw/combat_sfx.mp3 new file mode 100644 index 0000000..e8c1bff Binary files /dev/null and b/app/src/main/res/raw/combat_sfx.mp3 differ