Animals move random if moveTowards did nothing

johannes67890 · Dec 20, 2023 · cb8d521 · cb8d521
1 parent 118f75b
commit cb8d521
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 12 deletions.
diff --git a/src/main/Animal.java b/src/main/Animal.java
@@ -175,7 +175,7 @@ protected void move(Location location, World world) {
    *
    * @param location - The location to move towards
    */
-  protected void moveTowards(Location location, World world) {
+  protected boolean moveTowards(Location location, World world) {
     int targetX = location.getX();
     int targetY = location.getY();
     int thisX = world.getLocation(this).getX();
@@ -197,6 +197,9 @@ protected void moveTowards(Location location, World world) {
     } else if (targetX < thisX && targetY == thisY) {
       move(new Location(thisX - 1, thisY), world);
     }
+    if(world.getTile(location) != world.getLocation(this)){
+      return true;
+    } else return false;
   }
 
   /**

diff --git a/src/main/Predator.java b/src/main/Predator.java
@@ -45,9 +45,11 @@ public boolean attackForFood(World world) {
     for (Location location : world.getSurroundingTiles(vision)) {
       if (world.getTile(location) instanceof Animal &&
         !world.getTile(location).getClass().equals(this.getClass())) {
-        moveTowards(location, world);
-        System.out.println(this.getClass().getSimpleName() + " Move to attack");
-        return true;
+        if(moveTowards(location, world)){
+          moveTowards(location, world);
+          System.out.println(this.getClass().getSimpleName() + " Move to attack");
+          return true;
+        } else return false;
       }
     }
     return false;

diff --git a/src/main/Rabbit.java b/src/main/Rabbit.java
@@ -71,8 +71,12 @@ public void act(World world) {
         home.addAnimal(this, world);
         return;
       }
-      moveTowards(world.getLocation(home), world);
-      return;
+      if(moveTowards(world.getLocation(home), world)){
+        return;
+      } else {
+        move(getRandomEmptySurroundingTile(world), world);
+        return;
+      }
     }
 
     // move away from predator
@@ -112,6 +116,11 @@ public boolean moveAwayFromPredator(World world) {
       for (Location location : world.getSurroundingTiles(vision)) {
         if (world.getTile(location) instanceof Predator) {
           if(moveAway(location, world)){
+            System.out.println("Rabbit move away from predator");
+            return true;
+          } else {
+            move(getRandomEmptySurroundingTile(world), world);
+            System.out.println("Rabbit move random");
             return true;
           }
         }

diff --git a/src/main/Wolf.java b/src/main/Wolf.java
@@ -49,9 +49,14 @@ public void act(World world) {
         System.out.println("Wolf enters home");
         return;
       }
-      moveTowards(world.getLocation(myPack.getHome(world)), world);
-      System.out.println("Wolf move to home");
-      return;
+      if(moveTowards(world.getLocation(myPack.getHome(world)), world)){
+        System.out.println("Wolf moved towards home");
+        return;
+      } else {
+        move(getRandomEmptySurroundingTile(world), world);
+        System.out.println("Wolf move random because could not get to home");
+        return;
+      }
     }
 
     // if starving
@@ -77,9 +82,14 @@ public void act(World world) {
           }
         }
         if (!closeToLeader) {
-          moveTowards(world.getLocation(myPack.getLeader()), world);
-          System.out.println("Wolf moved closer to leader");
-          return;
+          if(moveTowards(world.getLocation(myPack.getLeader()), world)){
+            System.out.println("Wolf moved closer to leader");
+            return;
+          } else {
+            move(getRandomEmptySurroundingTile(world), world);
+            System.out.println("Wolf move random because could not get to leader");
+            return;
+          }
         }
       }
     }