Capped damage taken by attacks effect to 80%.

This commit is contained in:
MobiusDevelopment
2020-02-04 22:48:57 +00:00
parent 0154d6d850
commit 79aabdcb76
15 changed files with 46 additions and 46 deletions

View File

@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }

View File

@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }

View File

@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }

View File

@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }

View File

@@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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;
} }
} }

View File

@@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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;
} }
} }

View File

@@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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;
} }
} }

View File

@@ -4513,20 +4513,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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;
} }
} }

View File

@@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }

View File

@@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }

View File

@@ -4512,20 +4512,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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;
} }
} }

View File

@@ -4521,20 +4521,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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); elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);

View File

@@ -4521,20 +4521,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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); elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);

View File

@@ -4520,20 +4520,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 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()) 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()) 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); elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);

View File

@@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (attacker.isPlayable()) 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 else
{ {
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
} }
} }