diff --git a/src/main/Plateau.java b/src/main/Plateau.java index c9c05b50141f66cd6cd62de56b766dd55ae5f99d..13a015f468dec00a503144b46a9e66562b63aa33 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 5fcf9f75895b0a0b0721bc3ab78fd6c7a21b424f..3778dab0f9d17368a96616b7f95d512afd6684a7 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); } }