BETA: DataPack for [L6639]

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

@@ -57,7 +57,6 @@ public final class EffectMasterHandler
 		ChangeFishingMastery.class,
 		ChangeHairColor.class,
 		ChangeHairStyle.class,
-		CharmOfCourage.class,
 		CharmOfLuck.class,
 		ClanGate.class,
 		Confuse.class,
@@ -135,7 +134,6 @@ public final class EffectMasterHandler
 		Paralyze.class,
 		Passive.class,
 		Petrification.class,
-		PhoenixBless.class,
 		PhysicalAttack.class,
 		PhysicalAttackHpLink.class,
 		PhysicalAttackMute.class,
@@ -153,6 +151,7 @@ public final class EffectMasterHandler
 		Restoration.class,
 		RestorationRandom.class,
 		Resurrection.class,
+		ResurrectionSpecial.class,
 		Root.class,
 		ServitorShare.class,
 		SetSkill.class,

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

@@ -179,6 +179,7 @@ import handlers.itemhandlers.BlessedSpiritShot;
 import handlers.itemhandlers.Book;
 import handlers.itemhandlers.Bypass;
 import handlers.itemhandlers.Calculator;
+import handlers.itemhandlers.CharmOfCourage;
 import handlers.itemhandlers.Disguise;
 import handlers.itemhandlers.Elixir;
 import handlers.itemhandlers.EnchantAttribute;
@@ -452,6 +453,7 @@ public class MasterHandler
 			Book.class,
 			Bypass.class,
 			Calculator.class,
+			CharmOfCourage.class,
 			Disguise.class,
 			Elixir.class,
 			EnchantAttribute.class,

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

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2004-2014 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.StatsSet;
-import com.l2jserver.gameserver.model.conditions.Condition;
-import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.EffectFlag;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
-import com.l2jserver.gameserver.model.skills.BuffInfo;
-
-/**
- * Phoenix Blessing effect implementation.
- * @author Faror
- */
-public final class PhoenixBless extends AbstractEffect
-{
-	public PhoenixBless(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
-	{
-		super(attachCond, applyCond, set, params);
-	}
-	
-	@Override
-	public boolean canStart(BuffInfo info)
-	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
-	}
-	
-	@Override
-	public int getEffectFlags()
-	{
-		return EffectFlag.PHOENIX_BLESSING.getMask();
-	}
-	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.PHOENIX_BLESSING;
-	}
-}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java → L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java

@@ -1,72 +1,80 @@
 /*
  * Copyright (C) 2004-2014 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.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
- * Charm Of Courage effect implementation.
- * @author nBd
+ * Resurrection Special effect implementation.
+ * @author Zealar
  */
-public final class CharmOfCourage extends AbstractEffect
+public final class ResurrectionSpecial extends AbstractEffect
 {
-	public CharmOfCourage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+	private final int _power;
+	
+	public ResurrectionSpecial(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getInt("power", 0);
 	}
 	
 	@Override
-	public boolean canStart(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return info.getEffected().isPlayer();
+		return L2EffectType.RESURRECTION_SPECIAL;
 	}
 	
 	@Override
 	public int getEffectFlags()
 	{
-		return EffectFlag.CHARM_OF_COURAGE.getMask();
-	}
-	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.CHARMOFCOURAGE;
+		return EffectFlag.RESURRECTION_SPECIAL.getMask();
 	}
 	
 	@Override
 	public void onExit(BuffInfo info)
 	{
+		if (!info.getEffected().isPlayer() && !info.getEffected().isPet())
+		{
+			return;
+		}
+		L2PcInstance caster = info.getEffector().getActingPlayer();
+		
+		Skill skill = info.getSkill();
+		
 		if (info.getEffected().isPlayer())
 		{
-			info.getEffected().broadcastPacket(new EtcStatusUpdate(info.getEffected().getActingPlayer()));
+			info.getEffected().getActingPlayer().reviveRequest(caster, skill, false, _power);
+			return;
+		}
+		if (info.getEffected().isPet())
+		{
+			L2PetInstance pet = (L2PetInstance) info.getEffected();
+			info.getEffected().getActingPlayer().reviveRequest(pet.getActingPlayer(), skill, true, _power);
 		}
 	}
-	
-	@Override
-	public void onStart(BuffInfo info)
-	{
-		info.getEffected().broadcastPacket(new EtcStatusUpdate(info.getEffected().getActingPlayer()));
-	}
-}
+}

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

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -81,17 +80,10 @@ public final class Unsummon extends AbstractEffect
 		{
 			final L2PcInstance summonOwner = summon.getOwner();
 			
-			if (summon.isPhoenixBlessed() || summon.isNoblesseBlessed())
-			{
-				summon.stopEffects(L2EffectType.NOBLESSE_BLESSING);
-			}
-			else
-			{
-				summon.stopAllEffectsExceptThoseThatLastThroughDeath();
-			}
-			
 			summon.abortAttack();
 			summon.abortCast();
+			summon.stopAllEffects();
+			
 			summon.unSummon(summonOwner);
 			summonOwner.sendPacket(SystemMessageId.YOUR_SERVITOR_HAS_VANISHED);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2004-2014 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 com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Charm Of Courage Handler
+ * @author Zealar
+ */
+public class CharmOfCourage implements IItemHandler
+{
+	@Override
+	public boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
+	{
+		
+		if (!playable.isPlayer())
+		{
+			return false;
+		}
+		
+		final L2PcInstance activeChar = playable.getActingPlayer();
+		
+		int level = activeChar.getLevel();
+		final int itemLevel = item.getItem().getItemGrade().getId();
+		
+		if (level < 20)
+		{
+			level = 0;
+		}
+		else if (level < 40)
+		{
+			level = 1;
+		}
+		else if (level < 52)
+		{
+			level = 2;
+		}
+		else if (level < 61)
+		{
+			level = 3;
+		}
+		else if (level < 76)
+		{
+			level = 4;
+		}
+		else
+		{
+			level = 5;
+		}
+		
+		if (itemLevel < level)
+		{
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addItemName(item.getId());
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		
+		if (activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), 1, null, false))
+		{
+			activeChar.setCharmOfCourage(true);
+			activeChar.sendPacket(new EtcStatusUpdate(activeChar));
+			return true;
+		}
+		return false;
+	}
+}

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

@@ -93,36 +93,6 @@ public class PcBody implements ITargetTypeHandler
 							condGood = false;
 							activeChar.sendMessage("You may not resurrect participants in a festival.");
 						}
-						if (targetPlayer.isReviveRequested())
-						{
-							if (targetPlayer.isRevivingPet())
-							{
-								player.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
-							}
-							else
-							{
-								player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
-							}
-							condGood = false;
-						}
-					}
-					else if (targetPet != null)
-					{
-						if (targetPet.getOwner() != player)
-						{
-							if (targetPet.getOwner().isReviveRequested())
-							{
-								if (targetPet.getOwner().isRevivingPet())
-								{
-									player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
-								}
-								else
-								{
-									player.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
-								}
-								condGood = false;
-							}
-						}
 					}
 				}
 				

L2J_DataPack_BETA/dist/game/data/stats/items/08500-08599.xml

@@ -173,8 +173,7 @@
 		<set name="price" val="2000" />
 		<set name="reuse_delay" val="1200000" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="item_skill" val="5041-1" />
+		<set name="handler" val="CharmOfCourage" />
 	</item>
 	<item id="8516" type="EtcItem" name="Charm of Courage (D-Grade)">
 		<set name="icon" val="icon.etc_charm_of_courage_i01" />
@@ -187,8 +186,7 @@
 		<set name="price" val="6600" />
 		<set name="reuse_delay" val="1200000" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="item_skill" val="5041-1" />
+		<set name="handler" val="CharmOfCourage" />
 	</item>
 	<item id="8517" type="EtcItem" name="Charm of Courage (C-Grade)">
 		<set name="icon" val="icon.etc_charm_of_courage_i02" />
@@ -201,8 +199,7 @@
 		<set name="price" val="13200" />
 		<set name="reuse_delay" val="1200000" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="item_skill" val="5041-1" />
+		<set name="handler" val="CharmOfCourage" />
 	</item>
 	<item id="8518" type="EtcItem" name="Charm of Courage (B-Grade)">
 		<set name="icon" val="icon.etc_charm_of_courage_i03" />
@@ -215,8 +212,7 @@
 		<set name="price" val="26000" />
 		<set name="reuse_delay" val="1200000" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="item_skill" val="5041-1" />
+		<set name="handler" val="CharmOfCourage" />
 	</item>
 	<item id="8519" type="EtcItem" name="Charm of Courage (A-Grade)">
 		<set name="icon" val="icon.etc_charm_of_courage_i04" />
@@ -229,8 +225,7 @@
 		<set name="price" val="54000" />
 		<set name="reuse_delay" val="1200000" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="item_skill" val="5041-1" />
+		<set name="handler" val="CharmOfCourage" />
 	</item>
 	<item id="8520" type="EtcItem" name="Charm of Courage (S-Grade)">
 		<set name="icon" val="icon.etc_charm_of_courage_i05" />
@@ -243,8 +238,7 @@
 		<set name="price" val="100000" />
 		<set name="reuse_delay" val="1200000" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="item_skill" val="5041-1" />
+		<set name="handler" val="CharmOfCourage" />
 	</item>
 	<item id="8521" type="EtcItem" name="Seed: Sea Coba">
 		<set name="icon" val="icon.etc_sea_coba_seed_i00" />

L2J_DataPack_BETA/dist/game/data/stats/items/10600-10699.xml

@@ -526,6 +526,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="allow_self_resurrection" val="true" />
 	</item>
 	<item id="10650" type="EtcItem" name="Adventurer's Scroll of Escape">
 		<set name="icon" val="icon.etc_scroll_of_return_i00" />

L2J_DataPack_BETA/dist/game/data/stats/items/13100-13199.xml

@@ -395,6 +395,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_premium" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="allow_self_resurrection" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2013-1" />
 	</item>

L2J_DataPack_BETA/dist/game/data/stats/items/13300-13399.xml

@@ -9,6 +9,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="allow_self_resurrection" val="true" />
 	</item>
 	<item id="13301" type="EtcItem" name="My Teleport Spellbook (Event)">
 		<set name="icon" val="icon.bookmark_book_i00" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml

@@ -1513,7 +1513,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="PhoenixBless" />
+			<effect name="ResurrectionSpecial">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="439" levels="1" name="Shield of Revenge">

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

@@ -395,7 +395,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="PhoenixBless" />
+			<effect name="ResurrectionSpecial">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1411" levels="1" name="Mystic Immunity">

L2J_DataPack_BETA/dist/game/data/stats/skills/02600-02699.xml

@@ -316,7 +316,12 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="1800000" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="ResurrectionSpecial">
+				<param power="50" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2629" levels="1" name="Ancient Treasure Sack">
 		<set name="isMagic" val="2" /> <!-- Static Skill -->

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

@@ -647,12 +647,7 @@
 		<set name="icon" val="icon.skill5041" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="reuseDelay" val="1200000" />
-		<set name="stayAfterDeath" val="true" />
 		<set name="targetType" val="SELF" />
-		<for>
-			<effect name="CharmOfCourage" />
-		</for>
 	</skill>
 	<skill id="5042" levels="12" name="NPC Dispel Bomb">
 		<!-- CT2.5 retail confirmed -->

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

@@ -1543,7 +1543,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="PhoenixBless" />
+			<effect name="ResurrectionSpecial">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="21091" levels="1" name="Agathion Seal Cancel - Weaver">

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

@@ -896,7 +896,12 @@
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="43200000" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="ResurrectionSpecial">
+				<param power="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23175" levels="1" name="Soul Stealth">
 		<!-- Hides for 5 seconds, then bestows the ability not to provoke preemptive attacks from monsters for 2 minutes. Decreases moving speed by 50% while the skill is in effect. Reuse delay is 12 hours. -->

L2J_DataPack_BETA/dist/game/data/xsd/items.xsd

@@ -49,6 +49,7 @@
 												<xs:enumeration value="isAttackWeapon" />
 												<xs:enumeration value="isForceEquip" />
 												<xs:enumeration value="item_skill" />
+												<xs:enumeration value="allow_self_resurrection" />
 												<xs:enumeration value="material" />
 												<xs:enumeration value="mp_consume" />
 												<xs:enumeration value="oncrit_chance" />