Modifying physicalSkillPower and magicalSkillPower to do what description says.

This commit is contained in:
MobiusDevelopment
2019-04-08 10:57:01 +00:00
parent 5c14df03a9
commit adf1653c1c
77 changed files with 77 additions and 77 deletions

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}

View File

@@ -149,7 +149,7 @@ public final class EnergyAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
damage = attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
damage = Math.max(0, damage);

View File

@@ -167,7 +167,7 @@ public final class PhysicalAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -128,7 +128,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
}

View File

@@ -139,7 +139,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
final double minHp = (effected.getMaxHp() * _saveHp) / 100;

View File

@@ -160,7 +160,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -154,7 +154,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
damage = effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, damage);
damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
}
effector.doAttack(damage, effected, skill, false, false, critical, false);

View File

@@ -179,7 +179,7 @@ public final class Formulas
}
damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
damage = attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, damage);
damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
return damage;
}