Bläddra i källkod

BETA: Fixed '''Blessed Scroll of Resurrection for Pet''', now anyone can use it on dead pet.
Reported by: goncafa

Adry_85 12 år sedan
förälder
incheckning
035e5cc3a4
24 ändrade filer med 37 tillägg och 275 borttagningar
  1. 2 6
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
  2. 0 182
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
  3. 0 54
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpsePet.java
  4. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PcBody.java
  5. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/items/00700-00799.xml
  6. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/items/03900-03999.xml
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/items/06300-06399.xml
  8. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/items/09100-09199.xml
  9. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/items/10100-10199.xml
  10. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/items/13200-13299.xml
  11. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
  12. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
  13. 3 3
      L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
  14. 3 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
  15. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
  16. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
  17. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
  18. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
  19. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
  20. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
  21. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/21000-21099.xml
  22. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/21100-21199.xml
  23. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
  24. 5 5
      L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml

+ 2 - 6
L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -194,7 +194,6 @@ import handlers.itemhandlers.NicknameColor;
 import handlers.itemhandlers.PetFood;
 import handlers.itemhandlers.Recipes;
 import handlers.itemhandlers.RollingDice;
-import handlers.itemhandlers.ScrollOfResurrection;
 import handlers.itemhandlers.Seed;
 import handlers.itemhandlers.SevenSignsRecord;
 import handlers.itemhandlers.SoulShots;
@@ -233,8 +232,6 @@ import handlers.targethandlers.Clan;
 import handlers.targethandlers.ClanMember;
 import handlers.targethandlers.CorpseClan;
 import handlers.targethandlers.CorpseMob;
-import handlers.targethandlers.CorpsePet;
-import handlers.targethandlers.CorpsePlayer;
 import handlers.targethandlers.EnemySummon;
 import handlers.targethandlers.FlagPole;
 import handlers.targethandlers.FrontArea;
@@ -248,6 +245,7 @@ import handlers.targethandlers.PartyClan;
 import handlers.targethandlers.PartyMember;
 import handlers.targethandlers.PartyNotMe;
 import handlers.targethandlers.PartyOther;
+import handlers.targethandlers.PcBody;
 import handlers.targethandlers.Pet;
 import handlers.targethandlers.Self;
 import handlers.targethandlers.Servitor;
@@ -462,7 +460,6 @@ public class MasterHandler
 		},
 		{
 			// Item Handlers
-			ScrollOfResurrection.class,
 			SoulShots.class,
 			SpiritShot.class,
 			BlessedSpiritShot.class,
@@ -566,8 +563,6 @@ public class MasterHandler
 			ClanMember.class,
 			CorpseClan.class,
 			CorpseMob.class,
-			CorpsePet.class,
-			CorpsePlayer.class,
 			EnemySummon.class,
 			FlagPole.class,
 			FrontArea.class,
@@ -581,6 +576,7 @@ public class MasterHandler
 			PartyMember.class,
 			PartyNotMe.class,
 			PartyOther.class,
+			PcBody.class,
 			Pet.class,
 			Self.class,
 			Servitor.class,

+ 0 - 182
L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java

@@ -1,182 +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.itemhandlers;
-
-import java.util.logging.Level;
-
-import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.instancemanager.CastleManager;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
-public class ScrollOfResurrection implements IItemHandler
-{
-	@Override
-	public boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
-	{
-		if (!playable.isPlayer())
-		{
-			playable.sendPacket(SystemMessageId.ITEM_NOT_FOR_PETS);
-			return false;
-		}
-		
-		if (!TvTEvent.onScrollUse(playable.getObjectId()))
-		{
-			playable.sendPacket(ActionFailed.STATIC_PACKET);
-			return false;
-		}
-		
-		final L2PcInstance activeChar = playable.getActingPlayer();
-		if (activeChar.isSitting())
-		{
-			activeChar.sendPacket(SystemMessageId.CANT_MOVE_SITTING);
-			return false;
-		}
-		
-		if (activeChar.isMovementDisabled())
-		{
-			return false;
-		}
-		
-		final int itemId = item.getItemId();
-		final boolean petScroll = (itemId == 6387);
-		final SkillHolder[] skills = item.getItem().getSkills();
-		
-		if (skills == null)
-		{
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!");
-			return false;
-		}
-		
-		// SoR Animation section
-		final L2Character target = (L2Character) activeChar.getTarget();
-		if ((target == null) || !target.isDead())
-		{
-			activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
-			return false;
-		}
-		
-		L2PcInstance targetPlayer = null;
-		if (target instanceof L2PcInstance)
-		{
-			targetPlayer = (L2PcInstance) target;
-		}
-		
-		L2PetInstance targetPet = null;
-		if (target instanceof L2PetInstance)
-		{
-			targetPet = (L2PetInstance) target;
-		}
-		
-		if ((targetPlayer != null) || (targetPet != null))
-		{
-			boolean condGood = true;
-			
-			// check target is not in a active siege zone
-			Castle castle = null;
-			
-			if (targetPlayer != null)
-			{
-				castle = CastleManager.getInstance().getCastle(targetPlayer.getX(), targetPlayer.getY(), targetPlayer.getZ());
-			}
-			else if (targetPet != null)
-			{
-				castle = CastleManager.getInstance().getCastle(targetPet.getOwner().getX(), targetPet.getOwner().getY(), targetPet.getOwner().getZ());
-			}
-			
-			if ((castle != null) && castle.getSiege().getIsInProgress())
-			{
-				condGood = false;
-				activeChar.sendPacket(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE);
-			}
-			
-			if (targetPet != null)
-			{
-				if (targetPet.getOwner() != activeChar)
-				{
-					if (targetPet.getOwner().isReviveRequested())
-					{
-						if (targetPet.getOwner().isRevivingPet())
-						{
-							activeChar.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
-						}
-						else
-						{
-							activeChar.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
-						}
-						condGood = false;
-					}
-				}
-			}
-			else if (targetPlayer != null)
-			{
-				if (targetPlayer.isFestivalParticipant()) // Check to see if the current player target is in a festival.
-				{
-					condGood = false;
-					activeChar.sendMessage("You may not resurrect participants in a festival.");
-				}
-				if (targetPlayer.isReviveRequested())
-				{
-					if (targetPlayer.isRevivingPet())
-					{
-						activeChar.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
-					}
-					else
-					{
-						activeChar.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
-					}
-					condGood = false;
-				}
-				else if (petScroll)
-				{
-					condGood = false;
-					activeChar.sendMessage("You do not have the correct scroll");
-				}
-			}
-			
-			if (condGood)
-			{
-				if (!activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false))
-				{
-					return false;
-				}
-				
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
-				activeChar.sendPacket(sm);
-				
-				for (SkillHolder sk : skills)
-				{
-					activeChar.useMagic(sk.getSkill(), true, true);
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-}

+ 0 - 54
L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpsePet.java

@@ -1,54 +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.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.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
-
-/**
- * @author UnAfraid
- */
-public class CorpsePet implements ITargetTypeHandler
-{
-	@Override
-	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
-	{
-		if (activeChar.isPlayer())
-		{
-			target = activeChar.getSummon();
-			if ((target != null) && target.isDead())
-			{
-				return new L2Character[]
-				{
-					target
-				};
-			}
-		}
-		return EMPTY_TARGET_LIST;
-	}
-	
-	@Override
-	public Enum<L2TargetType> getTargetType()
-	{
-		return L2TargetType.CORPSE_PET;
-	}
-}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpsePlayer.java → L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/PcBody.java

@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 /**
  * @author UnAfraid
  */
-public class CorpsePlayer implements ITargetTypeHandler
+public class PcBody implements ITargetTypeHandler
 {
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -147,6 +147,6 @@ public class CorpsePlayer implements ITargetTypeHandler
 	@Override
 	public Enum<L2TargetType> getTargetType()
 	{
-		return L2TargetType.CORPSE_PLAYER;
+		return L2TargetType.PC_BODY;
 	}
 }

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/items/00700-00799.xml

@@ -515,7 +515,7 @@
 		<set name="price" val="2000" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2014-1" />
 	</item>
 	<item id="738" type="Weapon" name="Sword of Solidarity">

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/stats/items/03900-03999.xml

@@ -660,7 +660,7 @@
 		<set name="price" val="400000" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2049-1" />
 	</item>
 	<item id="3937" type="Weapon" name="Giant Bar">
@@ -961,7 +961,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2062-1" />
 	</item>
 	<item id="3960" type="EtcItem" name="Mercenary Posting Ticket (Sword/Stationary)">

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/items/06300-06399.xml

@@ -1529,7 +1529,7 @@
 		<set name="price" val="5000" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2179-1" />
 	</item>
 	<item id="6388" type="EtcItem" name="Lord of the Manor's Certificate of Approval">

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/items/09100-09199.xml

@@ -821,7 +821,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2321-1" />
 	</item>
 	<item id="9158" type="Armor" name="Gold Circlet of Redemption">

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/items/10100-10199.xml

@@ -699,7 +699,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2393-1" />
 		<cond msgId="113" addName="1">
 			<player SiegeZone="126" />

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/items/13200-13299.xml

@@ -1337,7 +1337,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
-		<set name="handler" val="ScrollOfResurrection" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2596-1" />
 	</item>
 	<item id="13260" type="Armor" name="Gran Kain's Squeaking Shoes - 10-hour limited period">

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

@@ -33,7 +33,7 @@
 		<set name="power" val="70" />
 		<set name="reuseDelay" val="30000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="702" levels="1" name="Divine Healer Cleanse">
 		<set name="castRange" val="600" />
@@ -971,7 +971,7 @@
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="741" levels="3" name="Heretic Heal Side Effect">
 		<!-- Confirmed CT2.5 -->

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

@@ -487,7 +487,7 @@
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="1018" levels="3" name="Purify">
 		<!-- Confirmed CT2.5 and Updated to H5 -->

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

@@ -182,7 +182,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2015" levels="1" name="Scroll: Enchant Weapon (Grade B)">
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
@@ -559,7 +559,7 @@
 		<set name="operateType" val="A1" />
 		<set name="power" val="100" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2050" levels="1" name="Scroll of Guidance">
 		<set name="abnormalLvl" val="4" />
@@ -771,7 +771,7 @@
 		<set name="operateType" val="A1" />
 		<set name="power" val="100" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2063" levels="1" name="Hatchling Food">
 		<!-- Confirmed CT2.5 -->

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

@@ -1082,11 +1082,13 @@
 		<set name="effectRange" val="600" />
 		<set name="hitTime" val="15000" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="itemConsumeCount" val="1" />
+		<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="CORPSE_PET" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2180" levels="1" name="Feed: Castle Strider">
 		<!-- Confirmed CT2.5 -->

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

@@ -405,7 +405,7 @@
 		<set name="operateType" val="A1" />
 		<set name="power" val="100" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2322" levels="1" name="Chest Key - For Events Only">
 		<!-- Confirmed CT2.5 -->
@@ -1643,7 +1643,7 @@
 		<set name="operateType" val="A1" />
 		<set name="power" val="100" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2394" levels="1" name="Scroll of Battlefield Transformation">
 		<!-- Confirmed CT2.5 -->

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

@@ -1688,7 +1688,7 @@
 		<set name="operateType" val="A1" />
 		<set name="power" val="100" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="2597" levels="1" name="Gran Kain's Echo Crystal - Theme of Journey">
 		<set name="isMagic" val="2" /> <!-- Static Skill -->

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

@@ -1407,7 +1407,7 @@
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="300000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="3161" levels="3" name="Item Skill: Skill Clarity">
 		<table name="#effectPoints"> 549 611 655 </table>

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

@@ -906,7 +906,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="1800000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="3264" levels="1" name="Blessed Escape">
 		<!-- Allows the use of Blessed Escape. -->

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

@@ -122,7 +122,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="300000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="3410" levels="1" name="Blue Talisman of Reflection">
 		<set name="abnormalLvl" val="1" />

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

@@ -715,7 +715,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="259200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="16031" />
 		</cond>
@@ -787,7 +787,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="259200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="16032" />
 		</cond>

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

@@ -736,7 +736,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="21055" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -1491,7 +1491,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="21096" levels="1" name="Ability of Cool Watermelon">
 		<!-- Confirmed CT2.5 -->

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

@@ -58,7 +58,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</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%. -->

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

@@ -110,7 +110,7 @@
 		<set name="operateType" val="A1" />
 		<set name="power" val="100" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 	</skill>
 	<skill id="22105" levels="1" name="Uldie Summon Scroll (Event)">
 		<!-- Confirmed CT2.5 -->

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

@@ -75,7 +75,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1502" />
 		</cond>
@@ -161,7 +161,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1504" />
 		</cond>
@@ -230,7 +230,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1506" />
 		</cond>
@@ -486,7 +486,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1510" />
 		</cond>
@@ -1002,7 +1002,7 @@
 		<set name="power" val="100" />
 		<set name="reuseDelay" val="43200000" />
 		<set name="skillType" val="RESURRECT" />
-		<set name="targetType" val="CORPSE_PLAYER" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
 			<player agathionId="1522" />
 		</cond>