diff --git a/src/main/Case.java b/src/main/Case.java index a47af92925524e6e3d8e5dc8a33a2cb2ca0cc3bb..ff8c99e9e7d08bf969ffd41e5cdf7e095ade5d3b 100644 --- a/src/main/Case.java +++ b/src/main/Case.java @@ -9,6 +9,7 @@ public class Case { private Unite unite; private int x; private int y; + private boolean aEteVu; public Case(Type type) { this.type = type; diff --git a/src/main/Region.java b/src/main/Region.java index 4b9c87b60a9a005b45127bce1da81ddd540dc8ca..ea1a573be58c922a43f0cdda6f4a77e22ab2b800 100644 --- a/src/main/Region.java +++ b/src/main/Region.java @@ -21,8 +21,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); diff --git a/src/units/Paysant.java b/src/units/Paysant.java index a1747f87131378057e2c19bceb7e1f573374855e..125145f52b09e750dccf1996a60cfd2556c6a054 100644 --- a/src/units/Paysant.java +++ b/src/units/Paysant.java @@ -12,7 +12,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); diff --git a/src/units/Unite.java b/src/units/Unite.java index b646c9d739dd1fbd81cabbd9f86747df75a6c297..26c43201d1eeee7ad7a4e19cb8ae17e1a698a89d 100644 --- a/src/units/Unite.java +++ b/src/units/Unite.java @@ -157,37 +157,30 @@ public abstract class Unite { } 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 (this.plateau.getCase(emplacement.getX(), emplacement.getY()-1).getType() != Type.MOUNTAIN) { + updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() -1), vision-1); + } } - if (vision-- > -1) { - updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() -1), vision--); - } - } - 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 (this.plateau.getCase(emplacement.getX()+1, emplacement.getY()+1).getType() != Type.MOUNTAIN) { + updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() +1), vision-1); + } } - if (vision-- > -1) { - updateDecouverte(this.plateau.getCase(emplacement.getX(), emplacement.getY() +1), vision--); - } - } - 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 (vision-- > -1) { - updateDecouverte(this.plateau.getCase(emplacement.getX()-1, emplacement.getY()), vision--); + if (this.plateau.getCase(emplacement.getX()-1, emplacement.getY()).getType() != Type.MOUNTAIN) { + updateDecouverte(this.plateau.getCase(emplacement.getX()-1, emplacement.getY()), vision-1); + } } } }