supression vieux todo + ajout logo

app/src/main/java/com/iutlaval/myapplication/CardListActivity.java

@@ -1,6 +1,5 @@
 package com.iutlaval.myapplication;
 
-import android.app.SearchableInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -14,7 +13,6 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.SearchView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -103,7 +101,7 @@ public class CardListActivity extends AppCompatActivity {
                 linearLayout.addView(cardName);
 
                 cardStats = new TextView(this);
-                cardStats.setText("Attaque : "+card.getAttack()+"       Vie : "+card.getHealth()+"\n");
+                cardStats.setText("Attaque : "+card.getDefaultAttack()+"       Vie : "+card.getDefaultHealth()+"\n");
                 linearLayout.addView(cardStats);
 
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java

@@ -12,6 +12,9 @@ public abstract class Card {
     private static Bitmap frameBitmap = null;
     private DrawableCard drawableCard = null;
 
+
+    private int attack;
+    private int health;
     /**
      * cree une carte est lui definit un drawable
      * @param UID
@@ -21,6 +24,26 @@ public abstract class Card {
         if(!(UID == null || c == null)) {
             drawableCard = new DrawableCard(this, 0, 0, UID, c);
         }
+        this.attack=getDefaultAttack();
+        this.health=getDefaultHealth();
+    }
+
+    public int getAttack() {
+        return attack;
+    }
+
+    public int getHealth() {
+        return health;
+    }
+
+    public void setAttack(int attack) {
+        this.attack = attack;
+        drawableCard.updateHpAndAtk(attack,null);
+    }
+
+    public void setHealth(int health) {
+        this.health = health;
+        drawableCard.updateHpAndAtk(null,health);
     }
 
     /**
@@ -87,13 +110,13 @@ public abstract class Card {
      * retourne un entier coresspondant a l'attaque de la carte
      * @return
      */
-    public abstract int getAttack();
+    public abstract int getDefaultAttack();
 
     /**
      * retourne la santé de la carte
      * @return
      */
-    public abstract int getHealth();
+    public abstract int getDefaultHealth();
 
     /**
      * NE PAS TOUCHER CETTE FONCTION SI VOUS N'ÊTES PAS SUR DE CE QUE VOUS FAITES

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Charlemagne extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 6;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Charlemagne extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 6;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java

@@ -42,7 +42,7 @@ public class Moyen_Age_CharlesV extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 6;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_CharlesV extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 6;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java

@@ -42,7 +42,7 @@ public class Moyen_Age_CharlesVII extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 4;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_CharlesVII extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Chretien_De_Troyes extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Chretien_De_Troyes extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Christine extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Christine extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Clovis extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 5;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Clovis extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 15;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java

@@ -43,7 +43,7 @@ public class Moyen_Age_Croisade extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -53,7 +53,7 @@ public class Moyen_Age_Croisade extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Etienne extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Etienne extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Ferré extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Ferré extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Guerre_100 extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Guerre_100 extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Guillaume extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Guillaume extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Heresie_Cathares extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Heresie_Cathares extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Hugue extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Hugue extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 5;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Isabelle extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Isabelle extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Jean extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Jean extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Jean_Vienne extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Jean_Vienne extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 6;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Jeanne extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Jeanne extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Louis extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Louis extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Malediction_Templier extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Malediction_Templier extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Peste extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Peste extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Philippe extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Philippe extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 8;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java

@@ -42,7 +42,7 @@ public class Moyen_Age_PhilippeIV extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_PhilippeIV extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Philippe_Cacqueray extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Philippe_Cacqueray extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Pierre extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Pierre extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Pierre_Ermite extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Pierre_Ermite extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Pouvoir_Du_Franc extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Pouvoir_Du_Franc extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Prise_Sainte_Terre extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Prise_Sainte_Terre extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Roland extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Roland extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Sire_Jean extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Sire_Jean extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java

@@ -42,7 +42,7 @@ public class Moyen_Age_Traite_Verdun extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Moyen_Age_Traite_Verdun extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java

@@ -42,7 +42,7 @@ public class Mythes_12_Travaux extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_12_Travaux extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java

@@ -42,7 +42,7 @@ public class Mythes_Achille extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 4;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Achille extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java

@@ -42,7 +42,7 @@ public class Mythes_Amazones extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Amazones extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java

@@ -42,7 +42,7 @@ public class Mythes_Castor_Pollux extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Castor_Pollux extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java

@@ -42,7 +42,7 @@ public class Mythes_Chant_Sirene extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Chant_Sirene extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java

@@ -42,7 +42,7 @@ public class Mythes_Chaos extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 10;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Chaos extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 10;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java

@@ -42,7 +42,7 @@ public class Mythes_Cheval_Troie extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Cheval_Troie extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java

@@ -42,7 +42,7 @@ public class Mythes_Chiron extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Chiron extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java

@@ -42,7 +42,7 @@ public class Mythes_Dédale extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Dédale extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java

@@ -42,7 +42,7 @@ public class Mythes_Enigme_Sphinx extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Enigme_Sphinx extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java

@@ -42,7 +42,7 @@ public class Mythes_Eole extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 5;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Eole extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java

@@ -42,7 +42,7 @@ public class Mythes_Erinyes extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 7;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Erinyes extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 7;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java

@@ -42,7 +42,7 @@ public class Mythes_Guerre_Sept_Chefs extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Guerre_Sept_Chefs extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java

@@ -42,7 +42,7 @@ public class Mythes_Hades extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 7;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Hades extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 7;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java

@@ -42,7 +42,7 @@ public class Mythes_Heracles extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Heracles extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java

@@ -42,7 +42,7 @@ public class Mythes_Hermione extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Hermione extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 5;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java

@@ -42,7 +42,7 @@ public class Mythes_Icar extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Icar extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java

@@ -42,7 +42,7 @@ public class Mythes_Kunée extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Kunée extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java

@@ -42,7 +42,7 @@ public class Mythes_Minos extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Minos extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java

@@ -42,7 +42,7 @@ public class Mythes_Oedipie extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Oedipie extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java

@@ -27,12 +27,12 @@ public class Mythes_Perséphone extends Card {
     }
 
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 4;
     }
 
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java

@@ -42,7 +42,7 @@ public class Mythes_Poseidon extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 7;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Poseidon extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 7;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java

@@ -42,7 +42,7 @@ public class Mythes_Psyché extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Psyché extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java

@@ -42,7 +42,7 @@ public class Mythes_Rapt extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Rapt extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java

@@ -42,7 +42,7 @@ public class Mythes_Sémélé extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Sémélé extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java

@@ -42,7 +42,7 @@ public class Mythes_Thanatos extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Thanatos extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java

@@ -42,7 +42,7 @@ public class Mythes_Titanomachie extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Titanomachie extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java

@@ -42,7 +42,7 @@ public class Mythes_Toison extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Toison extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java

@@ -42,7 +42,7 @@ public class Mythes_Zeus extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 7;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Zeus extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 7;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java

@@ -42,7 +42,7 @@ public class Mythes_Zeus_VS_Typhon extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Mythes_Zeus_VS_Typhon extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java

@@ -42,7 +42,7 @@ public class Renaissance_Casimir extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 4;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Casimir extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java

@@ -42,7 +42,7 @@ public class Renaissance_Charles extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 5;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Charles extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 5;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java

@@ -42,7 +42,7 @@ public class Renaissance_Chatherine extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Chatherine extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java

@@ -42,7 +42,7 @@ public class Renaissance_Chute_Constantinople extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Chute_Constantinople extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java

@@ -42,7 +42,7 @@ public class Renaissance_Concile_Trente extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Concile_Trente extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java

@@ -42,7 +42,7 @@ public class Renaissance_Constantin extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 7;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Constantin extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 7;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java

@@ -42,7 +42,7 @@ public class Renaissance_Copernic extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Copernic extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java

@@ -42,7 +42,7 @@ public class Renaissance_Decouverte_Amerique extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Decouverte_Amerique extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java

@@ -42,7 +42,7 @@ public class Renaissance_Elisabeth extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Elisabeth extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java

@@ -42,7 +42,7 @@ public class Renaissance_Ferdinand extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Ferdinand extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java

@@ -42,7 +42,7 @@ public class Renaissance_Fin_Guerre_Cent_Ans extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Fin_Guerre_Cent_Ans extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java

@@ -42,7 +42,7 @@ public class Renaissance_Francois extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 8;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Francois extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 6;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java

@@ -42,7 +42,7 @@ public class Renaissance_Guerres_Italie extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Guerres_Italie extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java

@@ -42,7 +42,7 @@ public class Renaissance_Henri extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Henri extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java

@@ -42,7 +42,7 @@ public class Renaissance_Henri_8 extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Henri_8 extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java

@@ -42,7 +42,7 @@ public class Renaissance_Isabelle extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Isabelle extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java

@@ -42,7 +42,7 @@ public class Renaissance_Ivan extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Ivan extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java

@@ -42,7 +42,7 @@ public class Renaissance_Leonard extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Leonard extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java

@@ -42,7 +42,7 @@ public class Renaissance_Machiavel extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Machiavel extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java

@@ -42,7 +42,7 @@ public class Renaissance_Mehmet extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Mehmet extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java

@@ -42,7 +42,7 @@ public class Renaissance_Michel_Ange extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Michel_Ange extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 1;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java

@@ -42,7 +42,7 @@ public class Renaissance_Nobunaga extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 5;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Nobunaga extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 5;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java

@@ -43,7 +43,7 @@ public class Renaissance_Presse_Imprimer extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -53,7 +53,7 @@ public class Renaissance_Presse_Imprimer extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java

@@ -43,7 +43,7 @@ public class Renaissance_Rabelais extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 3;
     }
 
@@ -53,7 +53,7 @@ public class Renaissance_Rabelais extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 3;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java

@@ -43,7 +43,7 @@ public class Renaissance_Reforme extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -53,7 +53,7 @@ public class Renaissance_Reforme extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java

@@ -42,7 +42,7 @@ public class Renaissance_Shakespeare extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 2;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Shakespeare extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 2;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java

@@ -43,7 +43,7 @@ public class Renaissance_Skanderberg extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 1;
     }
 
@@ -53,7 +53,7 @@ public class Renaissance_Skanderberg extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 5;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java

@@ -28,12 +28,12 @@ public class Renaissance_Soliman extends Card {
     }
 
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 6;
     }
 
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 4;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java

@@ -42,7 +42,7 @@ public class Renaissance_Succession_Bourgogne extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 0;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Succession_Bourgogne extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 0;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java

@@ -42,7 +42,7 @@ public class Renaissance_Vlad extends Card {
      * @return
      */
     @Override
-    public int getAttack() {
+    public int getDefaultAttack() {
         return 5;
     }
 
@@ -52,7 +52,7 @@ public class Renaissance_Vlad extends Card {
      * @return
      */
     @Override
-    public int getHealth() {
+    public int getDefaultHealth() {
         return 5;
     }
 

app/src/main/java/com/iutlaval/myapplication/Game/Command.java

@@ -27,6 +27,8 @@ public final class Command {
     public static final String BATTLE = "battlephase";
     public static final String SET_ENEMY_HP = "setenemhp";
     public static final String SET_HP = "sethp";
+    public static final String SET_CARD_HP = "setcardhp";
+    public static final String SET_ADV_CARD_HP = "setadvcardhp";
 
     //inutilisé
     public static final String SELECT_CARD = "selectCard";

app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java

@@ -106,6 +106,10 @@ 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
+        Intent intent = new Intent(gameActivity,MainActivity.class);
+        //on reset le top et recrée l'activité principale
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         try {
             Socket client = new Socket(host, port);
             coms= new Communication(client);
@@ -114,10 +118,7 @@ public class GameLogicThread extends Thread{
             gameActivity.runOnUiThread(new PopupRunable("erreur de comunication avec le serveur",gameActivity));
             renderer.terminate();
 
-            //gameativity.finish() n'etait pas utilisable il fermais l'application
-            Intent intent = new Intent(gameActivity,MainActivity.class);
-            //on reset le top et recrée l'activité principale
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
             gameActivity.startActivity(intent);
             return;
         }
@@ -222,6 +223,8 @@ public class GameLogicThread extends Thread{
                         renderer.addToDraw(new DrawableBitmap(bitmapVictory,0,0,"victory",100F,50F));
                         renderer.updateFrame();
                         cancelled = true;
+                        currentThread().sleep(2000);
+                        gameActivity.startActivity(intent);
                         break;
                     case Command.LOSE:
                         //on termine la partie
@@ -229,6 +232,9 @@ public class GameLogicThread extends Thread{
                         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
+                        gameActivity.startActivity(intent);
                         break;
                     case Command.PING:
                         coms.send(Command.PONG);
@@ -294,6 +300,18 @@ public class GameLogicThread extends Thread{
                         renderer.addToDraw(new DrawableText(" Hp  : " + coms.recieve(),85F,80F,"playerHp",13.3F,6.65F,20, 100,30,Color.WHITE));
                         break;
 
+                    case Command.SET_CARD_HP :
+                        int zonecartecible = coms.recieveInt();
+                        board.getPlayerCardsOnBoard()[zonecartecible].setHealth(coms.recieveInt());
+                        renderer.updateFrame();
+                        break;
+
+                    case Command.SET_ADV_CARD_HP:
+                        int zonecarteadvcible = coms.recieveInt();
+                        board.getAdvCardsOnBoard()[zonecarteadvcible].setHealth(coms.recieveInt());
+                        renderer.updateFrame();
+                        break;
+
                     case "timeout":
                         //ceci est une erreur et non une commande elle se doit donc de ne rien faire
                         break;
@@ -399,7 +417,7 @@ public class GameLogicThread extends Thread{
 
     public synchronized boolean setOnCardAttackRequest(DrawableCard card, int zoneCible) {
         if(zoneCible == -1 || zoneCible != 100 && board.getAdvCardsOnBoard()[zoneCible] == null
-        || card.getCard().getAttack() == 0)
+        || card.getCard().getDefaultAttack() == 0)
         {
             return false;
         }
@@ -429,21 +447,6 @@ public class GameLogicThread extends Thread{
         return true;
     }
 
-    /**
-     * cette fonction est appeller a chaque fin de frame
-     * CETTE FONCTION A UN IMPACT DIRECT SUR LES FPS ELLE SE DOIT D'être OPTIMAL
-     * TOUT CALCUL REDONDANT CE DOIT D'AVOIR ETE PRE FAIT
-     *
-     * TOUT APELLE DE CETTE FONCTION SE DOIT D'ÊTRE PROTEGER PAR isReady()
-     *
-     * /!\ renderer.updateFrame(); va forcer le system a redessiner l'afficher qui ensuite reappelera onFrameDoneRendering() ce qui peut causer si le updateFrame() n'est pas proteger
-     * une utilisation de la batterie massive
-     */
-    //TODO : supprimer cette fonction si on a rien a en faire
-    public void onFrameDoneRendering()
-    {
-    }
-
     /**
      * retourne vrai sir le moteur est pret a avoir sont evenemnt onFrameDoneRendering d'appeler
      * @return

app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java

@@ -227,7 +227,6 @@ public class DrawableCard extends Drawable{
      * @param atk l'attaque de la carte
      * @param hp les point de vie de la carte
      */
-    //TODO supprimer la possibilité null si non utilisé
     public void updateHpAndAtk(Integer atk,Integer hp)
     {
         if(onBoard) {

app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableRectangle.java

@@ -25,25 +25,4 @@ public class DrawableRectangle extends Drawable{
 
         setBitmap(bitmap);
     }
-
-
-    /**
-     * ce constructeur n'est pas tres rapide donc a eviter il utilse pas mal de ram mais sava encore le gc de java s'en ocupe vite
-     * ce constructeur dessine un rectangle avec la couleur donné en argument
-     * @param bitmap bitmap sur le quel dessiner
-     * @param rectangle recange cooresspondant a la surface a dessiner
-     * @param name nom du drawable agit comme un identifiant mais doit être unique
-     * @param color couleur du rectangle
-     * @throws InvalidDataException
-     */
-    //TODO verifier l'utiliter de ce constructeur
-    @Deprecated
-    public DrawableRectangle(Bitmap bitmap,Rectangle rectangle, String name, int color) throws InvalidDataException {
-        super(rectangle.getPositionX(),rectangle.getPositionY(),name);
-        if(rectangle.isDrawable() || bitmap == null)throw new InvalidDataException(name,rectangle);
-
-        rectangle.scaleRectangleToScreen();
-        rectangle.bitmapRectangleBuilder(bitmap,color);
-        setBitmap(bitmap);
-    }
 }

app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java

@@ -185,7 +185,6 @@ public class Renderer extends SurfaceView implements SurfaceHolder.Callback {
                 //empecher d'aller plus vite que le taux de rafraichissement de l'ecran
                 //sauve de la baterie
                 FpsTime.waitFrameTime(time);
-                if(engine != null && engine.isReady())engine.onFrameDoneRendering();
                 while(!needToUpdate)
                 {
                     try {

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
           android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>