[Share]Core Support for Salvation and Soul of The Phoenix

ZeRo* · March 16, 2009

Kalispera paidia epsaxna sto L2j Gia to Salvation and Soul of The Phoenix pos mporw na to fix kai pistebw pos 8a fanei xrisimo

Credits:Faror

[Java Patch]

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Effect.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Effect.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Effect.java	(working copy)
@@ -74,6 +74,7 @@
         SILENCE_MAGIC_PHYSICAL,
         BETRAY,
         NOBLESSE_BLESSING,
+        PHOENIX_BLESSING,
         PETRIFICATION,
         BLUFF,
         BATTLE_FORCE,

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java	(working copy)
@@ -37,6 +37,7 @@

	private boolean _isNoblesseBlessed = false; // for Noblesse Blessing skill, restores buffs after death
	private boolean _getCharmOfLuck = false; // Charm of Luck - During a Raid/Boss war, decreased chance for death penalty
+	private boolean _isPhoenixBlessed = false; // for Soul of The PPhoenix or Salvation buffs
	/**
	 * Constructor of L2PlayableInstance (use L2Character constructor).<BR><BR>
	 *
@@ -173,7 +174,28 @@
     	setIsNoblesseBlessed(false);
     	updateAbnormalEffect();
     }
-
+    
+    // Support for Soul of the Phoenix and Salvation skills
+    public final boolean isPhoenixBlessed() { return _isPhoenixBlessed; }
+    public final void setIsPhoenixBlessed(boolean value) { _isPhoenixBlessed = value; }
+      
+    public final void startPhoenixBlessing()
+    {
+       	setIsPhoenixBlessed(true);
+       	updateAbnormalEffect();
+    }
+       
+    public final void stopPhoenixBlessing(L2Effect effect)
+    {
+      	if (effect == null)
+      		stopEffects(L2Effect.EffectType.PHOENIX_BLESSING);
+       	else
+       		removeEffect(effect);
+       			
+       	setIsPhoenixBlessed(false);
+       	updateAbnormalEffect();
+    }
+        
	public abstract boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference, boolean sendMessage);
	public abstract boolean destroyItem(String process, int objectId, int count, L2Object reference, boolean sendMessage);

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Character.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Character.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Character.java	(working copy)
@@ -1581,6 +1581,12 @@
			if (((L2PlayableInstance)this).getCharmOfLuck()) //remove Lucky Charm if player have Nobless blessing buff 
				((L2PlayableInstance)this).stopCharmOfLuck(null); 
		} 
+		//Same thing if the Character is affected by Soul of The Phoenix or Salvation
+		else if (this instanceof L2PlayableInstance && ((L2PlayableInstance)this).isPhoenixBlessed())
+		{
+			if (((L2PlayableInstance)this).getCharmOfLuck()) //remove Lucky Charm if player has SoulOfThePhoenix/Salvation buff
+				((L2PlayableInstance)this).stopCharmOfLuck(null);
+		}
		else
			stopAllEffects();

@@ -1603,6 +1609,12 @@
		getNotifyQuestOfDeath().clear();

		getAttackByList().clear();
+		
+		//If character is PhoenixBlessed a resurrection popup will show up
+		if (this instanceof L2PlayableInstance && ((L2PlayableInstance)this).isPhoenixBlessed())
+		{
+			((L2PcInstance)this).reviveRequest(((L2PcInstance)this),null,false);
+		}
		return true;
	}

@@ -1616,16 +1628,21 @@
		if (!isTeleporting())
		{
			setIsPendingRevive(false);
-
+			
+			if (this instanceof L2PlayableInstance && ((L2PlayableInstance)this).isPhoenixBlessed())
+			{
+				((L2PlayableInstance)this).stopPhoenixBlessing(null);
+			}
+			
			_status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP);
			_status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP);
			//_Status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP);
-
-			// Start broadcast status
-			broadcastPacket(new Revive(this));
-			if (getWorldRegion() != null)
-				getWorldRegion().onRevive(this);			
		}
+		// Start broadcast status
+		broadcastPacket(new Revive(this));
+		if (getWorldRegion() != null)
+			getWorldRegion().onRevive(this);			
+		
		else
			setIsPendingRevive(true);
	}

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(working copy)
@@ -9224,7 +9224,10 @@
		if((Pet && getPet() != null && getPet().isDead()) || (!Pet && isDead()))
		{
			_reviveRequested = 1;
-			_revivePower = Formulas.getInstance().calculateSkillResurrectRestorePercent(skill.getPower(), Reviver.getWIT());
+			if (isPhoenixBlessed())
+				_revivePower=100;
+			else
+				_revivePower = Formulas.getInstance().calculateSkillResurrectRestorePercent(skill.getPower(), Reviver.getWIT());
			_revivePet = Pet;
			sendPacket(new ConfirmDlg(SystemMessageId.RESSURECTION_REQUEST.getId(),Reviver.getName()));
		}
@@ -9234,6 +9237,12 @@
	{
		if (_reviveRequested != 1 || (!isDead() && !_revivePet) || (_revivePet && getPet() != null && !getPet().isDead()))
			return;
+		//If character refuse a PhoenixBlessed autoress, cancel all buffs he had
+		if (answer == 0 && ((L2PlayableInstance)this).isPhoenixBlessed()) 
+		{
+			((L2PlayableInstance)this).stopPhoenixBlessing(null);
+			stopAllEffects();
+		}
		if (answer == 1)
		{
			if (!_revivePet)

[DataPack Modifications]

<skill id="438" levels="1" name="Soul of the Phoenix">
<!--
  Description(s):
      Revives target from death and restores them to full health, retaining all buff/debuff effects except for Noblesse Blessing and Lucky Charm. Consumes 1 Blood of the Phoenix.
-->
  <set name="magicLvl" val="79"/>
  <set name="mpConsume" val="250"/>
  <set name="itemConsumeId" val="8873"/>
  <set name="itemConsumeCount" val="1"/>
  <set name="power" val="0.0"/>
  <set name="target" val="TARGET_SELF"/>
  <set name="reuseDelay" val="3600000"/>
  <set name="hitTime" val="4000"/>
  <set name="skillType" val="BUFF"/>
  <set name="isMagic" val="true"/>
  <set name="operateType" val="OP_ACTIVE"/>
  <set name="buffDuration" val="1800000"/>
  <set name="castRange" val="400"/>
  <set name="effectRange" val="900"/>
  <for>
<effect count="1" name="PhoenixBless" time="1800" val="0"/>
  </for>
</skill>

<skill id="1410" levels="1" name="Salvation">
<!--
   Some values need to be confirmed
-->  
  <set name="magicLvl" val="79"/>
  <set name="mpConsume" val="87"/>
  <set name="itemConsumeId" val="8874"/>
  <set name="itemConsumeCount" val="2"/>
  <set name="power" val="0.0"/>
  <set name="target" val="TARGET_ONE"/>
  <set name="reuseDelay" val="3600000"/>
  <set name="hitTime" val="4000"/> <!--guessing-->
  <set name="skillType" val="BUFF"/>
  <set name="isMagic" val="true"/>
  <set name="operateType" val="OP_ACTIVE"/>
  <set name="buffDuration" val="3600000"/>
  <set name="castRange" val="400"/>
  <set name="effectRange" val="900"/>
  <for>
<effect count="1" name="PhoenixBless" time="3600" val="0"/>
  </for>
</skill>

fdLP. · March 16, 2009

credits?

ZeRo* · March 16, 2009

Nai mafia sorry apla apo to zori mou na to kanw share to 3exasa ^^ :p

jossoo · March 16, 2009

wraios zero...an dn kanw la8os ola ta pack exoun auta ta skils..apla 8eloun kapia fix malon..

afto einai fix swsta?

wraio share telos panton...sinexise etsi :)

ZeRo* · March 16, 2009

Nai koita...ola se ola ta pack einai afta ta skill alla sta pio pola dn doulebei...Pistebw me afto to share 8a boi8isei na to fix ;)

EDIT : 800 posts done :D :D

Versus · March 16, 2009

Thanks alla dn ekanes share ena simantiko kommati. To effect. EffectPhoenixBless.java

Auto prepei na kanei ti douleia, alla DEN TO DOKIMASA!

package net.sf.l2j.gameserver.skills.effects;

import net.sf.l2j.gameserver.model.L2Effect;
import net.sf.l2j.gameserver.model.actor.instance.L2PlayableInstance;
import net.sf.l2j.gameserver.skills.Env;

final class EffectPhoenixBless extends L2Effect
{

    public EffectPhoenixBless(Env env, EffectTemplate template)
    {
        super(env, template);
    }

    public net.sf.l2j.gameserver.model.L2Effect.EffectType getEffectType()
    {
        return net.sf.l2j.gameserver.model.L2Effect.EffectType.PHOENIX_BLESSING;
    }

    public void onStart()
    {
        if(getEffected() instanceof L2PlayableInstance)
            ((L2PlayableInstance)getEffected()).startPhoenixBlessing();
    }

    public void onExit()
    {
        if(getEffected() instanceof L2PlayableInstance)
            ((L2PlayableInstance)getEffected()).stopPhoenixBlessing(this);
    }

    public boolean onActionTime()
    {
        return false;
    }
}

hakerboy · March 16, 2009

oreos file. nice share. gt oute ston diko m srvr doulevi to soul. paw na to fix :P

Lord_Voldemort · February 7, 2010

Kalispera paidia epsaxna sto L2j Gia to Salvation and Soul of The Phoenix pos mporw na to fix kai pistebw pos 8a fanei xrisimo

Credits:Faror

[Java Patch]

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Effect.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Effect.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Effect.java	(working copy)
@@ -74,6 +74,7 @@
         SILENCE_MAGIC_PHYSICAL,
         BETRAY,
         NOBLESSE_BLESSING,
+        PHOENIX_BLESSING,
         PETRIFICATION,
         BLUFF,
         BATTLE_FORCE,

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java	(working copy)
@@ -37,6 +37,7 @@

	private boolean _isNoblesseBlessed = false; // for Noblesse Blessing skill, restores buffs after death
	private boolean _getCharmOfLuck = false; // Charm of Luck - During a Raid/Boss war, decreased chance for death penalty
+	private boolean _isPhoenixBlessed = false; // for Soul of The PPhoenix or Salvation buffs
	/**
	 * Constructor of L2PlayableInstance (use L2Character constructor).<BR><BR>
	 *
@@ -173,7 +174,28 @@
     	setIsNoblesseBlessed(false);
     	updateAbnormalEffect();
     }
-
+    
+    // Support for Soul of the Phoenix and Salvation skills
+    public final boolean isPhoenixBlessed() { return _isPhoenixBlessed; }
+    public final void setIsPhoenixBlessed(boolean value) { _isPhoenixBlessed = value; }
+      
+    public final void startPhoenixBlessing()
+    {
+       	setIsPhoenixBlessed(true);
+       	updateAbnormalEffect();
+    }
+       
+    public final void stopPhoenixBlessing(L2Effect effect)
+    {
+      	if (effect == null)
+      		stopEffects(L2Effect.EffectType.PHOENIX_BLESSING);
+       	else
+       		removeEffect(effect);
+       			
+       	setIsPhoenixBlessed(false);
+       	updateAbnormalEffect();
+    }
+        
	public abstract boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference, boolean sendMessage);
	public abstract boolean destroyItem(String process, int objectId, int count, L2Object reference, boolean sendMessage);

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Character.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Character.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2Character.java	(working copy)
@@ -1581,6 +1581,12 @@
			if (((L2PlayableInstance)this).getCharmOfLuck()) //remove Lucky Charm if player have Nobless blessing buff 
				((L2PlayableInstance)this).stopCharmOfLuck(null); 
		} 
+		//Same thing if the Character is affected by Soul of The Phoenix or Salvation
+		else if (this instanceof L2PlayableInstance && ((L2PlayableInstance)this).isPhoenixBlessed())
+		{
+			if (((L2PlayableInstance)this).getCharmOfLuck()) //remove Lucky Charm if player has SoulOfThePhoenix/Salvation buff
+				((L2PlayableInstance)this).stopCharmOfLuck(null);
+		}
		else
			stopAllEffects();

@@ -1603,6 +1609,12 @@
		getNotifyQuestOfDeath().clear();

		getAttackByList().clear();
+		
+		//If character is PhoenixBlessed a resurrection popup will show up
+		if (this instanceof L2PlayableInstance && ((L2PlayableInstance)this).isPhoenixBlessed())
+		{
+			((L2PcInstance)this).reviveRequest(((L2PcInstance)this),null,false);
+		}
		return true;
	}

@@ -1616,16 +1628,21 @@
		if (!isTeleporting())
		{
			setIsPendingRevive(false);
-
+			
+			if (this instanceof L2PlayableInstance && ((L2PlayableInstance)this).isPhoenixBlessed())
+			{
+				((L2PlayableInstance)this).stopPhoenixBlessing(null);
+			}
+			
			_status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP);
			_status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP);
			//_Status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP);
-
-			// Start broadcast status
-			broadcastPacket(new Revive(this));
-			if (getWorldRegion() != null)
-				getWorldRegion().onRevive(this);			
		}
+		// Start broadcast status
+		broadcastPacket(new Revive(this));
+		if (getWorldRegion() != null)
+			getWorldRegion().onRevive(this);			
+		
		else
			setIsPendingRevive(true);
	}

Index: C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(revision 1582)
+++ C:/Documents and Settings/EdeN/Documenti/EclipseWorkspace/L2JServerCT1/L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(working copy)
@@ -9224,7 +9224,10 @@
		if((Pet && getPet() != null && getPet().isDead()) || (!Pet && isDead()))
		{
			_reviveRequested = 1;
-			_revivePower = Formulas.getInstance().calculateSkillResurrectRestorePercent(skill.getPower(), Reviver.getWIT());
+			if (isPhoenixBlessed())
+				_revivePower=100;
+			else
+				_revivePower = Formulas.getInstance().calculateSkillResurrectRestorePercent(skill.getPower(), Reviver.getWIT());
			_revivePet = Pet;
			sendPacket(new ConfirmDlg(SystemMessageId.RESSURECTION_REQUEST.getId(),Reviver.getName()));
		}
@@ -9234,6 +9237,12 @@
	{
		if (_reviveRequested != 1 || (!isDead() && !_revivePet) || (_revivePet && getPet() != null && !getPet().isDead()))
			return;
+		//If character refuse a PhoenixBlessed autoress, cancel all buffs he had
+		if (answer == 0 && ((L2PlayableInstance)this).isPhoenixBlessed()) 
+		{
+			((L2PlayableInstance)this).stopPhoenixBlessing(null);
+			stopAllEffects();
+		}
		if (answer == 1)
		{
			if (!_revivePet)

[DataPack Modifications]

<skill id="438" levels="1" name="Soul of the Phoenix">
<!--
  Description(s):
      Revives target from death and restores them to full health, retaining all buff/debuff effects except for Noblesse Blessing and Lucky Charm. Consumes 1 Blood of the Phoenix.
-->
  <set name="magicLvl" val="79"/>
  <set name="mpConsume" val="250"/>
  <set name="itemConsumeId" val="8873"/>
  <set name="itemConsumeCount" val="1"/>
  <set name="power" val="0.0"/>
  <set name="target" val="TARGET_SELF"/>
  <set name="reuseDelay" val="3600000"/>
  <set name="hitTime" val="4000"/>
  <set name="skillType" val="BUFF"/>
  <set name="isMagic" val="true"/>
  <set name="operateType" val="OP_ACTIVE"/>
  <set name="buffDuration" val="1800000"/>
  <set name="castRange" val="400"/>
  <set name="effectRange" val="900"/>
  <for>
<effect count="1" name="PhoenixBless" time="1800" val="0"/>
  </for>
</skill>

<skill id="1410" levels="1" name="Salvation">
<!--
   Some values need to be confirmed
-->  
  <set name="magicLvl" val="79"/>
  <set name="mpConsume" val="87"/>
  <set name="itemConsumeId" val="8874"/>
  <set name="itemConsumeCount" val="2"/>
  <set name="power" val="0.0"/>
  <set name="target" val="TARGET_ONE"/>
  <set name="reuseDelay" val="3600000"/>
  <set name="hitTime" val="4000"/> <!--guessing-->
  <set name="skillType" val="BUFF"/>
  <set name="isMagic" val="true"/>
  <set name="operateType" val="OP_ACTIVE"/>
  <set name="buffDuration" val="3600000"/>
  <set name="castRange" val="400"/>
  <set name="effectRange" val="900"/>
  <for>
<effect count="1" name="PhoenixBless" time="3600" val="0"/>
  </for>
</skill>

Please helpme. How insert this values into my Java files.

I have L2j Interlude revision 2741.

Thanks!

Coyote™ · February 7, 2010

Please helpme. How insert this values into my Java files.

I have L2j Interlude revision 2741.

Thanks!

Is it so hard to read patches?

If yes, read guides..

Lord_Voldemort · February 7, 2010

Is it so hard to read patches?

If yes, read guides..

isn't complicate but i dont understand the language of faror

So please giveme a good guide for this, and i promise I'll read all i need.

weydogg · February 25, 2010

Thanks Zero*, very useful

TheBestPlayers RULEZZZZZZZZZZ!!!!!!!!!!!!!!!!!!

vladimiros · March 10, 2010

Oreo share file sinexise etci :)

[Share]Core Support for Salvation and Soul of The Phoenix

Recommended Posts

ZeRo*

fdLP.

ZeRo*

jossoo

ZeRo*

Versus

hakerboy

Lord_Voldemort

Coyote™

Lord_Voldemort

weydogg

vladimiros

Create an account or sign in to comment

Create an account

Sign in

Posts

Topics

Browse

Activity

Store