|
|
@ -270,6 +270,12 @@ public class PlayerCombatStats { |
|
|
|
minDMG *= 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); |
|
|
|
minDMG *= 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.owner.charItemManager != null){ |
|
|
|
|
|
|
|
if(this.owner.charItemManager.getEquipped(1) != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){ |
|
|
|
|
|
|
|
minDMG *= 0.7f; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int roundedMin = (int)Math.round(minDMG); |
|
|
|
int roundedMin = (int)Math.round(minDMG); |
|
|
|
|
|
|
|
|
|
|
|
if (mainHand) { |
|
|
|
if (mainHand) { |
|
|
@ -341,6 +347,12 @@ public class PlayerCombatStats { |
|
|
|
maxDMG *= 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); |
|
|
|
maxDMG *= 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.owner.charItemManager != null){ |
|
|
|
|
|
|
|
if(this.owner.charItemManager.getEquipped(1) != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){ |
|
|
|
|
|
|
|
maxDMG *= 0.7f; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int roundedMax = (int)Math.round(maxDMG); |
|
|
|
int roundedMax = (int)Math.round(maxDMG); |
|
|
|
|
|
|
|
|
|
|
|
if(mainHand){ |
|
|
|
if(mainHand){ |
|
|
|