diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java index a65a217..4aeaf54 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java @@ -63,7 +63,7 @@ public class Moyen_Age_Hugue extends Card { */ @Override public String getName() { - return "Hugue capet, fondateur de la dynastie capétienne"; + return "Hugue capet"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java index 92acaae..9605bb2 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java @@ -63,7 +63,7 @@ public class Moyen_Age_Isabelle extends Card { */ @Override public String getName() { - return "Isabelle, la louve de france"; + return "Isabelle"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java index e88cb19..8f6ade4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java @@ -63,7 +63,7 @@ public class Moyen_Age_Jean extends Card { */ @Override public String getName() { - return "L'enlumineur Jean Pucelle"; + return "Jean Pucelle"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java index f4264ef..62a4ede 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java @@ -63,7 +63,7 @@ public class Moyen_Age_Pierre extends Card { */ @Override public String getName() { - return "Pierre Flote, légiste et chancelier du Roi de fer"; + return "Pierre Flote"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java index b841a4a..cde9046 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java @@ -63,7 +63,7 @@ public class Mythes_Amazones extends Card { */ @Override public String getName() { - return "les Amazones, Femmes guerrières"; + return "les Amazones"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java index c88cd02..ccfca87 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java @@ -63,7 +63,7 @@ public class Mythes_Erinyes extends Card { */ @Override public String getName() { - return "Érinyes, pérsecutrices des Enfers"; + return "Érinyes"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java index a6faa6d..2f26772 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java @@ -63,7 +63,7 @@ public class Mythes_Heracles extends Card { */ @Override public String getName() { - return "Héraclès, Dieu des éphébes"; + return "Héraclès"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java index ba3bc11..566d457 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java @@ -63,7 +63,7 @@ public class Mythes_Poseidon extends Card { */ @Override public String getName() { - return "Poséidon, l'ébranleur du sol "; + return "Poséidon"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java index 9cd30e7..e390e68 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java @@ -63,7 +63,7 @@ public class Mythes_Psyché extends Card { */ @Override public String getName() { - return "Psyché, Beauté sans maris"; + return "Psyché"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java index b6f04de..8bc1c7e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java @@ -63,7 +63,7 @@ public class Mythes_Titanomachie extends Card { */ @Override public String getName() { - return "Titanomachie, La Chute des Titans"; + return "Titanomachie"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java index 740fb1f..9eb478b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java @@ -63,7 +63,7 @@ public class Renaissance_Casimir extends Card { */ @Override public String getName() { - return "Casimir IV, Soutien à la Ligue de Prusse"; + return "Casimir IV"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java index 79eecc4..458abb1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java @@ -63,7 +63,7 @@ public class Renaissance_Charles extends Card { */ @Override public String getName() { - return "Charles Quint, Apogée des Habsbourg "; + return "Charles Quint "; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java index 0b5803d..6f4aa8b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java @@ -63,7 +63,7 @@ public class Renaissance_Chatherine extends Card { */ @Override public String getName() { - return "Catherine de Medicis, Reine-Mère de France"; + return "Catherine de Medicis"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java index eae57a1..4838ff2 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java @@ -63,7 +63,7 @@ public class Renaissance_Constantin extends Card { */ @Override public String getName() { - return "Constantin XI, Dernier Empereur Romain"; + return "Constantin XI"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java index 3b3cc16..f934564 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java @@ -63,7 +63,7 @@ public class Renaissance_Copernic extends Card { */ @Override public String getName() { - return "Copernic, Défenseur de L'Héliocentrisme"; + return "Copernic"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java index 5ca3350..6de7de7 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java @@ -33,7 +33,7 @@ public class Renaissance_Ferdinand extends Card { */ @Override public String getDescription() { - return "RA: vous gagnez 2 PV"; + return ""; } /** @@ -63,7 +63,7 @@ public class Renaissance_Ferdinand extends Card { */ @Override public String getName() { - return "Ferdinand II, le Catholique"; + return "Ferdinand II"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java index 843d874..cdfc427 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java @@ -63,7 +63,7 @@ public class Renaissance_Francois extends Card { */ @Override public String getName() { - return "François I, Vainqueur de Marignan"; + return "François I"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java index e63339a..a0c078e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java @@ -63,7 +63,7 @@ public class Renaissance_Henri_8 extends Card { */ @Override public String getName() { - return "Henri VIII, Premier Anglican"; + return "Henri VIII"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java index 524c975..d443c26 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java @@ -63,7 +63,7 @@ public class Renaissance_Isabelle extends Card { */ @Override public String getName() { - return "Isabelle I, la Catholique"; + return "Isabelle I"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java index a6693de..13520b2 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java @@ -63,7 +63,7 @@ public class Renaissance_Ivan extends Card { */ @Override public String getName() { - return "Ivan IV, le Terrible"; + return "Ivan IV"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java index 8556027..086ada2 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java @@ -63,7 +63,7 @@ public class Renaissance_Mehmet extends Card { */ @Override public String getName() { - return "Mehmet II, Conquérant de Constantinople"; + return "Mehmet II"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java index 503b000..bd7680b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java @@ -63,7 +63,7 @@ public class Renaissance_Michel_Ange extends Card { */ @Override public String getName() { - return "Michel-Ange, Maître Sculpteur"; + return "Michel-Ange"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java index f1e6445..4b92c1d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java @@ -63,7 +63,7 @@ public class Renaissance_Nobunaga extends Card { */ @Override public String getName() { - return "Oda Nobunaga, Premier Unificateur"; + return "Oda Nobunaga"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java index 2eb7f54..67abfc3 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java @@ -39,7 +39,7 @@ public class Renaissance_Soliman extends Card { @Override public String getName() { - return "Soliman I, Le Magnifique "; + return "Soliman I"; } @Override diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java index caf1b3a..71c7ddd 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java @@ -63,7 +63,7 @@ public class Renaissance_Vlad extends Card { */ @Override public String getName() { - return "Vlad III, l'Empaleur"; + return "Vlad III"; } /**