diff --git a/src/engine/mobileAI/utilities/CombatUtilities.java b/src/engine/mobileAI/utilities/CombatUtilities.java index 4b95d5cc..b8e4aafc 100644 --- a/src/engine/mobileAI/utilities/CombatUtilities.java +++ b/src/engine/mobileAI/utilities/CombatUtilities.java @@ -101,6 +101,14 @@ public class CombatUtilities { if (!target.isAlive()) return; + if(agent.isPet()){ + try{ + damage *= agent.getOwner().ZergMultiplier; + }catch(Exception ignored){ + + } + } + if (AbstractWorldObject.IsAbstractCharacter(target)) { //damage = Resists.handleFortitude((AbstractCharacter) target,DamageType.Crush,damage); trueDamage = ((AbstractCharacter) target).modifyHealth(-damage, agent, false); diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java index a72b173b..f8a48adb 100644 --- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java @@ -122,9 +122,13 @@ public class HealthEffectModifier extends AbstractEffectModifier { float spi = (pc.getStatSpiCurrent() >= 1) ? (float) pc.getStatSpiCurrent() : 1f; // min *= (intt * 0.0045 + 0.055 * (float)Math.sqrt(intt - 0.5) + spi * 0.006 + 0.07 * (float)Math.sqrt(spi - 0.5) + 0.02 * (int)focus); // max *= (intt * 0.0117 + 0.13 * (float)Math.sqrt(intt - 0.5) + spi * 0.0024 + (float)Math.sqrt(spi - 0.5) * 0.021 + 0.015 * (int)focus); + min = HealthEffectModifier.getMinDamage(min, intt, spi, focus); max = HealthEffectModifier.getMaxDamage(max, intt, spi, focus); + min *= pc.ZergMultiplier; + max *= pc.ZergMultiplier; + //debug for spell damage and atr if (pc.getDebug(16)) { String smsg = "Damage: " + (int) Math.abs(min) + " - " + (int) Math.abs(max);