Merge pull request #5 from JavaSTMN/dev

Dev

assets/img/Cards/Spells/readme.md

@@ -0,0 +1 @@
+

src/core/.gitignore

@@ -8,3 +8,4 @@
 /Hand.class
 /Hero.class
 /Player.class
+/Mana.class

src/core/Card.java

@@ -4,16 +4,14 @@
 
 public abstract class Card {
 	private String name;
-	private String description;
 	private int mana;
 	private Image image;
 	private String effect;
 
 
 
-	public Card(String name, String description, int mana, Image image, String effect) {
+	public Card(String name, int mana, Image image, String effect) {
 		this.name = name;
-		this.description = description;
 		this.mana = mana;
 		this.image = image;
 		this.effect = effect;
@@ -31,13 +29,6 @@ public String getEffect() {
 		return this.effect;
 	}
 
-	/**
-	 * 
-	 * @return
-	 */
-	public String getDescription() {
-		return this.description;
-	}
 	/**
 	 * 
 	 * @return
@@ -51,14 +42,14 @@ public void action() {
 	/**
 	 * @return
 	 */
-	public Image getImgPath() {
+	public Image getImg() {
 		return this.image;
 	}
 	/**
 	 * 
 	 * @param imgPath
 	 */
-	public void setImgPath(Image image) {
+	public void setImg(Image image) {
 		this.image = image;
 	}
 

src/core/Deck.java

@@ -4,33 +4,17 @@
 
 public class Deck {
 
-	private String label;
-	private String heroType;
+	private Hero hero;
 	private final int _NB_MAX_CARD = 10 ;
 	private ArrayList<Card> cards;
+
+
 	public ArrayList<Card> getCards() {
 		return cards;
 	}
 	public void setCards(ArrayList<Card> cards) {
 		this.cards = cards;
 	}
-
-
-	/**
-	 * 
-	 * @param label
-	 * @param heroType
-	 * @param nb
-	 * @param cards
-	 */
-	public Deck(String label, String heroType, int nb, ArrayList<Card> cards) {
-		this.label = label;
-		this.heroType = heroType;
-		this.cards = cards;
-
-	}
-
-
 	/**
 	 * @param deck
 	 * @param card
@@ -43,17 +27,13 @@ public void addCardToDeck(Card card) {
 	public void removeCardFromDeck(Card card) {
 		this.cards.remove(card);
 	}
-	public String getLabel() {
-		return label;
-	}
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	public String getHeroType() {
-		return heroType;
+
+	public Hero getHero() {
+		return hero;
 	}
-	public void setHeroType(String heroType) {
-		this.heroType = heroType;
+
+	public void setHero(Hero hero) {
+		this.hero = hero;
 	}
 	public int get_NB_MAX_CARD() {
 		return _NB_MAX_CARD;

src/core/GameManager.java

@@ -5,10 +5,15 @@ public class GameManager {
 	private Player playerOne;
 	private Player playerTwo;
 
+	public GameManager(Player playerOne, Player playerTwo) {
+		this.playerOne = playerOne;
+		this.playerTwo = playerTwo;
+	}
 
 
 	public void startGame() {
-		//TODO hah
+		System.out.println(playerOne.toString());
+		System.out.println(playerTwo.toString());
 	}
 
 	public void endGame() {
@@ -19,4 +24,20 @@ public void endRound() {
 		//TODO
 	}
 
+	public Player getPlayerOne() {
+		return playerOne;
+	}
+
+	public void setPlayerOne(Player playerOne) {
+		this.playerOne = playerOne;
+	}
+
+	public Player getPlayerTwo() {
+		return playerTwo;
+	}
+
+	public void setPlayerTwo(Player playerTwo) {
+		this.playerTwo = playerTwo;
+	}
+
 }

src/core/Hand.java

@@ -1,26 +1,39 @@
 package core;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class Hand {
 
 	private int maxCard;
 	private ArrayList<Card> cards;
 
-	public Hand() {
+	public Hand(ArrayList<Card> cards) {
+		this.cards = cards;
 	}
-	public void shuffleCards(ArrayList<Card> cards) {
-		//TODO Shuffle ArrayList
+	public void shuffleCards() {
+		Collections.shuffle(this.cards);
 	}
 
 	public void displayCard(Card card) {
 		//TODO Display a card, meh
-		// Afficher la carte dans la main
 
 	}
 
 	public void moveCard(Card card) {
 		//TODO Move a specific card, meh
 	}
+	public int getMaxCard() {
+		return maxCard;
+	}
+	public void setMaxCard(int maxCard) {
+		this.maxCard = maxCard;
+	}
+	public ArrayList<Card> getCards() {
+		return cards;
+	}
+	public void setCards(ArrayList<Card> cards) {
+		this.cards = cards;
+	}
 
 }

src/core/Hero.java

@@ -10,8 +10,8 @@ public class Hero {
 	public static int _NB_MAX_HP = 20;
 
 	public Hero(String name, Image img) {
-		this.name = name;
-		this.hp = _NB_MAX_HP;
+		this.setName(name);
+		this.setHp(_NB_MAX_HP);
 		this.img = img;
 	}
 
@@ -20,15 +20,30 @@ public Image getImage() {
 	}
 
 	public void die() {
-		// TODO
 	}
 
 	public void gainHp(int hp) {
-		this.hp += hp;
+		this.setHp(this.getHp() + hp);
 	}
 
 	public void loseHp(int hp) {
-		this.hp -= hp;
+		this.setHp(this.getHp() - hp);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getHp() {
+		return hp;
+	}
+
+	public void setHp(int hp) {
+		this.hp = hp;
 	}
 
 }

src/core/Mana.java

@@ -1,20 +1,20 @@
 package core;
 
 public class Mana {
-	private int _MAX_CRYSTALS;
+	private int _MAX_MANA;
 	private int manaTurn;
 	private int manaMaxByTurn;
 
 	public Mana(int init) {
-		this._MAX_CRYSTALS = 10;
+		this._MAX_MANA = 10;
 		this.manaTurn = init;
 		this.manaMaxByTurn = init;
 	}
 
 	//Fonction qui ajoute du mana a chaque tour
 		public void addManaTurn(int number) {
 			this.manaMaxByTurn = this.manaMaxByTurn + number;
-			this.manaMaxByTurn = (this.manaMaxByTurn >= _MAX_CRYSTALS)?_MAX_CRYSTALS:this.manaMaxByTurn;
+			this.manaMaxByTurn = (this.manaMaxByTurn >= _MAX_MANA)?_MAX_MANA:this.manaMaxByTurn;
 		}
 
 		//Fonction qui enleve les cristaux

src/core/Monster.java

@@ -3,10 +3,15 @@
 import java.awt.Image;
 
 public class Monster extends Card implements ICard, IAttackingCard{
+
+
+	private int hp;
+	private int damage;
 
-	public Monster(String name, String description, int mana, Image image, String effect) {
-		super(name, description, mana, image, effect);
-		// TODO Auto-generated constructor stub
+	public Monster(String name, int mana, Image image, String effect, int damage, int hp) {
+		super(name, mana, image, effect);
+		this.hp = hp;
+		this.damage = damage;
 	}
 
 	public void action() {
@@ -31,6 +36,22 @@ public void attack(Card card) {
 
 	}
 
+	public void removeHP(int number) {
+		this.hp -= number;
+	}
+
+	public void addHP(int number) {
+		this.hp += number;
+	}
+
+	public void removeAttack(int number) {
+		this.damage -= number;
+	}
+
+	public void addAttack(int number) {
+		this.damage += number;
+	}
+
 
 
 

src/core/Player.java

@@ -53,4 +53,5 @@ public Hero getHero() {
 	public void setHero(Hero hero) {
 		this.hero = hero;
 	}
+
 }

src/core/Spell.java

@@ -4,8 +4,8 @@
 
 public class Spell extends Card implements ICard, IAttackingCard {
 
-	public Spell(String name, String description, int mana, Image image, String effect) {
-		super(name, description, mana, image, effect);
+	public Spell(String name, int mana, Image image, String effect) {
+		super(name, mana, image, effect);
 		// TODO Auto-generated constructor stub
 	}
 

src/ihm/.gitignore

@@ -13,3 +13,5 @@
 /JPersoButton.class
 /CreateDeck$3.class
 /CreateDeck$4.class
+/CreateDeck$5.class
+/CreateDeck$6.class