diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..dc7f5aa
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java b/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java
index a626458..d636309 100644
--- a/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java
+++ b/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);
 
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
index 1cd95db..407955c 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
+++ b/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
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 ffee4aa..dbc7ac4 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java
index 86ffd89..0070ace 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java
+++ b/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;
     }
 
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 546a7cb..a10b873 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
@@ -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;
     }
 
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 2a2257b..132ee44 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
@@ -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;
     }
 
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 b01603e..28a339e 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java
index 433314d..0d94cb6 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java
index a50175c..0935564 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java
+++ b/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;
     }
 
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 42abfd7..d5b3760 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
@@ -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;
     }
 
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 3356b82..75b4de7 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java
index 959cf11..3b6d167 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java
+++ b/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;
     }
 
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 d3b2660..c160917 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java
index cb20dbf..41cff33 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java
+++ b/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;
     }
 
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 7650dca..6e4b7ec 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
@@ -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;
     }
 
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 9f42ab6..3e8f6ef 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
@@ -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;
     }
 
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 c376d16..f41a0c1 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
@@ -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;
     }
 
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 964835f..2584da8 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
@@ -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;
     }
 
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 1897674..4ecbc64 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
@@ -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;
     }
 
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 0d5a977..6698b87 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java
index 5215ddd..69968ea 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java
index 2236bd1..dbdde7a 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java
index 6bb5b33..e4c8ebb 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java
+++ b/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;
     }
 
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 6e615cf..f586990 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
@@ -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;
     }
 
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 38c1957..df5c5fe 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java
index 0428b9f..f4264ef 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java
@@ -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;
     }
 
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 0a2bf50..aa09594 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java
index bd0a506..a36db96 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java
index 67cf721..207fdc9 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java
index af09366..5235af7 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java
+++ b/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;
     }
 
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 b0c6086..3a85b62 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java
index fd9c699..25faf33 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java
index ec71867..8532fba 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java
+++ b/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;
     }
 
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 b4861b5..d6fb363 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
@@ -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;
     }
 
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 e25cd25..71e4f13 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
@@ -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;
     }
 
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 88bc60e..0113dab 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java
index ce311f1..aeaaab9 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java
+++ b/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;
     }
 
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 e27279c..2e3dded 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java
index 091649c..6d34da7 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java
+++ b/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;
     }
 
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 5288fd7..3e52324 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
@@ -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;
     }
 
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 90a4f11..e9a20eb 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java
index 3926fc3..0378f90 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java
index e906ee5..c7e20e6 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java
index 6189114..c88cd02 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java
index cda4496..d03c809 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java
+++ b/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;
     }
 
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 cc85d86..406cef0 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
@@ -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;
     }
 
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 36c3715..8b9c96a 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
@@ -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;
     }
 
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 5092cbe..0afd1df 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java
index ebebc34..8818555 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java
index 4f73907..004eba7 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java
+++ b/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;
     }
 
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 a94af3e..4ce6d1c 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
@@ -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;
     }
 
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 afa4664..b7b35aa 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
@@ -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;
     }
 
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 068d9ef..6a47078 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
@@ -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;
     }
 
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 890a1d5..008cbff 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
@@ -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;
     }
 
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 063e4b9..2253ee0 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java
index 5b52fe8..345cbcd 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java
index b6403dd..8b7606e 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java
@@ -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;
     }
 
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 3151a70..6794130 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java
index 6ed817e..3ff45ee 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java
index 70bf489..361ac58 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java
+++ b/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;
     }
 
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 5e75ef8..a0b9b2a 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java
index 920537d..533db08 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java
+++ b/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;
     }
 
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 aaeee25..2605950 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java
index a4fad1d..a823203 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java
index bf8b6a7..3202be9 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java
index 0cb4379..e9026e0 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java
index f0029cc..ac6fb6e 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java
+++ b/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;
     }
 
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 4296adc..20101a3 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
@@ -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;
     }
 
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 41003c4..220074f 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
@@ -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;
     }
 
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 ec9364a..00cd543 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java
index 28d64af..226ff9f 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java
index ece46b1..5ca3350 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java
index fb3c448..5da7ac2 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java
+++ b/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;
     }
 
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 ba3dfab..406967a 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java
index 59b3441..a3736bb 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java
index 659b983..2db46f5 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java
+++ b/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;
     }
 
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 b7f0107..f132d50 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
@@ -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;
     }
 
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 bf03eca..31474ea 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
@@ -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;
     }
 
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 2b8fef0..e69dd6a 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
@@ -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;
     }
 
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 ed937bd..8bc64ed 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
@@ -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;
     }
 
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 ec8bd6b..94ee122 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
@@ -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;
     }
 
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 f352c33..4d39c4e 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
@@ -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;
     }
 
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 a792f6e..9208483 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
@@ -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;
     }
 
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 6d2aaab..2bd64da 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java
index e8a03c4..d2e1548 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java
index 3812eaa..c413018 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java
+++ b/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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java
index 1b6c496..86bca90 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java
+++ b/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;
     }
 
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 c99b143..268fe84 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
@@ -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;
     }
 
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 6a9f15e..40a99c4 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
@@ -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;
     }
 
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 462c516..d8412d1 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java
index 6e0f1d5..00a5804 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java
@@ -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;
     }
 
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 a5da6db..dd48d01 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
@@ -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;
     }
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Command.java b/app/src/main/java/com/iutlaval/myapplication/Game/Command.java
index 5c4119f..166d9e0 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Command.java
+++ b/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";
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 2f24b7f..ea7ba21 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+++ b/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
diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
index 740c366..74bbefd 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
@@ -201,7 +201,7 @@ public class DrawableCard extends Drawable{
 
         if(ratio == 1)c.setDrawableCard(this);
 
-        updateHpAndAtk(c.getAttack(),c.getHealth());
+        updateHpAndAtk(c.getAttack(),c.getHealth() );
         setCoordinates(getX(), getY());
     }
 
@@ -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) {
diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableRectangle.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableRectangle.java
index 8f4f52b..1d0fdfb 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableRectangle.java
+++ b/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);
-    }
 }
diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java b/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java
index c2910c3..5d29fbb 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java
+++ b/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 {
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9..ca3826a 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/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"
-        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" />
+    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: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>
diff --git a/app/src/main/res/drawable/t_logo.png b/app/src/main/res/drawable/t_logo.png
new file mode 100644
index 0000000..1a15ca0
Binary files /dev/null and b/app/src/main/res/drawable/t_logo.png differ
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..c4a603d 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..c4a603d 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index a571e60..42c5110 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e1d7b2b
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 61da551..c98f166 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c41dd28..48cea87 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c3f1502
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index db5080a..e70ec21 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 6dba46d..6e3fe22 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..0f62b41
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index da31a87..62b0320 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 15ac681..a1f5e2b 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..6799a58
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index b216f2d..dcf3edc 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index f25a419..2b85d83 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..1a80bf5
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index e96783c..3659746 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ