diff --git a/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
index df366e8293718ffa74db236bc170987271fabfd8..310fff845b30d0db1f35922779e65924b3dd337c 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
@@ -35,9 +35,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class MagicalAttackMp extends AbstractEffect
 {
+	private final double _power;
+	
 	public MagicalAttackMp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		
+		_power = params.getDouble("power", 0);
 	}
 	
 	@Override
@@ -92,7 +96,7 @@ public final class MagicalAttackMp extends AbstractEffect
 		boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
 		final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
 		final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill()));
-		double damage = Formulas.calcManaDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
+		double damage = Formulas.calcManaDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit, _power);
 		double mp = (damage > target.getCurrentMp() ? target.getCurrentMp() : damage);
 		
 		if (damage > 0)
diff --git a/dist/game/data/stats/skills/01100-01199.xml b/dist/game/data/stats/skills/01100-01199.xml
index 67236b1d8d197081b2751fb83632a9524e071351..d984f8ed84ba0185a2fe1ee162f5b70cf37fd1e9 100644
--- a/dist/game/data/stats/skills/01100-01199.xml
+++ b/dist/game/data/stats/skills/01100-01199.xml
@@ -98,12 +98,13 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 			<effect name="ManaDamOverTime" ticks="5">
 				<param power="#mdot" />
 			</effect>
diff --git a/dist/game/data/stats/skills/01200-01299.xml b/dist/game/data/stats/skills/01200-01299.xml
index 83da5d0fc9b1d452e1484e4ad85624e0af801f79..3acc752ec1d74de3c8b94940abd06b4dc1ce0385 100644
--- a/dist/game/data/stats/skills/01200-01299.xml
+++ b/dist/game/data/stats/skills/01200-01299.xml
@@ -242,12 +242,13 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 			<effect name="ManaDamOverTime" ticks="5">
 				<param power="#mdot" />
 			</effect>
diff --git a/dist/game/data/stats/skills/01300-01399.xml b/dist/game/data/stats/skills/01300-01399.xml
index 3913a37d8bbebc032fa67e4ce446cc3bb1154b82..f0d6f998d7def0a6360560e1b843630dd09377df 100644
--- a/dist/game/data/stats/skills/01300-01399.xml
+++ b/dist/game/data/stats/skills/01300-01399.xml
@@ -3382,17 +3382,22 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="MagicalAttackMp">
+				<param power="#ench1Power" />
+			</effect>
+		</enchant1for>
 	</skill>
 	<skill id="1399" levels="5" name="Mana Storm" enchantGroup1="2" enchantGroup2="2">
 		<table name="#effectPoints"> -549 -582 -611 -635 -655 </table>
@@ -3411,16 +3416,21 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="MagicalAttackMp">
+				<param power="#ench1Power" />
+			</effect>
+		</enchant1for>
 	</skill>
 </list>
diff --git a/dist/game/data/stats/skills/03000-03099.xml b/dist/game/data/stats/skills/03000-03099.xml
index b516d5eb6aeadfa176520700f69b6004e55f0588..e237d9c6736ce659614b852ff9da6d27a800d8f7 100644
--- a/dist/game/data/stats/skills/03000-03099.xml
+++ b/dist/game/data/stats/skills/03000-03099.xml
@@ -1431,12 +1431,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3083" levels="10" name="Item Skill: Slow">
@@ -1786,12 +1787,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3096" levels="10" name="Item Skill: Slow">
diff --git a/dist/game/data/stats/skills/03100-03199.xml b/dist/game/data/stats/skills/03100-03199.xml
index 0af8de97ff294013d952192240a9b4eefe52dab1..38f4b1849dd68202224a1b0a5f72d9d29f2ad14e 100644
--- a/dist/game/data/stats/skills/03100-03199.xml
+++ b/dist/game/data/stats/skills/03100-03199.xml
@@ -290,12 +290,13 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="30000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3111" levels="10" name="Item Skill: Slow">
@@ -1476,13 +1477,14 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="300000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3155" levels="10" name="Item Skill: Unlock">
diff --git a/dist/game/data/stats/skills/04000-04099.xml b/dist/game/data/stats/skills/04000-04099.xml
index 506ce16c2218d16ece8c7fa1034e1e3daa623332..8fdbe61c9696b1628d088310a0f9758440b9fe68 100644
--- a/dist/game/data/stats/skills/04000-04099.xml
+++ b/dist/game/data/stats/skills/04000-04099.xml
@@ -692,12 +692,13 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4040" levels="12" name="NPC Bow Attack">
diff --git a/dist/game/data/stats/skills/04100-04199.xml b/dist/game/data/stats/skills/04100-04199.xml
index fd7357ec8161c42528358ca29b50a262c3d39cc0..882df104e15d3b4ad079bca9438cb3150499728b 100644
--- a/dist/game/data/stats/skills/04100-04199.xml
+++ b/dist/game/data/stats/skills/04100-04199.xml
@@ -1245,11 +1245,12 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4155" levels="12" name="NPC Twister - Magic">
diff --git a/dist/game/data/stats/skills/04400-04499.xml b/dist/game/data/stats/skills/04400-04499.xml
index a5cbe0ca03a3b92dc9111dd46a479d3bc635180a..744d9d842870862fcaddd1f9eae019c9fbefffbd 100644
--- a/dist/game/data/stats/skills/04400-04499.xml
+++ b/dist/game/data/stats/skills/04400-04499.xml
@@ -1580,11 +1580,12 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="4490" levels="12" name="NPC Holy Wall">
diff --git a/dist/game/data/stats/skills/05200-05299.xml b/dist/game/data/stats/skills/05200-05299.xml
index c90ce9cc198f379a92ae2003a7c0c893240f5ad3..38e52da9580bc51acd3c8eec30e93471f3f56f9c 100644
--- a/dist/game/data/stats/skills/05200-05299.xml
+++ b/dist/game/data/stats/skills/05200-05299.xml
@@ -1273,11 +1273,12 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5256" levels="1" name="Announcement of Death">
@@ -1336,11 +1337,12 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5259" levels="12" name="Fear">
diff --git a/dist/game/data/stats/skills/05300-05399.xml b/dist/game/data/stats/skills/05300-05399.xml
index 9cf2f5c5b2b7d46fd2dc2922f77cec7963cd0878..33696b01a42827dd8ab0eb2c084c938caeba196a 100644
--- a/dist/game/data/stats/skills/05300-05399.xml
+++ b/dist/game/data/stats/skills/05300-05399.xml
@@ -716,11 +716,12 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5333" levels="9" name="Poison">
@@ -1801,7 +1802,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5394" levels="9" name="Poison">
diff --git a/dist/game/data/stats/skills/05400-05499.xml b/dist/game/data/stats/skills/05400-05499.xml
index ad01f160528b46f4b3762b4ce69027bee7cc0096..3f4377b5a2b97814b7d6336c85026a230ce91b53 100644
--- a/dist/game/data/stats/skills/05400-05499.xml
+++ b/dist/game/data/stats/skills/05400-05499.xml
@@ -822,11 +822,12 @@
 		<table name="#power"> 148 153 157 162 </table>
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MagicalAttackMp" />
+			<effect name="MagicalAttackMp">
+				<param power="#power" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5454" levels="1" name="Shadow Bind">