BETA: Continuing with Balance Life rework.

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

@@ -1382,7 +1382,6 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 		
 		switch (sk.getSkillType())
 		{
-		
 			case BUFF:
 			{
 				if (caster.getFirstEffect(sk) == null)
@@ -1428,7 +1427,6 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			case HOT:
 			case HEAL_PERCENT:
 			case HEAL_STATIC:
-			case BALANCE_LIFE:
 			{
 				double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100;
 				if (caster.isMinion() && (sk.getTargetType() != L2TargetType.TARGET_SELF))

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

@@ -1292,7 +1292,6 @@ public class L2CharacterAI extends AbstractAI
 					case HEAL:
 					case HEAL_PERCENT:
 					case HEAL_STATIC:
-					case BALANCE_LIFE:
 					case HOT:
 						healSkills.add(sk);
 						hasHealOrResurrect = true;

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

@@ -386,10 +386,26 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 			for (L2Skill 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.getSkillType() == L2SkillType.HEAL) || (skill.getSkillType() == L2SkillType.HOT) || (skill.getSkillType() == L2SkillType.BALANCE_LIFE) || (skill.getSkillType() == L2SkillType.HEAL_PERCENT) || (skill.getSkillType() == L2SkillType.HEAL_STATIC) || (skill.getSkillType() == L2SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == L2SkillType.CPHOT) || (skill.getSkillType() == L2SkillType.MANAHEAL) || (skill.getSkillType() == L2SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == L2SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == L2SkillType.MANARECHARGE) || (skill.getSkillType() == L2SkillType.MPHOT)))
+				if (Rnd.get(5) < chance)
 				{
-					sitCastAndFollow(skill, _owner);
-					return;
+					switch (skill.getSkillType())
+					{
+						case COMBATPOINTHEAL:
+						case CPHOT:
+						case HEAL:
+						case HEAL_PERCENT:
+						case HEAL_STATIC:
+						case HOT:
+						case MANA_BY_LEVEL:
+						case MANAHEAL:
+						case MANAHEAL_PERCENT:
+						case MANARECHARGE:
+						case MPHOT:
+						{
+							sitCastAndFollow(skill, _owner);
+							return;
+						}
+					}
 				}
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

@@ -434,7 +434,6 @@ public final class L2NpcTemplate extends L2CharTemplate
 					case HOT:
 					case HEAL_PERCENT:
 					case HEAL_STATIC:
-					case BALANCE_LIFE:
 						addHealSkill(skill);
 						break;
 					case RESURRECT:

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

@@ -19,75 +19,76 @@
 package com.l2jserver.gameserver.model.effects;
 
 /**
+ * Effect types.
  * @author nBd
  */
 public enum L2EffectType
 {
-	BALANCE_LIFE,
+	ABORT_CAST,
+	BETRAY,
+	BLOCK_RESURRECTION,
+	BLUFF,
 	BUFF,
-	DEBUFF,
 	CANCEL,
-	CANCEL_DEBUFF,
 	CANCEL_ALL,
+	CANCEL_DEBUFF,
+	CHANCE_SKILL_TRIGGER,
 	CHARGE,
+	CHARM_OF_LUCK,
+	CHARMOFCOURAGE,
+	CLAN_GATE,
+	CONFUSE_MOB_ONLY,
+	CONFUSION,
+	CPDAMPERCENT,
+	CPHEAL,
+	CPHEAL_OVER_TIME,
+	CPHEAL_PERCENT,
+	DAMAGE_TRANSFER,
+	DEBUFF,
+	DISARM,
 	DMG_OVER_TIME,
 	DMG_OVER_TIME_PERCENT,
+	FAKE_DEATH,
+	FEAR,
+	FUSION,
+	HARVESTING,
 	HEAL,
 	HEAL_OVER_TIME,
 	HEAL_PERCENT,
+	HIDE,
+	INCREASE_CHARGES,
+	INVINCIBLE,
+	MANA_DMG_OVER_TIME,
+	MANA_HEAL_OVER_TIME,
 	MANAHEAL,
 	MANAHEAL_BY_LEVEL,
 	MANAHEAL_PERCENT,
-	MANA_DMG_OVER_TIME,
-	MANA_HEAL_OVER_TIME,
-	CPHEAL,
-	CPHEAL_PERCENT,
-	CPHEAL_OVER_TIME,
-	CPDAMPERCENT,
 	MP_CONSUME_PER_LEVEL,
-	RELAXING,
-	STUN,
-	ROOT,
-	SLEEP,
-	FAKE_DEATH,
-	RANDOMIZE_HATE,
-	CONFUSION,
-	CONFUSE_MOB_ONLY,
 	MUTE,
-	FEAR,
-	SILENT_MOVE,
+	NEGATE,
+	NOBLESSE_BLESSING,
 	PARALYZE,
-	PHYSICAL_MUTE,
+	PETRIFICATION,
+	PHOENIX_BLESSING,
 	PHYSICAL_ATTACK_MUTE,
+	PHYSICAL_MUTE,
+	PROTECTION_BLESSING,
+	RANDOMIZE_HATE,
+	REBALANCE_HP,
+	RELAXING,
 	REMOVE_TARGET,
-	TARGET_ME,
-	BETRAY,
-	NOBLESSE_BLESSING,
-	PHOENIX_BLESSING,
-	PETRIFICATION,
-	BLUFF,
-	CHARM_OF_LUCK,
-	INVINCIBLE,
-	TRANSFORMATION,
-	DISARM,
-	CHARMOFCOURAGE,
+	RESTORATION_RANDOM,
+	ROOT,
 	SIGNET_EFFECT,
 	SIGNET_GROUND,
-	WARP,
+	SILENT_MOVE,
+	SLEEP,
 	SPOIL,
-	PROTECTION_BLESSING,
-	FUSION,
-	CHANCE_SKILL_TRIGGER,
-	CLAN_GATE,
-	NEGATE,
+	STUN,
+	SUMMON_AGATHION,
+	TARGET_ME,
 	THROW_UP,
-	HIDE,
-	ABORT_CAST,
-	INCREASE_CHARGES,
-	BLOCK_RESURRECTION,
-	DAMAGE_TRANSFER,
-	RESTORATION_RANDOM,
-	HARVESTING,
+	TRANSFORMATION,
 	UNSUMMON_AGATHION,
-	SUMMON_AGATHION
+	WARP
 }

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

@@ -58,7 +58,6 @@ public enum L2SkillType
 	BLOW,
 	SIGNET(L2SkillSignet.class),
 	SIGNET_CASTTIME(L2SkillSignetCasttime.class),
-	
 	// Disablers
 	BLEED,
 	POISON,
@@ -71,11 +70,9 @@ public enum L2SkillType
 	MUTE,
 	PARALYZE,
 	DISARM,
-	
 	// hp, mp, cp
 	HEAL,
 	HOT,
-	BALANCE_LIFE,
 	HEAL_PERCENT,
 	HEAL_STATIC,
 	COMBATPOINTHEAL,
@@ -90,27 +87,23 @@ public enum L2SkillType
 	HPMPHEAL_PERCENT,
 	HPCPHEAL_PERCENT,
 	CHAIN_HEAL,
-	
 	// sp
 	GIVE_SP,
 	// reco
 	GIVE_RECO,
 	// vitality
 	GIVE_VITALITY,
-	
 	// Aggro
 	AGGDAMAGE,
 	AGGREDUCE,
 	AGGREMOVE,
 	AGGREDUCE_CHAR,
 	AGGDEBUFF,
-	
 	// Fishing
 	FISHING,
 	PUMPING,
 	REELING,
-	
-	// MISC
+	// Misc
 	UNLOCK,
 	UNLOCK_SPECIAL,
 	ENCHANT_ARMOR,
@@ -129,13 +122,11 @@ public enum L2SkillType
 	INSTANT_JUMP,
 	DETECTION,
 	DUMMY,
-	
 	// Creation
 	COMMON_CRAFT,
 	DWARVEN_CRAFT,
 	CREATE_ITEM(L2SkillCreateItem.class),
 	LEARN_SKILL(L2SkillLearnSkill.class),
-	
 	// Summons
 	SUMMON(L2SkillSummon.class),
 	FEED_PET,
@@ -145,7 +136,6 @@ public enum L2SkillType
 	BETRAY,
 	DECOY(L2SkillDecoy.class),
 	SPAWN(L2SkillSpawn.class),
-	
 	// Cancel
 	CANCEL,
 	CANCEL_ALL,
@@ -187,12 +177,10 @@ public enum L2SkillType
 	
 	// Skill is done within the core.
 	COREDONE,
-	
 	// Refuel airship
 	REFUEL,
 	// Nornil's Power (Nornil's Garden instance)
 	NORNILS_POWER,
-	
 	// unimplemented
 	NOTDONE,
 	BALLISTA;