BETA: Skills rework:

	* Resurrection from skillhandlers to effecthandlers.
	* Fixing Mass Resurrection effect, if both player and pet are dead only player is ressed.
		* Patch by: Zoey76
	Rewieved by: Zoey76

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

@@ -138,6 +138,7 @@ public final class EffectMasterHandler
 		Relax.class,
 		Restoration.class,
 		RestorationRandom.class,
+		Resurrection.class,
 		Root.class,
 		ServitorShare.class,
 		SetSkill.class,

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

@@ -214,7 +214,6 @@ import handlers.skillhandlers.FishingSkill;
 import handlers.skillhandlers.GetPlayer;
 import handlers.skillhandlers.GiveReco;
 import handlers.skillhandlers.NornilsPower;
-import handlers.skillhandlers.Resurrect;
 import handlers.skillhandlers.Sow;
 import handlers.skillhandlers.TakeCastle;
 import handlers.skillhandlers.TakeFort;
@@ -510,7 +509,6 @@ public class MasterHandler
 			GetPlayer.class,
 			GiveReco.class,
 			NornilsPower.class,
-			Resurrect.class,
 			Sow.class,
 			TakeCastle.class,
 			TakeFort.class,

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

@@ -0,0 +1,75 @@
+/*
+ * 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.effecthandlers;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+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.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+
+/**
+ * Resurrection effect implementation.
+ * @author Adry_85
+ */
+public class Resurrection extends L2Effect
+{
+	private final int _power;
+	
+	public Resurrection(Env env, EffectTemplate template)
+	{
+		super(env, template);
+		_power = template.getParameters().getInt("power", 0);
+	}
+	
+	@Override
+	public L2EffectType getEffectType()
+	{
+		return L2EffectType.RESURRECTION;
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public boolean onStart()
+	{
+		L2Character target = getEffected();
+		L2Character activeChar = getEffector();
+		
+		if (activeChar.isPlayer())
+		{
+			if (target.getActingPlayer() != null)
+			{
+				target.getActingPlayer().reviveRequest(activeChar.getActingPlayer(), getSkill(), target.isPet(), _power);
+			}
+		}
+		else
+		{
+			DecayTaskManager.getInstance().cancelDecayTask(target);
+			target.doRevive(Formulas.calculateSkillResurrectRestorePercent(_power, activeChar));
+		}
+		return true;
+	}
+}

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

@@ -1,111 +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 javolution.util.FastList;
-
-import com.l2jserver.gameserver.enums.ShotType;
-import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
-import com.l2jserver.gameserver.model.stats.Formulas;
-import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
-
-public class Resurrect implements ISkillHandler
-{
-	private static final L2SkillType[] SKILL_IDS =
-	{
-		L2SkillType.RESURRECT
-	};
-	
-	@Override
-	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
-	{
-		L2PcInstance player = null;
-		if (activeChar.isPlayer())
-		{
-			player = activeChar.getActingPlayer();
-		}
-		
-		L2PcInstance targetPlayer;
-		List<L2Character> targetToRes = new FastList<>();
-		
-		for (L2Character target : (L2Character[]) targets)
-		{
-			if (target.isPlayer())
-			{
-				targetPlayer = target.getActingPlayer();
-				
-				// Check for same party or for same clan, if target is for clan.
-				if (skill.getTargetType() == L2TargetType.CORPSE_CLAN)
-				{
-					if ((player != null) && (player.getClanId() != targetPlayer.getClanId()))
-					{
-						continue;
-					}
-				}
-			}
-			if (target.isVisible())
-			{
-				targetToRes.add(target);
-			}
-		}
-		
-		if (targetToRes.isEmpty())
-		{
-			activeChar.abortCast();
-			return;
-		}
-		
-		for (L2Character cha : targetToRes)
-		{
-			if (activeChar.isPlayer())
-			{
-				if (cha.isPlayer())
-				{
-					cha.getActingPlayer().reviveRequest(activeChar.getActingPlayer(), skill, false);
-				}
-				else if (cha.isPet())
-				{
-					((L2PetInstance) cha).getOwner().reviveRequest(activeChar.getActingPlayer(), skill, true);
-				}
-			}
-			else
-			{
-				DecayTaskManager.getInstance().cancelDecayTask(cha);
-				cha.doRevive(Formulas.calculateSkillResurrectRestorePercent(skill.getPower(), 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/targethandlers/CorpseClan.java

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.util.Util;
@@ -44,11 +43,10 @@ public class CorpseClan implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		List<L2Character> targetList = new ArrayList<>();
+		List<L2Object> targetList = new ArrayList<>();
 		if (activeChar.isPlayable())
 		{
 			final L2PcInstance player = activeChar.getActingPlayer();
-			
 			if (player == null)
 			{
 				return EMPTY_TARGET_LIST;
@@ -56,28 +54,20 @@ public class CorpseClan implements ITargetTypeHandler
 			
 			if (player.isInOlympiadMode())
 			{
-				return new L2Character[]
+				return new L2Object[]
 				{
 					player
 				};
 			}
 			
-			final int radius = skill.getAffectRange();
 			final L2Clan clan = player.getClan();
-			
-			if (L2Skill.addSummon(activeChar, player, radius, true))
-			{
-				targetList.add(player.getSummon());
-			}
-			
 			if (clan != null)
 			{
-				L2PcInstance obj;
-				int maxTargets = skill.getAffectLimit();
+				final int radius = skill.getAffectRange();
+				final int maxTargets = skill.getAffectLimit();
 				for (L2ClanMember member : clan.getMembers())
 				{
-					obj = member.getPlayerInstance();
-					
+					final L2PcInstance obj = member.getPlayerInstance();
 					if ((obj == null) || (obj == player))
 					{
 						continue;
@@ -106,28 +96,20 @@ public class CorpseClan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, true))
-					{
-						targetList.add(obj.getSummon());
-					}
-					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, true))
 					{
 						continue;
 					}
 					
-					if (skill.getSkillType() == L2SkillType.RESURRECT)
+					// check target is not in a active siege zone
+					if (obj.isInsideZone(ZoneId.SIEGE) && !obj.isInSiege())
 					{
-						// check target is not in a active siege zone
-						if (obj.isInsideZone(ZoneId.SIEGE) && !obj.isInSiege())
-						{
-							continue;
-						}
+						continue;
 					}
 					
 					if (onlyFirst)
 					{
-						return new L2Character[]
+						return new L2Object[]
 						{
 							obj
 						};
@@ -148,7 +130,7 @@ public class CorpseClan implements ITargetTypeHandler
 			final L2Npc npc = (L2Npc) activeChar;
 			if ((npc.getFactionId() == null) || npc.getFactionId().isEmpty())
 			{
-				return new L2Character[]
+				return new L2Object[]
 				{
 					activeChar
 				};
@@ -172,12 +154,12 @@ public class CorpseClan implements ITargetTypeHandler
 						break;
 					}
 					
-					targetList.add((L2Npc) newTarget);
+					targetList.add(newTarget);
 				}
 			}
 		}
 		
-		return targetList.toArray(new L2Character[targetList.size()]);
+		return targetList.toArray(new L2Object[targetList.size()]);
 	}
 	
 	@Override

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

@@ -26,8 +26,8 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+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.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -77,7 +77,7 @@ public class PcBody implements ITargetTypeHandler
 			{
 				boolean condGood = true;
 				
-				if (skill.getSkillType() == L2SkillType.RESURRECT)
+				if (skill.hasEffectType(L2EffectType.RESURRECTION))
 				{
 					if (targetPlayer != null)
 					{

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

@@ -31,10 +31,13 @@
 		<set name="magicLvl" val="80" />
 		<set name="mpConsume" val="252" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="70" />
 		<set name="reuseDelay" val="30000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="70" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="702" levels="1" name="Divine Healer Cleanse">
 		<set name="castRange" val="600" />
@@ -977,10 +980,13 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="#power" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="741" levels="3" name="Heretic Heal Side Effect">
 		<!-- Confirmed CT2.5 -->

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

@@ -484,10 +484,13 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="#power" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="1018" levels="3" name="Purify">
 		<!-- Confirmed CT2.5 and Updated to H5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml

@@ -1784,13 +1784,20 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="150000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="CORPSE_CLAN" />
-		<enchant1 name="power" val="#ench1power" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="#power" />
+			</effect>
+		</for>
+		<enchant1for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="#ench1power" />
+			</effect>
+		</enchant1for>
 	</skill>
 	<skill id="1255" levels="2" name="Party Recall">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml

@@ -183,8 +183,10 @@
 		<set name="itemConsumeId" val="737" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0" />
+		</for>
 	</skill>
 	<skill id="2015" levels="1" name="Scroll: Enchant Weapon (Grade B)">
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
@@ -561,9 +563,12 @@
 		<set name="itemConsumeId" val="3936" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2050" levels="1" name="Scroll of Guidance">
 		<set name="abnormalLvl" val="4" />
@@ -775,9 +780,12 @@
 		<set name="itemConsumeId" val="3959" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2063" levels="1" name="Hatchling Food">
 		<!-- Confirmed CT2.5 -->

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

@@ -1087,12 +1087,15 @@
 		<set name="itemConsumeId" val="6387" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="113" addName="1">
 			<target npcType="L2PetInstance" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2180" levels="1" name="Feed: Castle Strider">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml

@@ -405,9 +405,12 @@
 		<set name="itemConsumeId" val="9157" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2322" levels="1" name="Chest Key - For Events Only">
 		<!-- Confirmed CT2.5 -->
@@ -1644,9 +1647,12 @@
 		<set name="itemConsumeId" val="10150" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2394" levels="1" name="Scroll of Battlefield Transformation">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml

@@ -1689,9 +1689,12 @@
 		<set name="itemConsumeId" val="13259" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2597" levels="1" name="Gran Kain's Echo Crystal - Theme of Journey">
 		<set name="isMagic" val="2" /> <!-- Static Skill -->

L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml

@@ -1425,10 +1425,13 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="300000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="#power" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="3161" levels="3" name="Item Skill: Skill Clarity">
 		<table name="#effectPoints"> 549 611 655 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml

@@ -904,10 +904,13 @@
 		<set name="mpConsume" val="65" />
 		<set name="mpInitialConsume" val="17" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="1800000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="3264" levels="1" name="Blessed Escape">
 		<!-- Allows the use of Blessed Escape. -->

L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml

@@ -129,10 +129,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="300000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="3410" levels="1" name="Blue Talisman of Reflection">
 		<set name="abnormalLvl" val="1" />

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

@@ -725,13 +725,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="259200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="16031" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="5542" levels="1" name="Little Devil Agathion Special Skill - Firecrackers">
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -798,13 +801,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="259200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="16032" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="5546" levels="1" name="Alert">
 		<set name="effectPoint" val="-100" />

L2J_DataPack_BETA/dist/game/data/stats/skills/21000-21099.xml

@@ -734,10 +734,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="21055" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -1505,10 +1508,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="21096" levels="1" name="Ability of Cool Watermelon">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/21100-21199.xml

@@ -55,10 +55,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="21103" levels="1" name="Great Adventurer's Soul Power : Endless">
 		<!-- For five minutes, the Great Spirit increases maximum HP by 20%, maximum MP by 20%, moving speed by 20%, and resistance against debuff by 10%. -->

L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml

@@ -108,9 +108,12 @@
 		<set name="itemConsumeId" val="20584" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22105" levels="1" name="Uldie Summon Scroll (Event)">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml

@@ -73,13 +73,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1502" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23006" levels="1" name="Black Majo Agathion Special Skill - Power of Blessed Return">
 		<set name="hitTime" val="200" />
@@ -160,13 +163,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1504" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23010" levels="1" name="Baby Panda Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -230,13 +236,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1506" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23015" levels="1" name="Sexy Panda Agathion Special Skill - Power of Blessed Return">
 		<set name="hitTime" val="200" />
@@ -488,13 +497,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1510" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23031" levels="1" name="Black Maneki Neko Agathion Special Skill - Ability of Blessed Return">
 		<set name="hitTime" val="200" />
@@ -1012,13 +1024,16 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="skillType" val="RESURRECT" />
 		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1522" />
 		</cond>
+		<for>
+			<effect name="Resurrection" noicon="1" val="0">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23063" levels="1" name="Button-Eyed Bear Doll Agathion Special Skill - Ability of Energy Recovery">
 		<!-- Recovers energy when acquiring Exp. for 5 minutes. Reuse Delay 1 hours -->