Fixed PhysicalAttackHpLink effect.
This commit is contained in:
parent
baa4b24ca4
commit
4c592c1707
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (effector.isAlikeDead())
|
if (effector.isAlikeDead())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -130,7 +129,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
|
|||||||
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
|
||||||
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
|
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, damage);
|
||||||
damage *= Math.max(1.0d, ((100 - ((effected.getCurrentHp() / effected.getMaxHp()) * 100) - 40) * 2) / 100);
|
damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
effector.doAttack(damage, effected, skill, false, false, critical, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user