Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
This commit is contained in:
commit
4d7f223e9d
|
|
@ -241,15 +241,33 @@ public class Simulator extends Thread {
|
|||
* method called when clicking on a cell in the interface
|
||||
*/
|
||||
public void clickCell(int x, int y) {
|
||||
|
||||
if (clickActionFlag==0) { // cell
|
||||
world.setCell(x, y, getCell(x, y) == 1 ? 0 : 1);
|
||||
|
||||
} else if (clickActionFlag==1) { // sheep
|
||||
Sheep sheep = new Sheep(x,y);
|
||||
agents.add(sheep);
|
||||
ArrayList<Agent> nearby=getNeighboringAnimals(x,y,1);
|
||||
if (nearby.isEmpty()) {
|
||||
Sheep sheep = new Sheep(x,y);
|
||||
agents.add(sheep);
|
||||
}else {
|
||||
for (Agent animal:nearby) {
|
||||
agents.remove(animal);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else if (clickActionFlag==2) { // wolf
|
||||
Wolf wolf = new Wolf(x,y);
|
||||
agents.add(wolf);
|
||||
}
|
||||
ArrayList<Agent> nearby=getNeighboringAnimals(x,y,1);
|
||||
if (nearby.isEmpty()) {
|
||||
Wolf wolf = new Wolf(x,y);
|
||||
agents.add(wolf);
|
||||
}else {
|
||||
for (Agent animal:nearby) {
|
||||
agents.remove(animal);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue