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 3fb4eac..df57ac9 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 @@ -116,5 +116,22 @@ public abstract class Card { */ public abstract String getName(); + /** + * cette fonction retourne le coût en mana de la carte qui sera afficher + * @return le cout + */ + public abstract int getCost(); + + /** + * cette fonction retourne le lien wikipédia de la carte qui sera afficher + * @return le lien wikipedia + */ + public abstract String getWikipediaLink(); + + /** + * cette fonction retourne la catégorie de la carte qui sera afficher + * @return la categorie + */ + public abstract String getCategorie(); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java index 071509b..e166233 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java @@ -10,8 +10,8 @@ public class CardRegistery { { registry = new ArrayList<>(); - registry.add(DemoCard.class); - registry.add(DemoCard2.class); + registry.add(Mythes_Perséphone.class); + registry.add(Mythes_Chiron.class); diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java deleted file mode 100644 index 52535a4..0000000 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.iutlaval.myapplication.Game.Cards; - -import android.content.Context; -import android.graphics.Color; - -import com.iutlaval.myapplication.R; - -public class DemoCard extends Card{ - - /** - * cree une carte est lui definit un drawable - * - * @param UID - * @param c - */ - public DemoCard(String UID, Context c) { - super(UID, c); - } - - - @Override - public int getCardPicture() { - return R.drawable.t_cp_elfe_fournisseur; - } - - - //#AARRGGBB - @Override - public String getColor() { - return "#00000000"; - } - - @Override - public String getDescription() { - return "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec volutpat metus eu augue aliquet, nec accumsan tellus aliquam. Nullam eu consectetur quam."; - } - - @Override - public int getAttack() { - return 10; - } - - @Override - public int getHealth() { - return 10; - } - - @Override - public String getName() { - return "DEMO"; - } -} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard2.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard2.java deleted file mode 100644 index 09c1a80..0000000 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard2.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.iutlaval.myapplication.Game.Cards; - -import android.content.Context; - -import com.iutlaval.myapplication.R; - -public class DemoCard2 extends Card{ - /** - * cree une carte est lui definit un drawable - * - * @param UID - * @param c - */ - public DemoCard2(String UID, Context c) { - super(UID, c); - } - - @Override - public int getCardPicture() { - return R.drawable.t_b_batiut; - } - - @Override - public String getDescription() { - return "usless demo"; - } - - @Override - public int getAttack() { - return 0; - } - - @Override - public int getHealth() { - return 0; - } - - @Override - public String getName() { - return "DEMO2"; - } -} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java new file mode 100644 index 0000000..f8902e7 --- /dev/null +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java @@ -0,0 +1,97 @@ +package com.iutlaval.myapplication.Game.Cards; + +import android.content.Context; + +import com.iutlaval.myapplication.R; + +public class Mythes_Chiron extends Card{ + /** + * cree une carte est lui definit un drawable + * + * @param UID + * @param c + */ + public Mythes_Chiron(String UID, Context c) { + super(UID, c); + } + + /** + * retourne l'indice de la texture de la photo de la carte + * + * @return + */ + @Override + public int getCardPicture() { + return R.drawable.t_c_chiron; + } + + /** + * retourn le texte de la description de la carte + * + * @return la description + */ + @Override + public String getDescription() { + return "Quand il arrive sur le champ de bataille vous piocher une carte"; + } + + /** + * retourne un entier coresspondant a l'attaque de la carte + * + * @return + */ + @Override + public int getAttack() { + return 3; + } + + /** + * retourne la santé de la carte + * + * @return + */ + @Override + public int getHealth() { + return 2; + } + + /** + * cette fonction retourne le nom de la carte qui sera afficher + * + * @return le nom + */ + @Override + public String getName() { + return "Chiron, formateur de héros"; + } + + /** + * cette fonction retourne le coût en mana de la carte qui sera afficher + * + * @return le nom + */ + @Override + public int getCost() { + return 3; + } + + /** + * cette fonction retourne le lien wikipédia de la carte qui sera afficher + * + * @return le nom + */ + @Override + public String getWikipediaLink() { + return "https://fr.wikipedia.org/wiki/Chiron_(mythologie)#Autres_disciples"; + } + + /** + * cette fonction retourne la catégorie de la carte qui sera afficher + * + * @return la categorie + */ + @Override + public String getCategorie() { + return "Demi-dieu"; + } +} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java new file mode 100644 index 0000000..ed25aee --- /dev/null +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java @@ -0,0 +1,62 @@ +package com.iutlaval.myapplication.Game.Cards; + +import android.content.Context; + +import com.iutlaval.myapplication.R; + +public class Mythes_Perséphone extends Card{ + /** + * cree une carte est lui definit un drawable + * + * @param UID + * @param c + */ + public Mythes_Perséphone(String UID, Context c) { + super(UID, c); + } + + @Override + public int getCardPicture() { + return R.drawable.t_c_mythe_persephone; + } + + @Override + public String getDescription() { + return "Redonne 5 points de vie au joueur"; + } + + @Override + public int getAttack() { + return 4; + } + + @Override + public int getHealth() { + return 4; + } + + @Override + public String getName() { + return "Perséphone, Reine des Enfers"; + } + + @Override + public int getCost() { + return 7; + } + + @Override + public String getWikipediaLink() { + return "https://fr.wikipedia.org/wiki/Pers%C3%A9phone#"; + } + + /** + * cette fonction retourne la catégorie de la carte qui sera afficher + * + * @return la categorie + */ + @Override + public String getCategorie() { + return "Dieu" ; + } +} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java b/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java index 5625893..068e33a 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java @@ -4,12 +4,9 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.Game.Cards.CardRegistery; -import com.iutlaval.myapplication.Game.Cards.DemoCard; -import com.iutlaval.myapplication.Game.Cards.DemoCard2; +import com.iutlaval.myapplication.Game.Cards.Mythes_Perséphone; import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.List; import java.util.Stack; public class NetworkDeck{ @@ -27,7 +24,7 @@ public class NetworkDeck{ cards.add((Card) con.newInstance("nas"+nbcarte,context)); } catch (Exception e) { e.printStackTrace(); - cards.add(new DemoCard("nas"+nbcarte,context)); + cards.add(new Mythes_Perséphone("nas"+nbcarte,context)); } nbcarte++; } diff --git a/app/src/main/res/drawable-v24/t_c_chiron.jpg b/app/src/main/res/drawable-v24/t_c_chiron.jpg new file mode 100644 index 0000000..0486f59 Binary files /dev/null and b/app/src/main/res/drawable-v24/t_c_chiron.jpg differ diff --git a/app/src/main/res/drawable-v24/t_c_mythe_persephone.jpg b/app/src/main/res/drawable-v24/t_c_mythe_persephone.jpg new file mode 100644 index 0000000..710f330 Binary files /dev/null and b/app/src/main/res/drawable-v24/t_c_mythe_persephone.jpg differ diff --git a/app/src/main/res/drawable/t_cp_compagnon_des_elfes.jpg b/app/src/main/res/drawable/t_cp_compagnon_des_elfes.jpg deleted file mode 100644 index c224d6b..0000000 Binary files a/app/src/main/res/drawable/t_cp_compagnon_des_elfes.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/t_cp_elfe_fournisseur.jpg b/app/src/main/res/drawable/t_cp_elfe_fournisseur.jpg deleted file mode 100644 index b2d2674..0000000 Binary files a/app/src/main/res/drawable/t_cp_elfe_fournisseur.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/t_cp_elfe_nul.png b/app/src/main/res/drawable/t_cp_elfe_nul.png deleted file mode 100644 index ab0a9db..0000000 Binary files a/app/src/main/res/drawable/t_cp_elfe_nul.png and /dev/null differ