BETA: Core part for [DP10338].

	Reviewed by: Nos

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -1487,7 +1487,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 		}
 		
-		if (sk.hasEffectType(L2EffectType.HEAL, L2EffectType.HEAL_PERCENT))
+		if (sk.hasEffectType(L2EffectType.HEAL))
 		{
 			double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100;
 			if (caster.isMinion() && (sk.getTargetType() != L2TargetType.SELF))
@@ -1567,7 +1567,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 		}
 		
-		if (sk.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.FATAL_BLOW, L2EffectType.ENERGY_ATTACK, L2EffectType.MAGICAL_ATTACK_MP, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
+		if (sk.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
 		{
 			if (!canAura(sk))
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

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

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcData.java

@@ -522,11 +522,11 @@ public class NpcData extends DocumentParser
 												aiSkillScopes.add(AISkillScope.NEGATIVE);
 												aiSkillScopes.add(shortOrLongRangeScope);
 											}
-											else if (skill.hasEffectType(L2EffectType.HEAL, L2EffectType.HEAL_PERCENT))
+											else if (skill.hasEffectType(L2EffectType.HEAL))
 											{
 												aiSkillScopes.add(AISkillScope.HEAL);
 											}
-											else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.FATAL_BLOW, L2EffectType.ENERGY_ATTACK, L2EffectType.MAGICAL_ATTACK_MP, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
+											else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
 											{
 												aiSkillScopes.add(AISkillScope.ATTACK);
 												aiSkillScopes.add(AISkillScope.UNIVERSAL);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java

@@ -384,7 +384,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.CPHEAL, L2EffectType.HEAL, L2EffectType.HEAL_PERCENT, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT))
+				if ((Rnd.get(5) < chance) && skill.hasEffectType(L2EffectType.CPHEAL, L2EffectType.HEAL, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT))
 				{
 					sitCastAndFollow(skill, _owner);
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/L2EffectType.java

@@ -25,41 +25,25 @@ package com.l2jserver.gameserver.model.effects;
 public enum L2EffectType
 {
 	AGGRESSION,
-	BLOCK_RESURRECTION,
 	BUFF,
 	CHARM_OF_LUCK,
 	CHARMOFCOURAGE,
 	CHAT_BLOCK,
-	CLAN_GATE,
-	CPDAMPERCENT,
 	CPHEAL,
-	CPHEAL_OVER_TIME,
-	CPHEAL_PERCENT,
-	DAMAGE_TRANSFER,
 	DEBUFF,
 	DISPEL,
 	DISPEL_BY_SLOT,
 	DMG_OVER_TIME,
 	DMG_OVER_TIME_PERCENT,
 	DEATH_LINK,
-	ENERGY_ATTACK,
 	FAKE_DEATH,
-	FATAL_BLOW,
 	FEAR,
 	FISHING,
 	FISHING_START,
 	HATE,
 	HEAL,
-	HEAL_OVER_TIME,
-	HEAL_PERCENT,
 	HP_DRAIN,
-	INVINCIBLE,
-	LETHAL,
-	LUCKY,
 	MAGICAL_ATTACK,
-	MAGICAL_ATTACK_MP,
-	MANA_DMG_OVER_TIME,
-	MANAHEAL,
 	MANAHEAL_BY_LEVEL,
 	MANAHEAL_PERCENT,
 	MUTE,
@@ -69,15 +53,12 @@ public enum L2EffectType
 	PHOENIX_BLESSING,
 	PHYSICAL_ATTACK,
 	PHYSICAL_ATTACK_HP_LINK,
-	PHYSICAL_ATTACK_MUTE,
-	PROTECTION_BLESSING,
 	REBALANCE_HP,
 	REFUEL_AIRSHIP,
 	RELAXING,
 	RESURRECTION,
 	ROOT,
 	SLEEP,
-	STATIC_DAMAGE,
 	STEAL_ABNORMAL,
 	STUN,
 	SUMMON,

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/Skill.java

@@ -889,7 +889,7 @@ public final class Skill implements IChanceSkillTrigger, IIdentifiable
 	
 	public boolean useSoulShot()
 	{
-		return (hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.FATAL_BLOW, L2EffectType.ENERGY_ATTACK));
+		return (hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK));
 	}
 	
 	public boolean useSpiritShot()