From 51a54a6d6cd1bcbdb97fd7adc51383c88b75ae1a Mon Sep 17 00:00:00 2001
From: CARION Baptiste <baptiste.carion@sfr.fr>
Date: Wed, 2 Sep 2020 08:25:11 +0200
Subject: [PATCH] Brouillard de guerre fonctionnel
---
src/main/Case.java | 1 +
src/main/Region.java | 4 ++--
src/units/Paysant.java | 2 +-
src/units/Unite.java | 41 +++++++++++++++++------------------------
4 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/src/main/Case.java b/src/main/Case.java
index a47af92..ff8c99e 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 4b9c87b..ea1a573 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 a1747f8..125145f 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 b646c9d..26c4320 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);
+ }
}
}
}
--
GitLab