Playable only physical defence adjustments.
This commit is contained in:
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
|
|||||||
if (defence != -1)
|
if (defence != -1)
|
||||||
{
|
{
|
||||||
// TODO: Find proper defence formula.
|
// TODO: Find proper defence formula.
|
||||||
defence = effected.getLevel() > 99 ? defence / 10 : defence;
|
defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
|
||||||
|
|
||||||
// Trait, elements
|
// Trait, elements
|
||||||
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
|
||||||
|
|||||||
Reference in New Issue
Block a user