From 7d80363d65c7d6676b851af13ff88b8ab1ec2d98 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sun, 16 Feb 2025 16:55:15 -0600 Subject: [PATCH] mob AI aggro --- src/engine/mobileAI/MobAI.java | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java index d5f01e7d..bf3b9771 100644 --- a/src/engine/mobileAI/MobAI.java +++ b/src/engine/mobileAI/MobAI.java @@ -724,8 +724,8 @@ public class MobAI { DefaultLogic(mob); break; } - if(mob.isAlive()) - RecoverHealth(mob); + //if(mob.isAlive()) + // RecoverHealth(mob); } catch (Exception e) { Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DetermineAction" + " " + e.getMessage()); } @@ -1102,17 +1102,17 @@ public class MobAI { if (mob.getCombatTarget() == null) CheckForPlayerGuardAggro(mob); - AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob); + //AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob); - if (newTarget != null) { + //if (newTarget != null) { - if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) { - if (GuardCanAggro(mob, (PlayerCharacter) newTarget)) - mob.setCombatTarget(newTarget); - } else - mob.setCombatTarget(newTarget); + // 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) { @@ -1202,21 +1202,21 @@ public class MobAI { if (mob.getCombatTarget() != null && mob.playerAgroMap.containsKey(mob.getCombatTarget().getObjectUUID()) == false) mob.setCombatTarget(null); - if (mob.BehaviourType.isAgressive) { + //if (mob.BehaviourType.isAgressive) { - AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob); + // AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob); - if (newTarget != null) - mob.setCombatTarget(newTarget); - else { - if (mob.getCombatTarget() == null) { - if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard) - SafeGuardAggro(mob); //safehold guard - else - CheckForAggro(mob); //normal aggro - } - } - } + // if (newTarget != null) + // mob.setCombatTarget(newTarget); + // else { + // if (mob.getCombatTarget() == null) { + // if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard) + // SafeGuardAggro(mob); //safehold guard + // else + // CheckForAggro(mob); //normal aggro + // } + // } + //} //check if mob can move for patrol or moving to target