From 37a43672709a385b8a1cc6e2f187752de1718d96 Mon Sep 17 00:00:00 2001
From: "Francois .D" <automate59go@gmail.com>
Date: Wed, 2 Sep 2020 11:17:17 +0200
Subject: [PATCH] fix combat et plateau
---
src/main/Plateau.java | 10 +++++++---
src/units/Combattre.java | 2 --
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/Plateau.java b/src/main/Plateau.java
index c9c05b5..13a015f 100644
--- a/src/main/Plateau.java
+++ b/src/main/Plateau.java
@@ -18,9 +18,13 @@ public class Plateau {
plateau[i][j].fillRegion();
}
}
- int rd1 = (int)random.nextInt(10)+10;
- int rd2 = (int)random.nextInt(30);
- this.getCase(rd1, rd2).setItem(new Crown(this.getCase(0, 0)));
+ int rd1;
+ int rd2;
+ do {
+ rd1 = (int)random.nextInt(10)+10;
+ rd2 = (int)random.nextInt(30);
+ this.getCase(rd1, rd2).setItem(new Crown(this.getCase(0, 0)));
+ } while (this.getCase(rd1, rd2).getType() != Type.GRASS);
}
public Case getCase(int x, int y) {
return plateau[x/5][y/5].region[x%5][y%5];
diff --git a/src/units/Combattre.java b/src/units/Combattre.java
index 5fcf9f7..3778dab 100644
--- a/src/units/Combattre.java
+++ b/src/units/Combattre.java
@@ -9,9 +9,7 @@ public class Combattre {
uniteDef.setArmor(uniteDef.getArmor()-uniteAttq.getDamage());
if (isAlive(uniteDef)) {
- //TODO: peut �tre mettre moins de d�gat pour l'unit� qui d�fend
uniteAttq.setArmor(uniteAttq.getArmor()-uniteDef.getDamage());
- //TODO: attention au archer !
isAlive(uniteAttq);
}
}
--
GitLab