From dcac0634a8a3739c4c1057e88301b2244916414f Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Tue, 14 Mar 2023 13:32:41 -0500
Subject: [PATCH] added Chase to mob ai state enum

---
 src/engine/ai/MobileFSM.java                 | 38 ++++++++++++++------
 src/engine/ai/utilities/CombatUtilities.java |  2 +-
 src/engine/objects/AbstractCharacter.java    |  6 ++++
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/engine/ai/MobileFSM.java b/src/engine/ai/MobileFSM.java
index 731369e8..e5c7f95a 100644
--- a/src/engine/ai/MobileFSM.java
+++ b/src/engine/ai/MobileFSM.java
@@ -53,7 +53,8 @@ public class MobileFSM {
         Home,
         Dead,
         Recalling,
-        Retaliate
+        Retaliate,
+        Chase
     }
 
     public static void run(Mob mob) {
@@ -116,7 +117,6 @@ public class MobileFSM {
                     rwss.setPlayer(mob);
                     DispatchMessage.sendToAllInRange(mob, rwss);
                 }
-
                 if (mob.isPlayerGuard())
                     guardAttack(mob);
                 else if (mob.isPet() || mob.isSiege())
@@ -144,6 +144,9 @@ public class MobileFSM {
             case Retaliate:
                 retaliate(mob);
                 break;
+            case Chase:
+                handleMobChase(mob);
+                break;
         }
     }
 
@@ -339,8 +342,8 @@ public class MobileFSM {
         if (!MovementUtilities.canMove(aiAgent))
             return;
 
-
-        if (CombatUtilities.inRangeToAttack2D(aiAgent, mob))
+        double WeaponRange = aiAgent.getEquip().get(0).getItemBase().getRange();
+        if (CombatUtilities.inRange2D(aiAgent, mob, WeaponRange))
             return;
 
 
@@ -465,11 +468,18 @@ public class MobileFSM {
             aiAgent.setState(STATE.Patrol);
             return;
         }
+        aiAgent.setCombatTarget(aggroTarget);
+        double AttackRange = 3;
+        if(aiAgent.getEquip().get(0) != null){
+            AttackRange = aiAgent.getEquip().get(0).getItemBase().getRange();
+        } else if(aiAgent.getEquip().get(1) != null){
+            AttackRange = aiAgent.getEquip().get(1).getItemBase().getRange();
+        }
         if (canCast(aiAgent) == true) {
             if (MobCast(aiAgent) == false) {
                 attack(aiAgent, targetID);
             }
-        } else if (CombatUtilities.inRangeToAttack(aiAgent, aggroTarget)) {
+        } else if (CombatUtilities.inRange2D(aiAgent, aggroTarget, AttackRange)) {
             aiAgent.setState(STATE.Attack);
             attack(aiAgent, targetID);
             return;
@@ -888,10 +898,8 @@ public class MobileFSM {
         //this stops mobs from attempting to move while they are underneath a player.
         if (CombatUtilities.inRangeToAttack2D(aiAgent, player))
             return;
-
-        aiAgent.destination = MovementUtilities.GetDestinationToCharacter(aiAgent, player);
-        MovementUtilities.moveToLocation(aiAgent, aiAgent.destination, aiAgent.getRange());
-
+        //move mob to within attack range again
+        aiAgent.setState(MobileFSM.STATE.Chase);
     }
     private static void handleMobAttackForPet(Mob aiAgent, Mob mob) {
 
@@ -1678,7 +1686,7 @@ public class MobileFSM {
                 powerToken = entry.getKey();
                 powerRank = entry.getValue();
                 PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
-                if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mobPower.getRange())) {
+                if (CombatUtilities.inRange2D(mob, target, mobPower.getRange())) {
                     PowersManager.useMobPower(mob,(AbstractCharacter)mob.getCombatTarget(),mobPower,powerRank);
                     PerformActionMsg msg = new PerformActionMsg();
                     if(mobPower.isHarmful() == false || mobPower.targetSelf == true){
@@ -1721,4 +1729,14 @@ public class MobileFSM {
         //wait 60 seconds to call for help again
         mob.nextCallForHelp = System.currentTimeMillis() + 60000;
     }
+    public static void handleMobChase(Mob mob){
+        if(CombatUtilities.inRange2D(mob,mob.getCombatTarget(),mob.getRange()) == true) {
+            MovementUtilities.moveToLocation(mob, mob.getLoc(), 0);
+            mob.setState(STATE.Attack);
+        }
+        else{
+            mob.destination = MovementUtilities.GetDestinationToCharacter(mob, (AbstractCharacter) mob.getCombatTarget());
+            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange());
+        }
+    }
 }
diff --git a/src/engine/ai/utilities/CombatUtilities.java b/src/engine/ai/utilities/CombatUtilities.java
index 68a48a2f..519dcdeb 100644
--- a/src/engine/ai/utilities/CombatUtilities.java
+++ b/src/engine/ai/utilities/CombatUtilities.java
@@ -91,7 +91,7 @@ public class CombatUtilities {
 		sum += x * x;
 		double z = loc1.z - loc2.z;
 		sum += z * z;
-		if(sqrt(sum) <= range){
+		if((sum*sum) <= (range*range)){
 			return true;
 		} else {
 			return false;
diff --git a/src/engine/objects/AbstractCharacter.java b/src/engine/objects/AbstractCharacter.java
index 32e9e6e7..643323b2 100644
--- a/src/engine/objects/AbstractCharacter.java
+++ b/src/engine/objects/AbstractCharacter.java
@@ -786,6 +786,12 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 			if (mob.isSiege()) {
 				return 300;
 			}
+			float DefaultRange = 8;
+			if(((Mob) this).getEquip().get(0) != null){
+				return ((Mob) this).getEquip().get(0).getItemBase().getRange();
+			} else if(((Mob) this).getEquip().get(1) != null){
+				return ((Mob) this).getEquip().get(1).getItemBase().getRange();
+			}
 		}
 		if (this.rangeHandOne > this.rangeHandTwo) {
 			return this.rangeHandOne;