diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java index fb1622a..51ca7aa 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java @@ -63,7 +63,7 @@ public class Mythes_Hermione extends Card { */ @Override public String getName() { - return "Hermione, fille de Ménélas"; + return "Hermione"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java index 8b7606e..2637dcd 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java @@ -63,7 +63,7 @@ public class Mythes_Sémélé extends Card { */ @Override public String getName() { - return "Sémélé, Mére de Dionysos"; + return "Sémélé"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java index 310b090..3107e0b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java @@ -63,7 +63,7 @@ public class Renaissance_Succession_Bourgogne extends Card { */ @Override public String getName() { - return "Guerre de succession de Bourgogne"; + return "Succession de Bourgogne"; } /** 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 9fdc658..8671367 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -134,6 +134,8 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL 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)); + soundMap.put("win",soundPool.load(cont,R.raw.victoire,1)); + soundMap.put("lose",soundPool.load(cont,R.raw.defaite,1)); @@ -296,21 +298,27 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL case Command.WIN: //on termine la parite + backgroundMusicPlayer.stop(); + playSound("win"); gameActivity.runOnUiThread(new PopupRunable("bravo ! vous avez gagné",gameActivity)); renderer.addToDraw(new DrawableBitmap(bitmapVictory,0,0,"victory",100F,50F)); renderer.updateFrame(); cancelled = true; currentThread().sleep(2000); + returnToTheMainActivity(); break; case Command.LOSE: //on termine la partie + backgroundMusicPlayer.stop(); + playSound("lose"); gameActivity.runOnUiThread(new PopupRunable("vous avez perdu!",gameActivity)); renderer.addToDraw(new DrawableBitmap(bitmapDefeat,0,0,"defeat",100F,50F)); renderer.updateFrame(); cancelled=true; currentThread().sleep(2000); //gameativity.finish() n'etait pas utilisable il fermais l'application + returnToTheMainActivity(); break; case Command.PING: diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java index 391371e..5931e5f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java @@ -159,7 +159,7 @@ public class DrawableCard extends Drawable{ if(c.getDescription() != null) cardDescription = new DrawableText(c.getDescription(),0,0,toString()+"description",DESCRIPTION_WIDTH*ratio,DESCRIPTION_HEIGHT*ratio,DESCRIPTION_FONT_SIZE,DESCRIPTION_TEXT_X_RES,DESCRIPTION_TEXT_Y_RES,Color.BLACK); - cardTitle = new DrawableText(c.getName(),0,0,toString()+"name",TITLE_WIDTH*ratio,TITLE_HEIGHT*ratio,TITLE_FONT_SIZE*0.75F,TEXT_TITLE_X_RES,TEXT_TITLE_Y_RES,Color.BLACK,30); + cardTitle = new DrawableText(c.getName(),0,0,toString()+"name",TITLE_WIDTH*ratio,TITLE_HEIGHT*ratio,TITLE_FONT_SIZE*0.75F,TEXT_TITLE_X_RES,TEXT_TITLE_Y_RES,Color.BLACK,26); cardCostDrawable = new DrawableText(c.getCost() + "", 0, 0, toString() + "cost", OFFBOARD_ATK_HP_WIDTH*ratio, OFFBOARD_ATK_HP_HEIGHT*ratio, HP_ATK_FONT_SIZE, TEXT_ATK_HP_X_RES, TEXT_ATK_HP_Y_RES,Color.BLACK); diff --git a/app/src/main/res/drawable/t_b_batiut.jpg b/app/src/main/res/drawable/t_b_batiut.jpg index 3a28e26..1cbc818 100644 Binary files a/app/src/main/res/drawable/t_b_batiut.jpg and b/app/src/main/res/drawable/t_b_batiut.jpg differ diff --git a/app/src/main/res/layout/activity_credit.xml b/app/src/main/res/layout/activity_credit.xml index 76465c3..5efc8f5 100644 --- a/app/src/main/res/layout/activity_credit.xml +++ b/app/src/main/res/layout/activity_credit.xml @@ -21,13 +21,24 @@ + + + app:layout_constraintTop_toBottomOf="@+id/textView" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a459852..f8f448e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -22,22 +22,6 @@ app:layout_constraintVertical_bias="0.0" app:srcCompat="@drawable/t_b_batiut" /> - -