From 3919cb9e4cd99df45980e41058fb1154ec5ad38f Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Sun, 2 Mar 2014 22:53:41 +0000
Subject: [PATCH] BETA: Adding parameters for some effects. 	Reviewed by:
 Nos

---
 .../scripts/handlers/effecthandlers/Heal.java |  6 +-
 .../handlers/effecthandlers/HealOverTime.java |  8 +-
 .../handlers/effecthandlers/HealPercent.java  |  6 +-
 .../effecthandlers/Transformation.java        |  2 +-
 .../game/data/stats/skills/00000-00099.xml    | 36 ++++++--
 .../game/data/stats/skills/00100-00199.xml    | 12 ++-
 .../game/data/stats/skills/00200-00299.xml    | 16 +++-
 .../game/data/stats/skills/00300-00399.xml    |  8 +-
 .../game/data/stats/skills/00400-00499.xml    |  4 +-
 .../game/data/stats/skills/00500-00599.xml    |  4 +-
 .../game/data/stats/skills/00600-00699.xml    |  8 +-
 .../game/data/stats/skills/00700-00799.xml    | 40 ++++++---
 .../game/data/stats/skills/00800-00899.xml    |  8 +-
 .../game/data/stats/skills/01000-01099.xml    | 20 +++--
 .../game/data/stats/skills/01100-01199.xml    |  8 +-
 .../game/data/stats/skills/01200-01299.xml    | 84 ++++++++++++++-----
 .../game/data/stats/skills/01300-01399.xml    | 16 +++-
 .../game/data/stats/skills/01400-01499.xml    | 44 +++++++---
 .../game/data/stats/skills/01500-01599.xml    | 20 +++--
 .../game/data/stats/skills/02000-02099.xml    | 24 ++++--
 .../game/data/stats/skills/02100-02199.xml    |  4 +-
 .../game/data/stats/skills/02200-02299.xml    | 16 +++-
 .../game/data/stats/skills/02300-02399.xml    |  8 +-
 .../game/data/stats/skills/02400-02499.xml    |  4 +-
 .../game/data/stats/skills/02500-02599.xml    |  4 +-
 .../game/data/stats/skills/02700-02799.xml    |  8 +-
 .../game/data/stats/skills/02800-02899.xml    | 12 ++-
 .../game/data/stats/skills/02900-02999.xml    |  4 +-
 .../game/data/stats/skills/03100-03199.xml    |  8 +-
 .../game/data/stats/skills/03200-03299.xml    |  4 +-
 .../game/data/stats/skills/03400-03499.xml    |  8 +-
 .../game/data/stats/skills/03500-03599.xml    |  8 +-
 .../game/data/stats/skills/04000-04099.xml    | 36 ++++++--
 .../game/data/stats/skills/04100-04199.xml    | 12 ++-
 .../game/data/stats/skills/04200-04299.xml    | 12 ++-
 .../game/data/stats/skills/04400-04499.xml    |  8 +-
 .../game/data/stats/skills/04500-04599.xml    | 16 +++-
 .../game/data/stats/skills/04600-04699.xml    | 10 ++-
 .../game/data/stats/skills/04700-04799.xml    | 58 +++++++++----
 .../game/data/stats/skills/05000-05099.xml    | 12 ++-
 .../game/data/stats/skills/05100-05199.xml    |  8 +-
 .../game/data/stats/skills/05200-05299.xml    |  4 +-
 .../game/data/stats/skills/05400-05499.xml    |  8 +-
 .../game/data/stats/skills/05500-05599.xml    | 16 +++-
 .../game/data/stats/skills/05600-05699.xml    | 12 ++-
 .../game/data/stats/skills/05700-05799.xml    |  8 +-
 .../game/data/stats/skills/05800-05899.xml    | 12 ++-
 .../game/data/stats/skills/06200-06299.xml    |  4 +-
 .../game/data/stats/skills/06300-06399.xml    |  8 +-
 .../game/data/stats/skills/06400-06499.xml    |  8 +-
 .../game/data/stats/skills/06600-06699.xml    | 12 ++-
 .../game/data/stats/skills/06700-06799.xml    | 32 +++++--
 .../game/data/stats/skills/06800-06899.xml    |  8 +-
 .../game/data/stats/skills/07000-07099.xml    |  4 +-
 .../game/data/stats/skills/08200-08299.xml    |  4 +-
 .../game/data/stats/skills/09000-09099.xml    |  4 +-
 .../game/data/stats/skills/20000-20099.xml    |  4 +-
 .../game/data/stats/skills/21000-21099.xml    | 28 +++++--
 .../game/data/stats/skills/22000-22099.xml    |  4 +-
 .../game/data/stats/skills/22100-22199.xml    |  4 +-
 .../game/data/stats/skills/22200-22299.xml    |  4 +-
 .../game/data/stats/skills/23000-23099.xml    |  4 +-
 .../game/data/stats/skills/23100-23199.xml    |  4 +-
 .../game/data/stats/skills/23200-23299.xml    |  8 +-
 .../game/data/stats/skills/26000-26099.xml    | 16 +++-
 65 files changed, 640 insertions(+), 214 deletions(-)

diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
index a60bf30625..de7bd18e4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
@@ -38,9 +38,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class Heal extends AbstractEffect
 {
+	private final double _power;
+	
 	public Heal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -65,7 +69,7 @@ public final class Heal extends AbstractEffect
 			return;
 		}
 		
-		double amount = getValue();
+		double amount = _power;
 		double staticShotBonus = 0;
 		int mAtkMul = 1;
 		boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
index 65aea8d068..c62c3715cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
@@ -31,9 +31,13 @@ import com.l2jserver.gameserver.network.serverpackets.ExRegenMax;
  */
 public final class HealOverTime extends AbstractEffect
 {
+	private final double _power;
+	
 	public HealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -59,7 +63,7 @@ public final class HealOverTime extends AbstractEffect
 			return false;
 		}
 		
-		hp += getValue() * getTicksMultiplier();
+		hp += _power * getTicksMultiplier();
 		hp = Math.min(hp, maxhp);
 		info.getEffected().setCurrentHp(hp);
 		return info.getSkill().isToggle();
@@ -70,7 +74,7 @@ public final class HealOverTime extends AbstractEffect
 	{
 		if (info.getEffected().isPlayer() && (getTicks() > 0) && (info.getSkill().getAbnormalType() == AbnormalType.HP_RECOVER))
 		{
-			info.getEffected().sendPacket(new ExRegenMax(info.getAbnormalTime(), getTicks(), getValue()));
+			info.getEffected().sendPacket(new ExRegenMax(info.getAbnormalTime(), getTicks(), _power));
 		}
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
index c604c0ff46..58970b2804 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
@@ -33,9 +33,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class HealPercent extends AbstractEffect
 {
+	private final int _power;
+	
 	public HealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getInt("power", 0);
 	}
 	
 	@Override
@@ -60,7 +64,7 @@ public final class HealPercent extends AbstractEffect
 		}
 		
 		double amount = 0;
-		double power = getValue();
+		double power = _power;
 		boolean full = (power == 100.0);
 		
 		amount = full ? target.getMaxHp() : (target.getMaxHp() * power) / 100.0;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
index 1d6a978233..07d1e1dcc9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
@@ -36,7 +36,7 @@ public final class Transformation extends AbstractEffect
 	{
 		super(attachCond, applyCond, set, params);
 		
-		_id = params != null ? params.getInt("id", 0) : 0;
+		_id = params.getInt("id", 0);
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
index e4d4687378..92fd4d425c 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
@@ -1331,7 +1331,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="46" levels="15" name="Life Scavenge" enchantGroup1="2" enchantGroup2="2">
@@ -1626,19 +1628,27 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 		<enchant3for>
-			<effect name="Heal" val="546" />
+			<effect name="Heal">
+				<param power="546" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Heal" val="546" />
+			<effect name="Heal">
+				<param power="546" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="BLEEDING,9" />
 			</effect>
@@ -1761,19 +1771,27 @@
 		<enchant4 name="hpConsume" val="#ench34HpConsume" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 		<enchant3for>
-			<effect name="Heal" val="1170" />
+			<effect name="Heal">
+				<param power="1170" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Heal" val="1170" />
+			<effect name="Heal">
+				<param power="1170" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="BLEEDING,9" />
 			</effect>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
index 5b3d8d7040..fee92c2025 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
@@ -683,14 +683,18 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="#maxHp" />
 			</effect>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant2for>
 			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="1.35" />
 				<add order="0x40" stat="pAtk" val="#ench2pAtk" />
 			</effect>
-			<effect name="HealPercent" val="35" />
+			<effect name="HealPercent">
+				<param power="35" />
+			</effect>
 		</enchant2for>
 	</skill>
 	<skill id="122" levels="15" name="Hex" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
@@ -1351,7 +1355,9 @@
 			<player hp="10" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="190" levels="37" name="Fatal Strike" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
index 3a46bb57e6..1b9165c588 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
@@ -1670,19 +1670,27 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<enchant4 name="mpConsume" val="#ench34MpConsume" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 		<enchant3for>
-			<effect name="Heal" val="546" />
+			<effect name="Heal">
+				<param power="546" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Heal" val="546" />
+			<effect name="Heal">
+				<param power="546" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="BLEEDING,9" />
 			</effect>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
index 59530cc126..6ebc2e14e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
@@ -1251,8 +1251,12 @@
 				<sub order="0x40" stat="debuffVuln" val="30" />
 				<mul order="0x30" stat="healEffect" val="1.3" />
 			</effect>
-			<effect name="HealOverTime" ticks="5" val="50" />
-			<effect name="HealPercent" val="50" />
+			<effect name="HealOverTime" ticks="5">
+				<param power="50" />
+			</effect>
+			<effect name="HealPercent">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="342" levels="1" name="Touch of Death" enchantGroup1="6" enchantGroup2="6">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
index cadec6b0ea..a5a8a898b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
@@ -1559,7 +1559,9 @@
 			<effect name="Paralyze">
 				<mul order="0x30" stat="pDef" val="0.2" />
 			</effect>
-			<effect name="HealOverTime" ticks="5" val="60" />
+			<effect name="HealOverTime" ticks="5">
+				<param power="60" />
+			</effect>
 			<effect name="ManaHealOverTime" ticks="5" val="10" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
index 6d6a8a7346..69939d5f70 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
@@ -2107,7 +2107,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="568" levels="4" name="Attack Buster">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
index 37a0e3fd46..ca4b9102f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
@@ -2018,7 +2018,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="946" />
+			<effect name="Heal">
+				<param power="946" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="699" levels="1" name="Divine Healer Battle Heal">
@@ -2034,7 +2036,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="826" />
+			<effect name="Heal">
+				<param power="826" />
+			</effect>
 		</for>
 	</skill>
 </list>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
index 718bf87ec3..2fa803a887 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
@@ -16,8 +16,12 @@
 		<set name="reuseDelay" val="6000" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="27" />
-			<effect name="Heal" val="400" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="27" />
+			</effect>
+			<effect name="Heal">
+				<param power="400" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="701" levels="1" name="Divine Healer Resurrection">
@@ -72,7 +76,9 @@
 			<player mp="10" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 		</for>
 		<selfEffects>
@@ -353,7 +359,9 @@
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<sub order="0x40" stat="debuffVuln" val="20" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="713" levels="1" name="Divine Summoner Servitor Hill">
@@ -369,7 +377,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SERVITOR" />
 		<for>
-			<effect name="Heal" val="991" />
+			<effect name="Heal">
+				<param power="991" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="714" levels="1" name="Sacrifice Summoner">
@@ -614,7 +624,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="Heal" val="1340" />
+			<effect name="Heal">
+				<param power="1340" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="724" levels="1" name="Anakim Clans">
@@ -944,7 +956,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="739" levels="3" name="Heretic Battle Heal">
@@ -967,7 +981,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="740" levels="3" name="Heretic Resurrection">
@@ -2209,8 +2225,12 @@
 				<sub order="0x40" stat="debuffVuln" val="30" />
 				<mul order="0x30" stat="healEffect" val="1.3" />
 			</effect>
-			<effect name="HealOverTime" ticks="5" val="50" />
-			<effect name="HealPercent" val="50" />
+			<effect name="HealOverTime" ticks="5">
+				<param power="50" />
+			</effect>
+			<effect name="HealPercent">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="788" levels="1" name="Pain of Shilen">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
index 950db82f88..bc480fd9d0 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
@@ -438,7 +438,9 @@
 		<set name="targetType" val="SERVITOR" />
 		<!-- FIXME: It shouldn't affect all summons, missing condition for target race "construct" -->
 		<for>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="823" levels="3" name="Strengthen Golem">
@@ -704,7 +706,9 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="834" levels="1" name="Blood Pact">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
index 97793204c3..2b30c60f44 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
@@ -373,7 +373,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#effectPoints" />
+			<effect name="Heal">
+				<param power="#effectPoints" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1012" levels="3" name="Cure Poison">
@@ -457,7 +459,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1016" levels="9" name="Resurrection">
@@ -537,13 +541,17 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="#dispelAbnormals" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9;BLEEDING,9" />
 			</effect>
@@ -566,7 +574,9 @@
 		<set name="reuseDelay" val="6000" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="Heal" val="#effectPoints" />
+			<effect name="Heal">
+				<param power="#effectPoints" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1028" levels="19" name="Might of Heaven" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
index aa0da4e521..57b00d2f0e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
@@ -329,10 +329,14 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1128" levels="18" name="Summon Shadow" enchantGroup1="1">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
index 617dc3c04f..46450ca145 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
@@ -281,7 +281,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="42" />
+			<effect name="Heal">
+				<param power="42" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1217" levels="33" name="Greater Heal" enchantGroup1="2" enchantGroup2="2">
@@ -318,12 +320,20 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hotValue" />
-			<effect name="Heal" val="#amount" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hotValue" />
+			</effect>
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealOverTime" ticks="1" val="32" />
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="32" />
+			</effect>
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1218" levels="33" name="Greater Battle Heal" enchantGroup1="2" enchantGroup2="2">
@@ -354,10 +364,14 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1219" levels="33" name="Greater Group Heal" enchantGroup1="2" enchantGroup2="2">
@@ -393,12 +407,20 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hotValue" />
-			<effect name="Heal" val="#amount" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hotValue" />
+			</effect>
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealOverTime" ticks="1" val="26" />
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="26" />
+			</effect>
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1220" levels="8" name="Blaze">
@@ -773,10 +795,14 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealOverTime" ticks="1" val="#ench1hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#ench1hot" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1230" levels="28" name="Prominence" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
@@ -1855,12 +1881,20 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
-			<effect name="Heal" val="#amount" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealOverTime" ticks="1" val="#ench1hot" />
-			<effect name="Heal" val="172" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#ench1hot" />
+			</effect>
+			<effect name="Heal">
+				<param power="172" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1257" levels="3" name="Decrease Weight" enchantGroup1="1" enchantGroup2="1">
@@ -1930,10 +1964,14 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealPercent" val="#ench1power" />
+			<effect name="HealPercent">
+				<param power="#ench1power" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1259" levels="4" name="Resist Shock" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
@@ -2390,11 +2428,15 @@
 			<player mp="25" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 		<enchant2for>
 			<effect name="CpHeal" val="#ench2Bravery" />
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</enchant2for>
 	</skill>
 	<skill id="1272" levels="13" name="Word of Fear">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
index 0fe43965a6..4d1c5a550b 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
@@ -359,7 +359,9 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="#maxHp" />
 			</effect>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1312" levels="1" name="Fishing">
@@ -1499,7 +1501,9 @@
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<sub order="0x40" stat="debuffVuln" val="20" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1350" levels="1" name="Warrior Bane">
@@ -2061,7 +2065,9 @@
 				<add order="0x40" stat="accCombat" val="4" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 		<enchant3for>
 			<effect name="Buff">
@@ -2078,7 +2084,9 @@
 				<add order="0x40" stat="accCombat" val="4" />
 				<mul order="0x30" stat="runSpd" val="#ench3Spd" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="1364" levels="1" name="Eye of Pa'agrio" enchantGroup1="5" enchantGroup2="5">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
index 6a5c408b45..b4c7236a38 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
@@ -97,10 +97,14 @@
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1402" levels="5" name="Major Group Heal" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
@@ -135,19 +139,27 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Heal" val="#ench1amount" />
+			<effect name="Heal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 		<enchant3for>
-			<effect name="Heal" val="#ench34amount" />
+			<effect name="Heal">
+				<param power="#ench34amount" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="#ench3dispelAbnormals" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Heal" val="#ench34amount" />
+			<effect name="Heal">
+				<param power="#ench34amount" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="#ench4dispelAbnormals" />
 			</effect>
@@ -861,7 +873,9 @@
 			<player olympiad="false" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1427" levels="1" name="Flames of Invincibility">
@@ -3042,10 +3056,14 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealOverTime" ticks="1" val="#ench1Heal" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#ench1Heal" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1488" levels="3" name="Restoration Impact" enchantGroup1="1">
@@ -3074,13 +3092,17 @@
 			<target active_effect_id="1487" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="LIFE_FORCE_KAMAEL,9" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="HealPercent" val="#ench1amount" />
+			<effect name="HealPercent">
+				<param power="#ench1amount" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="LIFE_FORCE_KAMAEL,9" />
 			</effect>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
index 80416173ef..f372b23ac8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
@@ -172,7 +172,9 @@
 		<for>
 			<effect name="Invincible" />
 			<effect name="CpHeal" val="9000" />
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 		</for>
 	</skill>
@@ -197,7 +199,9 @@
 		</cond>
 		<for>
 			<effect name="CpHeal" val="9000" />
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 			<effect name="DispelByCategory">
 				<param slot="debuff" rate="40" max="10" />
@@ -1587,7 +1591,9 @@
 		<set name="reuseDelay" val="9000" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="Heal" val="796" />
+			<effect name="Heal">
+				<param power="796" />
+			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9;BLEEDING,9" />
 			</effect>
@@ -1612,7 +1618,9 @@
 		<set name="reuseDelay" val="5000" />
 		<set name="targetType" val="AREA_FRIENDLY" />
 		<for>
-			<effect name="HealPercent" val="30" />
+			<effect name="HealPercent">
+				<param power="30" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1554" levels="1" name="Aura Blast">
@@ -1815,7 +1823,9 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="#maxHp" />
 			</effect>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1562" levels="2" name="Chant of Berserker">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
index 53bbba4b41..d4420a2721 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
@@ -10,7 +10,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="2" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2002" levels="1" name="Healing Drug">
@@ -23,7 +25,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="1.5" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="1.5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2003" levels="1" name="Squash Seed">
@@ -297,7 +301,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="8" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2032" levels="1" name="Healing potion">
@@ -312,7 +318,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="24" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="24" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2033" levels="1" name="Item - Beast Soul Shot">
@@ -387,7 +395,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="50" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2038" levels="1" name="Quick Healing Potion">
@@ -397,7 +407,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="435" />
+			<effect name="Heal">
+				<param power="435" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2039" levels="1" name="Soulshot: No Grade">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
index 2841a741a9..4874889a72 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
@@ -602,7 +602,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="3" />
+			<effect name="HealPercent">
+				<param power="3" />
+			</effect>
 			<effect name="ManaHealPercent" val="1" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
index e7330e9c6f..d15293bad9 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
@@ -918,8 +918,12 @@
 			<player flyMounted="false" />
 		</cond>
 		<for>
-			<effect name="Heal" val="60" />
-			<effect name="HealPercent" val="17" />
+			<effect name="Heal">
+				<param power="60" />
+			</effect>
+			<effect name="HealPercent">
+				<param power="17" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2245" levels="1" name="Herb of Mana">
@@ -1599,7 +1603,9 @@
 			<player flyMounted="false" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2279" levels="3" name="Herb of Mana">
@@ -1788,7 +1794,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2288" levels="6" name="Elixir of Mental Strength">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
index 49d110ffe2..cf77d68587 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
@@ -1218,7 +1218,9 @@
 			<target npcId="18482" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="30" />
+			<effect name="HealPercent">
+				<param power="30" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2369" levels="1" name="Water Dragon Scale">
@@ -1731,7 +1733,9 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="Heal" val="1900" />
+			<effect name="Heal">
+				<param power="1900" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2396" levels="1" name="Mental Potion">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml
index 2810ed883d..31a59fb0ea 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml
@@ -1829,7 +1829,9 @@
 			<player flyMounted="false" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="15" />
+			<effect name="HealPercent">
+				<param power="15" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2486" levels="1" name="Herb of Mana">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
index 828c0665ff..f944a581b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
@@ -1594,7 +1594,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="30" />
+			<effect name="HealPercent">
+				<param power="30" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2593" levels="1" name="Bow/Crossbow Attack Resistance Potion">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml
index 817f8a9a72..04346f3bef 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml
@@ -2619,7 +2619,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2793" levels="2" name="Stone of Mana">
@@ -2650,7 +2652,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="#hpHeal" />
+			<effect name="HealPercent">
+				<param power="#hpHeal" />
+			</effect>
 			<effect name="ManaHealPercent" val="#mpHeal" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml
index 91e4aa4236..96fe6a50df 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml
@@ -1328,7 +1328,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2861" levels="6" name="Highest Power Secret Medicine of Mind">
@@ -1379,7 +1381,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="100" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2864" levels="1" name="Highest Power Quick Healing Potion">
@@ -1390,7 +1394,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="870" />
+			<effect name="Heal">
+				<param power="870" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2865" levels="1" name="Agathion's New Year's Gift 1">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02900-02999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02900-02999.xml
index 5859ac8890..554b586eb2 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02900-02999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02900-02999.xml
@@ -124,7 +124,9 @@
 			<player levelRange="61;75" />
 		</cond>
 		<for>
-			<effect name="Heal" val="1900" />
+			<effect name="Heal">
+				<param power="1900" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2908" levels="5" name="Battlefield Use Secret Medicine of Mind">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
index ab565a0d00..deab6e5393 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
@@ -537,7 +537,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3124" levels="10" name="Item Skill: Blessed Body">
@@ -587,7 +589,9 @@
 			<effect name="Buff">
 				<mul order="0x40" stat="maxHp" val="1.03" />
 			</effect>
-			<effect name="HealPercent" val="3" />
+			<effect name="HealPercent">
+				<param power="3" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3126" levels="10" name="Item Skill: Prayer">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
index 1b29e6c64c..d10fd6c3d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
@@ -1230,7 +1230,9 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="200" />
+			<effect name="Heal">
+				<param power="200" />
+			</effect>
 			<effect name="CpHeal" val="200" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
index 5c412e245d..737c63585c 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
@@ -424,7 +424,9 @@
 		<set name="reuseDelay" val="1800000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 		</for>
 	</skill>
@@ -1257,7 +1259,9 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="100" />
+			<effect name="Heal">
+				<param power="100" />
+			</effect>
 			<effect name="CpHeal" val="100" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml
index 71e4e33c17..e1a51c1395 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml
@@ -1531,7 +1531,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3597" levels="1" name="Special Ability: Infinity Rod">
@@ -1567,7 +1569,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3599" levels="1" name="Polearm Multi-attack">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
index 4063bce9f5..5c665d6ef5 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
@@ -252,7 +252,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="10846" />
+			<effect name="Heal">
+				<param power="10846" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4021" levels="1" name="Queen Ant">
@@ -293,7 +295,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="10846" />
+			<effect name="Heal">
+				<param power="10846" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4025" levels="12" name="Master Recharge">
@@ -349,7 +353,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="628" />
+			<effect name="Heal">
+				<param power="628" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4028" levels="3" name="NPC Might">
@@ -751,7 +757,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="427" />
+			<effect name="Heal">
+				<param power="427" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4045" levels="1" name="Resist Full Magic Attack">
@@ -894,7 +902,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4052" levels="15" name="Poison">
@@ -1135,7 +1145,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4066" levels="12" name="NPC Twister">
@@ -1472,7 +1484,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="628" />
+			<effect name="Heal">
+				<param power="628" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4081" levels="1" name="Pretending to steal">
@@ -1684,7 +1698,9 @@
 				<sub order="0x40" stat="rEvas" val="#rEvas" />
 				<add order="0x40" stat="accCombat" val="#accCombat" />
 			</effect>
-			<effect name="HealPercent" val="#maxHpHeal" />
+			<effect name="HealPercent">
+				<param power="#maxHpHeal" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4092" levels="1" name="NPC Puma Spirit Totem">
@@ -1796,7 +1812,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4098" levels="12" name="Magic Skill Block">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04100-04199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04100-04199.xml
index 323f9dc0b4..10ae25b316 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04100-04199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04100-04199.xml
@@ -390,7 +390,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="689" />
+			<effect name="Heal">
+				<param power="689" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4116" levels="10" name="Resist M.Atk">
@@ -734,7 +736,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="1000" />
+			<effect name="Heal">
+				<param power="1000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4134" levels="1" name="Seal Skill">
@@ -757,7 +761,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="1000000" />
+			<effect name="Heal">
+				<param power="1000000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4136" levels="1" name="Baium's Gift">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
index 99cf04ca73..320f0b3ec6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
@@ -245,7 +245,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4210" levels="12" name="Life Chant">
@@ -268,8 +270,12 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
-			<effect name="HealPercent" val="3" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
+			<effect name="HealPercent">
+				<param power="3" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4211" levels="12" name="BOSS Might">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
index 9d343ac627..c51094e756 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
@@ -1206,7 +1206,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="#amount" />
+			<effect name="HealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4475" levels="1" name="Perfect Resist Bleeding">
@@ -1428,7 +1430,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="50" />
+			<effect name="HealPercent">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4485" levels="1" name="Eating Follower">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
index 8d694f93fd..88928ec04c 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
@@ -135,7 +135,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="5600" />
+			<effect name="Heal">
+				<param power="5600" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4517" levels="1" name="Quest - BOSS Defend">
@@ -280,7 +282,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="10" />
+			<effect name="HealPercent">
+				<param power="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4527" levels="1" name="Quest - BOSS Inc HP to Summoned">
@@ -298,7 +302,9 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="1.3" />
 			</effect>
-			<effect name="HealPercent" val="30" />
+			<effect name="HealPercent">
+				<param power="30" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4528" levels="1" name="Quest - BOSS Movement to Summoned">
@@ -340,7 +346,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="HealPercent" val="5" />
+			<effect name="HealPercent">
+				<param power="5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4531" levels="1" name="Quest - Summoned MP Heal">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml
index c3358d1ced..578d2c1ee8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml
@@ -373,7 +373,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4614" levels="12" name="NPC Death Bomb">
@@ -1248,7 +1250,7 @@
 		</for>
 	</skill>
 	<skill id="4653" levels="12" name="NPC Corpse Life Drain">
-		<table name="#heal"> 131 201 271 351 451 551 651 691 731 751 771 781 </table>
+		<table name="#amount"> 131 201 271 351 451 551 651 691 731 751 771 781 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume"> 13 20 27 35 45 55 65 69 73 75 77 78 </table>
 		<set name="castRange" val="400" />
@@ -1262,7 +1264,9 @@
 		<set name="reuseDelay" val="20000" />
 		<set name="targetType" val="CORPSE" />
 		<for>
-			<effect name="Heal" val="#heal" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
index 6c60700275..494bfc8f09 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
@@ -209,8 +209,8 @@
 	<skill id="4707" levels="13" name="Shade Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<!-- Summon Nightshade Skill -->
+		<table name="#amount"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
 		<table name="#effectPoints"> 589 700 789 804 810 816 826 835 844 852 860 867 874 </table>
-		<table name="#heal"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
 		<table name="#hpConsume"> 706 840 946 964 972 979 991 1002 1013 1023 1032 1041 1049 </table>
 		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
 		<set name="castRange" val="600" />
@@ -225,7 +225,9 @@
 		<!-- NOTE: skill description mention party members, but is client typo, it could affect any single target -->
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#heal" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4708" levels="10" name="Cursed Strike">
@@ -374,7 +376,9 @@
 		<set name="reuseDelay" val="12000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4714" levels="1" name="Twilight Dragon">
@@ -415,7 +419,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="OWNER_PET" />
 		<for>
-			<effect name="Heal" val="#effectPoints" />
+			<effect name="Heal">
+				<param power="#effectPoints" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4718" levels="12" name="Greater Heal Trick">
@@ -435,7 +441,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="OWNER_PET" />
 		<for>
-			<effect name="Heal" val="#effectPoints" />
+			<effect name="Heal">
+				<param power="#effectPoints" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4719" levels="12" name="BOSS Strike">
@@ -1753,7 +1761,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4780" levels="12" name="BOSS Heal">
@@ -1771,7 +1781,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4781" levels="12" name="BOSS Heal">
@@ -1789,7 +1801,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4782" levels="12" name="BOSS Heal">
@@ -1807,7 +1821,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4783" levels="12" name="BOSS Heal">
@@ -1825,7 +1841,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4784" levels="12" name="BOSS Chant of Life">
@@ -1848,7 +1866,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4785" levels="12" name="BOSS Chant of Life">
@@ -1871,7 +1891,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4786" levels="12" name="BOSS Chant of Life">
@@ -1894,7 +1916,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4787" levels="12" name="BOSS Chant of Life">
@@ -1917,7 +1941,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4788" levels="12" name="BOSS Chant of Life">
@@ -1940,7 +1966,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4789" levels="10" name="NPC High Level">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
index 76f72cbd85..806acd676a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
@@ -174,7 +174,9 @@
 			<effect name="DispelByCategory">
 				<param slot="buff" rate="#activateRate" max="#maxNegated" />
 			</effect>
-			<effect name="HealPercent" val="#healPercent" />
+			<effect name="HealPercent">
+				<param power="#healPercent" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5009" levels="1" name="Frintezza's Ghostly Fighter">
@@ -370,7 +372,9 @@
 			<effect name="Grow">
 				<mul order="0x30" stat="runSpd" val="1.22" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5018" levels="2" name="Frintezza's Daemon Field">
@@ -628,7 +632,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="#hot" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="#hot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5041" levels="1" name="Charm of Courage">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
index debc8cdee9..a178991af0 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
@@ -841,7 +841,9 @@
 		<set name="reuseDelay" val="30000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5147" levels="10" name="Blessed Body">
@@ -1932,7 +1934,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="OWNER_PET" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5196" levels="3" name="Pet Wind Shackle">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml
index 6f45d19962..d66bbfb43a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml
@@ -119,7 +119,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5206" levels="1" name="Decrease Speed">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml
index f1096a4c15..f183279b62 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml
@@ -506,7 +506,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5439" levels="9" name="NPC party 60 Clan Heal">
@@ -525,7 +527,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5440" levels="1" name="Presentation - Trap Activate">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
index 9a44ff6449..7fd5016d56 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
@@ -1259,7 +1259,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SERVITOR" />
 		<for>
-			<effect name="Heal" val="418" />
+			<effect name="Heal">
+				<param power="418" />
+			</effect>
 			<effect name="ManaHealByLevel" val="73" />
 		</for>
 	</skill>
@@ -1365,7 +1367,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="150" />
+			<effect name="Heal">
+				<param power="150" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5578" levels="1" name="Summoner Ability - Spirit">
@@ -1648,7 +1652,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="OWNER_PET" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5591" levels="8" name="Light Flow">
@@ -1664,7 +1670,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5592" levels="16" name="Lightning Barrier">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
index 9c5715b3d6..58aaacb9df 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
@@ -52,7 +52,9 @@
 			<effect name="Debuff">
 				<mul order="0x30" stat="maxRecoverableHp" val="0.1" />
 			</effect>
-			<effect name="HealPercent" val="-99" />
+			<effect name="HealPercent">
+				<param power="-99" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5603" levels="1" name="Dagger Mastery">
@@ -1666,7 +1668,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="200" />
+			<effect name="Heal">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5693" levels="1" name="PvP Armor - Speed Down">
@@ -1783,7 +1787,9 @@
 		<set name="reuseDelay" val="4000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5699" levels="7" name="Decrease P. Def">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml
index e0f851ef33..ce5b0ab3c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml
@@ -192,7 +192,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="200" />
+			<effect name="Heal">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5713" levels="5" name="Energy Ditch">
@@ -760,7 +762,9 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="CpHeal" val="5000" />
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml
index 439d38b739..6af785bf42 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml
@@ -441,7 +441,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<for>
-			<effect name="HealPercent" val="10" />
+			<effect name="HealPercent">
+				<param power="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5836" levels="1" name="Greater Heal">
@@ -462,8 +464,12 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CLAN" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="270" />
-			<effect name="HealPercent" val="20" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="270" />
+			</effect>
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5837" levels="1" name="Double Throwing Javelin">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
index b013514fd9..3f5e2da1b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
@@ -1111,7 +1111,9 @@
 		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="CpHealPercent" val="100" />
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml
index 55a0aed186..b79591fe16 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml
@@ -377,7 +377,9 @@
 		<set name="reuseDelay" val="5000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="15" />
+			<effect name="HealPercent">
+				<param power="15" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6317" levels="1" name="Sacred Tacit">
@@ -675,7 +677,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="5" />
+			<effect name="HealPercent">
+				<param power="5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6331" levels="1" name="Camp Fire Tired">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06400-06499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06400-06499.xml
index 5948b9f011..e3a570ff51 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06400-06499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06400-06499.xml
@@ -576,7 +576,9 @@
 			<effect name="DefenceTrait">
 				<param HOLD="100" />
 			</effect>
-			<effect name="HealPercent" val="90" />
+			<effect name="HealPercent">
+				<param power="90" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6429" levels="1" name="Cozy Mucus">
@@ -611,7 +613,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="30" />
+			<effect name="HealPercent">
+				<param power="30" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6431" levels="1" name="Feral Might">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06600-06699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06600-06699.xml
index fd67130078..159ab16858 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06600-06699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06600-06699.xml
@@ -313,7 +313,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="15" />
+			<effect name="HealPercent">
+				<param power="15" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6626" levels="2" name="Energy of Life's Power">
@@ -327,7 +329,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="25" />
+			<effect name="HealPercent">
+				<param power="25" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6627" levels="3" name="Energy of Life's Highest Power">
@@ -341,7 +345,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6628" levels="1" name="Energy of Mana">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
index 16f7b97fbe..e03891b51f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
@@ -302,8 +302,12 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="30" />
-			<effect name="Heal" val="450" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="30" />
+			</effect>
+			<effect name="Heal">
+				<param power="450" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6725" levels="1" name="Bless the Blood of Elcadia">
@@ -333,7 +337,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="458" />
+			<effect name="Heal">
+				<param power="458" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6727" levels="1" name="Vampiric Rage of Elcadia">
@@ -400,7 +406,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="Heal" val="858" />
+			<effect name="Heal">
+				<param power="858" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6731" levels="1" name="Etis Shadow">
@@ -463,7 +471,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="800" />
+			<effect name="Heal">
+				<param power="800" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6738" levels="1" name="Hold">
@@ -627,7 +637,9 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6753" levels="1" name="Death Blow">
@@ -881,7 +893,9 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6766" levels="1" name="Earth Tremor">
@@ -974,7 +988,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="CLAN" />
 		<for>
-			<effect name="Heal" val="800" />
+			<effect name="Heal">
+				<param power="800" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6771" levels="1" name="Death Strike">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06800-06899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06800-06899.xml
index f04ba0c2fc..872456d7c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06800-06899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06800-06899.xml
@@ -268,7 +268,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6818" levels="1" name="Powerful Rage">
@@ -1279,7 +1281,9 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6887" levels="1" name="Fatal Strike">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
index b4c7317db7..581fc905ff 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
@@ -930,7 +930,9 @@
 				<add order="0x40" stat="accCombat" val="4" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="7065" levels="1" name="Test - Charge">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
index 6edb331eb4..6292cf7cd7 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
@@ -937,7 +937,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="540" />
+			<effect name="Heal">
+				<param power="540" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="8238" levels="1" name="Shalin Strike">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml
index 7ee05ed6f9..f8c2accda8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml
@@ -1170,7 +1170,9 @@
 		<set name="reuseDelay" val="600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="2300" />
+			<effect name="Heal">
+				<param power="2300" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9075" levels="1" name="Awful Soup">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/20000-20099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/20000-20099.xml
index e1621fb2bf..be2c11b4b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/20000-20099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/20000-20099.xml
@@ -85,7 +85,9 @@
 				<mul order="0x30" stat="maxCp" val="1.15" />
 			</effect>
 			<effect name="CpHealPercent" val="15" />
-			<effect name="HealPercent" val="15" />
+			<effect name="HealPercent">
+				<param power="15" />
+			</effect>
 		</for>
 	</skill>
 </list>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/21000-21099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/21000-21099.xml
index 4837ae36a2..ea31f8d67a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/21000-21099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/21000-21099.xml
@@ -604,7 +604,9 @@
 		<set name="reuseDelay" val="1800000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="50" />
 		</for>
 	</skill>
@@ -880,8 +882,12 @@
 		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="30" />
-			<effect name="Heal" val="444" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="30" />
+			</effect>
+			<effect name="Heal">
+				<param power="444" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="21060" levels="1" name="Death Whisper">
@@ -1184,8 +1190,12 @@
 		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="30" />
-			<effect name="Heal" val="444" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="30" />
+			</effect>
+			<effect name="Heal">
+				<param power="444" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="21076" levels="1" name="Resist Unholy">
@@ -1334,8 +1344,12 @@
 		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
 		<for>
-			<effect name="HealOverTime" ticks="1" val="30" />
-			<effect name="Heal" val="444" />
+			<effect name="HealOverTime" ticks="1">
+				<param power="30" />
+			</effect>
+			<effect name="Heal">
+				<param power="444" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="21084" levels="1" name="Energy Recovery">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
index 2018857049..615b39f38f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
@@ -785,7 +785,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="HealPercent" val="50" />
+			<effect name="HealPercent">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22045" levels="1" name="Omen Beast Transformation Scroll">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
index e24990c98e..fb00cfdfff 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
@@ -1365,7 +1365,9 @@
 		<set name="reuseDelay" val="60000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="500" />
+			<effect name="Heal">
+				<param power="500" />
+			</effect>
 			<effect name="ManaHeal" val="200" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml
index 08c179554e..4bd05a6757 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml
@@ -665,7 +665,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="Heal" val="1000" /> <!-- TODO: Custom. -->
+			<effect name="Heal">
+				<param power="1000" /> <!-- TODO: Custom. -->
+			</effect>
 		</for>
 	</skill>
 	<skill id="22299" levels="1" name="Refined Blue Dragon Blood">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml
index 35b04cd5d1..3b50391109 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml
@@ -710,7 +710,9 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="regHp" val="1.3" />
 			</effect>
-			<effect name="Heal" val="444" />
+			<effect name="Heal">
+				<param power="444" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23043" levels="1" name="Blue-robed Tojigong Agathion Special Skill - Ability of Reflect Damage">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml
index d760f8d5fe..dc1bedc956 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml
@@ -811,7 +811,9 @@
 		<for>
 			<effect name="Invincible" />
 			<effect name="CpHealPercent" val="100" />
-			<effect name="HealPercent" val="100" />
+			<effect name="HealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="ManaHealPercent" val="100" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml
index ffb316e1ed..3dfff37284 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml
@@ -181,7 +181,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="500" />
+			<effect name="Heal">
+				<param power="500" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23215" levels="1" name="Good/Bad of Mind">
@@ -1122,7 +1124,9 @@
 				<add order="0x40" stat="accCombat" val="4" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
-			<effect name="HealPercent" val="20" />
+			<effect name="HealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23277" levels="1" name="Master's Blessing - Improve Combat">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml
index 5a3ca0e1d9..b125daf842 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml
@@ -261,7 +261,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Heal" val="435" />
+			<effect name="Heal">
+				<param power="435" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26025" levels="1" name="Powerful Healing Potion">
@@ -275,7 +277,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="50" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26026" levels="1" name="High-grade Healing Potion">
@@ -289,7 +293,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="HealOverTime" ticks="3" val="24" />
+			<effect name="HealOverTime" ticks="3">
+				<param power="24" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26027" levels="6" name="Secret medicine of Will">
@@ -323,7 +329,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="Heal" val="#amount" />
+			<effect name="Heal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26029" levels="1" name="Potion of Will">
-- 
GitLab