diff --git a/src/main/Case.java b/src/main/Case.java index 8508388b74e4b72a1167dffaabda881c6059cc1a..4abf007811a26be428cf45b29896b1470dfc6762 100644 --- a/src/main/Case.java +++ b/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; diff --git a/src/main/Region.java b/src/main/Region.java index 2bc804a88d4c3f049a8396077eb3310dc1851852..6eb76d39e4b0f656df2d9df2bcb69e55af9dba58 100644 --- a/src/main/Region.java +++ b/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); diff --git a/src/units/Paysant.java b/src/units/Paysant.java index dd7b0ffa72146075bb23f04a61dd54d965c5d964..f361b7e5fb16d3d4d09396d93d3af5b09304e6eb 100644 --- a/src/units/Paysant.java +++ b/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); diff --git a/src/units/Unite.java b/src/units/Unite.java index edb5f60ca9358bb4004d34a346ab741b21d8c6b9..a31a4acb2cab859689972cbf4f3935f4271ff551 100644 --- a/src/units/Unite.java +++ b/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 (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); + } } } }