Browse Source

pets to use owners ZergMultiplier

lakebane-jobs
FatBoy-DOTC 4 days ago
parent
commit
4a7a999ed1
  1. 8
      src/engine/mobileAI/utilities/CombatUtilities.java
  2. 4
      src/engine/powers/effectmodifiers/HealthEffectModifier.java

8
src/engine/mobileAI/utilities/CombatUtilities.java

@ -101,6 +101,14 @@ public class CombatUtilities { @@ -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);

4
src/engine/powers/effectmodifiers/HealthEffectModifier.java

@ -122,9 +122,13 @@ public class HealthEffectModifier extends AbstractEffectModifier { @@ -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);

Loading…
Cancel
Save