Skip to content
Snippets Groups Projects
Commit 8b50bff4 authored by MELERIX's avatar MELERIX
Browse files

BETA: Fixed '''"Restoration Impact"''' skill (Reported by: valdaron), also...

BETA: Fixed '''"Restoration Impact"''' skill (Reported by: valdaron), also fixed handlers to avoid duplicate heal restoration and messages when power is <= 0.

'''NOTE: Don't remove skillTypes from heal skills yet, because core still depend of it to manage heal behavior.'''
parent c0f8e3c0
No related branches found
No related tags found
No related merge requests found
......@@ -106,6 +106,12 @@ public class Heal implements ISkillHandler
double hp;
for (L2Character target: (L2Character[]) targets)
{
// if skill power is "0 or less" don't show heal system message.
if (skill.getPower() <= 0)
{
continue;
}
// We should not heal if char is dead/invul
if (target == null || target.isDead() || target.isInvul())
continue;
......
......@@ -82,6 +82,12 @@ public class HealPercent implements ISkillHandler
boolean full = skill.getPower() == 100.0;
for (L2Character target : (L2Character[]) targets)
{
// if skill power is "0 or less" don't show heal system message.
if (skill.getPower() <= 0)
{
continue;
}
// 1505 - sublime self sacrifice
if ((target.isDead() || target.isInvul()) && (skill.getId() != 1505))
{
......
......@@ -43,6 +43,12 @@ public class ManaHeal implements ISkillHandler
{
for (L2Character target: (L2Character[]) targets)
{
// if skill power is "0 or less" don't show heal system message.
if (skill.getPower() <= 0)
{
continue;
}
if (target.isInvul())
continue;
......
......@@ -2811,25 +2811,25 @@
</skill>
<skill id="1488" levels="3" name="Restoration Impact" enchantGroup1="1">
<!-- Confirmed CT2.5 -->
<table name="#enchantMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
<table name="#aggroPoints"> 701 941 1083 </table>
<table name="#magicLvl"> 49 60 68 </table>
<table name="#mpConsume"> 18 22 26 </table>
<table name="#mpInitialConsume"> 5 6 7 </table>
<table name="#aggro"> 701 941 1083 </table>
<table name="#amount"> 10 15 20 </table>
<table name="#enchantMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
<table name="#ench1amount"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
<set name="aggroPoints" val="#aggro" />
<set name="aggroPoints" val="#aggroPoints" />
<set name="castRange" val="600" />
<set name="effectRange" val="1100" />
<set name="hitTime" val="1000" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="negateAbnormals" val="life_force_kamael,9" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="15000" />
<set name="skillType" val="NEGATE" />
<set name="skillType" val="HEAL_PERCENT" />
<set name="target" val="TARGET_ONE" />
<enchant1 name="magicLvl" val="#enchantMagicLvl" />
<cond msgId="109">
......@@ -2837,9 +2837,11 @@
</cond>
<for>
<effect name="HealPercent" noicon="1" val="#amount" />
<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
</for>
<enchant1for>
<effect name="HealPercent" noicon="1" val="#ench1amount" />
<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
</enchant1for>
</skill>
<skill id="1489" levels="1" name="Summoner Ability - Resist Attribute">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment