forked from MagicBane/Server
zerg multiplier application work
This commit is contained in:
@@ -14,7 +14,6 @@ import engine.Enum.DamageType;
|
||||
import engine.Enum.ModType;
|
||||
import engine.Enum.SourceType;
|
||||
import engine.gameManager.ChatManager;
|
||||
import engine.gameManager.ZergManager;
|
||||
import engine.jobs.AbstractEffectJob;
|
||||
import engine.jobs.DamageOverTimeJob;
|
||||
import engine.net.DispatchMessage;
|
||||
@@ -131,6 +130,16 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
|
||||
}
|
||||
if (modAmount == 0f)
|
||||
return;
|
||||
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
|
||||
modAmount *= ((PlayerCharacter)source).ZergMultiplier;
|
||||
}
|
||||
if(source.getObjectType().equals(Enum.GameObjectType.Mob)){
|
||||
Mob mob = (Mob)source;
|
||||
if(mob.isPet() && mob.guardCaptain.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
|
||||
modAmount *= ((PlayerCharacter)mob.guardCaptain).ZergMultiplier;
|
||||
}
|
||||
}
|
||||
|
||||
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
|
||||
AbstractCharacter ac = (AbstractCharacter) awo;
|
||||
int powerID = 0, effectID = 0;
|
||||
@@ -154,9 +163,6 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
|
||||
skipImmune = true;
|
||||
}
|
||||
}
|
||||
//if(ac.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && ac.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
|
||||
// modAmount *= ZergManager.getReducedZergMultiplier((PlayerCharacter)ac,(PlayerCharacter)ac.combatTarget);
|
||||
//}
|
||||
PlayerBonuses bonus = ac.getBonuses();
|
||||
if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {
|
||||
ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID);
|
||||
@@ -205,9 +211,6 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
|
||||
AbstractCharacter ac = (AbstractCharacter) awo;
|
||||
if (ac.isSit())
|
||||
damage *= 2.5f; // increase damage if sitting
|
||||
if(ac.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && !source.equals(ac)){
|
||||
damage *= ((PlayerCharacter)source).ZergMultiplier;
|
||||
}
|
||||
}
|
||||
|
||||
return damage;
|
||||
|
||||
Reference in New Issue
Block a user