Merge pull request #6 from JavaSTMN/dev

Dev

.gitignore

@@ -55,3 +55,4 @@ local.properties
 .scala_dependencies
 .worksheet
 
+/.metadata/

src/core/.gitignore

@@ -9,3 +9,9 @@
 /Hero.class
 /Player.class
 /Mana.class
+/GameManager$1.class
+/GameManager$2.class
+/GameManager$3.class
+/GameManager$4.class
+/GameManager$5.class
+/GameManager$6.class

src/core/Card.java

@@ -7,6 +7,7 @@ public abstract class Card {
 	private int mana;
 	private Image image;
 	private String effect;
+	private boolean attack;
 
 
 
@@ -15,7 +16,7 @@ public Card(String name, int mana, Image image, String effect) {
 		this.mana = mana;
 		this.image = image;
 		this.effect = effect;
-
+		attack = false;
 	}
 	/**
 	 * 
@@ -25,6 +26,14 @@ public String getName() {
 	return this.name;
 	}
 
+
+	public boolean isAttack() {
+		return attack;
+	}
+	public void setAttack(boolean a) {
+		this.attack = a;
+	}
+
 	public String getEffect() {
 		return this.effect;
 	}

src/core/Deck.java

@@ -1,13 +1,52 @@
 package core;
 
+import java.awt.Image;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
+import javax.swing.ImageIcon;
+
+import tool.ImagePaths;
+
 public class Deck {
 
 	private Hero hero;
-	private final int _NB_MAX_CARD = 10 ;
+	private final int _NB_MAX_CARD = 20 ;
 	private ArrayList<Card> cards;
 
+	public Deck() {
+		cards = new ArrayList<Card>();
+	}
+
+	public Deck(int test) {
+		cards = new ArrayList<Card>();
+		if(test == 1) {
+			ImageIcon imageIcon = new ImageIcon(ImagePaths._HERO_GLORIA); 
+			Image imgGloria = imageIcon.getImage();
+			hero = new Hero("Gloria", imgGloria);
+		} else {
+			ImageIcon imageIcon = new ImageIcon(ImagePaths._HERO_LSD); 
+			Image imgLsd = imageIcon.getImage();
+			hero = new Hero("Lsd", imgLsd);
+		}
+
+		Image sbire_slime = new ImageIcon(ImagePaths._SLIME_3).getImage();
+		Image spell_katon = new ImageIcon(ImagePaths._SPELL_KATON).getImage();
+		Image spell_rasengan = new ImageIcon(ImagePaths._SPELL_RASENGAN).getImage();
+
+		cards.add(new Monster("slime",1, sbire_slime,"Slurp",1,3));
+		cards.add(new Monster("slime",1, sbire_slime,"Slurp",1,3));
+		cards.add(new Monster("slime",1, sbire_slime,"Slurp",1,3));
+		cards.add(new Monster("slime",1, sbire_slime,"Slurp",1,3));
+		cards.add(new Monster("slime",1, sbire_slime,"Slurp",1,3));
+		cards.add(new Spell("katon",2, spell_katon,"Inflige 2 point(s) de dégats", 2));
+		cards.add(new Spell("katon",2, spell_katon,"Inflige 2 point(s) de dégats", 2));
+		cards.add(new Spell("katon",2, spell_katon,"Inflige 2 point(s) de dégats", 2));
+		cards.add(new Spell("katon",2, spell_katon,"Inflige 2 point(s) de dégats", 2));
+		cards.add(new Spell("rasengan",4, spell_rasengan,"Inflige 2 points de dégats à tous les serviteurs adverses",  2));
+
+	}
+
 
 	public ArrayList<Card> getCards() {
 		return cards;
@@ -23,6 +62,16 @@ public void addCardToDeck(Card card) {
 		this.cards.add(card);
 	}
 
+	public boolean canAddCardToDeck(Card card) {
+		int cpt = 0;
+		for(Card myCard : this.cards) {
+			if(myCard.getName() == card.getName())
+				cpt++;
+		}
+		return (cpt<3)?true:false;
+
+	}
+
 
 	public void removeCardFromDeck(Card card) {
 		this.cards.remove(card);
@@ -38,6 +87,19 @@ public void setHero(Hero hero) {
 	public int get_NB_MAX_CARD() {
 		return _NB_MAX_CARD;
 	}
+
+	public int getNbCards() {
+		return this.cards.size();
+	}
+
+	public String getCardsToString() {
+		String res = "";
+		for( Card myCard : this.cards) {
+			res += "  -  "+myCard.getMana()+" | "+ myCard.getName()+"\n";
+	    }
+		return res;
+	}
+
 
 
 }