AI tweaking

This commit is contained in:
2025-01-09 08:41:36 -06:00
parent 99f5a9c606
commit 84446eb726
2 changed files with 5 additions and 11 deletions
@@ -57,7 +57,7 @@ public class PlayerPet {
return;
}
mob.stopMovement(mob.getMovementLoc());
mob.updateLocation();
ItemBase weapon = mob.getWeaponItemBase(true);
boolean mainHand = true;
@@ -73,7 +73,7 @@ public class PlayerPet {
}
public static void aggro(Mob mob){
for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(mob.loc,30, MBServerStatics.MASK_PET)) {
for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(mob.loc,30, MBServerStatics.MASK_MOB)) {
Mob potentialTarget = (Mob) awo;
if (!potentialTarget.isAlive())
continue;
@@ -76,7 +76,7 @@ public class StandardMob {
if(enumMobState.Agressive(mob)){
for(int id : mob.playerAgroMap.keySet()){
PlayerCharacter potentialTarget = PlayerCharacter.getFromCache(id);
if(!potentialTarget.isAlive() || mob.canSee(potentialTarget))
if(!potentialTarget.isAlive() || !mob.canSee(potentialTarget))
continue;
if (MovementUtilities.inRangeToAggro(mob, potentialTarget)) {
mob.setCombatTarget(potentialTarget);
@@ -131,20 +131,14 @@ public class StandardMob {
return;
}
if(MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget())){
mob.setCombatTarget(null);
MovementUtilities.aiMove(mob,mob.bindLoc,true);
return;
}
if(!CombatUtilities.inRangeToAttack(mob,mob.combatTarget)){
if(!mob.isMoving() && !CombatUtilities.inRangeToAttack(mob,mob.combatTarget)){
if (!MovementUtilities.canMove(mob))
return;
MovementUtilities.aiMove(mob,mob.combatTarget.loc,false);
return;
}
mob.stopMovement(mob.getMovementLoc());
mob.updateLocation();
ItemBase weapon = mob.getWeaponItemBase(true);
boolean mainHand = true;