Core part for

https://bitbucket.org/l2jserver/l2j_datapack/commits/61181fcd15a4dadc7ab6326d9e579811f8fa7251

src/main/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -1435,7 +1435,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 		}
 		
-		if (sk.hasEffectType(L2EffectType.HEAL))
+		if (sk.hasEffectType(L2EffectType.HP))
 		{
 			double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100;
 			if (caster.isMinion() && (sk.getTargetType() != L2TargetType.SELF))

src/main/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -1345,7 +1345,7 @@ public class L2CharacterAI extends AbstractAI
 				{
 					cancelSkills.add(sk);
 				}
-				else if (sk.hasEffectType(L2EffectType.HEAL))
+				else if (sk.hasEffectType(L2EffectType.HP))
 				{
 					healSkills.add(sk);
 					hasHealOrResurrect = true;

src/main/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java

@@ -598,10 +598,10 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 				{
 					
 					L2Object OldTarget = _actor.getTarget();
-					if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL)))
+					if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP)))
 					{
 						boolean useSkillSelf = true;
-						if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
+						if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
 						{
 							useSkillSelf = false;
 							break;
@@ -743,10 +743,10 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !_actor.isSkillDisabled(sk))
 					{
 						L2Object OldTarget = _actor.getTarget();
-						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL)))
+						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP)))
 						{
 							boolean useSkillSelf = true;
-							if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
+							if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
 							{
 								useSkillSelf = false;
 								break;

src/main/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java

@@ -572,10 +572,10 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 				{
 					
 					L2Object OldTarget = _actor.getTarget();
-					if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL)))
+					if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP)))
 					{
 						boolean useSkillSelf = true;
-						if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
+						if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
 						{
 							useSkillSelf = false;
 							break;
@@ -713,10 +713,10 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !_actor.isSkillDisabled(sk))
 					{
 						L2Object OldTarget = _actor.getTarget();
-						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL)))
+						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP)))
 						{
 							boolean useSkillSelf = true;
-							if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
+							if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
 							{
 								useSkillSelf = false;
 								break;

src/main/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java

@@ -548,7 +548,7 @@ public class NpcData implements IXmlReader
 											aiSkillScopes.add(AISkillScope.NEGATIVE);
 											aiSkillScopes.add(shortOrLongRangeScope);
 										}
-										else if (skill.hasEffectType(L2EffectType.HEAL))
+										else if (skill.hasEffectType(L2EffectType.HP))
 										{
 											aiSkillScopes.add(AISkillScope.HEAL);
 										}

src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1690,7 +1690,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 					return;
 				}
 				
-				if ((skill.isContinuous() && !skill.isDebuff()) || skill.hasEffectType(L2EffectType.CP, L2EffectType.HEAL))
+				if ((skill.isContinuous() && !skill.isDebuff()) || skill.hasEffectType(L2EffectType.CP, L2EffectType.HP))
 				{
 					doit = true;
 				}
@@ -5416,7 +5416,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 					}
 					
 					// Healing party members should ignore LOS.
-					if (((skill.getTargetType() != L2TargetType.PARTY) || !skill.hasEffectType(L2EffectType.HEAL)) //
+					if (((skill.getTargetType() != L2TargetType.PARTY) || !skill.hasEffectType(L2EffectType.HP)) //
 						&& !GeoData.getInstance().canSeeTarget(this, target))
 					{
 						skipLOS++;

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java

@@ -380,7 +380,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 			for (Skill skill : getTemplate().getSkills().values())
 			{
 				// if the skill is a buff, check if the owner has it already [ owner.getEffect(L2Skill skill) ]
-				if ((Rnd.get(5) < chance) && skill.hasEffectType(L2EffectType.CP, L2EffectType.HEAL, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT))
+				if ((Rnd.get(5) < chance) && skill.hasEffectType(L2EffectType.CP, L2EffectType.HP, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT))
 				{
 					sitCastAndFollow(skill, _owner);
 				}

src/main/java/com/l2jserver/gameserver/model/effects/L2EffectType.java

@@ -42,7 +42,7 @@ public enum L2EffectType
 	FISHING,
 	FISHING_START,
 	HATE,
-	HEAL,
+	HP,
 	HP_DRAIN,
 	MAGICAL_ATTACK,
 	MAGICAL_ATTACK_MP,

src/main/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -6158,25 +6158,25 @@ public final class SystemMessageId
 	 * ID: 1066<br>
 	 * Message: $s1 HP has been restored.
 	 */
-	public static final SystemMessageId S1_HP_RESTORED = new SystemMessageId(1066);
+	public static final SystemMessageId S1_HP_HAS_BEEN_RESTORED = new SystemMessageId(1066);
 	
 	/**
 	 * ID: 1067<br>
 	 * Message: $s2 HP has been restored by $c1.
 	 */
-	public static final SystemMessageId S2_HP_RESTORED_BY_C1 = new SystemMessageId(1067);
+	public static final SystemMessageId S2_HP_HAS_BEEN_RESTORED_BY_C1 = new SystemMessageId(1067);
 	
 	/**
 	 * ID: 1068<br>
 	 * Message: $s1 MP has been restored.
 	 */
-	public static final SystemMessageId S1_MP_RESTORED = new SystemMessageId(1068);
+	public static final SystemMessageId S1_MP_HAS_BEEN_RESTORED = new SystemMessageId(1068);
 	
 	/**
 	 * ID: 1069<br>
 	 * Message: $s2 MP has been restored by $c1.
 	 */
-	public static final SystemMessageId S2_MP_RESTORED_BY_C1 = new SystemMessageId(1069);
+	public static final SystemMessageId S2_MP_HAS_BEEN_RESTORED_BY_C1 = new SystemMessageId(1069);
 	
 	/**
 	 * ID: 1070<br>