diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 65406ec4d9..9191ce25d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -66,7 +66,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - if (effector.isAlikeDead()) { return; @@ -130,7 +129,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 *= 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);