Amélioration commit

src/game/Board.java

@@ -1,5 +1,8 @@
 package game;
 
+import java.util.Arrays;
+import java.util.Iterator;
+
 import game.cards.Card;
 
 /**
@@ -28,8 +31,8 @@ public class Board {
 		return board[zone];
 	}
 
-	public int getNumberCardInZone() {
+	public Iterator<Card> getIterator(){
-		return board.length;
+          return Arrays.stream(board).iterator();
     }
 
 }

src/game/Joueur.java

@@ -1,6 +1,7 @@
 package game;
 
 import java.io.IOException;
+import java.util.Iterator;
 
 import game.cards.Card;
 import game.cards.CardRegistery;
@@ -219,8 +220,10 @@ public class Joueur {
 	 * cette methode a pour but d'executé les evenement de fin de trous des cartes
 	 */
 	public void endPhase() {
-		for (int i = 0; i < board.getNumberCardInZone(); i++) {
+		Iterator<Card> it = board.getIterator();
-			Card c = board.getCardInZone(i);
+        while(it.hasNext())
+        {
+        Card c = it.next();
             if (c != null) {
                 c.resetAttack();
             }
@@ -317,16 +320,17 @@ public class Joueur {
 					if (attackingCard == null) {
 						throw new RuntimeException("invalid attack");
 					} else {
-						if (carteCible.equals("100") && attackingCard.alreadyAttack()) {
+						if (carteCible.equals("100") && !attackingCard.hasAlreadyAttacked()) {
 							boolean isadvDead = handleAttackAgainstPlayer(attackingCard, adversaire);
 							if(isadvDead)
 							{
 								phaseActive = false;
 							}
+							attackingCard.hasAttacked();
 						} else {
-							if (attackingCard.alreadyAttack()) {
+							if (!attackingCard.hasAlreadyAttacked()) {
 								handleAttackAgainstCard(attackingCard, carteCible, adversaire);
-								attackingCard.haveAttack();
+								attackingCard.hasAttacked();
 							}
 						}
 					}

src/game/cards/Card.java

@@ -4,7 +4,7 @@ public abstract class Card{
 	
 	private int attack;
 	private int health;
-	private boolean notPlay=true;
+	private boolean hasAttacked=true;
 	
 	public Card() {
 		attack = getDefaultAttack();
@@ -78,16 +78,16 @@ public abstract class Card{
 		return health == 0;
     }
     
-	public boolean alreadyAttack() {
+	public boolean hasAlreadyAttacked() {
-		return notPlay;
+		return hasAttacked;
 	}
 	
-	public void haveAttack() {
+	public void hasAttacked() {
-		notPlay = false;
+		hasAttacked = true;
 	}
 	
 	public void resetAttack() {
-		notPlay=true;
+		hasAttacked=false;
 	}
 }