From 7a79420cd1a1d33cdb42f14d83f8a64e894da673 Mon Sep 17 00:00:00 2001
From: benoi <benoi@172.30.152.44>
Date: Thu, 30 May 2024 11:12:06 +0200
Subject: [PATCH] # WARNING: head commit changed in the meantime

Merge branch 'master' of
https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
---
 src/backend/Simulator.java | 10 +++++++++-
 src/backend/Wolf.java      |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index 8cbb0b1..553ac57 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -327,7 +327,15 @@ public class Simulator extends Thread {
 		}
 		return inArea;
 	}
-
+	public String typeAnimals(int x , int y,ArrayList<Agent> neighbor) {
+		//ArrayList<Agent> neighbor =getNeighboringAnimals(x,y,1);
+        Agent agent = neighbor.get(0);
+        if (agent instanceof Wolf) {
+            return "Wolf";
+        } else  {
+            return "Sheep";
+        } 
+    }
 	/**
 	 * set value of cell
 	 * @param x coord of cell
diff --git a/src/backend/Wolf.java b/src/backend/Wolf.java
index 584f4b0..189b1e7 100644
--- a/src/backend/Wolf.java
+++ b/src/backend/Wolf.java
@@ -26,7 +26,7 @@ public class Wolf extends Agent {
 	 * as you wish
 	 */
 	public boolean liveTurn(ArrayList<Agent> neighbors, Simulator world) {
-		if(world.getCell(x, y)==1) {
+		if(world.getCell(x, y)== Sheep sheep) {
 			world.setCell(x, y, 0);
 		} else {
 			hunger++;