lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HpCpHeal could be affected by ADDITIONAL_POTION_HP stat.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-12-21 22:53:57 +00:00
parent 4688b375d3
commit 7d1ceaca6a
17 changed files with 248 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@@ -120,12 +120,23 @@ public class HpCpHeal extends AbstractEffect
}
}
// Additional potion HP.
double additionalHp = 0;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
additionalHp = effected.getStat().getValue(Stat.ADDITIONAL_POTION_HP, 0);
}
// Prevents overheal and negative amount
final double healAmount = Math.max(Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()), 0);
if (healAmount != 0)
{
final double newHp = healAmount + effected.getCurrentHp();
effected.setCurrentHp(newHp, false);
if ((newHp + additionalHp) > effected.getMaxRecoverableHp())
{
additionalHp = Math.max(effected.getMaxRecoverableHp() - newHp, 0);
}
effected.setCurrentHp(newHp + additionalHp, false);
}
if (effected.isPlayer())
@@ -134,13 +145,13 @@ public class HpCpHeal extends AbstractEffect
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) healAmount);
sm.addInt((int) (healAmount + additionalHp));
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm.addInt((int) healAmount);
sm.addInt((int) (healAmount + additionalHp));
effected.sendPacket(sm);
}