From 4dac232723bee7bdf0c3eaf054e6c9d73328f746 Mon Sep 17 00:00:00 2001 From: Adry85 <adrya85@hotmail.it> Date: Thu, 14 Sep 2017 22:00:30 +0200 Subject: [PATCH] Little improvement on calcPhysDam and calcSkillPhysDam formulas: - Avoiding some variable declaration when target perform a shield perfect block; - Little fix on calcAttributeBonus formula. DP part for: https://bitbucket.org/l2jserver/l2j_server/commits/3a1c12740ba56ab48e314f736c1e3d31d31dd1b3 --- .../data/scripts/handlers/effecthandlers/PhysicalAttack.java | 2 +- .../scripts/handlers/effecthandlers/PhysicalAttackHpLink.java | 2 +- .../scripts/handlers/effecthandlers/PhysicalSoulAttack.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 93530a3704..399ddc0971 100644 --- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -108,7 +108,7 @@ public final class PhysicalAttack extends AbstractEffect crit = Formulas.calcSkillCrit(activeChar, target, _criticalChance); } - damage = Formulas.calcSkillPhysDam(activeChar, target, shield, false, ss, _power); + damage = Formulas.calcSkillPhysDam(activeChar, target, skill, shield, false, ss, _power); if (crit) { diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index cddbbe8fde..01d597c246 100644 --- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -89,7 +89,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect double power = _power * (-((target.getCurrentHp() * 2) / target.getMaxHp()) + 2); - damage = Formulas.calcSkillPhysDam(activeChar, target, shld, false, ss, power); + damage = Formulas.calcSkillPhysDam(activeChar, target, skill, shld, false, ss, power); if (damage > 0) { diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 6480db982a..c0fbd1f401 100644 --- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -108,7 +108,7 @@ public final class PhysicalSoulAttack extends AbstractEffect crit = Formulas.calcSkillCrit(activeChar, target, _criticalChance); } - damage = Formulas.calcSkillPhysDam(activeChar, target, shield, false, ss, _power); + damage = Formulas.calcSkillPhysDam(activeChar, target, skill, shield, false, ss, _power); if ((skill.getMaxSoulConsumeCount() > 0) && activeChar.isPlayer()) { -- GitLab