|
|
@ -318,9 +318,15 @@ public class HealthEffectModifier extends AbstractEffectModifier { |
|
|
|
AbstractCharacter ac = (AbstractCharacter) awo; |
|
|
|
AbstractCharacter ac = (AbstractCharacter) awo; |
|
|
|
if (ac.isSit()) |
|
|
|
if (ac.isSit()) |
|
|
|
damage *= 2.5f; // increase damage if sitting
|
|
|
|
damage *= 2.5f; // increase damage if sitting
|
|
|
|
if(source.getObjectType().equals(GameObjectType.PlayerCharacter) && source.equals(ac) == false){ |
|
|
|
if(source.getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
damage *= ((PlayerCharacter)source).ZergMultiplier; |
|
|
|
damage *= ((PlayerCharacter)source).ZergMultiplier; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if(source.getObjectType().equals(GameObjectType.Mob) && ((Mob)source).isPet()){ |
|
|
|
|
|
|
|
AbstractCharacter owner = ((Mob)source).guardCaptain; |
|
|
|
|
|
|
|
if(owner.getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
|
|
|
|
damage *= ((PlayerCharacter)owner).ZergMultiplier; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return damage; |
|
|
|
return damage; |
|
|
|