Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git

src/backend/Sheep.java

@@ -32,6 +32,7 @@ public class Sheep extends Agent {
 	public boolean liveTurn(ArrayList<Agent> neighbors, Simulator world) {
 		if(world.getCell(x, y)==1) {
 			world.setCell(x, y, 0);
+			hunger=hunger-1;
 		} else {
 			hunger++;
 		}
@@ -39,7 +40,7 @@ public class Sheep extends Agent {
 		if (hunger<=10) {
 			return true;
 		}else {
-			return hunger>10;
+			return false;
 		}
 	}
 

src/backend/Wolf.java

@@ -31,13 +31,20 @@ public class Wolf extends Agent {
 			if(world.typeAnimals(x,y, neighbors)== "Sheep") {
 				Sheep sheep = new Sheep(x,y) ;
 				world.getAnimals().remove(sheep);	
+				hunger=hunger-1;
+			}else {
+				hunger++;
 			}
 				
 		} else {
 			hunger++;
 		}
 		this.moveRandom();
-		return hunger>10;
+		if (hunger<=10) {
+			return true;
+		}else {
+			return false;
+		}
 	}
 
 	private void moveRandom() {