diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 82d6f87..1cdd68e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + android:configChanges="keyboardHidden|orientation|screenSize" + android:screenOrientation="portrait"> diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java index dbc7ac4..daf15e9 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java @@ -63,7 +63,7 @@ public class Moyen_Age_Charlemagne extends Card { */ @Override public String getName() { - return "Charlemagne, le Grand"; + return "Charlemagne"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java index a10b873..05b1cab 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java @@ -63,7 +63,7 @@ public class Moyen_Age_CharlesVII extends Card { */ @Override public String getName() { - return "Charles VII le Victorieux"; + return "Charles VII"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java index 132ee44..507147f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java @@ -63,7 +63,7 @@ public class Moyen_Age_Chretien_De_Troyes extends Card { */ @Override public String getName() { - return "Chrétien de Troyes, fondateur de l'écriture arthurienne"; + return "Chrétien de Troyes"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java index 28a339e..68f815b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java @@ -43,7 +43,7 @@ public class Moyen_Age_Christine extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -53,7 +53,7 @@ public class Moyen_Age_Christine extends Card { */ @Override public int getDefaultHealth() { - return 2; + return 1; } /** @@ -63,7 +63,7 @@ public class Moyen_Age_Christine extends Card { */ @Override public String getName() { - return "Christine de Pizan, première femme de lettre"; + return "Christine de Pizan"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java index d5b3760..cb70a4e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java @@ -33,7 +33,7 @@ public class Moyen_Age_Etienne extends Card { */ @Override public String getDescription() { - return "initiative"; + return "vigilance"; } /** @@ -63,7 +63,7 @@ public class Moyen_Age_Etienne extends Card { */ @Override public String getName() { - return "Etienne Chevalier, commis du Victorieux"; + return "Etienne Chevalier"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java index 75b4de7..6693cdb 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java @@ -63,7 +63,7 @@ public class Moyen_Age_Ferré extends Card { */ @Override public String getName() { - return "Le Grand Ferré, paysan au bras puissant"; + return "Le Grand Ferré"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java index c160917..9be4d8d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java @@ -63,7 +63,7 @@ public class Moyen_Age_Guillaume extends Card { */ @Override public String getName() { - return "Guillaume de Nogaret, conseiller du Roi de fer"; + return "Guillaume de Nogaret"; } /** 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 6e4b7ec..a65a217 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 @@ -33,7 +33,7 @@ public class Moyen_Age_Hugue extends Card { */ @Override public String getDescription() { - return "Vos créatures ont la vigilance until EOT"; + return ""; } /** 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 3e8f6ef..92acaae 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 @@ -33,7 +33,7 @@ public class Moyen_Age_Isabelle extends Card { */ @Override public String getDescription() { - return "Vos créatures utilise leur point d'endurance à la place de leur attaque jusqu'a la fin du tour"; + return ""; } /** 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 f41a0c1..e88cb19 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 @@ -33,7 +33,7 @@ public class Moyen_Age_Jean extends Card { */ @Override public String getDescription() { - return "vos créatures ont +1/+1 jusqu'a la fin du tour"; + return "vos créatures gagne +1/+1 jusqu'a la fin du tour"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java index 2584da8..45c59fa 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java @@ -63,7 +63,7 @@ public class Moyen_Age_Jean_Vienne extends Card { */ @Override public String getName() { - return "Jean de Vienne, Le « Du Guesclin » de la Mer"; + return "Jean de Vienne"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java index 4ecbc64..f104b23 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java @@ -33,7 +33,7 @@ public class Moyen_Age_Jeanne extends Card { */ @Override public String getDescription() { - return "lien de vie, initiative"; + return "lien de vie"; } /** @@ -63,7 +63,7 @@ public class Moyen_Age_Jeanne extends Card { */ @Override public String getName() { - return "Jeanne d'arc la Pucelle d'Orléans"; + return "Jeanne d'arc"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java index 6698b87..907458a 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java @@ -33,7 +33,7 @@ public class Moyen_Age_Louis extends Card { */ @Override public String getDescription() { - return "Vos créatures ont +3/+0 et la célérité jusqua la fin du tour"; + return "Vos créatures gagne +1/+0 "; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java index f586990..b1236be 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java @@ -33,7 +33,7 @@ public class Moyen_Age_PhilippeIV extends Card { */ @Override public String getDescription() { - return "Inciblable"; + return "Invisible"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java index df5c5fe..6d01b06 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java @@ -63,7 +63,7 @@ public class Moyen_Age_Philippe_Cacqueray extends Card { */ @Override public String getName() { - return "Philippe Cacqueray, inventeur du plat en verre"; + return "Philippe Cacqueray"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java index aa09594..c4017e1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java @@ -43,7 +43,7 @@ public class Moyen_Age_Pierre_Ermite extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -53,7 +53,7 @@ public class Moyen_Age_Pierre_Ermite extends Card { */ @Override public int getDefaultHealth() { - return 3; + return 2; } /** @@ -63,7 +63,7 @@ public class Moyen_Age_Pierre_Ermite extends Card { */ @Override public String getName() { - return "Pierre l'Ermitte, religieux des croisades"; + return "Pierre l'Ermitte"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java index 3a85b62..89fc227 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java @@ -63,7 +63,7 @@ public class Moyen_Age_Sire_Jean extends Card { */ @Override public String getName() { - return "Sire Jean de Joinville, biographe de Saint Louis"; + return "Sire Jean de Joinville"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java index d6fb363..3f7dd20 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java @@ -33,7 +33,7 @@ public class Mythes_Achille extends Card { */ @Override public String getDescription() { - return "quand il arrive sur le champ de bataille toutes tes creatures gagnent +2/+0"; + return "quand il arrive sur le champ de bataille toutes tes creatures gagnent +1/+0"; } /** @@ -43,7 +43,7 @@ public class Mythes_Achille extends Card { */ @Override public int getDefaultAttack() { - return 4; + return 5; } /** 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 71e4f13..b841a4a 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 @@ -33,7 +33,7 @@ public class Mythes_Amazones extends Card { */ @Override public String getDescription() { - return "initiative"; + return "vigilance"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java index 0113dab..5febbe4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java @@ -33,7 +33,7 @@ public class Mythes_Castor_Pollux extends Card { */ @Override public String getDescription() { - return "la creature ciblé a 50% de chance de gagner +2/+0 ou 50% de chance de ce prendre 2 points de degats"; + return ""; } /** @@ -63,7 +63,7 @@ public class Mythes_Castor_Pollux extends Card { */ @Override public String getName() { - return "Castor et pollux, fils jumeaux de Léda"; + return "Castor et pollux"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java index 2e3dded..b852756 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java @@ -33,7 +33,7 @@ public class Mythes_Chaos extends Card { */ @Override public String getDescription() { - return null; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java index 3e52324..0d98f71 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java @@ -33,7 +33,7 @@ public class Mythes_Chiron extends Card { */ @Override public String getDescription() { - return "Quand il arrive sur le champ de bataille vous piocher une carte"; + return ""; } /** @@ -73,7 +73,7 @@ public class Mythes_Chiron extends Card { */ @Override public int getCost() { - return 3; + return 2; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java index e9a20eb..b709e2a 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java @@ -33,7 +33,7 @@ public class Mythes_Dédale extends Card { */ @Override public String getDescription() { - return "donne +1/+1 à une de tes creatures au hasard"; + return "donne +1/+1 à toutes tes creatures"; } /** @@ -73,7 +73,7 @@ public class Mythes_Dédale extends Card { */ @Override public int getCost() { - return 1; + return 3; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java index 406cef0..24ea735 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java @@ -33,7 +33,7 @@ public class Mythes_Hades extends Card { */ @Override public String getDescription() { - return "detruit 2 créatures adverses aleatoirement"; + return ""; } /** @@ -43,7 +43,7 @@ public class Mythes_Hades extends Card { */ @Override public int getDefaultAttack() { - return 7; + return 6; } /** @@ -53,7 +53,7 @@ public class Mythes_Hades extends Card { */ @Override public int getDefaultHealth() { - return 7; + return 6; } /** @@ -73,7 +73,7 @@ public class Mythes_Hades extends Card { */ @Override public int getCost() { - return 9; + return 6; } /** 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 8b9c96a..a6faa6d 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 @@ -33,7 +33,7 @@ public class Mythes_Heracles extends Card { */ @Override public String getDescription() { - return "si il est seul sur notre cote du champ de bataille alors il gagne +2/+2"; + return "si il est seul sur notre cote du champ de bataille alors il gagne +1/+1"; } /** 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 0afd1df..fb1622a 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 @@ -33,7 +33,7 @@ public class Mythes_Hermione extends Card { */ @Override public String getDescription() { - return "cette créature ne peut pas attaquer"; + return ""; } /** @@ -43,7 +43,7 @@ public class Mythes_Hermione extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java index 4ce6d1c..8bd23ad 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java @@ -33,7 +33,7 @@ public class Mythes_Minos extends Card { */ @Override public String getDescription() { - return "la creature ciblé a 50% de chance de gagner +3/+0 ou 50% de gagner +0/+3"; + return "toutes vos créatures gagne +1/+1"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java index b7b35aa..92e2c7e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java @@ -33,7 +33,7 @@ public class Mythes_Oedipie extends Card { */ @Override public String getDescription() { - return "si votre adversaire n'a pas de creatures sur le champ de bataille quand cette creature arrivent sur le champ de bataille il perd 3pv"; + return "mutilation benefique"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java index 6a47078..ac06225 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java @@ -23,7 +23,7 @@ public class Mythes_Perséphone extends Card { @Override public String getDescription() { - return "Redonne 5 points de vie au joueur"; + return ""; } @Override @@ -33,7 +33,7 @@ public class Mythes_Perséphone extends Card { @Override public int getDefaultHealth() { - return 4; + return 6; } @Override 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 008cbff..ba3bc11 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 @@ -33,7 +33,7 @@ public class Mythes_Poseidon extends Card { */ @Override public String getDescription() { - return "pioche 2 cartes"; + return ""; } /** 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 2253ee0..9cd30e7 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 @@ -33,7 +33,7 @@ public class Mythes_Psyché extends Card { */ @Override public String getDescription() { - return "la créature ciblée ne peut pas attaquer pendant 2 tours"; + return "coutre porté"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java index 6794130..8ee1d43 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java @@ -33,7 +33,7 @@ public class Mythes_Thanatos extends Card { */ @Override public String getDescription() { - return "detruit une creature ennemis au hasard"; + return ""; } /** @@ -43,7 +43,7 @@ public class Mythes_Thanatos extends Card { */ @Override public int getDefaultAttack() { - return 2; + return 4; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java index a0b9b2a..1321d1e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java @@ -33,7 +33,7 @@ public class Mythes_Zeus extends Card { */ @Override public String getDescription() { - return "inflige 5 points de degats à la creature ciblée"; + return ""; } /** 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 2605950..740fb1f 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 @@ -33,7 +33,7 @@ public class Renaissance_Casimir extends Card { */ @Override public String getDescription() { - return "Ra: une autre créature que vous controller gagne +4/+4"; + return null; } /** @@ -73,7 +73,7 @@ public class Renaissance_Casimir extends Card { */ @Override public int getCost() { - return 7; + return 5; } /** 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 20101a3..eae57a1 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 @@ -33,7 +33,7 @@ public class Renaissance_Constantin extends Card { */ @Override public String getDescription() { - return "RA: Sacrifier une autre de vos créature"; + return ""; } /** @@ -73,7 +73,7 @@ public class Renaissance_Constantin extends Card { */ @Override public int getCost() { - return 5; + return 6; } /** 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 220074f..3b3cc16 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 @@ -33,7 +33,7 @@ public class Renaissance_Copernic extends Card { */ @Override public String getDescription() { - return "RA: inflige 2 degats à l'adversaire"; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java index 6566ebb..21fd7cc 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java @@ -33,7 +33,7 @@ public class Renaissance_Decouverte_Amerique extends Card { */ @Override public String getDescription() { - return "toxique"; + return "célérite ,toxique"; } /** 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 406967a..843d874 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 @@ -33,7 +33,7 @@ public class Renaissance_Francois extends Card { */ @Override public String getDescription() { - return "ETB: une créature aléatoire que vous controllez gagne -3/-3"; + return ""; } /** @@ -73,7 +73,7 @@ public class Renaissance_Francois extends Card { */ @Override public int getCost() { - return 5; + return 7; } /** 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 f132d50..e63339a 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 @@ -33,7 +33,7 @@ public class Renaissance_Henri_8 extends Card { */ @Override public String getDescription() { - return "ETB: Piocher 2 carte"; + return ""; } /** @@ -73,7 +73,7 @@ public class Renaissance_Henri_8 extends Card { */ @Override public int getCost() { - return 6; + return 5; } /** 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 31474ea..524c975 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 @@ -33,7 +33,7 @@ public class Renaissance_Isabelle extends Card { */ @Override public String getDescription() { - return "RA: inflige 1 dégat a une créature ciblée"; + return ""; } /** @@ -43,7 +43,7 @@ public class Renaissance_Isabelle extends Card { */ @Override public int getDefaultAttack() { - return 1; + return 2; } /** 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 e69dd6a..a6693de 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 @@ -33,7 +33,7 @@ public class Renaissance_Ivan extends Card { */ @Override public String getDescription() { - return "Quand il arrive sur le terrain, il échange ses points de vie et d'attaque de n'importe quelle créature jusqu'à la fin du tour"; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java index 8bc64ed..ada2d9f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java @@ -33,7 +33,7 @@ public class Renaissance_Leonard extends Card { */ @Override public String getDescription() { - return "ETB: Déclanche un rale d'agonie aléatoire"; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java index 94ee122..38de22b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java @@ -63,7 +63,7 @@ public class Renaissance_Machiavel extends Card { */ @Override public String getName() { - return "Machiavel, Philosophe de la Politique"; + return "Machiavel"; } /** 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 4d39c4e..8556027 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 @@ -33,7 +33,7 @@ public class Renaissance_Mehmet extends Card { */ @Override public String getDescription() { - return "RA: Prend 2 dégat"; + return ""; } /** @@ -73,7 +73,7 @@ public class Renaissance_Mehmet extends Card { */ @Override public int getCost() { - return 1; + return 2; } /** 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 9208483..503b000 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 @@ -33,7 +33,7 @@ public class Renaissance_Michel_Ange extends Card { */ @Override public String getDescription() { - return "RA: Vous pouvez jouer une créature de votre main avec un coût de mana de 3 ou moins"; + return ""; } /** @@ -53,7 +53,7 @@ public class Renaissance_Michel_Ange extends Card { */ @Override public int getDefaultHealth() { - return 1; + return 3; } /** 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 2bd64da..f1e6445 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 @@ -33,7 +33,7 @@ public class Renaissance_Nobunaga extends Card { */ @Override public String getDescription() { - return "RA: Vous prenez 4 points de degats"; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java index 268fe84..4d7bcb3 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java @@ -33,7 +33,7 @@ public class Renaissance_Shakespeare extends Card { */ @Override public String getDescription() { - return "RA: piochez une carte"; + return null; } /** @@ -63,7 +63,7 @@ public class Renaissance_Shakespeare extends Card { */ @Override public String getName() { - return "Shakespeare, Ame d'un Dramaturge"; + return "Shakespeare"; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java index 40a99c4..12ac0d1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java @@ -34,7 +34,7 @@ public class Renaissance_Skanderberg extends Card { */ @Override public String getDescription() { - return "Défenseur"; + return ""; } /** @@ -64,7 +64,7 @@ public class Renaissance_Skanderberg extends Card { */ @Override public String getName() { - return "Skanderberg, Libérateur de l'Albanie"; + return "Skanderberg"; } /** 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 d8412d1..2eb7f54 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 @@ -24,7 +24,7 @@ public class Renaissance_Soliman extends Card { @Override public String getDescription() { - return "RA: Piocher 4 carte, infliger 4 dégats au joueur adverse"; + return null; } @Override @@ -44,7 +44,7 @@ public class Renaissance_Soliman extends Card { @Override public int getCost() { - return 9; + return 7; } @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 dd48d01..caf1b3a 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 @@ -33,7 +33,7 @@ public class Renaissance_Vlad extends Card { */ @Override public String getDescription() { - return "RA: detruisez 2 créatures adverses aleatoirement"; + return ""; } /** @@ -73,7 +73,7 @@ public class Renaissance_Vlad extends Card { */ @Override public int getCost() { - return 8; + return 5; } /** 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 9657eef..8016ef5 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -121,7 +121,6 @@ public class GameLogicThread extends Thread{ final String host = "2.tcp.ngrok.io";//192.168.43.251tcp://2.tcp.ngrok.io: final int port = 17057; - //gameativity.finish() n'etait pas utilisable il fermais l'application //on fait trois essay de connection for(int i = 0 ; i < 3 ; i++) @@ -393,6 +392,7 @@ public class GameLogicThread extends Thread{ } private void returnToTheMainActivity() { + //gameativity.finish() n'etait pas utilisable il fermais l'application gameActivity.runOnUiThread(new Runnable() { @Override public void run() {