diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index de311023..51e95243 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -8,6 +8,7 @@ package engine.gameManager; +import engine.Enum; import engine.Enum.*; import engine.exception.MsgSendException; import engine.job.JobContainer; @@ -924,7 +925,6 @@ public enum CombatManager { damage *= 1 + (armorPierce * 0.01f); } } - //Resists.handleFortitude(tarAc,damageType,damage); float d = 0f; diff --git a/src/engine/objects/PlayerCombatStats.java b/src/engine/objects/PlayerCombatStats.java index f397e306..ec3e58b6 100644 --- a/src/engine/objects/PlayerCombatStats.java +++ b/src/engine/objects/PlayerCombatStats.java @@ -517,6 +517,7 @@ public class PlayerCombatStats { ); if(this.owner.bonuses != null){ minDMG += this.owner.bonuses.getFloat(Enum.ModType.MinDamage, Enum.SourceType.None); + minDMG += this.owner.bonuses.getFloat(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); minDMG *= 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); } @@ -597,6 +598,7 @@ public class PlayerCombatStats { if(this.owner.bonuses != null){ maxDMG += this.owner.bonuses.getFloat(Enum.ModType.MaxDamage, Enum.SourceType.None); + maxDMG += this.owner.bonuses.getFloat(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); maxDMG *= 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); }