Capped damage taken by attacks effect to 80%.
This commit is contained in:
@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4513,20 +4513,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4512,20 +4512,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4521,20 +4521,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
|
||||
elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
|
||||
|
@@ -4521,20 +4521,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
|
||||
elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
|
||||
|
@@ -4520,20 +4520,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
|
||||
if (attacker.isRaid() || attacker.isRaidMinion())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
|
||||
}
|
||||
else if (attacker.isMonster())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
|
||||
}
|
||||
|
||||
elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
|
||||
|
@@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
if (attacker.isPlayable())
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
|
||||
value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user