Outlaw moved before guild check.

src/engine/gameManager/CombatManager.java

@@ -144,7 +144,7 @@ public enum CombatManager {
 
         City playerCity = ZoneManager.getCityAtLocation(playerCharacter.getLoc());
 
-        if (playerCity != null && playerCity.getGuild().getNation().equals(playerCharacter.getGuild().getNation()) == false && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false)
+        if (playerCity != null && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false)
             playerCity.cityOutlaws.add(playerCharacter.getObjectUUID());
     }
 

src/engine/mobileAI/MobAI.java

@@ -252,18 +252,21 @@ public class MobAI {
 
         try {
 
-            //make sure mob is out of combat stance
-
             int patrolDelay = ThreadLocalRandom.current().nextInt((int) (MobAIThread.AI_PATROL_DIVISOR * 0.5f), MobAIThread.AI_PATROL_DIVISOR) + MobAIThread.AI_PATROL_DIVISOR;
 
-            //early exit while waiting to patrol again
+            // early exit while waiting to patrol again.
+            // Minions are force marched if captain is alive
+
+            boolean forced = mob.agentType.equals(Enum.AIAgentType.GUARDMINION) &&
+                    mob.guardCaptain.isAlive();
 
             if (mob.stopPatrolTime + (patrolDelay * 1000) > System.currentTimeMillis())
-                return;
+                if (!forced)
+                    return;
 
-            //guard captains inherit barracks patrol points dynamically
+            //guards inherit barracks patrol points dynamically
 
-            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)) {
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
 
                 Building barracks = mob.building;
 
@@ -278,28 +281,28 @@ public class MobAI {
             if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
                 mob.lastPatrolPointIndex = 0;
 
-            mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
-            mob.lastPatrolPointIndex += 1;
+            // Minions are given marching orders by the captain if he is alive
 
-            MovementUtilities.aiMove(mob, mob.destination, true);
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) && mob.guardCaptain.isAlive()) {
+                Mob captain = (Mob) mob.guardCaptain;
+                mob.destination = captain.destination.add(Formation.getOffset(2, mob.guardCaptain.minions.indexOf(mob.getObjectUUID()) + 3));
+                mob.lastPatrolPointIndex = captain.lastPatrolPointIndex;
+            } else {
+                mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
+                mob.lastPatrolPointIndex += 1;
+            }
+
+            // Captain orders minions to patrol
 
             if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
-                for (Integer minionUUUD : mob.minions) {
-
-                    Mob minion = Mob.getMob(minionUUUD);
-
-                    //make sure mob is out of combat stance
-
-                    if (minion.despawned == false) {
-                        if (MovementUtilities.canMove(minion)) {
-                            Vector3f minionOffset = Formation.getOffset(2, mob.minions.indexOf(minionUUUD) + 3);
-                            minion.updateLocation();
-                            Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(mob.destination.x + minionOffset.x, mob.destination.y, mob.destination.z + minionOffset.z);
-                            MovementUtilities.aiMove(minion, formationPatrolPoint, true);
-                        }
-                    }
+                for (Integer minionUUID : mob.minions) {
+                    Mob minion = Mob.getMob(minionUUID);
+                    if (minion.isAlive() && minion.combatTarget == null)
+                        MobAI.Patrol(minion);
                 }
 
+            MovementUtilities.aiMove(mob, mob.destination, true);
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
@@ -609,10 +612,8 @@ public class MobAI {
 
             switch (mob.behaviourType) {
                 case GuardCaptain:
-                    GuardCaptainLogic(mob);
-                    break;
                 case GuardMinion:
-                    GuardMinionLogic(mob);
+                    GuardLogic(mob);
                     break;
                 case GuardWallArcher:
                     GuardWallArcherLogic(mob);
@@ -682,7 +683,6 @@ public class MobAI {
                     aiAgent.setCombatTarget(loadedPlayer);
                     return;
                 }
-
             }
 
             if (aiAgent.getCombatTarget() == null) {
@@ -721,49 +721,41 @@ public class MobAI {
 
                 case Pet1:
 
-
                     if (mob.guardCaptain == null)
                         return;
 
+                    //mob no longer has its owner loaded, translate pet to owner
 
                     if (!mob.playerAgroMap.containsKey(mob.guardCaptain.getObjectUUID())) {
-
-                        //mob no longer has its owner loaded, translocate pet to owner
-
-
                         MovementManager.translocate(mob, mob.guardCaptain.getLoc(), null);
                         return;
                     }
+
                     if (mob.getCombatTarget() == null) {
 
                         //move back to owner
 
-
                         if (CombatUtilities.inRange2D(mob, mob.guardCaptain, 6))
                             return;
 
-
                         mob.destination = mob.guardCaptain.getLoc();
                         MovementUtilities.moveToLocation(mob, mob.destination, 5);
                     } else
                         chaseTarget(mob);
                     break;
-                case GuardMinion:
-                    if (!mob.guardCaptain.isAlive() || ((Mob) mob.guardCaptain).despawned)
-                        randomGuardPatrolPoint(mob);
-                    else {
-                        if (mob.getCombatTarget() != null) {
-                            chaseTarget(mob);
-                        }
-                    }
-                    break;
                 default:
                     if (mob.getCombatTarget() == null) {
-                        if (!mob.isMoving())
-                            Patrol(mob);
-                        else {
+
+                        if (!mob.isMoving()) {
+
+                            // Minions only patrol on their own if captain is dead.
+
+                            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) == false)
+                                Patrol(mob);
+                            else if (mob.guardCaptain.isAlive() == false)
+                                Patrol(mob);
+                        } else
                             mob.stopPatrolTime = System.currentTimeMillis();
-                        }
                     } else {
                         chaseTarget(mob);
                     }
@@ -851,15 +843,6 @@ public class MobAI {
     private static void CheckToSendMobHome(Mob mob) {
 
         try {
-            if (mob.behaviourType.isAgressive) {
-
-                if (mob.isPlayerGuard()) {
-                    if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
-                        CheckForPlayerGuardAggro(mob);
-                } else {
-                    CheckForAggro(mob);
-                }
-            }
 
             if (mob.getCombatTarget() != null && CombatUtilities.inRange2D(mob, mob.getCombatTarget(), MobAIThread.AI_BASE_AGGRO_RANGE * 0.5f))
                 return;
@@ -904,13 +887,7 @@ public class MobAI {
 
         try {
 
-            float rangeSquared = mob.getRange() * mob.getRange();
-            float distanceSquared = mob.getLoc().distanceSquared2D(mob.getCombatTarget().getLoc());
-
-            if (mob.isMoving() == true && distanceSquared < rangeSquared - 50) {
-                mob.destination = mob.getLoc();
-                MovementUtilities.moveToLocation(mob, mob.destination, 0);
-            } else if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
+            if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
                 if (mob.getRange() > 15) {
                     mob.destination = mob.getCombatTarget().getLoc();
                     MovementUtilities.moveToLocation(mob, mob.destination, 0);
@@ -970,7 +947,7 @@ public class MobAI {
         }
     }
 
-    public static void GuardCaptainLogic(Mob mob) {
+    public static void GuardLogic(Mob mob) {
 
         try {
             if (mob.getCombatTarget() == null)
@@ -991,33 +968,7 @@ public class MobAI {
             CheckMobMovement(mob);
             CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
-        }
-    }
-
-    public static void GuardMinionLogic(Mob mob) {
-
-        try {
-
-            if (mob.getCombatTarget() == null)
-                CheckForPlayerGuardAggro(mob);
-
-            AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
-
-            if (newTarget != null) {
-
-                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                    if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
-                        mob.setCombatTarget(newTarget);
-                } else
-                    mob.setCombatTarget(newTarget);
-
-            }
-
-            CheckMobMovement(mob);
-            CheckForAttack(mob);
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardLogic" + " " + e.getMessage());
         }
     }
 
@@ -1037,7 +988,6 @@ public class MobAI {
 
         try {
 
-
             if (mob.guardCaptain == null && mob.isNecroPet() == false && mob.isSiege() == false)
                 if (ZoneManager.getSeaFloor().zoneMobSet.contains(mob))
                     mob.killCharacter("no owner");
@@ -1186,12 +1136,12 @@ public class MobAI {
 
         try {
 
-            if (mob.getGuild().getNation().equals(target.getGuild().getNation()))
-                return false;
-
             if (mob.guardedCity.cityOutlaws.contains(target.getObjectUUID()) == true)
                 return true;
 
+            if (mob.getGuild().getNation().equals(target.getGuild().getNation()))
+                return false;
+
             //first check condemn list for aggro allowed (allies button is checked)
 
             if (ZoneManager.getCityAtLocation(mob.getLoc()).getTOL().reverseKOS) {

src/engine/objects/AbstractIntelligenceAgent.java

@@ -163,7 +163,9 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
                 this.setCombatTarget(null);
             }
 
-            //clear owner
+            // clear owner and set not alive
+
+            this.isAlive.set(false);
 
             PlayerCharacter owner = (PlayerCharacter) this.guardCaptain;
 
@@ -181,7 +183,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
                     owner.setPet(null);
 
                 if (this.getObjectType().equals(GameObjectType.Mob))
-                    ((Mob) this).guardCaptain = null;
+                    this.guardCaptain = null;
             }