BETA: DP-Part for ​[L5861].

	Patch by: Adry_85, UnAfraid

L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -211,7 +211,6 @@ import handlers.itemhandlers.TeleportBookmark;
 import handlers.skillhandlers.BallistaBomb;
 import handlers.skillhandlers.BeastSkills;
 import handlers.skillhandlers.Blow;
-import handlers.skillhandlers.Cancel;
 import handlers.skillhandlers.ChainHeal;
 import handlers.skillhandlers.Charge;
 import handlers.skillhandlers.CombatPointHeal;
@@ -552,7 +551,6 @@ public class MasterHandler
 			StrSiegeAssault.class,
 			SummonFriend.class,
 			Disablers.class,
-			Cancel.class,
 			ChainHeal.class,
 			StealBuffs.class,
 			BallistaBomb.class,

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Negate.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.effects.EffectTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.stats.Env;
 
 /**
@@ -46,17 +45,6 @@ public class Negate extends L2Effect
 	{
 		L2Skill skill = getSkill();
 		
-		for (int negateSkillId : skill.getNegateId())
-		{
-			if (negateSkillId != 0)
-			{
-				getEffected().stopSkillEffects(negateSkillId);
-			}
-		}
-		for (L2SkillType negateSkillType : skill.getNegateStats())
-		{
-			getEffected().stopSkillEffects(negateSkillType, skill.getNegateLvl());
-		}
 		if (skill.getNegateAbnormals() != null)
 		{
 			for (L2Effect effect : getEffected().getAllEffects())

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Cancel.java

@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J DataPack
- * 
- * This file is part of L2J DataPack.
- * 
- * L2J DataPack is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J DataPack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.skillhandlers;
-
-import java.util.List;
-
-import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.ShotType;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.effects.L2Effect;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
-import com.l2jserver.gameserver.model.stats.Formulas;
-
-/**
- * @author DS
- */
-public class Cancel implements ISkillHandler
-{
-	private static final L2SkillType[] SKILL_IDS =
-	{
-		L2SkillType.CANCEL,
-	};
-	
-	@Override
-	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
-	{
-		L2Character target;
-		L2Effect effect;
-		for (L2Object obj : targets)
-		{
-			if (!(obj instanceof L2Character))
-			{
-				continue;
-			}
-			target = (L2Character) obj;
-			
-			if (target.isDead())
-			{
-				continue;
-			}
-			
-			List<L2Effect> canceled = Formulas.calcCancel(activeChar, target, skill, skill.getPower());
-			for (L2Effect eff : canceled)
-			{
-				eff.exit();
-			}
-		}
-		
-		// Applying self-effects
-		if (skill.hasSelfEffects())
-		{
-			effect = activeChar.getFirstEffect(skill.getId());
-			if ((effect != null) && effect.isSelfEffect())
-			{
-				// Replace old effect with new one.
-				effect.exit();
-			}
-			skill.getEffectsSelf(activeChar);
-		}
-		
-		activeChar.setChargedShot(activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
-	}
-	
-	@Override
-	public L2SkillType[] getSkillIds()
-	{
-		return SKILL_IDS;
-	}
-}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java

@@ -23,9 +23,7 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2AttackableAI;
-import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -42,7 +40,6 @@ import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.Rnd;
 
 /**
  * This Handles Disabler skills
@@ -61,10 +58,7 @@ public class Disablers implements ISkillHandler
 		L2SkillType.AGGREDUCE_CHAR,
 		L2SkillType.AGGREMOVE,
 		L2SkillType.MUTE,
-		L2SkillType.FAKE_DEATH,
 		L2SkillType.CONFUSE_MOB_ONLY,
-		L2SkillType.NEGATE,
-		L2SkillType.CANCEL_DEBUFF,
 		L2SkillType.PARALYZE,
 		L2SkillType.ERASE,
 		L2SkillType.BETRAY,
@@ -90,7 +84,7 @@ public class Disablers implements ISkillHandler
 				continue;
 			}
 			L2Character target = (L2Character) obj;
-			if (target.isDead() || ((target.isInvul() && (type != L2SkillType.NEGATE)) && !target.isParalyzed()))
+			if (target.isDead() || (target.isInvul() && !target.isParalyzed()))
 			{
 				continue;
 			}
@@ -114,12 +108,6 @@ public class Disablers implements ISkillHandler
 					}
 					break;
 				}
-				case FAKE_DEATH:
-				{
-					// stun/fakedeath is not mdef dependant, it depends on lvl difference, target CON and power of stun
-					skill.getEffects(activeChar, target, new Env(shld, ss, sps, bss));
-					break;
-				}
 				case ROOT:
 				case DISARM:
 				case STUN:
@@ -379,136 +367,8 @@ public class Disablers implements ISkillHandler
 					}
 					break;
 				}
-				case CANCEL_DEBUFF:
-				{
-					L2Effect[] effects = target.getAllEffects();
-					
-					if ((effects == null) || (effects.length == 0))
-					{
-						break;
-					}
-					
-					int count = (skill.getMaxNegatedEffects() > 0) ? 0 : -2;
-					for (L2Effect e : effects)
-					{
-						if ((e == null) || !e.getSkill().isDebuff() || !e.getSkill().canBeDispeled())
-						{
-							continue;
-						}
-						
-						e.exit();
-						
-						if (count > -1)
-						{
-							count++;
-							if (count >= skill.getMaxNegatedEffects())
-							{
-								break;
-							}
-						}
-					}
-					
-					break;
-				}
-				case NEGATE:
-				{
-					if (Formulas.calcSkillReflect(target, skill) == Formulas.SKILL_REFLECT_SUCCEED)
-					{
-						target = activeChar;
-					}
-					
-					if (skill.getNegateId().length != 0)
-					{
-						for (int i = 0; i < skill.getNegateId().length; i++)
-						{
-							if (skill.getNegateId()[i] != 0)
-							{
-								target.stopSkillEffects(skill.getNegateId()[i]);
-							}
-						}
-					}
-					else if (skill.getNegateAbnormals() != null)
-					{
-						for (L2Effect effect : target.getAllEffects())
-						{
-							if (effect == null)
-							{
-								continue;
-							}
-							
-							for (String negateAbnormalType : skill.getNegateAbnormals().keySet())
-							{
-								if (negateAbnormalType.equalsIgnoreCase(effect.getAbnormalType()) && (skill.getNegateAbnormals().get(negateAbnormalType) >= effect.getAbnormalLvl()))
-								{
-									effect.exit();
-								}
-							}
-						}
-					}
-					else
-					// all others negate type skills
-					{
-						int removedBuffs = (skill.getMaxNegatedEffects() > 0) ? 0 : -2;
-						
-						for (L2SkillType skillType : skill.getNegateStats())
-						{
-							if (removedBuffs > skill.getMaxNegatedEffects())
-							{
-								break;
-							}
-							
-							switch (skillType)
-							{
-								case BUFF:
-									int lvlmodifier = 52 + (skill.getMagicLevel() * 2);
-									if (skill.getMagicLevel() == 12)
-									{
-										lvlmodifier = (ExperienceTable.getInstance().getMaxLevel() - 1);
-									}
-									int landrate = 90;
-									if ((target.getLevel() - lvlmodifier) > 0)
-									{
-										landrate = 90 - (4 * (target.getLevel() - lvlmodifier));
-									}
-									
-									landrate = (int) activeChar.calcStat(Stats.CANCEL_VULN, landrate, target, null);
-									
-									if (Rnd.get(100) < landrate)
-									{
-										removedBuffs += negateEffect(target, L2SkillType.BUFF, -1, skill.getMaxNegatedEffects());
-									}
-									break;
-								case HEAL:
-									ISkillHandler Healhandler = SkillHandler.getInstance().getHandler(L2SkillType.HEAL);
-									if (Healhandler == null)
-									{
-										_log.severe("Couldn't find skill handler for HEAL.");
-										continue;
-									}
-									L2Character tgts[] = new L2Character[]
-									{
-										target
-									};
-									Healhandler.useSkill(activeChar, skill, tgts);
-									break;
-								default:
-									removedBuffs += negateEffect(target, skillType, skill.getNegateLvl(), skill.getMaxNegatedEffects());
-									break;
-							}// end switch
-						}// end for
-					}// end else
-					
-					if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, ss, sps, bss))
-					{
-						skill.getEffects(activeChar, target, new Env(shld, ss, sps, bss));
-					}
-				}// end case
-			}// end switch
-			
-			// Possibility of a lethal strike
-			Formulas.calcLethalHit(activeChar, target, skill);
-			
-		}// end for
+			}
+		}
 		
 		// self Effect :]
 		if (skill.hasSelfEffects())
@@ -525,100 +385,6 @@ public class Disablers implements ISkillHandler
 		activeChar.setChargedShot(bss ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
 	}
 	
-	/**
-	 * @param target
-	 * @param type
-	 * @param negateLvl
-	 * @param maxRemoved
-	 * @return
-	 */
-	private int negateEffect(L2Character target, L2SkillType type, int negateLvl, int maxRemoved)
-	{
-		return negateEffect(target, type, negateLvl, 0, maxRemoved);
-	}
-	
-	/**
-	 * @param target
-	 * @param type
-	 * @param negateLvl
-	 * @param skillId
-	 * @param maxRemoved
-	 * @return
-	 */
-	private int negateEffect(L2Character target, L2SkillType type, int negateLvl, int skillId, int maxRemoved)
-	{
-		L2Effect[] effects = target.getAllEffects();
-		int count = (maxRemoved <= 0) ? -2 : 0;
-		for (L2Effect e : effects)
-		{
-			if (negateLvl == -1) // if power is -1 the effect is always removed without power/lvl check ^^
-			{
-				if ((e.getSkill().getSkillType() == type) || ((e.getSkill().getEffectType() != null) && (e.getSkill().getEffectType() == type)))
-				{
-					if (skillId != 0)
-					{
-						if ((skillId == e.getSkill().getId()) && (count < maxRemoved))
-						{
-							e.exit();
-							if (count > -1)
-							{
-								count++;
-							}
-						}
-					}
-					else if (count < maxRemoved)
-					{
-						e.exit();
-						if (count > -1)
-						{
-							count++;
-						}
-					}
-				}
-			}
-			else
-			{
-				boolean cancel = false;
-				if ((e.getSkill().getEffectType() != null) && (e.getSkill().getEffectAbnormalLvl() >= 0))
-				{
-					if ((e.getSkill().getEffectType() == type) && (e.getSkill().getEffectAbnormalLvl() <= negateLvl))
-					{
-						cancel = true;
-					}
-				}
-				else if ((e.getSkill().getSkillType() == type) && (e.getSkill().getAbnormalLvl() <= negateLvl))
-				{
-					cancel = true;
-				}
-				
-				if (cancel)
-				{
-					if (skillId != 0)
-					{
-						if ((skillId == e.getSkill().getId()) && (count < maxRemoved))
-						{
-							e.exit();
-							if (count > -1)
-							{
-								count++;
-							}
-						}
-					}
-					else if (count < maxRemoved)
-					{
-						e.exit();
-						if (count > -1)
-						{
-							count++;
-						}
-					}
-				}
-			}
-		}
-		
-		return (maxRemoved <= 0) ? count + 2 : count;
-	}
-	
 	@Override
 	public L2SkillType[] getSkillIds()
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java

@@ -21,6 +21,7 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -41,12 +42,18 @@ public class TargetOne implements ITargetTypeHandler
 			case HEAL:
 			case HEAL_PERCENT:
 			case MANAHEAL_BY_LEVEL:
-			case NEGATE:
-			case CANCEL_DEBUFF:
 			case COMBATPOINTHEAL:
 			case DUMMY:
 				canTargetSelf = true;
 				break;
+			default:
+			{
+				if (skill.hasEffectType(L2EffectType.CANCEL_DEBUFF, L2EffectType.NEGATE))
+				{
+					canTargetSelf = true;
+					break;
+				}
+			}
 		}
 		
 		// Check for null target or any other invalid target

L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml

@@ -1332,7 +1332,7 @@
 	<skill id="60" levels="1" name="Fake Death">
 		<set name="mpConsume" val="200" />
 		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="FAKE_DEATH" />
+		<set name="skillType" val="CONT" />
 		<set name="operateType" val="T" />
 		<for>
 			<!-- retail value: 10MP/sec; stat update every 3 sec -->
@@ -1452,11 +1452,11 @@
 		</enchant1for>
 		<enchant3for>
 			<effect name="Heal" noicon="1" val="1170" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</enchant3for>
 		<enchant4for>
 			<effect name="Heal" noicon="1" val="1170" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</enchant4for>
 	</skill>
 	<skill id="70" levels="53" name="Drain Health" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">

L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml

@@ -1441,11 +1441,11 @@
 		</enchant1for>
 		<enchant3for>
 			<effect name="Heal" noicon="1" val="546" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</enchant3for>
 		<enchant4for>
 			<effect name="Heal" noicon="1" val="546" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</enchant4for>
 	</skill>
 	<skill id="263" levels="37" name="Deadly Blow" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">

L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml

@@ -1218,7 +1218,7 @@
 				<add order="0x40" stat="debuffVuln" val="30" />
 				<mul order="0x30" stat="gainHp" val="0.7" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="25" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
 			<effect name="CpDamPercent" noicon="1" val="0" effectPower="90" effectType="CPDAMPERCENT" />
 		</for>
 		<enchant2for>
@@ -1227,7 +1227,7 @@
 				<add order="0x40" stat="debuffVuln" val="30" />
 				<mul order="0x30" stat="gainHp" val="0.7" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="25" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
 			<effect name="CpDamPercent" noicon="1" val="0" effectPower="90" effectType="CPDAMPERCENT" />
 		</enchant2for>
 	</skill>

L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml

@@ -38,8 +38,10 @@
 		<set name="mpConsume" val="59" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="703" levels="1" name="Sacrifice Healer">
 		<!-- Confirmed CT2.5 -->
@@ -534,10 +536,12 @@
 		<set name="target" val="TARGET_SELF" />
 		<set name="hitTime" val="1500" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="operateType" val="A1" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="aggroPoints" val="624" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="725" levels="2" name="Venom Power Smash">
 		<!-- Confirmed CT2.5 -->
@@ -942,12 +946,14 @@
 		<set name="target" val="TARGET_ONE" />
 		<set name="hitTime" val="4000" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="operateType" val="A1" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="aggroPoints" val="624" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="746" levels="3" name="Saber Tooth Tiger Bite">
 		<!-- Confirmed CT2.5 -->
@@ -1301,7 +1307,7 @@
 				<add order="0x40" stat="debuffVuln" val="30" />
 				<mul order="0x30" stat="gainHp" val="0.7" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="25" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
 		</for>
 	</skill>
 	<skill id="763" levels="1" name="Hell Scream">

L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml

@@ -62,14 +62,15 @@
 	<skill id="806" levels="1" name="Magic Obstacle">
 		<set name="mpConsume" val="49" />
 		<set name="magicLvl" val="83" />
-		<set name="power" val="25" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_AURA" />
 		<set name="affectRange" val="100" />
 		<set name="reuseDelay" val="75000" />
 		<set name="hitTime" val="1500" />
-		<set name="skillType" val="CANCEL" />
 		<set name="operateType" val="A1" />
 		<set name="maxNegated" val="5" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
+		</for>
 	</skill>
 	<skill id="807" levels="1" name="Over-hit">
 		<set name="abnormalLvl" val="99" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml

@@ -303,7 +303,7 @@
 				<sub order="0x40" stat="debuffVuln" val="30" />
 				<mul order="0x30" stat="gainHp" val="1.3" />
 			</effect>
-			<effect name="CancelDebuff" noicon="1" val="0" effectPower="80" effectType="CANCEL_DEBUFF" />
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="80" />
 		</for>
 	</skill>
 	<skill id="915" levels="1" name="Dance of Berserker">

L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml

@@ -388,13 +388,15 @@
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="4000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="NEGATE" />
 		<set name="negateAbnormals" val="#negateAbnormals" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="aggroPoints" val="#aggro" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="1013" levels="32" name="Recharge" enchantGroup1="2" enchantGroup2="2">
 		<table name="#magicLvl"> 28 30 33 35 38 40 42 44 46 48 50 52 54 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table>
@@ -490,8 +492,10 @@
 		<set name="negateAbnormals" val="#negateAbnormals" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="4000" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="1020" levels="27" name="Vitalize" enchantGroup1="2" enchantGroup2="2">
 		<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>
@@ -521,11 +525,11 @@
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
 			<effect name="Heal" noicon="1" val="#amount" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 		<enchant1for>
 			<effect name="Heal" noicon="1" val="#ench1amount" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</enchant1for>
 	</skill>
 	<skill id="1027" levels="15" name="Group Heal">
@@ -1129,16 +1133,17 @@
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="power" val="25" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="30000" />
 		<set name="hitTime" val="6000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="5" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
+		</for>
 	</skill>
 	<skill id="1059" levels="3" name="Empower" enchantGroup1="1" enchantGroup2="1">
 		<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>

L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml

@@ -11,7 +11,6 @@
 		<set name="target" val="TARGET_PET" />
 		<set name="hitTime" val="4000" />
 		<set name="reuseDelay" val="4000" />
-		<set name="skillType" val="NEGATE" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
@@ -19,6 +18,9 @@
 		<set name="negateAbnormals" val="#negateAbnormals" />
 		<set name="aggroPoints" val="#aggro" />
 		<set name="magicLvl" val="#magicLvl" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="1301" levels="1" name="Servitor Blessing">
 		<set name="magicLvl" val="62" />
@@ -27,13 +29,15 @@
 		<set name="target" val="TARGET_PET" />
 		<set name="hitTime" val="4000" />
 		<set name="reuseDelay" val="4000" />
-		<set name="skillType" val="NEGATE" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="negateAbnormals" val="root_physically,1;root_magically,1;paralyze,1;attack_time_up,3;speed_down,3" />
 		<set name="aggroPoints" val="582" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="1303" levels="2" name="Wild Magic" enchantGroup1="1" enchantGroup2="1">
 		<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>
@@ -1222,28 +1226,30 @@
 		<set name="mpConsume" val="80" />
 		<set name="magicLvl" val="77" />
 		<set name="negateAbnormals" val="attack_time_down;speed_up;improve_speed_avoid_up;improve_vampiric_haste" />
-		<set name="power" val="40" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_AURA" />
 		<set name="affectRange" val="200" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="40" />
+		</for>
 	</skill>
 	<skill id="1345" levels="1" name="Mass Mage Bane">
 		<set name="mpInitialConsume" val="27" />
 		<set name="mpConsume" val="80" />
 		<set name="magicLvl" val="78" />
 		<set name="negateAbnormals" val="ma_up;casting_time_down;improve_ma_md_up" />
-		<set name="power" val="40" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_AURA" />
 		<set name="affectRange" val="200" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="40" />
+		</for>
 	</skill>
 	<skill id="1346" levels="1" name="Warrior Servitor" enchantGroup1="5" enchantGroup2="5">
 		<table name="#ench1Time"> 320 340 360 380 400 420 440 460 480 500 520 540 560 580 600 </table>
@@ -1448,30 +1454,32 @@
 		<set name="mpConsume" val="50" />
 		<set name="magicLvl" val="76" />
 		<set name="negateAbnormals" val="attack_time_down;speed_up;improve_speed_avoid_up;improve_vampiric_haste" />
-		<set name="power" val="80" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="3000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="80" />
+		</for>
 	</skill>
 	<skill id="1351" levels="1" name="Mage Bane">
 		<set name="mpInitialConsume" val="20" />
 		<set name="mpConsume" val="50" />
 		<set name="magicLvl" val="77" />
 		<set name="negateAbnormals" val="ma_up;casting_time_down;improve_ma_md_up" />
-		<set name="power" val="80" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="3000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="80" />
+		</for>
 	</skill>
 	<skill id="1352" levels="1" name="Elemental Protection" enchantGroup1="5" enchantGroup2="5">
 		<table name="#ench1Time"> 1280 1360 1440 1520 1600 1680 1760 1840 1920 2000 2080 2160 2240 2320 2400 </table>
@@ -1832,7 +1840,7 @@
 			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_shield_up">
 				<mul order="0x30" stat="pDef" val="0.9" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_pa_pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
@@ -1840,7 +1848,7 @@
 			<effect name="Debuff" abnormalTime="#ench2Time" val="0" abnormalLvl="10" abnormalType="block_shield_up">
 				<mul order="0x30" stat="pDef" val="0.9" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_pa_pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</enchant2for>
@@ -1879,7 +1887,7 @@
 			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_speed_up">
 				<mul order="0x30" stat="runSpd" val="0.9" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
@@ -1887,7 +1895,7 @@
 			<effect name="Debuff" abnormalTime="#ench2Time" val="0" abnormalLvl="10" abnormalType="block_speed_up">
 				<mul order="0x30" stat="runSpd" val="0.9" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</enchant2for>
@@ -1926,7 +1934,7 @@
 			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_shield_up">
 				<mul order="0x30" stat="pDef" val="0.9" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_pa_pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
@@ -1965,7 +1973,7 @@
 			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_speed_up">
 				<mul order="0x30" stat="runSpd" val="0.9" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>

L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml

@@ -281,11 +281,13 @@
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="1410" levels="1" name="Salvation">
 		<!-- Confirmed CT2.5 -->
@@ -759,7 +761,6 @@
 	</skill>
 	<skill id="1425" levels="1" name="Purification Field">
 		<set name="target" val="TARGET_CLAN" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="operateType" val="A1" />
 		<set name="hitTime" val="3000" />
 		<set name="reuseDelay" val="1200000" />
@@ -775,6 +776,9 @@
 		<cond msgId="1509">
 			<player olympiad="false" />
 		</cond>
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="1426" levels="1" name="Miracle">
 		<set name="aggroPoints" val="100" />
@@ -1640,7 +1644,7 @@
 			<target active_effect_id="1339" />
 		</cond>
 		<for>
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 	</skill>
 	<skill id="1452" levels="1" name="Count of Fire" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
@@ -1714,7 +1718,7 @@
 			<target active_effect_id="1340" />
 		</cond>
 		<for>
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 	</skill>
 	<skill id="1454" levels="1" name="Diamond Dust" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
@@ -1819,7 +1823,7 @@
 			<target active_effect_id="1341" />
 		</cond>
 		<for>
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 	</skill>
 	<skill id="1457" levels="1" name="Empowering Echo" enchantGroup1="5" enchantGroup2="5">
@@ -2299,8 +2303,10 @@
 		<set name="negateAbnormals" val="#negateAbnormals" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="4000" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="1476" levels="3" name="Appetite for Destruction" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
 		<!-- Confirmed CT2.5 -->
@@ -2839,11 +2845,11 @@
 		</cond>
 		<for>
 			<effect name="HealPercent" noicon="1" val="#amount" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 		<enchant1for>
 			<effect name="HealPercent" noicon="1" val="#ench1amount" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</enchant1for>
 	</skill>
 	<skill id="1489" levels="1" name="Summoner Ability - Resist Attribute">

L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml

@@ -181,7 +181,7 @@
 		</cond>
 		<for>
 			<effect name="CpHeal" noicon="1" val="9000" />
-			<effect name="CancelDebuff" noicon="1" val="0" effectPower="40" effectType="CANCEL_DEBUFF" />
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="40" />
 			<effect name="HealPercent" noicon="1" val="100" />
 			<effect name="ManaHealPercent" noicon="1" val="100" />
 		</for>
@@ -271,11 +271,13 @@
 		<set name="mpInitialConsume" val="7" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="15000" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<cond msgId="113" addName="1">
 			<target races="Kamael" />
 		</cond>
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="1511" levels="8" name="Curse of Life Flow" enchantGroup1="1" enchantGroup2="1">
 		<!-- Confirmed CT2.5 -->
@@ -398,7 +400,7 @@
 			<target active_effect_id="1512" />
 		</cond>
 		<for>
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 	</skill>
 	<skill id="1514" levels="1" name="Soul Barrier" enchantGroup1="1" enchantGroup2="1">

L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml

@@ -797,12 +797,14 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="NEGATE" />
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="1000" />
 		<set name="effectRange" val="600" />
 		<set name="negateAbnormals" val="sleep,1" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="2171" levels="1" name="Spellbook Paper">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/03300-03399.xml

@@ -389,7 +389,7 @@
 		<set name="transformId" val="103" />
 		<for>
 			<effect name="Transformation" abnormalTime="300" val="0" abnormalLvl="1" abnormalType="transform" />
-			<effect name="Negate" noicon="1" val="0" effectType="NEGATE" />
+			<effect name="Negate" noicon="1" val="0" />
 		</for>
 	</skill>
 	<skill id="3337" levels="1" name="Transform Cutie Pig">

L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml

@@ -1071,7 +1071,7 @@
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<!-- NOTE: The Cancel effect have been reduced in H5, value unconfirmed -->
-			<effect name="Cancel" noicon="1" val="0" effectPower="5" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="5" />
 		</for>
 	</skill>
 	<skill id="3593" levels="1" name="Special Ability: Infinity Bow">

L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml

@@ -595,8 +595,10 @@
 		<set name="magicLvl" val="99" />
 		<set name="negateAbnormals" val="watcher_gaze,1" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="4549" levels="1" name="Quest - Unsealed Altar">
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
@@ -735,7 +737,6 @@
 		<set name="mpInitialConsume" val="14" />
 		<set name="negateAbnormals" val="spa_disease_a,10;spa_disease_d,10" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Negate" noicon="1" val="0" />
@@ -752,7 +753,6 @@
 		<set name="mpInitialConsume" val="14" />
 		<set name="negateAbnormals" val="spa_disease_b,10;spa_disease_d,10" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Negate" noicon="1" val="0" />
@@ -769,7 +769,6 @@
 		<set name="mpInitialConsume" val="14" />
 		<set name="negateAbnormals" val="spa_disease_c,10;spa_disease_d,10" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Negate" noicon="1" val="0" />

L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml

@@ -433,7 +433,6 @@
 	<skill id="4619" levels="1" name="NPC Dispel Sleep">
 		<set name="mpConsume" val="35" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="NEGATE" />
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="A1" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
@@ -442,6 +441,9 @@
 		<set name="effectRange" val="1100" />
 		<set name="negateAbnormals" val="sleep,1" />
 		<set name="aggroPoints" val="100" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="4620" levels="12" name="Paralysis">
 		<table name="#mpConsume"> 13 20 27 35 45 55 65 69 73 75 77 78 </table>
@@ -1573,25 +1575,24 @@
 		<table name="#power"> 8 17 25 33 42 50 58 67 75 83 92 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="CANCEL" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="reuseDelay" val="8000" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="-1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4674" levels="12" name="NPC Dispel Defensive Buff">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 75 90 95 </table>
 		<table name="#mpConsume"> 12 20 27 35 45 55 67 69 73 75 77 78 </table>
 		<table name="#power"> 8 17 25 33 42 50 58 67 75 83 92 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="CANCEL" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -1600,15 +1601,16 @@
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="-1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4675" levels="12" name="NPC Dispel Fighter Buff">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 75 90 95 </table>
 		<table name="#mpConsume"> 12 20 27 35 45 55 67 69 73 75 77 78 </table>
 		<table name="#power"> 8 17 25 33 42 50 58 67 75 83 92 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="CANCEL" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -1617,15 +1619,16 @@
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="-1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4676" levels="12" name="NPC Dispel Mage Offensive Buff">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 75 90 95 </table>
 		<table name="#mpConsume"> 12 20 27 35 45 55 67 69 73 75 77 78 </table>
 		<table name="#power"> 8 17 25 33 42 50 58 67 75 83 92 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="CANCEL" />
 		<set name="hitTime" val="2000" />
 		<set name="reuseDelay" val="8000" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -1634,16 +1637,17 @@
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="-1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4677" levels="12" name="NPC Dispel Fighter Defensive Buff">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 75 90 95 </table>
 		<table name="#mpConsume"> 12 20 27 35 45 55 67 69 73 75 77 78 </table>
 		<table name="#power"> 8 17 25 33 42 50 58 67 75 83 92 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
@@ -1651,16 +1655,17 @@
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="-1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4678" levels="12" name="NPC Dispel Mage Defensive Buff">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 75 90 95 </table>
 		<table name="#mpConsume"> 12 20 27 35 45 55 67 69 73 75 77 78 </table>
 		<table name="#power"> 8 17 25 33 42 50 58 67 75 83 92 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
@@ -1668,6 +1673,9 @@
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="maxNegated" val="-1" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4679" levels="1" name="Valakas">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml

@@ -33,17 +33,18 @@
 		<table name="#aggroPoints"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
 		<table name="#power"> 40 45 50 55 60 65 70 75 80 85 90 95 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_PARTY" />
 		<set name="affectRange" val="1000" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="2000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
 		<set name="negateAbnormals" val="attack_time_up;hit_down;pa_down" />
 		<set name="aggroPoints" val="#aggroPoints" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4702" levels="13" name="Blessing of Seraphim">
 		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
@@ -101,10 +102,8 @@
 		<table name="#aggroPoints"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
 		<table name="#power"> 40 45 50 55 60 65 70 75 80 85 90 95 100 </table> <!-- Base Land Rate -->
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
 		<set name="target" val="TARGET_PARTY" />
 		<set name="affectRange" val="1000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="hitTime" val="2000" />
 		<set name="reuseDelay" val="8000" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -112,6 +111,9 @@
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="negateAbnormals" val="sleep;root_magically;stun;paralyze;silence" />
 		<set name="aggroPoints" val="#aggroPoints" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="#power" />
+		</for>
 	</skill>
 	<skill id="4705" levels="13" name="Curse of Shade">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml

@@ -139,7 +139,7 @@
 		<table name="#effectname1"> Buff Buff Buff Buff Stun </table>
 		<table name="#effectname2"> Buff Buff Buff Buff Cancel </table>
 		<table name="#effectPower"> 0 0 0 0 20 </table>
-		<table name="#effectType"> BUFF BUFF BUFF BUFF CANCEL </table>
+		<table name="#effectType"> BUFF BUFF BUFF BUFF DUMMY </table>
 		<table name="#maxNegated"> 0 0 0 0 10 </table>
 		<table name="#traits"> NONE NONE NONE DERANGEMENT DERANGEMENT </table>
 		<set name="aggroPoints" val="#aggroPoints" />
@@ -564,7 +564,7 @@
 		<set name="maxNegated" val="20" />
 		<set name="aggroPoints" val="100" />
 		<for>
-			<effect name="Cancel" noicon="1" val="0" effectPower="25" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
 		</for>
 	</skill>
 	<skill id="5043" levels="12" name="NPC Super Sonic Blaster">

L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml

@@ -196,15 +196,16 @@
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="power" val="25" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_AURA" />
 		<set name="affectRange" val="150" />
 		<set name="reuseDelay" val="6000" />
 		<set name="hitTime" val="6000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="operateType" val="A1" />
 		<set name="maxNegated" val="5" />
 		<set name="aggroPoints" val="100" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
+		</for>
 	</skill>
 	<skill id="5114" levels="12" name="Hold">
 		<!-- Lvl 1-12 - Temporarily Immobilized. -->
@@ -291,15 +292,16 @@
 		<!-- CT2.5 retail confirmed -->
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="90" />
-		<set name="power" val="25" /> <!-- Base Land Rate -->
 		<set name="target" val="TARGET_AURA" />
 		<set name="affectRange" val="300" />
 		<set name="reuseDelay" val="6000" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="CANCEL" />
 		<set name="operateType" val="A1" />
 		<set name="maxNegated" val="5" />
 		<set name="aggroPoints" val="100" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
+		</for>
 	</skill>
 	<skill id="5119" levels="1" name="Bleed">
 		<!-- CT2.5 retail confirmed -->

L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml

@@ -717,11 +717,10 @@
 		<set name="effectRange" val="1400" />
 		<set name="operateType" val="A2" />
 		<set name="maxNegated" val="20" />
-		<set name="power" val="100" />
 		<set name="saveVs" val="MEN" />
-		<set name="skillType" val="CANCEL" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Debuff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="speed_down" effectPower="80" effectType="DEBUFF">
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
@@ -890,8 +889,10 @@
 		<set name="magicLvl" val="85" />
 		<set name="negateAbnormals" val="invincibility,9" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="NEGATE" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="Negate" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="5481" levels="1" name="Transform Penalty">
 		<!-- You cannot be transformed while under this effect. -->

L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml

@@ -380,7 +380,7 @@
 				<!-- set order="0x08" stat="buffImmunity" val="1" / TODO: Needs Support -->
 				<sub order="0x40" stat="darkRes" val="50" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 		</for>
 	</skill>
 	<skill id="5524" levels="1" name="Chain Buff - Resistance to Bow and Magic attacks">
@@ -1209,8 +1209,10 @@
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="5580" levels="1" name="Divine Beast Bite">
 		<set name="mpConsume" val="80" />

L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml

@@ -1294,7 +1294,7 @@
 		<set name="staticReuse" val="true" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Cancel" noicon="1" val="0" effectPower="25" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
 		</for>
 	</skill>
 	<skill id="5683" levels="1" name="PvP Weapon - Ignore Shield Defense">

L2J_DataPack_BETA/dist/game/data/stats/skills/06000-06099.xml

@@ -307,8 +307,10 @@
 		<set name="mpInitialConsume" val="12" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="180000" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="6043" levels="1" name="Phoenix Flame Feather">
 		<!-- Confirmed CT2.5 -->
@@ -799,10 +801,11 @@
 		<set name="maxNegated" val="2" />
 		<set name="mpConsume" val="42" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="25" /> <!-- Base Land Rate -->
 		<set name="reuseDelay" val="60000" />
-		<set name="skillType" val="CANCEL" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
+		</for>
 	</skill>
 	<skill id="6095" levels="15" name="Panther Dark Claw">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml

@@ -25,7 +25,7 @@
 				<add order="0x40" stat="weightPenalty" val="9000" />
 				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Buff" abnormalTime="520" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Buff" abnormalTime="520" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
@@ -49,7 +49,7 @@
 				<add order="0x40" stat="weightPenalty" val="9000" />
 				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Buff" abnormalTime="460" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Buff" abnormalTime="460" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
@@ -73,7 +73,7 @@
 				<add order="0x40" stat="weightPenalty" val="9000" />
 				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Buff" abnormalTime="215" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Buff" abnormalTime="215" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
@@ -97,7 +97,7 @@
 				<add order="0x40" stat="weightPenalty" val="9000" />
 				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
 			<effect name="Buff" abnormalTime="-1" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 			<effect name="Buff" abnormalTime="-1" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>

L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml

@@ -8,22 +8,25 @@
 	<skill id="7001" levels="1" name="Dispel Buff">
 		<set name="magicLvl" val="99" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="CANCEL" />
 		<set name="operateType" val="A1" />
 		<set name="maxNegated" val="20" />
-		<set name="power" val="100" /> <!-- Base Land Rate -->
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="aggroPoints" val="100" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="7002" levels="1" name="Dispel Debuff">
 		<set name="magicLvl" val="99" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="aggroPoints" val="100" />
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="7003" levels="1" name="Dispel All">
 		<!-- Confirmed CT2.5 -->
@@ -35,8 +38,8 @@
 		<set name="operateType" val="A1" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
-			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" effectType="CANCEL_DEBUFF" />
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" />
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
 		</for>
 	</skill>
 	<skill id="7004" levels="2" name="Dispel Petrification">

L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml

@@ -334,11 +334,12 @@
 		<set name="mpConsume" val="40" />
 		<set name="mpInitialConsume" val="10" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="25" /> <!-- Base Land Rate -->
 		<set name="reuseDelay" val="360000" />
 		<set name="affectRange" val="150" />
-		<set name="skillType" val="CANCEL" />
 		<set name="target" val="TARGET_AURA" />
+		<for>
+			<effect name="Cancel" noicon="1" val="0" effectPower="25" />
+		</for>
 	</skill>
 	<skill id="8332" levels="1" name="Blue Talisman - Buff Steal">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml

@@ -667,13 +667,14 @@
 		<set name="target" val="TARGET_SELF" />
 		<set name="maxNegated" val="20" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="CANCEL_DEBUFF" />
-		<set name="power" val="100" />
 		<set name="hitTime" val="2000" />
 		<set name="reuseDelay" val="14400000" />
 		<cond msgId="2292">
 			<player agathionId="1574" />
 		</cond>
+		<for>
+			<effect name="CancelDebuff" noicon="1" val="0" effectPower="100" />
+		</for>
 	</skill>
 	<skill id="23174" levels="1" name="Narrow Escape from Death">
 		<!-- Revives from death with completely recovered status. Buff/de-buff doesn't disappear at death but is maintained, though the Blessing of Noblesse and the Amulet of Luck will both be lost. Cooldown of 12 hours. -->