From 1b487fdbb6715ec2f3589083d01245828b6b270c Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 21 Jan 2025 19:51:59 -0600 Subject: [PATCH] PlayerCombatStats damage calc --- src/engine/objects/PlayerCombatStats.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/engine/objects/PlayerCombatStats.java b/src/engine/objects/PlayerCombatStats.java index f06c7ee7..cd52bf6c 100644 --- a/src/engine/objects/PlayerCombatStats.java +++ b/src/engine/objects/PlayerCombatStats.java @@ -155,6 +155,11 @@ public class PlayerCombatStats { 0.064 * Math.sqrt(secondaryStat - 0.75) + 0.01 * (weaponSkill + weaponMastery) ); + if(this.owner.bonuses != null){ + minDMG += this.owner.bonuses.getFloat(Enum.ModType.MinDamage, Enum.SourceType.None); + minDMG *= 1+ this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); + } + if (mainHand) { this.minDamageHandOne = (int) minDMG; @@ -211,6 +216,11 @@ public class PlayerCombatStats { 0.0075 * (weaponSkill + weaponMastery) ); + if(this.owner.bonuses != null){ + maxDMG += this.owner.bonuses.getFloat(Enum.ModType.MaxDamage, Enum.SourceType.None); + maxDMG *= 1+ this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); + } + if(mainHand){ this.maxDamageHandOne = (int) maxDMG; }else{