From b8be399df760b29551ef1a08952d74056182b95b Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 8 Feb 2023 20:37:31 -0600 Subject: [PATCH] mob AI testing --- src/engine/ai/MobileFSM.java | 2 +- src/engine/ai/utilities/CombatUtilities.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/engine/ai/MobileFSM.java b/src/engine/ai/MobileFSM.java index a5835fe5..e905423e 100644 --- a/src/engine/ai/MobileFSM.java +++ b/src/engine/ai/MobileFSM.java @@ -1680,7 +1680,7 @@ public class MobileFSM { return false; } public static void MobCallForHelp(Mob mob) { - if(mob.nextCallForHelp > System.currentTimeMillis()){ + if(mob.nextCallForHelp < System.currentTimeMillis()){ return; } Zone mobCamp = mob.getParentZone(); diff --git a/src/engine/ai/utilities/CombatUtilities.java b/src/engine/ai/utilities/CombatUtilities.java index 0bb1152d..b3330ebf 100644 --- a/src/engine/ai/utilities/CombatUtilities.java +++ b/src/engine/ai/utilities/CombatUtilities.java @@ -334,6 +334,10 @@ public class CombatUtilities { //set default values float min = 40; float max = 60; + if(agent.getLevel() == 85){ + min = agent.getMinDamageHandOne(); + max = agent.getMaxDamageHandOne(); + } float range; float damage; float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None); @@ -376,10 +380,12 @@ public class CombatUtilities { if (AbstractWorldObject.IsAbstractCharacter(target)) return ((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, damage, 0) * dmgMultiplier; } - else { + else{ //damage calc for regular mob - min = agent.getMobBase().getDamageMin(); - max = agent.getMobBase().getMaxDmg(); + if(agent.getLevel() > 85) { + min = agent.getMobBase().getDamageMin(); + max = agent.getMobBase().getMaxDmg(); + } DamageType dt = DamageType.Crush; if(agent.getEquip().get(1) != null && agent.getEquip().get(2) == null){