diff --git a/src/engine/mobileAI/utilities/CombatUtilities.java b/src/engine/mobileAI/utilities/CombatUtilities.java index 3a0c0634..021082cd 100644 --- a/src/engine/mobileAI/utilities/CombatUtilities.java +++ b/src/engine/mobileAI/utilities/CombatUtilities.java @@ -480,8 +480,9 @@ public class CombatUtilities { masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount(); } } + return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel)); } - return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel)); + return agent.getMinDamageHandOne(); } public static double getMaxDmg(double max, Mob agent, ItemBase weapon) { @@ -507,8 +508,9 @@ public class CombatUtilities { if (agent.getSkills().containsKey(weapon.getSkillRequired())) masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount(); + return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel)); } - return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel)); + return agent.getMaxDamageHandOne(); } }