Merge branch 'master' into Francois

src/main/Case.java

@@ -15,6 +15,7 @@ public class Case {
 	private Unite unite;
 	private int x;
 	private int y;
+	private boolean aEteVu;
 	
 	public Case(Type type) {
 		this.type = type;

src/main/Region.java

@@ -23,8 +23,8 @@ public class Region {
 				else {
 					region[i][j] = new Case(Type.GRASS);
 				}
-				region[i][j].setX(i * x);
-				region[i][j].setY(j * y);
+				region[i][j].setX(i + (x *5));
+				region[i][j].setY(j + (y *5));
 			}
 		}
 		int rd1 = (int)random.nextInt(5);

src/units/Paysant.java

@@ -11,7 +11,7 @@ public class Paysant extends Unite{
 	public static final int DAMAGE = 1;
 	public static final char SYMBOL = 'p';
 	public static final int PATOGIVE = 1;
-	public static final int VISION = 2;
+	public static final int VISION = 4;
 
 	public Paysant(int x, int y, Plateau plateau, Joueur joueur) {
 		super(x, y, plateau, SYMBOL, ARMOR, DAMAGE, joueur, VISION);

src/units/Unite.java

@@ -196,37 +196,30 @@ public abstract class Unite {
 		this.y=rd2;
 	}
 	public void updateDecouverte (Case emplacement, int vision) {
-		System.out.println("" + emplacement.getX() + ", " + emplacement.getY());
-		if (emplacement.getX()+1 < this.plateau.getLength()) {	
-			if(this.plateau.getCase(emplacement.getX()+1, emplacement.getY()).isDecouverte()==false) {
+		if (vision > -1) {
+			if (emplacement.getX() < 29) {	
 				this.plateau.getCase(emplacement.getX()+1, emplacement.getY()).setDecouverte(true);
+				if (this.plateau.getCase(emplacement.getX()+1, emplacement.getY()).getType() != Type.MOUNTAIN) {
+					updateDecouverte(this.plateau.getCase(emplacement.getX()+1, emplacement.getY()), vision-1);
 				}
-			if (vision-- > -1) {
-				updateDecouverte(this.plateau.getCase(emplacement.getX()+1, emplacement.getY()), vision--);
 			}
-		}
-		if (emplacement.getY()-1 > -1) {
-			if(this.plateau.getCase(emplacement.getX(), emplacement.getY() -1).isDecouverte()==false) {
+			if (emplacement.getY() > 0) {
 				this.plateau.getCase(emplacement.getX(), emplacement.getY() -1).setDecouverte(true);
-			}
-			if (vision-- > -1) {
-				updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() -1), vision--);
+				if (this.plateau.getCase(emplacement.getX(), emplacement.getY()-1).getType() != Type.MOUNTAIN) {
+					updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() -1), vision-1);
 				}
 			}
-		if (emplacement.getY()+1 < plateau.getWidth()) {
-			if(this.plateau.getCase(emplacement.getX(), emplacement.getY() +1).isDecouverte()==false) {
+			if (emplacement.getY() < 29) {
 				this.plateau.getCase(emplacement.getX(), emplacement.getY() +1).setDecouverte(true);
-			}
-			if (vision-- > -1) {
-				updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() +1), vision--);
+				if (this.plateau.getCase(emplacement.getX()+1, emplacement.getY()+1).getType() != Type.MOUNTAIN) {
+					updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() +1), vision-1);
 				}
 			}
-		if (emplacement.getX()-1 > -1) {
-			if(this.plateau.getCase(emplacement.getX()-1, emplacement.getY()).isDecouverte()==false) {
+			if (emplacement.getX() > 0) {
 				this.plateau.getCase(emplacement.getX()-1, emplacement.getY()).setDecouverte(true);
+				if (this.plateau.getCase(emplacement.getX()-1, emplacement.getY()).getType() != Type.MOUNTAIN) {
+					updateDecouverte(this.plateau.getCase(emplacement.getX()-1, emplacement.getY()), vision-1);
 				}
-			if (vision-- > -1) {
-				updateDecouverte(this.plateau.getCase(emplacement.getX()-1, emplacement.getY()), vision--);
 			}
 		}
 	}