From 8874d03a16340b7a0853fb664abbc995161b184c Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Mon, 3 Mar 2014 23:17:13 +0000
Subject: [PATCH] BETA: Continuing with [10224]. 	Reviewed by: Nos,
 St3eT

---
 .../handlers/effecthandlers/AddHate.java      |  6 +-
 .../effecthandlers/ChameleonRest.java         |  6 +-
 .../handlers/effecthandlers/CpDamPercent.java |  6 +-
 .../handlers/effecthandlers/CpHeal.java       |  6 +-
 .../effecthandlers/CpHealOverTime.java        |  6 +-
 .../effecthandlers/CpHealPercent.java         |  6 +-
 .../handlers/effecthandlers/DamOverTime.java  |  4 +-
 .../effecthandlers/DamOverTimePercent.java    |  4 +-
 .../handlers/effecthandlers/FakeDeath.java    |  6 +-
 .../handlers/effecthandlers/FocusEnergy.java  |  6 +-
 .../handlers/effecthandlers/FocusSouls.java   |  6 +-
 .../handlers/effecthandlers/HpByLevel.java    |  8 +-
 .../handlers/effecthandlers/HpDrain.java      |  8 +-
 .../effecthandlers/ManaDamOverTime.java       |  6 +-
 .../handlers/effecthandlers/ManaHeal.java     |  6 +-
 .../effecthandlers/ManaHealByLevel.java       |  6 +-
 .../effecthandlers/ManaHealOverTime.java      |  6 +-
 .../effecthandlers/ManaHealPercent.java       |  6 +-
 .../effecthandlers/MpConsumePerLevel.java     |  6 +-
 .../handlers/effecthandlers/Relax.java        |  6 +-
 .../handlers/effecthandlers/SilentMove.java   |  6 +-
 .../game/data/stats/skills/00000-00099.xml    | 65 ++++++++++----
 .../game/data/stats/skills/00100-00199.xml    |  8 +-
 .../game/data/stats/skills/00200-00299.xml    | 51 +++++++----
 .../game/data/stats/skills/00300-00399.xml    | 75 ++++++++++++-----
 .../game/data/stats/skills/00400-00499.xml    | 59 +++++++++----
 .../game/data/stats/skills/00500-00599.xml    | 67 +++++++++++----
 .../game/data/stats/skills/00600-00699.xml    |  8 +-
 .../game/data/stats/skills/00700-00799.xml    | 35 ++++++--
 .../game/data/stats/skills/00800-00899.xml    |  4 +-
 .../game/data/stats/skills/00900-00999.xml    | 27 ++++--
 .../game/data/stats/skills/01000-01099.xml    | 22 +++--
 .../game/data/stats/skills/01100-01199.xml    | 76 ++++++++++++-----
 .../game/data/stats/skills/01200-01299.xml    | 64 ++++++++++----
 .../game/data/stats/skills/01300-01399.xml    | 57 +++++++++----
 .../game/data/stats/skills/01400-01499.xml    | 66 +++++++++++----
 .../game/data/stats/skills/01500-01599.xml    | 41 ++++++---
 .../game/data/stats/skills/02100-02199.xml    | 12 ++-
 .../game/data/stats/skills/02200-02299.xml    | 20 +++--
 .../game/data/stats/skills/02400-02499.xml    | 20 +++--
 .../game/data/stats/skills/02700-02799.xml    |  8 +-
 .../game/data/stats/skills/02800-02899.xml    |  8 +-
 .../game/data/stats/skills/02900-02999.xml    |  8 +-
 .../game/data/stats/skills/03000-03099.xml    | 61 ++++++++++----
 .../game/data/stats/skills/03100-03199.xml    | 28 +++++--
 .../game/data/stats/skills/03200-03299.xml    |  8 +-
 .../game/data/stats/skills/03300-03399.xml    |  4 +-
 .../game/data/stats/skills/03400-03499.xml    |  8 +-
 .../game/data/stats/skills/04000-04099.xml    | 35 +++++---
 .../game/data/stats/skills/04100-04199.xml    | 53 ++++++++----
 .../game/data/stats/skills/04200-04299.xml    | 28 +++++--
 .../game/data/stats/skills/04300-04399.xml    | 41 ++++++---
 .../game/data/stats/skills/04500-04599.xml    | 24 ++++--
 .../game/data/stats/skills/04600-04699.xml    | 84 ++++++++++++++-----
 .../game/data/stats/skills/05000-05099.xml    | 20 +++--
 .../game/data/stats/skills/05100-05199.xml    | 27 ++++--
 .../game/data/stats/skills/05200-05299.xml    | 24 ++++--
 .../game/data/stats/skills/05300-05399.xml    | 44 +++++++---
 .../game/data/stats/skills/05400-05499.xml    | 29 +++++--
 .../game/data/stats/skills/05500-05599.xml    | 28 +++++--
 .../game/data/stats/skills/05600-05699.xml    | 28 +++++--
 .../game/data/stats/skills/05700-05799.xml    | 15 +++-
 .../game/data/stats/skills/05800-05899.xml    | 16 +++-
 .../game/data/stats/skills/05900-05999.xml    |  8 +-
 .../game/data/stats/skills/06200-06299.xml    | 12 ++-
 .../game/data/stats/skills/06300-06399.xml    | 28 +++++--
 .../game/data/stats/skills/06400-06499.xml    | 33 ++++++--
 .../game/data/stats/skills/06600-06699.xml    | 27 ++++--
 .../game/data/stats/skills/06700-06799.xml    | 14 +++-
 .../game/data/stats/skills/06800-06899.xml    | 40 ++++++---
 .../game/data/stats/skills/08300-08399.xml    | 12 ++-
 .../game/data/stats/skills/09000-09099.xml    |  4 +-
 .../game/data/stats/skills/20000-20099.xml    |  4 +-
 .../game/data/stats/skills/21000-21099.xml    |  4 +-
 .../game/data/stats/skills/22000-22099.xml    |  8 +-
 .../game/data/stats/skills/22100-22199.xml    |  4 +-
 .../game/data/stats/skills/22200-22299.xml    |  4 +-
 .../game/data/stats/skills/23100-23199.xml    |  8 +-
 .../game/data/stats/skills/23200-23299.xml    | 12 ++-
 .../game/data/stats/skills/23300-23399.xml    | 12 ++-
 .../game/data/stats/skills/26000-26099.xml    | 12 ++-
 .../data/stats/skills/custom/10000-10099.xml  |  8 +-
 82 files changed, 1323 insertions(+), 463 deletions(-)

diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 12658811d9..1864a9d648 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -30,9 +30,13 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class AddHate extends AbstractEffect
 {
+	private final double _power;
+	
 	public AddHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -49,7 +53,7 @@ public final class AddHate extends AbstractEffect
 			return;
 		}
 		
-		final double val = getValue();
+		final double val = _power;
 		if (val > 0)
 		{
 			((L2Attackable) info.getEffected()).addDamageHate(info.getEffector(), 0, (int) val);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
index f5724d0a03..7789d98d46 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
@@ -32,9 +32,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  */
 public final class ChameleonRest extends AbstractEffect
 {
+	private final double _power;
+	
 	public ChameleonRest(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 ChameleonRest extends AbstractEffect
 			}
 		}
 		
-		double manaDam = getValue() * getTicksMultiplier();
+		double manaDam = _power * getTicksMultiplier();
 		if (manaDam > info.getEffected().getCurrentMp())
 		{
 			info.getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
index b892068ae8..961175935a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
@@ -31,9 +31,13 @@ import com.l2jserver.gameserver.model.stats.Formulas;
  */
 public final class CpDamPercent extends AbstractEffect
 {
+	private final double _power;
+	
 	public CpDamPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -61,7 +65,7 @@ public final class CpDamPercent extends AbstractEffect
 			info.getEffected().stopFakeDeath(true);
 		}
 		
-		int damage = (int) ((info.getEffected().getCurrentCp() * getValue()) / 100);
+		int damage = (int) ((info.getEffected().getCurrentCp() * _power) / 100);
 		// Manage attack or cast break of the target (calculating rate, sending message)
 		if (!info.getEffected().isRaid() && Formulas.calcAtkBreak(info.getEffected(), damage))
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index cb3517d54d..da827f48a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -33,9 +33,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class CpHeal extends AbstractEffect
 {
+	private final double _power;
+	
 	public CpHeal(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 CpHeal extends AbstractEffect
 			return;
 		}
 		
-		double amount = getValue();
+		double amount = _power;
 		
 		// Prevents overheal and negative amount
 		amount = Math.max(Math.min(amount, target.getMaxRecoverableCp() - target.getCurrentCp()), 0);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
index 46efa63a87..355f3eefda 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
@@ -29,9 +29,13 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class CpHealOverTime extends AbstractEffect
 {
+	private final double _power;
+	
 	public CpHealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -57,7 +61,7 @@ public final class CpHealOverTime extends AbstractEffect
 			return false;
 		}
 		
-		cp += getValue() * getTicksMultiplier();
+		cp += _power * getTicksMultiplier();
 		cp = Math.min(cp, maxcp);
 		info.getEffected().setCurrentCp(cp);
 		return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index 25f0c5b28f..492cd7be65 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -33,9 +33,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class CpHealPercent extends AbstractEffect
 {
+	private final double _power;
+	
 	public CpHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -60,7 +64,7 @@ public final class CpHealPercent extends AbstractEffect
 		}
 		
 		double amount = 0;
-		double power = getValue();
+		double power = _power;
 		boolean full = (power == 100.0);
 		
 		amount = full ? target.getMaxCp() : (target.getMaxCp() * power) / 100.0;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
index 6b5c5936c8..4e0c6e4a6b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
@@ -31,12 +31,14 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public final class DamOverTime extends AbstractEffect
 {
 	private final boolean _canKill;
+	private final double _power;
 	
 	public DamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
 		
 		_canKill = params.getBoolean("canKill", false);
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -53,7 +55,7 @@ public final class DamOverTime extends AbstractEffect
 			return false;
 		}
 		
-		double damage = getValue() * getTicksMultiplier();
+		double damage = _power * getTicksMultiplier();
 		if (damage >= (info.getEffected().getCurrentHp() - 1))
 		{
 			if (info.getSkill().isToggle())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 6bbcc58ca7..24d845b479 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -32,12 +32,14 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 public final class DamOverTimePercent extends AbstractEffect
 {
 	private final boolean _canKill;
+	private final double _power;
 	
 	public DamOverTimePercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
 		
 		_canKill = params.getBoolean("canKill", false);
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -54,7 +56,7 @@ public final class DamOverTimePercent extends AbstractEffect
 			return false;
 		}
 		
-		double damage = info.getEffected().getCurrentHp() * getValue() * getTicksMultiplier();
+		double damage = info.getEffected().getCurrentHp() * _power * getTicksMultiplier();
 		if (damage >= (info.getEffected().getCurrentHp() - 1))
 		{
 			if (info.getSkill().isToggle())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
index 530b73ccf9..4c6ffdaa61 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
@@ -33,9 +33,13 @@ import com.l2jserver.gameserver.network.serverpackets.Revive;
  */
 public final class FakeDeath extends AbstractEffect
 {
+	private final double _power;
+	
 	public FakeDeath(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -52,7 +56,7 @@ public final class FakeDeath extends AbstractEffect
 			return false;
 		}
 		
-		final double manaDam = getValue() * getTicksMultiplier();
+		final double manaDam = _power * getTicksMultiplier();
 		if (manaDam > info.getEffected().getCurrentMp())
 		{
 			if (info.getSkill().isToggle())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java
index 7960d52e75..cca70ed35b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java
@@ -29,9 +29,13 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class FocusEnergy extends AbstractEffect
 {
+	private final int _charge;
+	
 	public FocusEnergy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_charge = params.getInt("charge", 0);
 	}
 	
 	@Override
@@ -48,6 +52,6 @@ public final class FocusEnergy extends AbstractEffect
 			return;
 		}
 		
-		info.getEffected().getActingPlayer().increaseCharges(1, (int) getValue());
+		info.getEffected().getActingPlayer().increaseCharges(1, _charge);
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java
index ab2c9b59b5..0043efa32e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java
@@ -32,9 +32,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  */
 public final class FocusSouls extends AbstractEffect
 {
+	private final int _charge;
+	
 	public FocusSouls(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_charge = params.getInt("charge", 0);
 	}
 	
 	@Override
@@ -55,7 +59,7 @@ public final class FocusSouls extends AbstractEffect
 		final int maxSouls = (int) target.calcStat(Stats.MAX_SOULS, 0, null, null);
 		if (maxSouls > 0)
 		{
-			int amount = (int) getValue();
+			int amount = _charge;
 			if ((target.getChargedSouls() < maxSouls))
 			{
 				int count = ((target.getChargedSouls() + amount) <= maxSouls) ? amount : (maxSouls - target.getChargedSouls());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
index 58569bfbc1..f93f2cfd3d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
@@ -27,14 +27,18 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * Hp By Level effect implementation..
+ * Hp By Level effect implementation.
  * @author Zoey76
  */
 public final class HpByLevel extends AbstractEffect
 {
+	private final double _power;
+	
 	public HpByLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -58,7 +62,7 @@ public final class HpByLevel extends AbstractEffect
 		}
 		
 		// Calculation
-		final int abs = (int) getValue();
+		final double abs = _power;
 		final double absorb = ((info.getEffector().getCurrentHp() + abs) > info.getEffector().getMaxHp() ? info.getEffector().getMaxHp() : (info.getEffector().getCurrentHp() + abs));
 		final int restored = (int) (absorb - info.getEffector().getCurrentHp());
 		info.getEffector().setCurrentHp(absorb);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
index 70c21fd1fc..c2aeea83df 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
@@ -33,9 +33,13 @@ import com.l2jserver.gameserver.model.stats.Formulas;
  */
 public final class HpDrain extends AbstractEffect
 {
+	private final double _power;
+	
 	public HpDrain(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -85,8 +89,8 @@ public final class HpDrain extends AbstractEffect
 			drain = damage;
 		}
 		
-		double hpAdd = (getValue() * drain);
-		double hpFinal = ((activeChar.getCurrentHp() + hpAdd) > activeChar.getMaxHp() ? activeChar.getMaxHp() : (activeChar.getCurrentHp() + hpAdd));
+		final double hpAdd = (_power * drain);
+		final double hpFinal = ((activeChar.getCurrentHp() + hpAdd) > activeChar.getMaxHp() ? activeChar.getMaxHp() : (activeChar.getCurrentHp() + hpAdd));
 		activeChar.setCurrentHp(hpFinal);
 		
 		if (damage > 0)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
index 1f08e3c5aa..e2a1977721 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
@@ -30,9 +30,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  */
 public final class ManaDamOverTime extends AbstractEffect
 {
+	private final double _power;
+	
 	public ManaDamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -49,7 +53,7 @@ public final class ManaDamOverTime extends AbstractEffect
 			return false;
 		}
 		
-		final double manaDam = getValue() * getTicksMultiplier();
+		final double manaDam = _power * getTicksMultiplier();
 		if ((manaDam > info.getEffected().getCurrentMp()) && info.getSkill().isToggle())
 		{
 			info.getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 2c444f7a99..dae78ae2fe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -34,9 +34,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class ManaHeal extends AbstractEffect
 {
+	private final double _power;
+	
 	public ManaHeal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -60,7 +64,7 @@ public final class ManaHeal extends AbstractEffect
 			return;
 		}
 		
-		double amount = getValue();
+		double amount = _power;
 		
 		if (!info.getSkill().isStatic())
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
index 94fbeebcc6..ed752719ee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
@@ -34,9 +34,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class ManaHealByLevel extends AbstractEffect
 {
+	private final double _power;
+	
 	public ManaHealByLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -60,7 +64,7 @@ public final class ManaHealByLevel extends AbstractEffect
 			return;
 		}
 		
-		double amount = getValue();
+		double amount = _power;
 		
 		// recharged mp influenced by difference between target level and skill level
 		// if target is within 5 levels or lower then skill level there's no penalty.
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
index 48fd300120..1bfa6b7d71 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
@@ -28,9 +28,13 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class ManaHealOverTime extends AbstractEffect
 {
+	private final double _power;
+	
 	public ManaHealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -50,7 +54,7 @@ public final class ManaHealOverTime extends AbstractEffect
 			return true;
 		}
 		
-		mp += getValue() * getTicksMultiplier();
+		mp += _power * getTicksMultiplier();
 		mp = Math.min(mp, maxmp);
 		info.getEffected().setCurrentMp(mp);
 		return info.getSkill().isToggle();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
index fd0ca82b43..fa1163c9e8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
@@ -33,9 +33,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class ManaHealPercent extends AbstractEffect
 {
+	private final double _power;
+	
 	public ManaHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -60,7 +64,7 @@ public final class ManaHealPercent extends AbstractEffect
 		}
 		
 		double amount = 0;
-		double power = getValue();
+		double power = _power;
 		boolean full = (power == 100.0);
 		
 		amount = full ? target.getMaxMp() : (target.getMaxMp() * power) / 100.0;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
index 8cb0d49806..c3720b5299 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
@@ -29,9 +29,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  */
 public final class MpConsumePerLevel extends AbstractEffect
 {
+	private final double _power;
+	
 	public MpConsumePerLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -42,7 +46,7 @@ public final class MpConsumePerLevel extends AbstractEffect
 			return false;
 		}
 		
-		final double base = getValue() * getTicksMultiplier();
+		final double base = _power * getTicksMultiplier();
 		final double consume = (info.getAbnormalTime() > 0) ? ((info.getEffected().getLevel() - 1) / 7.5) * base * info.getAbnormalTime() : base;
 		if (consume > info.getEffected().getCurrentMp())
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
index 4d9dec5830..f9fe3d57d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
@@ -32,9 +32,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  */
 public final class Relax extends AbstractEffect
 {
+	private final double _power;
+	
 	public Relax(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -74,7 +78,7 @@ public final class Relax extends AbstractEffect
 			}
 		}
 		
-		final double manaDam = getValue() * getTicksMultiplier();
+		final double manaDam = _power * getTicksMultiplier();
 		if (manaDam > info.getEffected().getCurrentMp())
 		{
 			if (info.getSkill().isToggle())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
index 083f291865..edaeeee553 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
@@ -30,9 +30,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  */
 public final class SilentMove extends AbstractEffect
 {
+	private final double _power;
+	
 	public SilentMove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -49,7 +53,7 @@ public final class SilentMove extends AbstractEffect
 			return false;
 		}
 		
-		final double manaDam = getValue() * getTicksMultiplier();
+		final double manaDam = _power * getTicksMultiplier();
 		if (manaDam > info.getEffected().getCurrentMp())
 		{
 			info.getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
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 92fd4d425c..3a2a65cfdc 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
@@ -375,7 +375,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusEnergy" val="#maxCharges" />
+			<effect name="FocusEnergy">
+				<param charge="#maxCharges" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9" levels="34" name="Sonic Buster" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
@@ -593,7 +595,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="AddHate" val="#power" />
+			<effect name="AddHate">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="16" levels="24" name="Mortal Blow">
@@ -1283,12 +1287,16 @@
 		</for>
 		<enchant1for>
 			<effect name="Sweeper" />
-			<effect name="HpByLevel" val="#ench1DrainHp" />
+			<effect name="HpByLevel">
+				<param power="#ench1DrainHp" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</enchant1for>
 		<enchant1for>
 			<effect name="Sweeper" />
-			<effect name="ManaHealByLevel" val="#ench2DrainMp" />
+			<effect name="ManaHealByLevel">
+				<param power="#ench2DrainMp" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</enchant1for>
 	</skill>
@@ -1360,11 +1368,15 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
 		<for>
-			<effect name="HpByLevel" val="#drain" />
+			<effect name="HpByLevel">
+				<param power="#drain" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</for>
 		<enchant1for>
-			<effect name="HpByLevel" val="#enchDrain" />
+			<effect name="HpByLevel">
+				<param power="#enchDrain" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</enchant1for>
 	</skill>
@@ -1479,7 +1491,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusEnergy" val="#maxCharges" />
+			<effect name="FocusEnergy">
+				<param charge="#maxCharges" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="51" levels="1" name="Lure" enchantGroup1="1">
@@ -1504,7 +1518,9 @@
 		<enchant1 name="mpConsume" val="#ench1mpConsume" />
 		<enchant1 name="reuseDelay" val="2000" />
 		<for>
-			<effect name="AddHate" val="500" />
+			<effect name="AddHate">
+				<param power="500" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="54" levels="49" name="Force Blaster" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
@@ -1662,7 +1678,9 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="FakeDeath" ticks="5" val="10" />
+			<effect name="FakeDeath" ticks="5">
+				<param power="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="61" levels="3" name="Cure Bleeding">
@@ -1832,10 +1850,14 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 		</for>
 		<enchant3for>
-			<effect name="HpDrain" val="#ench3Sap" />
+			<effect name="HpDrain">
+				<param power="#ench3Sap" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="72" levels="3" name="Iron Will" enchantGroup1="1" enchantGroup2="1">
@@ -2139,11 +2161,15 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant1for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="63" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="63" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="86" levels="3" name="Reflect Damage" enchantGroup1="1" enchantGroup2="1">
@@ -2475,18 +2501,23 @@
 			<using kind="Dagger,Dual Dagger" />
 		</cond>
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="HpByLevel" val="#ench2Sap" />
-			<effect name="DamOverTime" ticks="5" val="67">
+			<effect name="HpByLevel">
+				<param power="#ench2Sap" />
+			</effect>
+			<effect name="DamOverTime" ticks="5">
+				<param power="67" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="DamOverTime" ticks="5" val="#ench3dot">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench3dot" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</enchant3for>
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 fee92c2025..2e7c5d5ca2 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
@@ -192,7 +192,9 @@
 		<set name="targetType" val="AREA_CORPSE_MOB" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</for>
 	</skill>
@@ -843,7 +845,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="130" levels="2" name="Thrill Fight" enchantGroup1="1">
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 1b9165c588..dcbb498e7f 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
@@ -403,12 +403,14 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="SilentMove" ticks="5" val="9">
+			<effect name="SilentMove" ticks="5">
+				<param power="9" />
 				<mul order="0x30" stat="runSpd" val="0.6" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="SilentMove" ticks="5" val="9">
+			<effect name="SilentMove" ticks="5">
+				<param power="9" />
 				<mul order="0x30" stat="runSpd" val="#ench1Penalty" />
 			</effect>
 		</enchant1for>
@@ -422,7 +424,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="DamOverTime" ticks="2" val="12">
+			<effect name="DamOverTime" ticks="2">
+				<param power="12" />
 				<mul order="0x30" stat="pAtkSpd" val="1.25" />
 			</effect>
 		</for>
@@ -471,11 +474,15 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant1for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="67" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="225" levels="3" name="Acrobatic Move">
@@ -505,7 +512,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Relax" ticks="3" val="1">
+			<effect name="Relax" ticks="3">
+				<param power="1" />
 				<add order="0x40" stat="regHp" val="5" />
 			</effect>
 		</for>
@@ -1309,7 +1317,9 @@
 			<effect name="Spoil" />
 		</enchant1for>
 		<enchant2for>
-			<effect name="DamOverTime" ticks="5" val="118" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="118" />
+			</effect>
 			<effect name="Spoil" />
 		</enchant2for>
 		<enchant3for>
@@ -1356,12 +1366,14 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.4" />
 				<add order="0x40" stat="accCombat" val="3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench1val">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench1val" />
 				<add order="0x40" stat="accCombat" val="3" />
 			</effect>
 		</enchant1for>
@@ -2608,19 +2620,22 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="2">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="2" />
 				<add order="0x40" stat="pDef" val="#pDef" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="2">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="2" />
 				<add order="0x40" stat="pDef" val="#ench1pDef" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench2val">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench2val" />
 				<add order="0x40" stat="pDef" val="256" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
@@ -2657,10 +2672,14 @@
 		<enchant2 name="mpInitialConsume" val="#ench2mpConsume_Init" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 		<enchant3for>
-			<effect name="HpDrain" val="#ench3absorbPart" />
+			<effect name="HpDrain">
+				<param power="#ench3absorbPart" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="290" levels="14" name="Final Frenzy" enchantGroup1="1">
@@ -2828,7 +2847,9 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChameleonRest" ticks="5" val="2" />
+			<effect name="ChameleonRest" ticks="5">
+				<param power="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="297" levels="2" name="Duelist Spirit" enchantGroup1="1" enchantGroup2="1">
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 6ebc2e14e3..c2abdca46d 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
@@ -96,7 +96,9 @@
 			<effect name="Spoil" />
 		</enchant1for>
 		<enchant2for>
-			<effect name="DamOverTime" ticks="5" val="118" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="118" />
+			</effect>
 			<effect name="Spoil" />
 		</enchant2for>
 		<enchant3for>
@@ -400,17 +402,20 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.8" />
 				<add order="0x40" stat="cAtkAdd" val="#crit" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.8" />
 				<add order="0x40" stat="cAtkAdd" val="#ench1crit" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench2val">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench2val" />
 				<add order="0x40" stat="cAtkAdd" val="609" />
 			</effect>
 		</enchant2for>
@@ -722,7 +727,9 @@
 			<using kind="Pole" />
 		</cond>
 		<for>
-			<effect name="CpDamPercent" val="#power" />
+			<effect name="CpDamPercent">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="321" levels="10" name="Blinding Blow" enchantGroup1="2" enchantGroup2="2">
@@ -791,17 +798,20 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpConsume" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.8" />
 				<add order="0x40" stat="sDef" val="#sDef" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.8" />
 				<add order="0x40" stat="sDef" val="#ench1sDef" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench2val">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench2val" />
 				<add order="0x40" stat="sDef" val="560" />
 			</effect>
 		</enchant2for>
@@ -1054,7 +1064,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="2">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="2" />
 				<mul order="0x30" stat="skillMastery" val="2" />
 			</effect>
 		</for>
@@ -1100,13 +1111,15 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.7" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="#ench1mpConsume" />
 			</effect>
@@ -1123,13 +1136,15 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 				<mul order="0x30" stat="mAtk" val="1.3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 				<mul order="0x30" stat="mAtk" val="#ench1mAtk" />
 			</effect>
@@ -1148,21 +1163,24 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<mul order="0x30" stat="mReuse" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="mAtkSpd" val="#ench1mAtkSpd" />
 				<mul order="0x30" stat="mReuse" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="DamOverTime" ticks="5" val="50">
+			<effect name="DamOverTime" ticks="5">
+				<param power="50" />
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<mul order="0x30" stat="mReuse" val="#ench2mReuse" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
@@ -1180,7 +1198,8 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="1">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="1" />
 				<mul order="0x30" stat="pDef" val="1.25" />
 				<mul order="0x30" stat="mDef" val="1.25" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
@@ -1189,7 +1208,8 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="1">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="1" />
 				<mul order="0x30" stat="pDef" val="#enchDef" />
 				<mul order="0x30" stat="mDef" val="#enchDef" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
@@ -1206,7 +1226,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="1">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="1" />
 				<add order="0x40" stat="reflectDam" val="30" />
 				<add order="0x40" stat="reflectSkillPhysic" val="30" />
 				<add order="0x40" stat="reflectSkillMagic" val="30" />
@@ -1296,7 +1317,9 @@
 			<effect name="DispelByCategory">
 				<param slot="buff" rate="25" max="5" />
 			</effect>
-			<effect name="CpDamPercent" val="90" />
+			<effect name="CpDamPercent">
+				<param power="90" />
+			</effect>
 		</for>
 		<enchant2for>
 			<effect name="Debuff">
@@ -1307,7 +1330,9 @@
 			<effect name="DispelByCategory">
 				<param slot="buff" rate="25" max="5" />
 			</effect>
-			<effect name="CpDamPercent" val="90" />
+			<effect name="CpDamPercent">
+				<param power="90" />
+			</effect>
 		</enchant2for>
 	</skill>
 	<skill id="343" levels="1" name="Lethal Shot" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6" enchantGroup5="6" enchantGroup6="6" enchantGroup7="6">
@@ -1431,7 +1456,9 @@
 			<effect name="PhysicalAttack" />
 		</for>
 		<selfEffects>
-			<effect name="FocusEnergy" val="8" />
+			<effect name="FocusEnergy">
+				<param charge="8" />
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="346" levels="1" name="Raging Force">
@@ -1456,7 +1483,9 @@
 			<effect name="PhysicalAttack" />
 		</for>
 		<selfEffects>
-			<effect name="FocusEnergy" val="8" />
+			<effect name="FocusEnergy">
+				<param charge="8" />
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="347" levels="1" name="Earthquake" enchantGroup1="6" enchantGroup2="6" enchantGroup3="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 a5a8a898b8..13eedafd03 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
@@ -863,10 +863,14 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="#amount" />
+			<effect name="ManaHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaHeal" val="#ench1amount" />
+			<effect name="ManaHeal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="418" levels="3" name="Quiver of Holding">
@@ -1012,21 +1016,24 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.5">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.5" />
 				<add order="0x40" stat="accCombat" val="#accCombat">
 					<using kind="Pole" />
 				</add>
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.5">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.5" />
 				<add order="0x40" stat="accCombat" val="#ench1accCombat">
 					<using kind="Pole" />
 				</add>
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench2mpConsume">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench2mpConsume" />
 				<add order="0x40" stat="accCombat" val="4">
 					<using kind="Pole" />
 				</add>
@@ -1073,21 +1080,27 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="1" />
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="1" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="#trait_shock" />
 				<param SLEEP="#trait_sleep" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="1" />
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="1" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="#ench1Trait_shock" />
 				<param SLEEP="#ench1Trait_sleep" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench2mpConsume" />
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench2mpConsume" />
+			</effect> 
 			<effect name="DefenceTrait">
 				<param SHOCK="15" />
 				<param SLEEP="30" />
@@ -1532,10 +1545,14 @@
 		<set name="reuseDelay" val="150000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="1000" />
+			<effect name="CpHeal">
+				<param power="1000" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="CpHeal" val="#ench1amount" />
+			<effect name="CpHeal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="441" levels="1" name="Force Meditation">
@@ -1562,7 +1579,9 @@
 			<effect name="HealOverTime" ticks="5">
 				<param power="60" />
 			</effect>
-			<effect name="ManaHealOverTime" ticks="5" val="10" />
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="442" levels="1" name="Sonic Barrier">
@@ -2443,7 +2462,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.2">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.2" />
 				<add order="0x40" stat="vengeancePdam" val="3" />
 			</effect>
 		</for>
@@ -2558,7 +2578,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.4" />
 				<add order="0x40" stat="runSpd" val="20" />
 			</effect>
 		</for>
@@ -3067,15 +3088,21 @@
 		</cond>
 		<for>
 			<effect name="PhysicalSoulAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant1for>
 			<effect name="PhysicalSoulAttack" />
-			<effect name="DamOverTime" ticks="5" val="#ench1Power" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench1Power" />
+			</effect>
 		</enchant1for>
 		<enchant2for>
 			<effect name="PhysicalSoulAttack" />
-			<effect name="DamOverTime" ticks="5" val="134" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="134" />
+			</effect>
 		</enchant2for>
 	</skill>
 	<skill id="496" levels="31" name="Slashing Blade" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
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 69939d5f70..8863bc09f2 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
@@ -17,7 +17,8 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.4" />
 				<mul order="0x30" stat="pAtk" val="#amount" />
 				<mul order="0x30" stat="pAtkSpd" val="#amount" />
 				<add order="0x40" stat="accCombat" val="#amount2" />
@@ -26,7 +27,8 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.4" />
 				<mul order="0x30" stat="pAtk" val="#ench1Power" />
 				<mul order="0x30" stat="pAtkSpd" val="1.08" />
 				<add order="0x40" stat="accCombat" val="#ench1Power2" />
@@ -35,7 +37,8 @@
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="5" val="#ench2Cost">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="#ench2Cost" />
 				<mul order="0x30" stat="pAtk" val="1.08" />
 				<mul order="0x30" stat="pAtkSpd" val="1.08" />
 				<add order="0x40" stat="accCombat" val="4" />
@@ -105,10 +108,14 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusSouls" val="#souls" />
+			<effect name="FocusSouls">
+				<param charge="#souls" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="FocusSouls" val="#ench1souls" />
+			<effect name="FocusSouls">
+				<param charge="#ench1souls" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="503" levels="3" name="Scorn">
@@ -438,11 +445,15 @@
 		</cond>
 		<for>
 			<effect name="PhysicalSoulAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant3for>
 			<effect name="PhysicalSoulAttack" />
-			<effect name="DamOverTime" ticks="5" val="67" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="67" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="510" levels="5" name="Deadly Roulette" enchantGroup1="2" enchantGroup2="2">
@@ -496,7 +507,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="AddHate" val="500" />
+			<effect name="AddHate">
+				<param power="500" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="512" levels="10" name="Create Bio Potion">
@@ -978,7 +991,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1300,7 +1315,9 @@
 			<player cp="80" />
 		</cond>
 		<for>
-			<effect name="CpDamPercent" val="100" />
+			<effect name="CpDamPercent">
+				<param power="100" />
+			</effect>
 			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="1.35" />
 				<mul order="0x30" stat="regHp" val="1.15" />
@@ -1938,7 +1955,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="123" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="123" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="560" levels="4" name="Power Slash">
@@ -2192,7 +2211,9 @@
 			<effect name="PhysicalAttack" />
 		</for>
 		<selfEffects>
-			<effect name="FocusEnergy" val="#maxCharges" />
+			<effect name="FocusEnergy">
+				<param charge="#maxCharges" />
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="571" levels="4" name="Poison Dust">
@@ -2224,7 +2245,9 @@
 		<set name="targetType" val="AREA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="58" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="58" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="572" levels="4" name="Double Slasher">
@@ -2411,7 +2434,9 @@
 		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="579" levels="4" name="Fire Armor">
@@ -2531,7 +2556,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="123" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="123" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="583" levels="4" name="Assimilation">
@@ -2640,7 +2667,7 @@
 	</skill>
 	<skill id="588" levels="2" name="Curse of Darkness">
 		<!-- Confirmed CT2.5 -->
-		<table name="#dmg"> 88 101 </table>
+		<table name="#dot"> 88 101 </table>
 		<table name="#magicLvl"> 59 63 </table>
 		<table name="#mpConsume"> 54 58 </table>
 		<set name="abnormalLvl" val="1" />
@@ -2661,7 +2688,9 @@
 		<set name="reuseDelay" val="11000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dmg" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="589" levels="2" name="Darkness Energy Drain">
@@ -2679,7 +2708,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="CORPSE_MOB" />
 		<for>
-			<effect name="HpByLevel" val="#drainHp" />
+			<effect name="HpByLevel">
+				<param power="#drainHp" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</for>
 	</skill>
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 ca4b9102f8..09cea41692 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
@@ -428,7 +428,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusSouls" val="50" />
+			<effect name="FocusSouls">
+				<param charge="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="626" levels="4" name="Critical Sense" enchantGroup1="1" enchantGroup2="1">
@@ -1774,7 +1776,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="139" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="139" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="689" levels="1" name="Divine Rogue Deadly Blow">
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 2fa803a887..ab5b6c2c89 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
@@ -79,7 +79,9 @@
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 		<selfEffects>
 			<effect name="CallSkill">
@@ -321,7 +323,8 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.4" />
 				<add order="0x40" stat="transDam" val="50" />
 			</effect>
 		</for>
@@ -435,7 +438,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="AREA" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="716" levels="4" name="Zaken Hold">
@@ -910,7 +915,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="351" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="351" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1039,7 +1046,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="52" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="52" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="742" levels="3" name="Vale Master Bursting Flame">
@@ -1331,7 +1340,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="134" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="134" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="753" levels="3" name="Doll Blader Throwing Knife">
@@ -1583,7 +1594,9 @@
 			<effect name="DispelByCategory">
 				<param slot="buff" rate="25" max="5" />
 			</effect>
-			<effect name="CpDamPercent" val="90" />
+			<effect name="CpDamPercent">
+				<param power="90" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="763" levels="1" name="Hell Scream">
@@ -1959,7 +1972,9 @@
 				<param power="4500" />
 				<param criticalChance="20" />
 			</effect>
-			<effect name="DamOverTime" ticks="1" val="80" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="80" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="777" levels="1" name="Demolition Impact">
@@ -2572,7 +2587,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="69" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="69" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="799" levels="3" name="Master Ability - Defense">
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 b83710c236..db58fc02f9 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
@@ -766,7 +766,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
index 07cc9db5c5..b7aab065a2 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
@@ -121,7 +121,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="230" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="230" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="905" levels="6" name="Dark Detonation">
@@ -249,7 +251,8 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="230">
+			<effect name="DamOverTime" ticks="5">
+				<param power="230" />
 				<mul order="0x30" stat="runSpd" val="0.3" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
 				<mul order="0x30" stat="mAtkSpd" val="0.8" />
@@ -681,7 +684,9 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="928" levels="1" name="Dual Blow">
@@ -966,7 +971,9 @@
 			<effect name="PhysicalAttack" />
 		</for>
 		<selfEffects>
-			<effect name="FocusSouls" val="1" />
+			<effect name="FocusSouls">
+				<param charge="1" />
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="940" levels="1" name="Fake Attack">
@@ -1116,7 +1123,9 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="1" val="92" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="92" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="950" levels="7" name="Nail Attack">
@@ -1206,7 +1215,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusSouls" val="5" />
+			<effect name="FocusSouls">
+				<param charge="5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="954" levels="1" name="Strider Bite">
@@ -1236,7 +1247,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="52" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="52" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="955" levels="1" name="Strider Dash">
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 2b30c60f44..fe8a619429 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
@@ -16,12 +16,14 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
 				<add order="0x40" stat="pAtk" val="#pAtk" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaDamOverTime" ticks="5" val="4">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="4" />
 				<add order="0x40" stat="pAtk" val="#ench1patk" />
 			</effect>
 		</enchant1for>
@@ -434,10 +436,14 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="ManaHealByLevel" val="#amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaHealByLevel" val="#ench1amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1015" levels="15" name="Battle Heal">
@@ -1868,7 +1874,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1092" levels="19" name="Fear" enchantGroup1="1" enchantGroup2="1">
@@ -1941,7 +1949,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1096" levels="16" name="Seal of Chaos" enchantGroup1="1" enchantGroup2="1">
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 57b00d2f0e..65e16fbb50 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
@@ -30,7 +30,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1101" levels="2" name="Blaze Quake">
@@ -63,7 +65,9 @@
 		<set name="reuseDelay" val="4000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1102" levels="6" name="Aura Sink">
@@ -97,7 +101,9 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttackMp" />
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1104" levels="14" name="Seal of Winter" enchantGroup1="1" enchantGroup2="1">
@@ -195,7 +201,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1108" levels="4" name="Seal of Flame">
@@ -226,7 +234,9 @@
 		<set name="reuseDelay" val="5000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1111" levels="18" name="Summon Kat the Cat" enchantGroup1="1">
@@ -295,10 +305,14 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="ManaHealByLevel" val="#amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaHealByLevel" val="#ench1amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1127" levels="45" name="Servitor Heal" enchantGroup1="2" enchantGroup2="2">
@@ -648,7 +662,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1148" levels="13" name="Death Spike" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -717,15 +733,21 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="HpByLevel" val="#drain" />
+			<effect name="HpByLevel">
+				<param power="#drain" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</for>
 		<enchant2for>
-			<effect name="HpByLevel" val="#ench1Drain" />
+			<effect name="HpByLevel">
+				<param power="#ench1Drain" />
+			</effect>
 			<effect name="ConsumeBody" />
 		</enchant2for>
 		<enchant2selfEffects>
-			<effect name="CpHeal" val="#ench2Bravery" />
+			<effect name="CpHeal">
+				<param power="#ench2Bravery" />
+			</effect>
 		</enchant2selfEffects>
 	</skill>
 	<skill id="1154" levels="6" name="Summon Corrupted Man" enchantGroup1="1">
@@ -841,14 +863,22 @@
 		<set name="targetType" val="SELF" />
 		<enchant2 name="hpConsume" val="#ench2hpConsume" />
 		<for>
-			<effect name="ManaHeal" val="#amount" />
+			<effect name="ManaHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaHeal" val="#ench1amount" />
+			<effect name="ManaHeal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 		<enchant3for>
-			<effect name="CpHeal" val="#ench3Bravery" />
-			<effect name="ManaHeal" val="61" />
+			<effect name="CpHeal">
+				<param power="#ench3Bravery" />
+			</effect>
+			<effect name="ManaHeal">
+				<param power="61" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="1159" levels="22" name="Curse Death Link" enchantGroup1="2" enchantGroup2="2">
@@ -1064,10 +1094,14 @@
 		<enchant3 name="activateRate" val="#ench3ActivateRates" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="#ench1dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench1dot" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1168" levels="7" name="Curse: Poison">
@@ -1099,7 +1133,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1169" levels="14" name="Curse Fear" enchantGroup1="2" enchantGroup2="2">
@@ -1519,7 +1555,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1184" levels="6" name="Ice Bolt">
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 46450ca145..e66c433886 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
@@ -206,7 +206,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1210" levels="4" name="Seal of Gloom">
@@ -240,7 +242,9 @@
 		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="MagicalAttackMp" />
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1213" levels="13" name="Seal of Mirage">
@@ -980,7 +984,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1234" levels="28" name="Vampiric Claw" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
@@ -1018,13 +1024,19 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 		<enchant3for>
-			<effect name="HpDrain" val="#ench3absorbPart" />
+			<effect name="HpDrain">
+				<param power="#ench3absorbPart" />
+			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</enchant4for>
 		<enchant4selfEffects>
 			<effect name="Buff">
@@ -1191,11 +1203,15 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="67" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="67" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="1238" levels="3" name="Freezing Skin" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1" enchantGroup4="1">
@@ -1438,7 +1454,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1245" levels="14" name="Steal Essence" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -1472,10 +1490,14 @@
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 		<enchant3for>
-			<effect name="HpDrain" val="#ench3absorbPart" />
+			<effect name="HpDrain">
+				<param power="#ench3absorbPart" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="1246" levels="12" name="Seal of Silence" enchantGroup1="1" enchantGroup2="1">
@@ -2117,12 +2139,14 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.2">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.2" />
 				<add order="0x40" stat="transDam" val="#power" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="5" val="0.2">
+			<effect name="MpConsumePerLevel" ticks="5">
+				<param power="0.2" />
 				<add order="0x40" stat="transDam" val="#ench1power" />
 			</effect>
 		</enchant1for>
@@ -2433,7 +2457,9 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="CpHeal" val="#ench2Bravery" />
+			<effect name="CpHeal">
+				<param power="#ench2Bravery" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
@@ -2813,12 +2839,14 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
 				<add order="0x40" stat="pDef" val="#def" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaDamOverTime" ticks="5" val="10">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="10" />
 				<add order="0x40" stat="pDef" val="#ench1def" />
 			</effect>
 		</enchant1for>
@@ -2987,7 +3015,9 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="1" val="60" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="60" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1290" levels="1" name="Blizzard" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
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 4d1c5a550b..a8345dac20 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
@@ -144,10 +144,14 @@
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="CpHeal" val="#ench1amount" />
+			<effect name="CpHeal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1306" levels="6" name="Ritual of Life" enchantGroup1="2" enchantGroup2="2">
@@ -177,10 +181,14 @@
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="CpHeal" val="#ench1amount" />
+			<effect name="CpHeal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1307" levels="3" name="Prayer" enchantGroup1="1" enchantGroup2="1">
@@ -1021,7 +1029,8 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="24">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="24" />
 				<add order="0x40" stat="cancelVuln" val="30" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.3" />
 				<mul order="0x30" stat="PhysicalMpConsumeRate" val="1.1" />
@@ -1070,7 +1079,8 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.9" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
@@ -1079,7 +1089,8 @@
 		</for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.9" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
@@ -1128,7 +1139,8 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="pAtkSpd" val="0.9" />
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
@@ -1137,7 +1149,8 @@
 		</for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="pAtkSpd" val="0.9" />
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
@@ -1186,7 +1199,8 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.9" />
 				<mul order="0x30" stat="pAtkSpd" val="0.9" />
 				<mul order="0x30" stat="mAtkSpd" val="0.7" />
@@ -1195,7 +1209,8 @@
 		</for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.9" />
 				<mul order="0x30" stat="pAtkSpd" val="0.9" />
 				<mul order="0x30" stat="mAtkSpd" val="0.7" />
@@ -1243,14 +1258,16 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<sub order="0x40" stat="accCombat" val="6" />
 				<sub order="0x40" stat="holyRes" val="30" />
 			</effect>
 		</for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<sub order="0x40" stat="accCombat" val="6" />
 				<sub order="0x40" stat="holyRes" val="30" />
 			</effect>
@@ -1295,15 +1312,21 @@
 		<enchant4 name="elementPower" val="#ench4elementPower" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<sub order="0x40" stat="accCombat" val="6" />
 				<sub order="0x40" stat="darkRes" val="30" />
 			</effect>
 		</for>
 		<enchant3for>
-			<effect name="HpDrain" val="0.2" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<sub order="0x40" stat="accCombat" val="6" />
 				<sub order="0x40" stat="darkRes" val="30" />
 			</effect>
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 b4c7236a38..e01a92f08c 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
@@ -521,7 +521,9 @@
 				<sub order="0x40" stat="debuffVuln" val="10" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
-			<effect name="CpHealPercent" val="20" />
+			<effect name="CpHealPercent">
+				<param power="20" />
+			</effect>
 		</for>
 		<enchant3for>
 			<effect name="Buff">
@@ -539,7 +541,9 @@
 				<sub order="0x40" stat="debuffVuln" val="10" />
 				<mul order="0x30" stat="runSpd" val="#ench3decreasePenalty" />
 			</effect>
-			<effect name="CpHealPercent" val="20" />
+			<effect name="CpHealPercent">
+				<param power="20" />
+			</effect>
 		</enchant3for>
 	</skill>
 	<skill id="1415" levels="1" name="Pa'agrio's Emblem" enchantGroup1="5" enchantGroup2="5">
@@ -598,13 +602,17 @@
 			<effect name="Buff">
 				<add order="0x40" stat="maxCp" val="800" />
 			</effect>
-			<effect name="CpHeal" val="800" />
+			<effect name="CpHeal">
+				<param power="800" />
+			</effect>
 		</for>
 		<enchant1for>
 			<effect name="Buff">
 				<add order="0x40" stat="maxCp" val="#ench1amount" />
 			</effect>
-			<effect name="CpHeal" val="#ench1amount" />
+			<effect name="CpHeal">
+				<param power="#ench1amount" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1417" levels="5" name="Aura Flash" enchantGroup1="2" enchantGroup2="2">
@@ -921,7 +929,9 @@
 			<player olympiad="false" />
 		</cond>
 		<for>
-			<effect name="ManaHealByLevel" val="1500" />
+			<effect name="ManaHealByLevel">
+				<param power="1500" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1429" levels="1" name="Gate Chant">
@@ -976,7 +986,9 @@
 			<effect name="Paralyze">
 				<mul order="0x30" stat="pDef" val="0.1" />
 			</effect>
-			<effect name="ManaHealOverTime" ticks="5" val="#mhot" />
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="#mhot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1431" levels="6" name="Fallen Arrow">
@@ -1125,13 +1137,15 @@
 		<enchant2 name="activateRate" val="#ench2ActivateRates" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dmg">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dmg" />
 				<mul order="0x30" stat="pDef" val="#amount" />
 				<mul order="0x30" stat="mDef" val="#amount" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="#ench1dmg">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench1dmg" />
 				<mul order="0x30" stat="pDef" val="0.77" />
 				<mul order="0x30" stat="mDef" val="0.77" />
 			</effect>
@@ -1731,7 +1745,9 @@
 			<target races="Kamael" />
 		</cond>
 		<for>
-			<effect name="FocusSouls" val="1" />
+			<effect name="FocusSouls">
+				<param charge="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1450" levels="1" name="Chain Lightning" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
@@ -1845,10 +1861,14 @@
 		<enchant3 name="elementPower" val="#ench3elementPower" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="173" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="173" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="#ench1Power" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench1Power" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1453" levels="1" name="Ice Vortex Crusher" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
@@ -1960,10 +1980,14 @@
 		<enchant3 name="elementPower" val="#ench3elementPower" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="173" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="173" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="#ench1Power" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench1Power" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1456" levels="1" name="Wind Vortex Slug" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
@@ -2061,10 +2085,14 @@
 		<enchant3 name="elementPower" val="#ench3elementPower" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="173" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="173" />
+			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="5" val="#ench1Power" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#ench1Power" />
+			</effect>
 		</enchant1for>
 	</skill>
 	<skill id="1459" levels="1" name="Divine Power" enchantGroup1="5" enchantGroup2="5">
@@ -2726,7 +2754,9 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<enchant3 name="reuseDelay" val="#ench3Reuse" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="1" val="200" />
+			<effect name="ManaHealOverTime" ticks="1">
+				<param power="200" />
+			</effect>
 			<effect name="Paralyze">
 				<mul order="0x30" stat="pDef" val="0.1" />
 			</effect>
@@ -3260,7 +3290,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Debuff">
 				<mul order="0x30" stat="pAtk" val="0.5" />
 				<mul order="0x30" stat="pAtkSpd" val="0.5" />
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 f372b23ac8..c61c34fe61 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
@@ -171,11 +171,15 @@
 		<set name="targetType" val="PARTY_NOTME" />
 		<for>
 			<effect name="Invincible" />
-			<effect name="CpHeal" val="9000" />
+			<effect name="CpHeal">
+				<param power="9000" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1506" levels="1" name="Blessing of Eva">
@@ -198,11 +202,15 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="CpHeal" val="9000" />
+			<effect name="CpHeal">
+				<param power="9000" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="DispelByCategory">
 				<param slot="debuff" rate="40" max="10" />
 			</effect>
@@ -258,8 +266,12 @@
 			<effect name="DefenceTrait">
 				<param HOLD="100" />
 			</effect>
-			<effect name="DamOverTime" ticks="1" val="90" />
-			<effect name="ManaDamOverTime" ticks="1" val="30" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="90" />
+			</effect>
+			<effect name="ManaDamOverTime" ticks="1">
+				<param power="30" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1509" levels="1" name="Seal of Limit">
@@ -401,7 +413,8 @@
 		<enchant4 name="pvpPower" val="#ench4Duel" />
 		<for>
 			<effect name="MagicalSoulAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 				<mul order="0x30" stat="mAtkSpd" val="0.7" />
@@ -409,7 +422,8 @@
 		</for>
 		<enchant3for>
 			<effect name="MagicalSoulAttack" />
-			<effect name="ManaDamOverTime" ticks="5" val="12">
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="12" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 				<mul order="0x30" stat="mAtkSpd" val="0.7" />
@@ -837,7 +851,8 @@
 		<set name="reuseDelay" val="4000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
 				<mul order="0x30" stat="healEffect" val="0.5" />
 			</effect>
 		</for>
@@ -1646,7 +1661,9 @@
 			<effect name="MagicalAttack" />
 		</for>
 		<selfEffects>
-			<effect name="ManaHeal" val="10" /> <!-- FIXME: value unconfirmed -->
+			<effect name="ManaHeal">
+				<param power="10" />  <!-- FIXME: value unconfirmed -->
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="1555" levels="1" name="Aura Cannon">
@@ -1669,7 +1686,9 @@
 			<effect name="MagicalAttack" />
 		</for>
 		<selfEffects>
-			<effect name="ManaHeal" val="10" /> <!-- FIXME: value unconfirmed -->
+			<effect name="ManaHeal">
+				<param power="10" />  <!-- FIXME: value unconfirmed -->
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="1556" levels="1" name="Arcane Shield">
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 4874889a72..0d099c07c9 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
@@ -605,7 +605,9 @@
 			<effect name="HealPercent">
 				<param power="3" />
 			</effect>
-			<effect name="ManaHealPercent" val="1" />
+			<effect name="ManaHealPercent">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2137" levels="1" name="Summon Regular Tree">
@@ -820,7 +822,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="FocusEnergy" val="2" />
+			<effect name="FocusEnergy">
+				<param charge="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2166" levels="2" name="CP Gauge Potion">
@@ -831,7 +835,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2167" levels="4" name="Scroll of SP">
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 eee6a6dd7c..38b239eea1 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
@@ -966,8 +966,12 @@
 			<player flyMounted="false" />
 		</cond>
 		<for>
-			<effect name="ManaHeal" val="20" />
-			<effect name="ManaHealPercent" val="4" />
+			<effect name="ManaHeal">
+				<param power="20" />
+			</effect>
+			<effect name="ManaHealPercent">
+				<param power="4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2246" levels="1" name="Herb of Power">
@@ -1649,7 +1653,9 @@
 			<player flyMounted="false" />
 		</cond>
 		<for>
-			<effect name="ManaHealPercent" val="#amount" />
+			<effect name="ManaHealPercent">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2280" levels="1" name="Herb of Power">
@@ -1839,7 +1845,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="ManaHeal" val="#amount" />
+			<effect name="ManaHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2289" levels="6" name="Elixir of CP">
@@ -1855,7 +1863,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2290" levels="1" name="Coffer of Shadows">
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 31a59fb0ea..7e18d7f110 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
@@ -33,7 +33,9 @@
 			<player level="52" />
 		</cond>
 		<for>
-			<effect name="ManaHeal" val="360" />
+			<effect name="ManaHeal">
+				<param power="360" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2402" levels="1" name="Lesser Battlefield CP Potion">
@@ -48,7 +50,9 @@
 			<player level="52" />
 		</cond>
 		<for>
-			<effect name="CpHeal" val="1000" />
+			<effect name="CpHeal">
+				<param power="1000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2403" levels="1" name="Spring CP Potion">
@@ -60,7 +64,9 @@
 		<set name="reuseDelay" val="600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="1000" />
+			<effect name="CpHeal">
+				<param power="1000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2404" levels="1" name="Might">
@@ -1846,7 +1852,9 @@
 			<player flyMounted="false" />
 		</cond>
 		<for>
-			<effect name="ManaHealPercent" val="12" />
+			<effect name="ManaHealPercent">
+				<param power="12" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2487" levels="1" name="Item - Special Sound Crystal">
@@ -2042,7 +2050,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="FocusSouls" val="5" />
+			<effect name="FocusSouls">
+				<param charge="5" />
+			</effect>
 		</for>
 	</skill>
 </list>
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 04346f3bef..0a0c1c7c70 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
@@ -2635,7 +2635,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="#amount" />
+			<effect name="ManaHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2794" levels="2" name="Stone of Recovery">
@@ -2655,7 +2657,9 @@
 			<effect name="HealPercent">
 				<param power="#hpHeal" />
 			</effect>
-			<effect name="ManaHealPercent" val="#mpHeal" />
+			<effect name="ManaHealPercent">
+				<param power="#mpHeal" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2795" levels="1" name="Stone of Destruction">
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 96fe6a50df..1f95035344 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
@@ -1348,7 +1348,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="ManaHeal" val="#amount" />
+			<effect name="ManaHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2862" levels="6" name="Highest Power Secret Medicine of Will">
@@ -1366,7 +1368,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2863" levels="1" name="Highest Power Healing Potion">
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 554b586eb2..f92378980a 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
@@ -140,7 +140,9 @@
 			<player levelRange="61;75" />
 		</cond>
 		<for>
-			<effect name="ManaHeal" val="360" />
+			<effect name="ManaHeal">
+				<param power="360" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2909" levels="5" name="Battlefield Use Secret Medicine of Will">
@@ -154,7 +156,9 @@
 			<player levelRange="61;75" />
 		</cond>
 		<for>
-			<effect name="CpHeal" val="360" />
+			<effect name="CpHeal">
+				<param power="360" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2910" levels="1" name="Skull Key of Pain">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03000-03099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03000-03099.xml
index 0df3cbd0cf..2e2555995a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03000-03099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03000-03099.xml
@@ -36,7 +36,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="44" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="44" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3006" levels="1" name="Equip Set Items">
@@ -242,7 +244,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3021" levels="6" name="Special Ability: Critical Bleed">
@@ -265,7 +269,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3022" levels="6" name="Special Ability: Critical Drain">
@@ -285,7 +291,9 @@
 		<set name="reuseDelay" val="15000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="#absorbPart" />
+			<effect name="HpDrain">
+				<param power="#absorbPart" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3023" levels="6" name="Special Ability: Critical Damage">
@@ -329,7 +337,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3025" levels="6" name="Special Ability: Critical Anger">
@@ -562,7 +572,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="#absorbPart" />
+			<effect name="HpDrain">
+				<param power="#absorbPart" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3040" levels="6" name="Special Ability: Critical Poison">
@@ -590,7 +602,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3041" levels="6" name="Special Ability: Critical Poison">
@@ -618,7 +632,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3042" levels="20" name="Special Ability: Critical Damage">
@@ -807,7 +823,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="74" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="74" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3053" levels="2" name="Special Ability: Critical Bleed">
@@ -828,7 +846,8 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="88">
+			<effect name="DamOverTime" ticks="3">
+				<param power="88" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</for>
@@ -851,7 +870,8 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="256">
+			<effect name="DamOverTime" ticks="3">
+				<param power="256" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</for>
@@ -874,7 +894,8 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="128">
+			<effect name="DamOverTime" ticks="3">
+				<param power="128" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</for>
@@ -946,7 +967,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.65" />
+			<effect name="HpDrain">
+				<param power="0.65" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3060" levels="2" name="Special Ability: Critical Drain">
@@ -961,7 +984,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.35" />
+			<effect name="HpDrain">
+				<param power="0.35" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3061" levels="3" name="Special Ability: Critical Poison">
@@ -985,7 +1010,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3062" levels="2" name="Special Ability: Critical Poison">
@@ -1008,7 +1035,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="224" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="224" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3063" levels="2" name="Special Ability: Back Blow">
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 deab6e5393..25ed268456 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
@@ -226,7 +226,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="AddHate" val="#power" />
+			<effect name="AddHate">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3110" levels="10" name="Item Skill: Mana Burn">
@@ -638,7 +640,9 @@
 		<set name="reuseDelay" val="30000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealByLevel" val="#amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3128" levels="10" name="Item Skill: Blessed Soul">
@@ -708,7 +712,9 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3131" levels="10" name="Item Skill: Cheer">
@@ -1205,7 +1211,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="AddHate" val="#power" />
+			<effect name="AddHate">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3151" levels="10" name="Item Skill: Peace">
@@ -1273,7 +1281,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3154" levels="10" name="Item Skill: Mana Burn">
@@ -2371,7 +2381,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dmg" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3196" levels="10" name="Item Skill: Bleed">
@@ -2404,7 +2416,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dmg" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3197" levels="10" name="Item Skill: Silence">
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 d10fd6c3d3..dcf2ab77a9 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
@@ -1233,7 +1233,9 @@
 			<effect name="Heal">
 				<param power="200" />
 			</effect>
-			<effect name="CpHeal" val="200" />
+			<effect name="CpHeal">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3274" levels="1" name="Blue Talisman of Protection">
@@ -1361,7 +1363,9 @@
 			<effect name="Paralyze">
 				<mul order="0x30" stat="pDef" val="0.1" />
 			</effect>
-			<effect name="ManaHealOverTime" ticks="5" val="27" />
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="27" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3280" levels="1" name="Blue Talisman of Invisibility">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03300-03399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03300-03399.xml
index 6ed699fc69..8c81b060e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03300-03399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03300-03399.xml
@@ -422,7 +422,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="HpDrain" val="0.05" />
+			<effect name="HpDrain">
+				<param power="0.05" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3332" levels="1" name="Orange Talisman - Hot Springs Recovery">
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 737c63585c..0ddc17ae63 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
@@ -427,7 +427,9 @@
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3430" levels="1" name="White Talisman - Darkness">
@@ -1262,7 +1264,9 @@
 			<effect name="Heal">
 				<param power="100" />
 			</effect>
-			<effect name="CpHeal" val="100" />
+			<effect name="CpHeal">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3497" levels="1" name="Yellow Talisman of MP Regeneration">
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 5c665d6ef5..7a8af6bd46 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
@@ -42,7 +42,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4003" levels="1" name="Golem Body">
@@ -236,7 +238,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="AREA" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="30">
+			<effect name="DamOverTime" ticks="3">
+				<param power="30" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
 			</effect>
 		</for>
@@ -317,7 +320,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealByLevel" val="#amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4026" levels="1" name="Gludio Flame">
@@ -551,7 +556,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dmg" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4036" levels="12" name="Poison">
@@ -582,7 +589,9 @@
 		<set name="targetType" val="AREA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dmg" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4037" levels="3" name="Decrease P.Atk">
@@ -884,7 +893,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4051" levels="20" name="Cubic Heal">
@@ -929,7 +940,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4053" levels="16" name="Decrease P.Atk">
@@ -1518,8 +1531,8 @@
 		<set name="reuseDelay" val="50" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="20">
-				<param canKill="true" />
+			<effect name="DamOverTime" ticks="3">
+				<param canKill="true" power="30" />
 			</effect>
 			<effect name="Root" />
 		</for>
@@ -1627,7 +1640,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#damage" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#damage" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4089" levels="1" name="NPC Bear Spirit Totem">
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 10ae25b316..92c336741c 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
@@ -121,10 +121,11 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dmg" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dmg" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 31 45 60 75 90 105 112 119 126 132 139 </table>
-		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="mpConsume" val="#mpConsume" />
 	</skill>
 	<skill id="4105" levels="12" name="NPC Straight Beam Cannon">
@@ -868,7 +869,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="#damage" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4141" levels="12" name="NPC Wind Fist">
@@ -1017,7 +1020,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4149" levels="12" name="Bleed">
@@ -1041,7 +1046,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4150" levels="12" name="Flame">
@@ -1066,7 +1073,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4151" levels="12" name="NPC Windstrike - Magic">
@@ -1110,7 +1119,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4153" levels="12" name="Decrease Speed">
@@ -1393,7 +1404,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dot" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4166" levels="18" name="Stuns">
@@ -1759,7 +1772,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dmg" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dmg" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 29 39 53 67 83 97 103 108 112 115 116 </table>
 		<set name="mpConsume" val="#mpConsume" />
@@ -1912,7 +1927,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#damage" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 29 39 53 67 83 97 103 108 112 115 116 </table>
 		<set name="mpConsume" val="#mpConsume" />
@@ -1961,7 +1978,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 29 39 53 67 83 97 103 108 112 115 116 </table>
 		<set name="mpConsume" val="#mpConsume" />
@@ -2003,7 +2022,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4193" levels="12" name="BOSS Life Drain">
@@ -2021,7 +2042,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4194" levels="12" name="BOSS Aura Burn">
@@ -2141,7 +2164,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dmg" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dmg" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 29 39 53 67 83 97 103 108 112 115 116 </table>
 		<set name="mpConsume" val="#mpConsume" />
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 320f0b3ec6..277bf43303 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
@@ -127,7 +127,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#damage" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 29 39 53 67 83 97 103 108 112 115 116 </table>
 		<set name="mpConsume" val="#mpConsume" />
@@ -179,7 +181,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="#mdot" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="#mdot" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 17 29 39 53 67 83 97 103 108 112 115 116 </table>
 		<set name="mpConsume" val="#mpConsume" />
@@ -421,8 +425,12 @@
 		<set name="power" val="57" />
 		<set name="targetType" val="AREA" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
-			<effect name="ManaDamOverTime" val="274" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
+			<effect name="ManaDamOverTime">
+				<param power="274" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4219" levels="1" name="Hold">
@@ -851,7 +859,9 @@
 		<set name="power" val="100" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="98" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="98" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4244" levels="12" name="NPC Wild Sweep">
@@ -1186,7 +1196,9 @@
 		<set name="targetType" val="AREA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 18 29 40 53 68 83 98 104 109 113 115 117 </table>
 		<set name="mpConsume" val="#mpConsume" />
@@ -1212,7 +1224,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4261" levels="12" name="Mega Storm Strike">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml
index 60918d9434..a68b2bab35 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml
@@ -166,7 +166,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="AREA" />
 		<for>
-			<effect name="HpDrain" val="0.4" />
+			<effect name="HpDrain">
+				<param power="0.4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4317" levels="5" name="Increase Rage Might">
@@ -252,10 +254,11 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<table name="#mpConsume"> 13 20 27 35 45 55 65 69 73 83 77 78 </table>
-		<set name="abnormalVisualEffect" val="DOT_POISON" />
 		<set name="mpConsume" val="#mpConsume" />
 	</skill>
 	<skill id="4321" levels="1" name="Decrease P. Def">
@@ -1205,7 +1208,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="9.26" />
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="9.26" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4368" levels="1" name="Clan Hall Manager Buff">
@@ -1218,7 +1223,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="18.52">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="18.52" />
 				<add stat="maxMp" order="0x40" val="5000" />
 			</effect>
 		</for>
@@ -1233,7 +1239,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="27.78">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="27.78" />
 				<add stat="maxMp" order="0x40" val="10000" />
 			</effect>
 		</for>
@@ -1248,7 +1255,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="61.11">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="61.11" />
 				<add stat="maxMp" order="0x40" val="28000" />
 			</effect>
 		</for>
@@ -1263,7 +1271,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="116.7">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="116.7" />
 				<add stat="maxMp" order="0x40" val="58000" />
 			</effect>
 		</for>
@@ -1278,7 +1287,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="200">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="200" />
 				<add stat="maxMp" order="0x40" val="103000" />
 			</effect>
 		</for>
@@ -1293,7 +1303,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="205.6">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="205.6" />
 				<add stat="maxMp" order="0x40" val="106000" />
 			</effect>
 		</for>
@@ -1308,7 +1319,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="288.9">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="288.9" />
 				<add stat="maxMp" order="0x40" val="151000" />
 			</effect>
 		</for>
@@ -1323,7 +1335,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="372.2">
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="372.2" />
 				<add stat="maxMp" order="0x40" val="196000" />
 			</effect>
 		</for>
@@ -1404,7 +1417,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="CpHeal" val="5000" />
+			<effect name="CpHeal">
+				<param power="5000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4381" levels="1" name="Magic Skill Block">
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 88928ec04c..161f5e02be 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
@@ -360,7 +360,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="ManaHealPercent" val="5" />
+			<effect name="ManaHealPercent">
+				<param power="5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4532" levels="1" name="Quest - BOSS Reflect">
@@ -1301,7 +1303,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="FatalBlow" />
-			<effect name="DamOverTime" ticks="5" val="#damage" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4580" levels="12" name="Decrease P. Atk.">
@@ -1384,7 +1388,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dmg" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4583" levels="12" name="Decrease Speed">
@@ -1806,7 +1812,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#damage" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4597" levels="12" name="Bleed">
@@ -1834,7 +1842,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#damage" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4598" levels="12" name="Bleed">
@@ -1862,7 +1872,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#damage" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#damage" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4599" levels="12" name="Decrease Speed">
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 578d2c1ee8..cfba1150a8 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
@@ -216,7 +216,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4607" levels="1" name="Magma Attack">
@@ -421,7 +423,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dmg" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4616" levels="1" name="Fake Petrification">
@@ -534,7 +538,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4622" levels="12" name="NPC AE - 80% HP Drain - Magic">
@@ -555,7 +561,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="AREA" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4623" levels="12" name="NPC AE - 80% HP Drain - Slow">
@@ -575,7 +583,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4624" levels="12" name="Decrease HP Regeneration Rate">
@@ -694,7 +704,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4630" levels="12" name="NPC MR - Twister">
@@ -1197,7 +1209,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="3" val="#dot" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4650" levels="1" name="NPC AE - Dispel Hold">
@@ -1353,7 +1367,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="HOLD" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Root" />
 		</for>
 	</skill>
@@ -1384,7 +1400,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="HOLD" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Root" />
 		</for>
 	</skill>
@@ -1415,7 +1433,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="HOLD" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Root" />
 		</for>
 	</skill>
@@ -1448,7 +1468,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="SLEEP" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Sleep" />
 		</for>
 	</skill>
@@ -1480,7 +1502,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="SLEEP" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Sleep" />
 		</for>
 	</skill>
@@ -1512,7 +1536,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="SLEEP" />
 		<for>
-			<effect name="HpDrain" val="0.2" />
+			<effect name="HpDrain">
+				<param power="0.2" />
+			</effect>
 			<effect name="Sleep" />
 		</for>
 	</skill>
@@ -1549,7 +1575,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4665" levels="12" name="NPC 100% HP Drain - Magic">
@@ -1571,7 +1599,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4666" levels="12" name="NPC 100% HP Drain - Slow">
@@ -1593,7 +1623,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4667" levels="12" name="NPC Strong 100% HP Drain">
@@ -1616,7 +1648,9 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4668" levels="12" name="NPC Strong 100% HP Drain - Magic">
@@ -1638,7 +1672,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4669" levels="12" name="NPC Strong 100% HP Drain - Slow">
@@ -1660,7 +1696,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4670" levels="12" name="Short Stun">
@@ -1932,7 +1970,9 @@
 		<set name="targetType" val="FRONT_AREA" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="3" val="216" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="216" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4684" levels="1" name="Valakas Dragon Breath">
@@ -1962,7 +2002,9 @@
 		<set name="targetType" val="FRONT_AREA" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="3" val="216" />
+			<effect name="DamOverTime" ticks="3">
+				<param power="216" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4685" levels="1" name="Valakas Tail Stomp">
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 806acd676a..8dcfede5ed 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
@@ -27,7 +27,9 @@
 		<set name="power" val="111" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5002" levels="1" name="Giselle - Vampiric Rage">
@@ -271,7 +273,9 @@
 		<set name="power" val="61" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5014" levels="3" name="Frintezza's Daemon Attack">
@@ -410,7 +414,9 @@
 		<set name="power" val="314" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5020" levels="1" name="Forced Action">
@@ -1336,9 +1342,11 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="POISON" />
-		<effect name="DamOverTime" ticks="5" val="12">
-			<param canKill="true" />
-		</effect>
+		<for>
+			<effect name="DamOverTime" ticks="5">
+				<param canKill="true" power="12" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="5087" levels="2" name="Berserk">
 		<!-- Confirmed CT2.5 -->
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 a178991af0..ee102d4281 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
@@ -494,7 +494,9 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="pAtk" val="1.2" />
 			</effect>
-			<effect name="FocusEnergy" val="7" />
+			<effect name="FocusEnergy">
+				<param charge="7" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5128" levels="1" name="Maximize long-range weapon use">
@@ -724,7 +726,8 @@
 		<set name="reuseDelay" val="8000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="109">
+			<effect name="DamOverTime" ticks="5">
+				<param power="109" />
 				<mul order="0x30" stat="pAtkSpd" val="0.77" />
 			</effect>
 		</for>
@@ -904,7 +907,9 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHealByLevel" val="#amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5150" levels="10" name="Blessed Soul">
@@ -964,7 +969,9 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5153" levels="10" name="Cheer">
@@ -1231,7 +1238,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="AddHate" val="#power" />
+			<effect name="AddHate">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5166" levels="10" name="Slow">
@@ -1475,7 +1484,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5175" levels="10" name="Bleed">
@@ -1504,7 +1515,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5176" levels="10" name="Silence">
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 d66bbfb43a..1b4ac85964 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
@@ -20,7 +20,9 @@
 		<set name="reuseDelay" val="12000" />
 		<set name="targetType" val="OWNER_PET" />
 		<for>
-			<effect name="ManaHealByLevel" val="#amount" />
+			<effect name="ManaHealByLevel">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5201" levels="6" name="Pet Concentration">
@@ -971,7 +973,9 @@
 		<set name="targetType" val="AREA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1075,7 +1079,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1138,7 +1144,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1172,7 +1180,9 @@
 		<set name="reuseDelay" val="6000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1502,7 +1512,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dmg" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5269" levels="17" name="Slow Trap">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05300-05399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05300-05399.xml
index 6e3c4ce1a4..09cfe8b96e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05300-05399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05300-05399.xml
@@ -81,7 +81,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5303" levels="9" name="Bleed">
@@ -112,7 +114,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5304" levels="9" name="Paralysis">
@@ -173,7 +177,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5306" levels="9" name="Paralysis">
@@ -263,7 +269,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5309" levels="9" name="Bleed">
@@ -294,7 +302,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5310" levels="9" name="NPC(party) - Magic Close Range DD - less powerful">
@@ -1114,7 +1124,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5364" levels="9" name="Bleed">
@@ -1146,7 +1158,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5365" levels="9" name="Paralysis">
@@ -1206,7 +1220,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5367" levels="9" name="Paralysis">
@@ -1284,7 +1300,9 @@
 		<set name="trait" val="POISON" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5370" levels="9" name="Bleed">
@@ -1623,7 +1641,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.9" />
+			<effect name="HpDrain">
+				<param power="0.9" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5393" levels="9" name="NPC MP Burn">
@@ -1773,7 +1793,9 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="DamOverTime" ticks="5" val="75" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="75" />
+			</effect>
 		</for>
 	</skill>
 </list>
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 f183279b62..b47566cd24 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
@@ -217,7 +217,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
 				<add order="0x40" stat="mAtk" val="#mAtk" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
 			</effect>
@@ -244,7 +245,8 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
 			</effect>
 		</for>
@@ -270,7 +272,8 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot">
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
 				<mul order="0x30" stat="runSpd" val="0.7" />
 			</effect>
 		</for>
@@ -356,7 +359,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHealByLevel" val="49" />
+			<effect name="ManaHealByLevel">
+				<param power="49" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5430" levels="1" name="Spoil Bomb">
@@ -619,7 +624,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5445" levels="1" name="Awakening">
@@ -718,7 +725,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5451" levels="1" name="Enervation">
@@ -1222,7 +1231,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="71" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="71" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5496" levels="1" name="Dark Fireball">
@@ -1269,7 +1280,9 @@
 		<for>
 			<effect name="PhysicalAttack" />
 			<effect name="Stun" />
-			<effect name="DamOverTime" ticks="5" val="52" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="52" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5498" levels="1" name="Self-Destruct">
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 7fd5016d56..47fe6a3fd6 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
@@ -26,7 +26,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="52" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="52" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5501" levels="1" name="Stuns">
@@ -822,7 +824,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusSouls" val="1" />
+			<effect name="FocusSouls">
+				<param charge="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5549" levels="1" name="Physical Short-range Weakness">
@@ -1262,7 +1266,9 @@
 			<effect name="Heal">
 				<param power="418" />
 			</effect>
-			<effect name="ManaHealByLevel" val="73" />
+			<effect name="ManaHealByLevel">
+				<param power="73" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5572" levels="1" name="Warrior Ability - Haste">
@@ -1336,7 +1342,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHealByLevel" val="10" />
+			<effect name="ManaHealByLevel">
+				<param power="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5576" levels="1" name="Enchanter Ability - Barrier">
@@ -1718,8 +1726,12 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
-			<effect name="ManaDamOverTime" val="182" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
+			<effect name="ManaDamOverTime">
+				<param power="182" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5594" levels="1" name="Poison">
@@ -1771,7 +1783,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="200" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5597" levels="1" name="Invalid Skill cancel">
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 58aaacb9df..f9783e5698 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
@@ -274,7 +274,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHeal" val="#amount" />
+			<effect name="ManaHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5622" levels="7" name="Double Skill Attack">
@@ -1212,7 +1214,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="63" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="63" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5669" levels="1" name="Stun">
@@ -1364,7 +1368,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="41" />
+			<effect name="ManaHeal">
+				<param power="41" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5677" levels="1" name="Steal Mana">
@@ -1375,7 +1381,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="51" />
+			<effect name="ManaHeal">
+				<param power="51" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5678" levels="1" name="Steal Mana">
@@ -1386,7 +1394,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="59" />
+			<effect name="ManaHeal">
+				<param power="59" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5679" levels="3" name="Oblivion Trap">
@@ -1435,7 +1445,9 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="200" />
+			<effect name="CpHeal">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5682" levels="1" name="PvP Weapon - Cancel">
@@ -1732,7 +1744,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusEnergy" val="5" />
+			<effect name="FocusEnergy">
+				<param charge="5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5696" levels="1" name="Dizziness">
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 ce5b0ab3c2..da15cd48fe 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
@@ -241,7 +241,8 @@
 		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="55">
+			<effect name="DamOverTime" ticks="5">
+				<param power="55" />
 				<mul order="0x30" stat="runSpd" val="0.77" />
 			</effect>
 		</for>
@@ -761,11 +762,15 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="CpHeal" val="5000" />
+			<effect name="CpHeal">
+				<param power="5000" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5741" levels="1" name="Mental Pot">
@@ -778,7 +783,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5742" levels="5" name="Area Recharge - Per">
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 6af785bf42..570eb3211f 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
@@ -358,7 +358,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="70" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="70" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5832" levels="1" name="Hate Aura">
@@ -1111,7 +1113,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpByLevel" val="73" />
+			<effect name="HpByLevel">
+				<param power="73" />
+			</effect>
 			<effect name="Debuff">
 				<mul order="0x30" stat="mAtkSpd" val="0.8" />
 			</effect>
@@ -1138,7 +1142,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="145" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="145" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5880" levels="2" name="Vicious Mutilation">
@@ -1221,7 +1227,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="145" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="145" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5884" levels="2" name="Weakened Sweep">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
index a2cb5baaf0..e79d397369 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
@@ -96,7 +96,9 @@
 		<set name="power" val="#power" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5905" levels="1" name="Confusing Nuph">
@@ -351,7 +353,9 @@
 		<set name="power" val="121" />
 		<set name="targetType" val="FRONT_AREA" />
 		<for>
-			<effect name="HpDrain" val="0.8" />
+			<effect name="HpDrain">
+				<param power="0.8" />
+			</effect>
 			<effect name="Debuff">
 				<mul order="0x30" stat="pAtk" val="0.9" />
 				<mul order="0x30" stat="pAtkSpd" val="0.95" />
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 3f5e2da1b9..9aefabe42d 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
@@ -174,7 +174,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6206" levels="19" name="Strider Fear">
@@ -1110,11 +1112,15 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="CpHealPercent" val="100" />
+			<effect name="CpHealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6288" levels="1" name="Jinia's Prayer">
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 b79591fe16..a7f760c418 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
@@ -39,7 +39,9 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="5" val="#mdot" />
+			<effect name="ManaHealOverTime" ticks="5">
+				<param power="#mdot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6302" levels="1" name="Cold Air">
@@ -157,7 +159,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="139" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="139" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6307" levels="1" name="Opus of the Hand">
@@ -752,7 +756,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="200" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6334" levels="1" name="Shock">
@@ -884,7 +890,9 @@
 		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="200" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6340" levels="1" name="Shock">
@@ -1297,7 +1305,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="93" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="93" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6383" levels="1" name="Bistakon Deadly Roar">
@@ -1367,7 +1377,9 @@
 		<set name="targetType" val="FRONT_AREA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="95" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="95" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6386" levels="1" name="Bistakon Earth Rise">
@@ -1584,7 +1596,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="93" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="93" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6396" levels="1" name="Cokrakon Panic">
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 e3a570ff51..9ae42306b3 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
@@ -62,7 +62,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6403" levels="1" name="Torumba Numbing Poison">
@@ -87,7 +89,8 @@
 		<set name="targetType" val="AREA" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="DamOverTime" ticks="5" val="58">
+			<effect name="DamOverTime" ticks="5">
+				<param power="58" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 		</for>
@@ -348,7 +351,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="FRONT_AREA" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="4" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6417" levels="1" name="Reptilikon Poison Shot">
@@ -375,7 +380,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="5" val="4" />
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6418" levels="1" name="Reptilikon Fury Poison Bomb">
@@ -402,8 +409,12 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="69" />
-			<effect name="ManaDamOverTime" ticks="5" val="4" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="69" />
+			</effect>
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6419" levels="1" name="Light of Scout">
@@ -722,7 +733,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTimePercent" ticks="5" val="#dot">
+			<effect name="DamOverTimePercent" ticks="5">
+				<param power="#dot" />
 				<basemul order="0x30" stat="rCrit" val="#rCrit">
 					<using kind="Bow,Crossbow" />
 				</basemul>
@@ -748,7 +760,8 @@
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTimePercent" ticks="5" val="0.05">
+			<effect name="DamOverTimePercent" ticks="5">
+				<param power="0.05" />
 				<basemul order="0x30" stat="rCrit" val="0.9">
 					<using kind="Bow,Crossbow" />
 				</basemul>
@@ -777,7 +790,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="#dot" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="#dot" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6438" levels="1" name="Penalty Area">
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 159ab16858..961ab43582 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
@@ -361,7 +361,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealPercent" val="11" />
+			<effect name="ManaHealPercent">
+				<param power="11" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6629" levels="2" name="Energy of Mana's Power">
@@ -375,7 +377,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealPercent" val="18" />
+			<effect name="ManaHealPercent">
+				<param power="18" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6630" levels="3" name="Energy of Mana's Highest Power">
@@ -389,7 +393,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6631" levels="1" name="Energy of Power">
@@ -821,7 +827,9 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Paralyze" />
-			<effect name="DamOverTime" ticks="#ticks" val="115" />
+			<effect name="DamOverTime" ticks="#ticks">
+				<param power="115" />
+			</effect>
 			<effect name="CallSkill">
 				<param skillId="6302" skillLevel="1" />
 			</effect>
@@ -1267,7 +1275,8 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="CLAN" /> <!-- FIXME: Aura Friendly ? -->
 		<for>
-			<effect name="DamOverTimePercent" ticks="5" val="0.02">
+			<effect name="DamOverTimePercent" ticks="5">
+				<param power="0.02" />
 				<mul order="0x30" stat="pAtkSpd" val="1.2" />
 			</effect>
 		</for>
@@ -1379,8 +1388,12 @@
 		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="Paralyze" />
-			<effect name="DamOverTime" ticks="5" val="115" />
-			<effect name="ManaDamOverTime" ticks="5" val="5" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="115" />
+			</effect>
+			<effect name="ManaDamOverTime" ticks="5">
+				<param power="5" />
+			</effect>
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
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 e03891b51f..10ac5f3bd7 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
@@ -373,7 +373,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="ManaHealByLevel" val="136" />
+			<effect name="ManaHealByLevel">
+				<param power="136" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6729" levels="1" name="Resist Holy of Elcadia">
@@ -525,7 +527,8 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="200">
+			<effect name="DamOverTime" ticks="1">
+				<param power="200" />
 				<sub order="0x40" stat="darkRes" val="60" />
 			</effect>
 		</for>
@@ -684,7 +687,9 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="200" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6755" levels="1" name="Death Strike">
@@ -1157,7 +1162,8 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="200">
+			<effect name="DamOverTime" ticks="1">
+				<param power="200" />
 				<mul order="0x30" stat="runSpd" val="0.8" />
 			</effect>
 			<effect name="Petrification" />
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 872456d7c6..7bca25c314 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
@@ -228,7 +228,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusEnergy" val="#maxCharges" />
+			<effect name="FocusEnergy">
+				<param charge="#maxCharges" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6814" levels="8" name="Focus Force">
@@ -246,7 +248,9 @@
 			</not>
 		</cond>
 		<for>
-			<effect name="FocusEnergy" val="#maxCharges" />
+			<effect name="FocusEnergy">
+				<param charge="#maxCharges" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6815" levels="16" name="Deadly Poison">
@@ -556,7 +560,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6847" levels="1" name="Self Heal">
@@ -829,7 +835,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="100" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6863" levels="1" name="Poison">
@@ -855,7 +863,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="120" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="120" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6864" levels="1" name="Summon">
@@ -882,7 +892,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="100" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6866" levels="1" name="Vampiric Claw">
@@ -901,7 +913,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6867" levels="1" name="Magic Strike">
@@ -964,7 +978,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6871" levels="1" name="Range Magic Attack">
@@ -1073,7 +1089,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="#dmg" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="#dmg" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6876" levels="1" name="Power Strike">
@@ -1158,7 +1176,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="HpDrain" val="1" />
+			<effect name="HpDrain">
+				<param power="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="6880" levels="1" name="Silence">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
index 6628bee071..fc2086c88b 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
@@ -204,7 +204,9 @@
 			<effect name="Buff">
 				<add order="0x40" stat="maxCp" val="1200" />
 			</effect>
-			<effect name="CpHeal" val="1200" />
+			<effect name="CpHeal">
+				<param power="1200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="8309" levels="1" name="Red Talisman - Territory Convoy">
@@ -226,7 +228,9 @@
 			<effect name="Buff">
 				<add order="0x40" stat="maxCp" val="800" />
 			</effect>
-			<effect name="CpHeal" val="800" />
+			<effect name="CpHeal">
+				<param power="800" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="8310" levels="1" name="Arcana Sigil">
@@ -575,7 +579,9 @@
 			<effect name="Buff">
 				<add order="0x40" stat="maxCp" val="1500" />
 			</effect>
-			<effect name="CpHeal" val="1500" />
+			<effect name="CpHeal">
+				<param power="1500" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="8334" levels="1" name="Blue Talisman - Lord's Divine Protection">
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 f8c2accda8..a9bbc79d3b 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
@@ -1414,7 +1414,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="300" />
+			<effect name="CpHeal">
+				<param power="300" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9087" levels="1" name="Create Item">
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 be2c11b4b6..9e4dc29c32 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
@@ -84,7 +84,9 @@
 				<mul order="0x30" stat="maxHp" val="1.15" />
 				<mul order="0x30" stat="maxCp" val="1.15" />
 			</effect>
-			<effect name="CpHealPercent" val="15" />
+			<effect name="CpHealPercent">
+				<param power="15" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="15" />
 			</effect>
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 ea31f8d67a..419764c823 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
@@ -607,7 +607,9 @@
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="50" />
+			<effect name="ManaHealPercent">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="21043" levels="1" name="Agathion Seal Cancel - Red Sumo Wrestler">
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 615b39f38f..6ea8b8473b 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
@@ -752,7 +752,9 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="200" />
+			<effect name="CpHeal">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22043" levels="6" name="Secret medicine of Will">
@@ -769,7 +771,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22044" levels="6" name="Secret medicine of Life">
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 fb00cfdfff..6c36f86d94 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
@@ -1368,7 +1368,9 @@
 			<effect name="Heal">
 				<param power="500" />
 			</effect>
-			<effect name="ManaHeal" val="200" />
+			<effect name="ManaHeal">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22179" levels="1" name="Fortuna of Chaos">
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 4bd05a6757..3608c14f6b 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
@@ -678,7 +678,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="ManaHeal" val="1000" /> <!-- TODO: Custom. -->
+			<effect name="ManaHeal">
+				<param power="1000" /> <!-- TODO: Custom. -->
+			</effect>
 		</for>
 	</skill>
 </list>
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 dc1bedc956..49f8c6880d 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
@@ -810,11 +810,15 @@
 		</cond>
 		<for>
 			<effect name="Invincible" />
-			<effect name="CpHealPercent" val="100" />
+			<effect name="CpHealPercent">
+				<param power="100" />
+			</effect>
 			<effect name="HealPercent">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent" val="100" />
+			<effect name="ManaHealPercent">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23173" levels="1" name="Phoenix Agathion Special Skill - Oriental Phoenix">
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 3dfff37284..68a67a3aa9 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
@@ -197,7 +197,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="500" />
+			<effect name="ManaHeal">
+				<param power="500" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23216" levels="1" name="Granny Tiger Agathion Cute Trick">
@@ -1616,7 +1618,9 @@
 		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="300" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="300" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23299" levels="1" name="Arrow Rain">
@@ -1629,7 +1633,9 @@
 		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="300" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="300" />
+			</effect>
 		</for>
 	</skill>
 </list>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/23300-23399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/23300-23399.xml
index 435269823a..96c585cbc8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/23300-23399.xml
@@ -10,7 +10,9 @@
 		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="DamOverTime" ticks="1" val="300" />
+			<effect name="DamOverTime" ticks="1">
+				<param power="300" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23301" levels="1" name="Dimensional Door A">
@@ -157,7 +159,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="170" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="170" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23320" levels="1" name="Greedy Throat">
@@ -181,7 +185,9 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="5" val="230" />
+			<effect name="DamOverTime" ticks="5">
+				<param power="230" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23321" levels="1" name="Draconic Evolver">
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 b125daf842..9be1de9c97 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
@@ -312,7 +312,9 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<for>
-			<effect name="CpHeal" val="#amount" />
+			<effect name="CpHeal">
+				<param power="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26028" levels="6" name="Secret medicine of Life">
@@ -341,7 +343,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CpHeal" val="50" />
+			<effect name="CpHeal">
+				<param power="50" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26030" levels="1" name="Healing medicine for Mana">
@@ -352,7 +356,9 @@
 		<set name="reuseDelay" val="600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="60" />
+			<effect name="ManaHeal">
+				<param power="60" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26031" levels="1" name="Wind Walk Scroll">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/custom/10000-10099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/custom/10000-10099.xml
index 986779356c..875b7a079e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/custom/10000-10099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/custom/10000-10099.xml
@@ -11,7 +11,9 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHealOverTime" ticks="3" val="1.5" />
+			<effect name="ManaHealOverTime" ticks="3">
+				<param power="1.5" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="10001" levels="1" name="Mana Potion">
@@ -24,7 +26,9 @@
 		<set name="reuseDelay" val="500" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaHeal" val="100" />
+			<effect name="ManaHeal">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="10002" levels="1" name="Custom Trap skill">
-- 
GitLab