From 9ec95b974fbd92f44efe081147baa1788618ec68 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 18 Jan 2025 16:06:38 -0600 Subject: [PATCH] mob work --- src/engine/mobileAI/utilities/CombatUtilities.java | 2 +- src/engine/objects/Mob.java | 8 ++++---- src/engine/objects/MobBase.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/mobileAI/utilities/CombatUtilities.java b/src/engine/mobileAI/utilities/CombatUtilities.java index e61fcbda..691cea31 100644 --- a/src/engine/mobileAI/utilities/CombatUtilities.java +++ b/src/engine/mobileAI/utilities/CombatUtilities.java @@ -143,7 +143,7 @@ public class CombatUtilities { int atr = agent.mobBase.getAtr(); if(agent.getBonuses() != null){ atr += agent.getBonuses().getFloat(ModType.OCV,SourceType.None); - atr *= agent.getBonuses().getFloatPercentAll(ModType.OCV,SourceType.None); + atr *= 1 + agent.getBonuses().getFloatPercentAll(ModType.OCV,SourceType.None); } switch (target.getObjectType()) { case PlayerCharacter: diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index 7e1359ec..fc359097 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -1652,8 +1652,8 @@ public class Mob extends AbstractIntelligenceAgent { } catch (Exception e) { this.atrHandOne = GetAttackRating(this.mobBase.getAttackRating(), this); - this.minDamageHandOne = (short) this.mobBase.getMinDmg(); - this.maxDamageHandOne = (short) this.mobBase.getMaxDmg(); + this.minDamageHandOne = (short) this.mobBase.getDamageMin(); + this.maxDamageHandOne = (short) this.mobBase.getDamageMax(); this.rangeHandOne = 6.5f; this.speedHandOne = 20; Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. setting to default ATR and Damage." + e.getMessage()); @@ -1665,8 +1665,8 @@ public class Mob extends AbstractIntelligenceAgent { } catch (Exception e) { this.atrHandTwo = GetAttackRating(this.mobBase.getAttackRating(), this); - this.minDamageHandTwo = (short) this.mobBase.getMinDmg(); - this.maxDamageHandTwo = (short) this.mobBase.getMaxDmg(); + this.minDamageHandTwo = (short) this.mobBase.getDamageMin(); + this.maxDamageHandTwo = (short) this.mobBase.getDamageMax(); this.rangeHandTwo = 6.5f; this.speedHandTwo = 20; Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. setting to default ATR and Damage." + e.getMessage()); diff --git a/src/engine/objects/MobBase.java b/src/engine/objects/MobBase.java index cdc00e9f..6fb2efc6 100644 --- a/src/engine/objects/MobBase.java +++ b/src/engine/objects/MobBase.java @@ -260,7 +260,7 @@ public class MobBase extends AbstractGameObject { } public int getAtr() { - return atr; + return attackRating; } public void setAtr(int atr) {