diff --git a/dist/game/data/scripts/handlers/EffectMasterHandler.java b/dist/game/data/scripts/handlers/EffectMasterHandler.java
index caee7e68538d711cd4ad0318b132ac4e50e6be57..850a344bae2c8893d821295eed85e6aa18fabb70 100644
--- a/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -162,6 +162,7 @@ import handlers.effecthandlers.pump.Hide;
 import handlers.effecthandlers.pump.Lucky;
 import handlers.effecthandlers.pump.MaxCp;
 import handlers.effecthandlers.pump.MaxHp;
+import handlers.effecthandlers.pump.MaxMp;
 import handlers.effecthandlers.pump.NoblesseBless;
 import handlers.effecthandlers.pump.Passive;
 import handlers.effecthandlers.pump.PhysicalAttackMute;
@@ -276,6 +277,7 @@ public final class EffectMasterHandler
 		ManaHealByLevel.class,
 		MaxCp.class,
 		MaxHp.class,
+		MaxMp.class,
 		Mp.class,
 		MpPerMax.class,
 		Mute.class,
diff --git a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeChameleonRest.java b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeChameleonRest.java
index b4b1c73159210de83c7cbfb912876d626ee60bf6..cdec446675dd238189eedf80c766ffe6b51ed656 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeChameleonRest.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeChameleonRest.java
@@ -20,6 +20,7 @@ package handlers.effecthandlers.consume;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
@@ -62,22 +63,23 @@ public final class ConsumeChameleonRest extends AbstractEffect
 			return false;
 		}
 		
-		if (info.getEffected().isPlayer())
+		final L2Character target = info.getEffected();
+		if (target.isPlayer())
 		{
-			if (!info.getEffected().getActingPlayer().isSitting())
+			if (!target.getActingPlayer().isSitting())
 			{
 				return false;
 			}
 		}
 		
-		double manaDam = _power * getTicksMultiplier();
-		if (manaDam > info.getEffected().getCurrentMp())
+		final double manaDam = _power * getTicksMultiplier();
+		if ((manaDam < 0) && ((target.getCurrentMp() + manaDam) <= 0))
 		{
-			info.getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
+			target.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
 			return false;
 		}
 		
-		info.getEffected().reduceCurrentMp(manaDam);
+		target.setCurrentMp(Math.min(target.getCurrentMp() + manaDam, target.getMaxRecoverableMp()));
 		return true;
 	}
 	
diff --git a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeFakeDeath.java b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeFakeDeath.java
index ca255ef58f6e62408a81fac0685fb1a1e6663387..c9f051f996d828032fab726d09e8cc70eb2fa830 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeFakeDeath.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeFakeDeath.java
@@ -19,6 +19,7 @@
 package handlers.effecthandlers.consume;
 
 import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
@@ -57,18 +58,16 @@ public final class ConsumeFakeDeath extends AbstractEffect
 			return false;
 		}
 		
+		final L2Character target = info.getEffected();
 		final double manaDam = _power * getTicksMultiplier();
-		if (manaDam > info.getEffected().getCurrentMp())
+		
+		if ((manaDam < 0) && ((target.getCurrentMp() + manaDam) <= 0))
 		{
-			if (info.getSkill().isToggle())
-			{
-				info.getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-				return false;
-			}
+			target.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
+			return false;
 		}
 		
-		info.getEffected().reduceCurrentMp(manaDam);
-		
+		target.setCurrentMp(Math.min(target.getCurrentMp() + manaDam, target.getMaxRecoverableMp()));
 		return true;
 	}
 	
diff --git a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeHp.java b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeHp.java
index f383cc060da658e5c6b704e4ed35d22790d895f8..ee0ba8ac8ca75d3b0624c96a14261ce446c5a66e 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeHp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeHp.java
@@ -52,13 +52,14 @@ public final class ConsumeHp extends AbstractEffect
 		
 		final L2Character target = info.getEffected();
 		final double consume = _power * getTicksMultiplier();
-		if ((consume > target.getCurrentHp()))
+		double hp = target.getCurrentHp();
+		if ((consume < 0) && ((hp + consume) <= 0))
 		{
 			target.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_HP);
 			return false;
 		}
 		
-		target.setCurrentHp(Math.max(target.getCurrentHp() - consume, 0));
+		target.setCurrentHp(Math.min(hp + consume, target.getMaxRecoverableHp()));
 		return true;
 	}
 }
diff --git a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMp.java b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMp.java
index c18b0cd46112c36ca004a91867be7d4cc31536d9..eb2352325470614e4df8287f25fba71fff511db3 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMp.java
@@ -52,13 +52,14 @@ public final class ConsumeMp extends AbstractEffect
 		
 		final L2Character target = info.getEffected();
 		final double consume = _power * getTicksMultiplier();
-		if ((consume > target.getCurrentMp()))
+		double mp = target.getCurrentMp();
+		if ((consume < 0) && ((mp + consume) <= 0))
 		{
 			target.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
 			return false;
 		}
 		
-		target.setCurrentMp(Math.max(target.getCurrentMp() - consume, 0));
+		target.setCurrentMp(Math.min(mp + consume, target.getMaxRecoverableMp()));
 		return true;
 	}
 }
diff --git a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMpByLevel.java b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMpByLevel.java
index 5fe4a2fe7ed3a3090ffb3cd1554fb0be94594ade..1ee5a2e59eefcd018c36dcfb4763d2632be88e5b 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMpByLevel.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeMpByLevel.java
@@ -49,14 +49,15 @@ public final class ConsumeMpByLevel extends AbstractEffect
 		}
 		
 		final L2Character target = info.getEffected();
+		double mp = target.getCurrentMp();
 		final double consume = _power * getTicksMultiplier() * ((target.getLevel() - 1) / 7.5);
-		if (consume > target.getCurrentMp())
+		if ((consume < 0) && ((mp + consume) <= 0))
 		{
 			target.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
 			return false;
 		}
 		
-		target.reduceCurrentMp(consume);
+		target.setCurrentMp(Math.min(mp + consume, target.getMaxRecoverableMp()));
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeRest.java b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeRest.java
index 94a60c6d39e0089e0d3478b55318aa00b7c01f9c..0adc50b814100432beeac4ac2b625f4b208b2237 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeRest.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/consume/ConsumeRest.java
@@ -78,14 +78,15 @@ public final class ConsumeRest extends AbstractEffect
 			return false;
 		}
 		
-		final double manaDam = _power * getTicksMultiplier();
-		if (manaDam > target.getCurrentMp())
+		final double consume = _power * getTicksMultiplier();
+		double mp = target.getCurrentMp();
+		if ((consume < 0) && ((mp + consume) <= 0))
 		{
 			target.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
 			return false;
 		}
 		
-		target.reduceCurrentMp(manaDam);
+		target.setCurrentMp(Math.min(mp + consume, target.getMaxRecoverableMp()));
 		return true;
 	}
 	
diff --git a/dist/game/data/scripts/handlers/effecthandlers/pump/MaxCp.java b/dist/game/data/scripts/handlers/effecthandlers/pump/MaxCp.java
index eb0139bbe61a9cacc17b4441a3e1492972b8009b..f627378bbcf7c98e385179cbd9ac6efb3f0ddb7b 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/pump/MaxCp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/pump/MaxCp.java
@@ -49,12 +49,12 @@ public final class MaxCp extends AbstractEffect
 		{
 			case DIFF:
 			{
-				_power = params.getInt("power", 0);
+				_power = params.getDouble("power", 0);
 				break;
 			}
 			default:
 			{
-				_power = 1 + (params.getInt("power", 0) / 100.0);
+				_power = 1 + (params.getDouble("power", 0) / 100.0);
 			}
 		}
 		_heal = params.getBoolean("heal", false);
diff --git a/dist/game/data/scripts/handlers/effecthandlers/pump/MaxHp.java b/dist/game/data/scripts/handlers/effecthandlers/pump/MaxHp.java
index 8c1e5b3cc300ace507803314106ce5b41d96de0c..60b547a165701b064927f0f7af38bb7771c1ed16 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/pump/MaxHp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/pump/MaxHp.java
@@ -49,12 +49,12 @@ public final class MaxHp extends AbstractEffect
 		{
 			case DIFF:
 			{
-				_power = params.getInt("power", 0);
+				_power = params.getDouble("power", 0);
 				break;
 			}
 			default:
 			{
-				_power = 1 + (params.getInt("power", 0) / 100.0);
+				_power = 1 + (params.getDouble("power", 0) / 100.0);
 			}
 		}
 		_heal = params.getBoolean("heal", false);
diff --git a/dist/game/data/scripts/handlers/effecthandlers/pump/MaxMp.java b/dist/game/data/scripts/handlers/effecthandlers/pump/MaxMp.java
new file mode 100644
index 0000000000000000000000000000000000000000..d1a9375597a87bc7918fded9a1363804d7b37331
--- /dev/null
+++ b/dist/game/data/scripts/handlers/effecthandlers/pump/MaxMp.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2004-2018 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers.pump;
+
+import com.l2jserver.gameserver.enums.EffectCalculationType;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.stat.CharStat;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.FuncAdd;
+import com.l2jserver.gameserver.model.stats.functions.FuncMul;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Max Mp effect implementation.
+ * @author Adry_85
+ * @since 2.6.0.0
+ */
+public final class MaxMp extends AbstractEffect
+{
+	private final double _power;
+	private final EffectCalculationType _type;
+	private final boolean _heal;
+	
+	public MaxMp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+	{
+		super(attachCond, applyCond, set, params);
+		
+		_type = params.getEnum("type", EffectCalculationType.class, EffectCalculationType.DIFF);
+		switch (_type)
+		{
+			case DIFF:
+			{
+				_power = params.getDouble("power", 0);
+				break;
+			}
+			default:
+			{
+				_power = 1 + (params.getDouble("power", 0) / 100.0);
+			}
+		}
+		_heal = params.getBoolean("heal", false);
+		
+		if (params.isEmpty())
+		{
+			_log.warning(getClass().getSimpleName() + ": must have parameters.");
+		}
+	}
+	
+	@Override
+	public void onStart(BuffInfo info)
+	{
+		final L2Character effected = info.getEffected();
+		final CharStat charStat = effected.getStat();
+		final double currentMp = effected.getCurrentMp();
+		double amount = _power;
+		
+		synchronized (charStat)
+		{
+			switch (_type)
+			{
+				case DIFF:
+				{
+					charStat.getActiveChar().addStatFunc(new FuncAdd(Stats.MAX_MP, 1, this, _power, null));
+					if (_heal)
+					{
+						effected.setCurrentMp((currentMp + _power));
+					}
+					break;
+				}
+				case PER:
+				{
+					final double maxMp = effected.getMaxMp();
+					charStat.getActiveChar().addStatFunc(new FuncMul(Stats.MAX_MP, 1, this, _power, null));
+					if (_heal)
+					{
+						amount = (_power - 1) * maxMp;
+						effected.setCurrentMp(currentMp + amount);
+					}
+					break;
+				}
+			}
+		}
+		if (_heal)
+		{
+			effected.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED).addInt((int) amount));
+		}
+	}
+	
+	@Override
+	public void onExit(BuffInfo info)
+	{
+		final CharStat charStat = info.getEffected().getStat();
+		synchronized (charStat)
+		{
+			charStat.getActiveChar().removeStatsOwner(this);
+		}
+	}
+	
+}
diff --git a/dist/game/data/stats/skills/00000-00099.xml b/dist/game/data/stats/skills/00000-00099.xml
index 8b42b24334414383b64091507f2a864705d1ee41..c929fe49ecb9e56c0c427b8b3409a632b9782a00 100644
--- a/dist/game/data/stats/skills/00000-00099.xml
+++ b/dist/game/data/stats/skills/00000-00099.xml
@@ -1837,7 +1837,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeFakeDeath">
-				<param power="10" />
+				<param power="-10" />
 				<param ticks="5" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/00200-00299.xml b/dist/game/data/stats/skills/00200-00299.xml
index 0190c6a42fd7dbcbaf2c3d294f050f6ab18b025d..33ea90efc5e53584c4d78644ec66a0c41ab25e89 100644
--- a/dist/game/data/stats/skills/00200-00299.xml
+++ b/dist/game/data/stats/skills/00200-00299.xml
@@ -253,30 +253,36 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#hp" />
+			<effect name="MaxHp">
+				<param power="#hp" />
 			</effect>
 		</effects>
 		<enchant1Effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#ench1hp" />
+			<effect name="MaxHp">
+				<param power="#ench1hp" />
 			</effect>
 		</enchant1Effects>
 		<enchant2Effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="480" />
-				<add stat="maxCp" val="#ench2cp" />
+			<effect name="MaxHp">
+				<param power="480" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="#ench2cp" />
 			</effect>
 		</enchant2Effects>
 		<enchant3Effects>
+			<effect name="MaxHp">
+				<param power="480" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="480" />
 				<mul stat="regHp" val="#enchreg" />
-			</effect>
+			</effect>			
 		</enchant3Effects>
 		<enchant4Effects>
+			<effect name="MaxHp">
+				<param power="480" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="480" />
 				<mul stat="regCp" val="#enchreg" />
 			</effect>
 		</enchant4Effects>
@@ -309,13 +315,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#mp" />
+			<effect name="MaxMp">
+				<param power="#mp" />
 			</effect>
 		</effects>
 		<enchant1Effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#ench1mp" />
+			<effect name="MaxMp">
+				<param power="#ench1mp" />
 			</effect>
 		</enchant1Effects>
 	</skill>
@@ -449,7 +455,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeHp">
-				<param power="12" />
+				<param power="-12" />
 				<param ticks="2" />
 				<mul stat="pAtkSpd" val="1.25" />
 			</effect>
@@ -538,13 +544,13 @@
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0226" />
 		<set name="magicLvl" val="5" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume1" val="2" />
 		<set name="operateType" val="T" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeRest">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="3" />
 				<add stat="regHp" val="5" />
 			</effect>
@@ -1410,7 +1416,7 @@
 		</effects>
 	</skill>
 	<skill id="256" levels="1" name="Accuracy" enchantGroup1="1">
-		<table name="#ench1val"> 0.39 0.39 0.39 0.38 0.38 0.38 0.38 0.37 0.37 0.37 0.36 0.36 0.36 0.36 0.35 0.35 0.35 0.34 0.34 0.34 0.34 0.33 0.33 0.33 0.32 0.32 0.32 0.32 0.31 0.31 </table>
+		<table name="#ench1val"> -0.39 -0.39 -0.39 -0.38 -0.38 -0.38 -0.38 -0.37 -0.37 -0.37 -0.36 -0.36 -0.36 -0.36 -0.35 -0.35 -0.35 -0.34 -0.34 -0.34 -0.34 -0.33 -0.33 -0.33 -0.32 -0.32 -0.32 -0.32 -0.31 -0.31 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0256" />
@@ -1422,7 +1428,7 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.4" />
+				<param power="-0.4" />
 				<param ticks="5" />
 				<add stat="accCombat" val="3" />
 			</effect>
@@ -2795,7 +2801,7 @@
 		<table name="#pDef"> 121.8 161.1 212.1 256.5 </table>
 		<table name="#ench1pDef"> 259.4 262.3 265.2 268.1 271 274 276.9 279.8 282.7 285.6 288.5 291.5 294.4 297.3 300.2 303.1 306 309 311.9 314.8 317.7 320.6 323.5 326.5 329.4 332.3 335.2 338.1 341 344 </table>
 		<table name="#ench2MpConsume2"> 12 12 12 11 11 10 10 10 9 9 9 9 8 8 8 7 7 7 6 6 6 5 5 5 4 4 4 3 3 3 </table>
-		<table name="#ench2val"> 1.98 1.96 1.95 1.93 1.91 1.9 1.88 1.86 1.85 1.83 1.81 1.8 1.78 1.76 1.75 1.73 1.71 1.7 1.68 1.66 1.65 1.63 1.61 1.6 1.58 1.56 1.55 1.53 1.51 1.5 </table>
+		<table name="#ench2val"> -1.98 -1.96 -1.95 -1.93 -1.91 -1.9 -1.88 -1.86 -1.85 -1.83 -1.81 -1.8 -1.78 -1.76 -1.75 -1.73 -1.71 -1.7 -1.68 -1.66 -1.65 -1.63 -1.61 -1.6 -1.58 -1.56 -1.55 -1.53 -1.51 -1.5 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0288" />
@@ -2809,7 +2815,7 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="2" />
+				<param power="-2" />
 				<param ticks="5" />
 				<add stat="pDef" val="#pDef" />
 				<mul stat="rShld" val="1.5" />
@@ -2817,7 +2823,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="2" />
+				<param power="-2" />
 				<param ticks="5" />
 				<add stat="pDef" val="#ench1pDef" />
 				<mul stat="rShld" val="1.5" />
@@ -3066,7 +3072,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeChameleonRest">
-				<param power="2" />
+				<param power="-2" />
 				<param ticks="5" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/00300-00399.xml b/dist/game/data/stats/skills/00300-00399.xml
index 502791d26d87062e8be933b474448cf3e5a943a1..ac68c9c6a74d2ac557632b8eb116f5559fe244e4 100644
--- a/dist/game/data/stats/skills/00300-00399.xml
+++ b/dist/game/data/stats/skills/00300-00399.xml
@@ -125,10 +125,10 @@
 		<table name="#effectPoints"> 438 549 597 635 </table>
 		<table name="#hpConsume"> 185 271 316 364 </table>
 		<table name="#magicLvl"> 40 58 64 70 </table>
-		<table name="#maxMp"> 1.1 1.15 1.2 1.25 </table>
+		<table name="#maxMp"> 10 15 20 25 </table>
 		<table name="#ench1abnormalLvl"> 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 </table>
 		<table name="#ench1hpConsume"> 358 352 346 340 334 328 322 316 310 304 298 292 286 280 274 267 261 255 249 243 237 231 225 219 213 207 201 195 189 183 </table>
-		<table name="#ench1maxMp"> 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 </table>
+		<table name="#ench1maxMp"> 25 25 25 25 25 25 25 25 25 30 30 30 30 30 30 30 30 30 30 35 35 35 35 35 35 35 35 35 35 35 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="1200" />
@@ -145,13 +145,15 @@
 		<enchant1 name="hpConsume" val="#ench1hpConsume" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 		<enchant1Effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#ench1maxMp" />
+			<effect name="MaxMp">
+				<param power="#ench1maxMp" />
+				<param type="PER" />
 			</effect>
 		</enchant1Effects>
 	</skill>
@@ -180,8 +182,9 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.3" />
+			<effect name="MaxHp">
+				<param power="30" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -410,7 +413,7 @@
 		<table name="#mpConsume1"> 4 5 5 6 7 7 8 9 9 10 10 11 11 12 12 13 13 13 14 14 </table>
 		<table name="#ench1crit"> 615 620 626 631 637 642 648 653 659 664 670 675 681 686 692 697 702 708 713 719 724 730 735 741 746 752 757 763 768 774 </table>
 		<table name="#ench2MpConsume1"> 13 13 13 12 12 12 11 11 11 10 10 10 9 9 9 8 8 8 7 7 7 6 6 6 5 5 5 4 4 4 </table>
-		<table name="#ench2val"> 0.79 0.78 0.78 0.77 0.76 0.76 0.75 0.74 0.74 0.73 0.72 0.72 0.71 0.7 0.7 0.69 0.68 0.68 0.67 0.66 0.66 0.65 0.64 0.64 0.63 0.62 0.62 0.61 0.6 0.6 </table>
+		<table name="#ench2val"> -0.79 -0.78 -0.78 -0.77 -0.76 -0.76 -0.75 -0.74 -0.74 -0.73 -0.72 -0.72 -0.71 -0.7 -0.7 -0.69 -0.68 -0.68 -0.67 -0.66 -0.66 -0.65 -0.64 -0.64 -0.63 -0.62 -0.62 -0.61 -0.6 -0.6 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0312" />
@@ -425,14 +428,14 @@
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.8" />
+				<param power="-0.8" />
 				<param ticks="5" />
 				<add stat="critDmgAdd" val="#crit" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.8" />
+				<param power="-0.8" />
 				<param ticks="5" />
 				<add stat="critDmgAdd" val="#ench1crit" />
 			</effect>
@@ -873,8 +876,8 @@
 		<table name="#mpConsume1"> 12 13 13 13 14 14 </table>
 		<table name="#sDef"> 446 469 491 514 537 560 </table>
 		<table name="#ench1sDef"> 565 569 573 577 582 586 590 594 599 603 607 611 616 620 624 628 632 637 641 645 649 654 658 662 666 671 675 679 683 688 </table>
-		<table name="#ench2MpConsume2"> 13 13 13 12 12 12 11 11 11 10 10 10 9 9 9 8 8 8 7 7 7 6 6 6 5 5 5 4 4 4 </table>
-		<table name="#ench2val"> 0.79 0.78 0.78 0.77 0.76 0.76 0.75 0.74 0.74 0.73 0.72 0.72 0.71 0.7 0.7 0.69 0.68 0.68 0.67 0.66 0.66 0.65 0.64 0.64 0.63 0.62 0.62 0.61 0.6 0.6 </table>
+		<table name="#ench2MpConsume1"> 13 13 13 12 12 12 11 11 11 10 10 10 9 9 9 8 8 8 7 7 7 6 6 6 5 5 5 4 4 4 </table>
+		<table name="#ench2val"> -0.79 -0.78 -0.78 -0.77 -0.76 -0.76 -0.75 -0.74 -0.74 -0.73 -0.72 -0.72 -0.71 -0.7 -0.7 -0.69 -0.68 -0.68 -0.67 -0.66 -0.66 -0.65 -0.64 -0.64 -0.63 -0.62 -0.62 -0.61 -0.6 -0.6 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0322" />
@@ -885,17 +888,17 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="mpConsume1" val="#ench2MpConsume2" />
+		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.8" />
+				<param power="-0.8" />
 				<param ticks="5" />
 				<add stat="sDef" val="#sDef" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.8" />
+				<param power="-0.8" />
 				<param ticks="5" />
 				<add stat="sDef" val="#ench1sDef" />
 			</effect>
@@ -1162,7 +1165,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="2" />
+				<param power="-2" />
 				<param ticks="5" />
 				<mul stat="skillCriticalProbability" val="11" />
 			</effect>
@@ -1186,7 +1189,7 @@
 				<param PARALYZE="30" />
 			</effect>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 			</effect>
 		</effects>
@@ -1196,7 +1199,7 @@
 				<param PARALYZE="30" />
 			</effect>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 			</effect>
 		</enchant1Effects>
@@ -1206,7 +1209,7 @@
 				<param PARALYZE="#enchTraits" />
 			</effect>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 			</effect>
 		</enchant2Effects>
@@ -1224,7 +1227,7 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="mAtkSpd" val="0.9" />
 				<mul stat="magicalMpConsumeRate" val="0.7" />
@@ -1232,7 +1235,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="mAtkSpd" val="0.9" />
 				<mul stat="magicalMpConsumeRate" val="#ench1MpConsume2" />
@@ -1252,7 +1255,7 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="magicalMpConsumeRate" val="1.1" />
 				<mul stat="mAtk" val="1.3" />
@@ -1260,7 +1263,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="magicalMpConsumeRate" val="1.1" />
 				<mul stat="mAtk" val="#ench1mAtk" />
@@ -1282,7 +1285,7 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="mAtkSpd" val="1.2" />
 				<mul stat="mReuse" val="0.9" />
@@ -1291,7 +1294,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="mAtkSpd" val="#ench1mAtkSpd" />
 				<mul stat="mReuse" val="0.9" />
@@ -1300,7 +1303,7 @@
 		</enchant1Effects>
 		<enchant2Effects>
 			<effect name="ConsumeHp">
-				<param power="50" />
+				<param power="-50" />
 				<param ticks="5" />
 				<mul stat="mAtkSpd" val="1.2" />
 				<mul stat="mReuse" val="#ench2mReuse" />
@@ -1321,7 +1324,7 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 				<mul stat="pDef" val="1.25" />
 				<mul stat="mDef" val="1.25" />
@@ -1332,7 +1335,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 				<mul stat="pDef" val="#enchDef" />
 				<mul stat="mDef" val="#enchDef" />
@@ -1352,7 +1355,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 				<add stat="reflectDam" val="30" />
 				<add stat="reflectSkillPhysic" val="30" />
@@ -1439,8 +1442,11 @@
 		<enchant2 name="activateRate" val="#ench2ActivateRates" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="-90" />
+				<param type="PER" />
+			</effect>
 			<effect name="Debuff">
-				<mul stat="maxCp" val="0.1" />
 				<add stat="debuffVuln" val="30" />
 				<mul stat="healEffect" val="0.7" />
 			</effect>
@@ -1453,8 +1459,11 @@
 			</effect>
 		</effects>
 		<enchant2Effects>
+			<effect name="MaxCp">
+				<param power="-90" />
+				<param type="PER" />
+			</effect>
 			<effect name="Debuff">
-				<mul stat="maxCp" val="0.1" />
 				<add stat="debuffVuln" val="30" />
 				<mul stat="healEffect" val="0.7" />
 			</effect>
@@ -2817,40 +2826,43 @@
 	</skill>
 	<skill id="370" levels="3" name="Clan Body">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxHp"> 1.03 1.05 1.06 </table>
+		<table name="#maxHp"> 3 5 6 </table>
 		<set name="icon" val="icon.skill0370" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="371" levels="3" name="Clan Spirituality">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxCp"> 1.06 1.1 1.12 </table>
+		<table name="#maxCp"> 6 10 12 </table>
 		<set name="icon" val="icon.skill0371" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxCp" val="#maxCp" />
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="372" levels="3" name="Clan Soul">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxMp"> 1.03 1.05 1.06 </table>
+		<table name="#maxMp"> 3 5 6 </table>
 		<set name="icon" val="icon.skill0372" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/00400-00499.xml b/dist/game/data/stats/skills/00400-00499.xml
index ac7bd99f46c71e9989bf6ca10ec0d8ec017e6bab..e584d51cdc020abfce97870d0900d198b6529117 100644
--- a/dist/game/data/stats/skills/00400-00499.xml
+++ b/dist/game/data/stats/skills/00400-00499.xml
@@ -1100,19 +1100,19 @@
 	<skill id="422" levels="3" name="Polearm Accuracy" enchantGroup1="1" enchantGroup2="1">
 		<table name="#accCombat"> 2 3 4 </table>
 		<table name="#magicLvl"> 58 66 74 </table>
-		<table name="#mpConsume2"> 11 13 14 </table>
+		<table name="#mpConsume1"> 11 13 14 </table>
 		<table name="#ench1accCombat"> 5 5 5 5 5 5 5 5 5 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 </table>
-		<table name="#ench2MpConsume2"> 0.49 0.48 0.47 0.46 0.45 0.44 0.43 0.42 0.41 0.4 0.39 0.38 0.37 0.36 0.35 0.34 0.33 0.32 0.31 0.3 0.29 0.28 0.27 0.26 0.25 0.24 0.23 0.22 0.21 0.2 </table>
+		<table name="#ench2val"> -0.49 -0.48 -0.47 -0.46 -0.45 -0.44 -0.43 -0.42 -0.41 -0.4 -0.39 -0.38 -0.37 -0.36 -0.35 -0.34 -0.33 -0.32 -0.31 -0.3 -0.29 -0.28 -0.27 -0.26 -0.25 -0.24 -0.23 -0.22 -0.21 -0.2 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0422" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="mpConsume2" val="#mpConsume2" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="operateType" val="T" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.5" />
+				<param power="-0.5" />
 				<param ticks="5" />
 				<add stat="accCombat" val="#accCombat">
 					<using kind="POLE" />
@@ -1121,7 +1121,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.5" />
+				<param power="-0.5" />
 				<param ticks="5" />
 				<add stat="accCombat" val="#ench1accCombat">
 					<using kind="POLE" />
@@ -1130,7 +1130,7 @@
 		</enchant1Effects>
 		<enchant2Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="#ench2MpConsume2" />
+				<param power="#ench2val" />
 				<param ticks="5" />
 				<add stat="accCombat" val="4">
 					<using kind="POLE" />
@@ -1165,22 +1165,22 @@
 	</skill>
 	<skill id="424" levels="3" name="War Frenzy" enchantGroup1="1" enchantGroup2="1">
 		<table name="#magicLvl"> 58 66 74 </table>
-		<table name="#mpConsume2"> 13 14 15 </table>
+		<table name="#mpConsume1"> 13 14 15 </table>
 		<table name="#trait_shock"> 5 10 15 </table>
 		<table name="#trait_sleep"> 10 20 30 </table>
 		<table name="#ench1Trait_shock"> 16 16 16 17 17 17 18 18 18 19 19 19 19 20 20 20 21 21 21 22 22 22 22 23 23 23 24 24 24 25 </table>
 		<table name="#ench1Trait_sleep"> 31 31 31 32 32 32 33 33 33 34 34 34 34 35 35 35 36 36 36 37 37 37 37 38 38 38 39 39 39 40 </table>
-		<table name="#ench2MpConsume2"> 0.98 0.97 0.96 0.94 0.93 0.92 0.9 0.89 0.88 0.86 0.85 0.84 0.82 0.81 0.8 0.78 0.77 0.76 0.74 0.73 0.72 0.7 0.69 0.68 0.66 0.65 0.64 0.62 0.61 0.6 </table>
+		<table name="#ench2val"> -0.98 -0.97 -0.96 -0.94 -0.93 -0.92 -0.9 -0.89 -0.88 -0.86 -0.85 -0.84 -0.82 -0.81 -0.8 -0.78 -0.77 -0.76 -0.74 -0.73 -0.72 -0.7 -0.69 -0.68 -0.66 -0.65 -0.64 -0.62 -0.61 -0.6 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0424" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="mpConsume2" val="#mpConsume2" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="operateType" val="T" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -1190,7 +1190,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="1" />
+				<param power="-1" />
 				<param ticks="5" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -1200,7 +1200,7 @@
 		</enchant1Effects>
 		<enchant2Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="#ench2MpConsume2" />
+				<param power="#ench2val" />
 				<param ticks="5" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -1332,7 +1332,10 @@
 				<add stat="pAtk" val="80">
 					<using kind="SWORD,BLUNT,POLE,DUAL,DUALFIST" />
 				</add>
-				<mul stat="maxCp" val="1.05" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="5" />
+				<param type="PER" />
 			</effect>
 		</effects>
 		<enchant1Effects>
@@ -1343,7 +1346,10 @@
 				<add stat="pAtk" val="80">
 					<using kind="DUAL,DUALFIST" />
 				</add>
-				<mul stat="maxCp" val="1.05" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="5" />
+				<param type="PER" />
 			</effect>
 		</enchant1Effects>
 		<enchant2Effects>
@@ -1354,7 +1360,10 @@
 				<add stat="pAtk" val="#enchPAtk">
 					<using kind="DUAL,DUALFIST" />
 				</add>
-				<mul stat="maxCp" val="1.05" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="5" />
+				<param type="PER" />
 			</effect>
 		</enchant2Effects>
 	</skill>
@@ -2626,7 +2635,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.2" />
+				<param power="-0.2" />
 				<param ticks="5" />
 				<add stat="vengeancePdam" val="3" />
 			</effect>
@@ -2765,7 +2774,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.4" />
+				<param power="-0.4" />
 				<param ticks="5" />
 				<add stat="runSpd" val="20" />
 			</effect>
diff --git a/dist/game/data/stats/skills/00500-00599.xml b/dist/game/data/stats/skills/00500-00599.xml
index 0f333350b7540fa69c2bce138b6b99d898bf20ed..7c60d22dd80de0892d414cfa643614a44a2da232 100644
--- a/dist/game/data/stats/skills/00500-00599.xml
+++ b/dist/game/data/stats/skills/00500-00599.xml
@@ -7,7 +7,7 @@
 		<table name="#magicLvl"> 40 52 </table>
 		<table name="#ench1Power"> 1.09 1.09 1.09 1.09 1.09 1.09 1.09 1.09 1.09 1.1 1.1 1.1 1.1 1.1 1.1 1.1 1.1 1.1 1.1 1.11 1.11 1.11 1.11 1.11 1.11 1.11 1.11 1.11 1.11 1.12 </table>
 		<table name="#ench1Power2"> 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 6 </table>
-		<table name="#ench2Cost"> 0.39 0.39 0.38 0.38 0.37 0.37 0.36 0.36 0.35 0.35 0.34 0.34 0.33 0.33 0.32 0.32 0.31 0.31 0.3 0.3 0.29 0.29 0.28 0.28 0.27 0.27 0.26 0.26 0.25 0.25 </table>
+		<table name="#ench2Cost"> -0.39 -0.39 -0.38 -0.38 -0.37 -0.37 -0.36 -0.36 -0.35 -0.35 -0.34 -0.34 -0.33 -0.33 -0.32 -0.32 -0.31 -0.31 -0.3 -0.3 -0.29 -0.29 -0.28 -0.28 -0.27 -0.27 -0.26 -0.26 -0.25 -0.25 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="icon" val="icon.skill0500" />
@@ -19,7 +19,7 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.4" />
+				<param power="-0.4" />
 				<param ticks="5" />
 				<mul stat="pAtk" val="#amount" />
 				<mul stat="pAtkSpd" val="#amount" />
@@ -30,7 +30,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.4" />
+				<param power="-0.4" />
 				<param ticks="5" />
 				<mul stat="pAtk" val="#ench1Power" />
 				<mul stat="pAtkSpd" val="1.08" />
@@ -1491,8 +1491,11 @@
 				<param amount="-100" />
 				<param mode="PER" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
 				<mul stat="regHp" val="1.15" />
 				<mul stat="pAtk" val="1.25" />
 				<mul stat="pDef" val="1.3" />
@@ -2952,8 +2955,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="222" />
+			<effect name="MaxHp">
+				<param power="222" />
 			</effect>
 		</effects>
 	</skill>
@@ -2964,8 +2967,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="444" />
+			<effect name="MaxCp">
+				<param power="444" />
 			</effect>
 		</effects>
 	</skill>
@@ -2976,8 +2979,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="168" />
+			<effect name="MaxMp">
+				<param power="168" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/00600-00699.xml b/dist/game/data/stats/skills/00600-00699.xml
index 572585cb3c40bce49e8d25cda8beb88757e40bb6..a6c890ba030ad0404826f2a402a1d4e7cd54ef52 100644
--- a/dist/game/data/stats/skills/00600-00699.xml
+++ b/dist/game/data/stats/skills/00600-00699.xml
@@ -200,16 +200,19 @@
 	</skill>
 	<skill id="615" levels="3" name="Holy Squad">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxMp"> 1 1.3 1.3 </table>
+		<table name="#maxMp"> 0 30 30 </table>
 		<table name="#MpConsumeRate"> 1 1 0.95 </table>
 		<set name="icon" val="icon.skill1043" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="healEffect" val="20" />
-				<mul stat="maxMp" val="#maxMp" />
 				<mul stat="magicalMpConsumeRate" val="#MpConsumeRate" />
 				<mul stat="physicalMpConsumeRate" val="#MpConsumeRate" />
 				<mul stat="danceMpConsumeRate" val="#MpConsumeRate" />
@@ -794,8 +797,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="295.32" />
+			<effect name="MaxHp">
+				<param power="295.32" />
 			</effect>
 		</effects>
 	</skill>
@@ -807,8 +810,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="148.2" />
+			<effect name="MaxMp">
+				<param power="148.2" />
 			</effect>
 		</effects>
 	</skill>
@@ -820,9 +823,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="147.66" />
-				<add stat="maxMp" val="74.1" />
+			<effect name="MaxHp">
+				<param power="147.66" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="74.1" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/00700-00799.xml b/dist/game/data/stats/skills/00700-00799.xml
index e922e4f24dd53adac2b0e77175232e580481f593..2198d31c8a5ea438f9f313ac356be46f80c472a3 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -150,8 +150,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY_MEMBER" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="critDmg" val="1.2" />
@@ -186,8 +189,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY_MEMBER" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -221,8 +227,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY_MEMBER" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="critDmg" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -340,7 +349,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.4" />
+				<param power="-0.4" />
 				<param ticks="5" />
 				<add stat="transDam" val="50" />
 			</effect>
@@ -1679,8 +1688,11 @@
 				<param criticalChance="50" />
 				<param ignoreShieldDefence="true" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="-90" />
+				<param type="PER" />
+			</effect>
 			<effect name="Debuff">
-				<mul stat="maxCp" val="0.1" />
 				<add stat="debuffVuln" val="30" />
 				<mul stat="healEffect" val="0.7" />
 			</effect>
diff --git a/dist/game/data/stats/skills/00800-00899.xml b/dist/game/data/stats/skills/00800-00899.xml
index 3b36cdcbe9383a22b2f4a2dfd10ce9f12b498013..0f126101c4d6ffde2aabafb65220c2973d66c806 100644
--- a/dist/game/data/stats/skills/00800-00899.xml
+++ b/dist/game/data/stats/skills/00800-00899.xml
@@ -22,8 +22,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="738.3" />
+			<effect name="MaxCp">
+				<param power="738.3" />
 			</effect>
 		</effects>
 	</skill>
@@ -531,7 +531,7 @@
 		<!-- Confirmed CT2.5 -->
 		<table name="#effectPoints"> 379 467 523 </table>
 		<table name="#magicLvl"> 40 49 55 </table>
-		<table name="#maxHp"> 1.05 1.08 1.1 </table>
+		<table name="#maxHp"> 5 8 10 </table>
 		<table name="#mpConsume2"> 35 44 44 </table>
 		<table name="#pDef"> 1.08 1.12 1.15 </table>
 		<set name="abnormalLvl" val="4" />
@@ -553,9 +553,12 @@
 			<target race="CONSTRUCT" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="#pDef" />
-				<mul stat="maxHp" val="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -789,8 +792,11 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="PARTY" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.1" />
 				<add stat="regHp" val="10" />
 			</effect>
 		</effects>
@@ -2182,8 +2188,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="pAtk" val="1.08" />
 				<mul stat="pDef" val="1.18" />
 				<mul stat="pAtkSpd" val="1.2" />
diff --git a/dist/game/data/stats/skills/01000-01099.xml b/dist/game/data/stats/skills/01000-01099.xml
index e6ee0fe433cf84f790de01383546677ac996be60..6d542e1dbb823a09e8306e5b1ed345d625ba52bd 100644
--- a/dist/game/data/stats/skills/01000-01099.xml
+++ b/dist/game/data/stats/skills/01000-01099.xml
@@ -3,7 +3,7 @@
 	<skill id="1001" levels="10" name="Soul Cry" enchantGroup1="1">
 		<!-- Confirmed CT2.5 -->
 		<table name="#magicLvl"> 1 14 25 35 40 48 56 60 66 72 </table>
-		<table name="#mdot"> 0 0 1 2 2 2 3 3 4 4 </table>
+		<table name="#mdot"> 0 0 -1 -2 -2 -2 -3 -3 -4 -4 </table>
 		<table name="#mpConsume1"> 1 2 3 3 4 5 6 6 7 7 </table>
 		<table name="#pAtk"> 4.5 14 33.5 66.5 90.5 141.5 208.5 247 310 375.5 </table>
 		<table name="#ench1patk"> 418 421 424 427 430 433 436 439 442 445 448 451 454 457 460 463 466 469 472 475 478 481 484 487 490 493 496 499 502 505 </table>
@@ -25,7 +25,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMp">
-				<param power="4" />
+				<param power="-4" />
 				<param ticks="5" />
 				<add stat="pAtk" val="#ench1patk" />
 			</effect>
@@ -1061,7 +1061,7 @@
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
 		<table name="#effectPoints"> 418 457 495 532 597 646 </table>
 		<table name="#magicLvl"> 44 48 52 56 64 72 </table>
-		<table name="#maxHp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxHp"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 31 35 38 41 48 53 </table>
 		<table name="#mpConsume1"> 8 9 10 11 12 14 </table>
 		<table name="#ench1AbnormalTimes"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 1840 1880 1920 1960 2000 2040 2080 2120 2160 2200 2240 2280 2320 2360 2400 </table>
@@ -1090,8 +1090,9 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1137,7 +1138,7 @@
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
 		<table name="#effectPoints"> 418 457 495 532 582 635 </table>
 		<table name="#magicLvl"> 44 48 52 56 62 70 </table>
-		<table name="#maxMp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxMp"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 31 35 38 41 46 52 </table>
 		<table name="#mpConsume1"> 8 9 10 11 12 13 </table>
 		<table name="#ench1AbnormalTimes"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 1840 1880 1920 1960 2000 2040 2080 2120 2160 2200 2240 2280 2320 2360 2400 </table>
@@ -1166,8 +1167,9 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/01200-01299.xml b/dist/game/data/stats/skills/01200-01299.xml
index ff7c9de19bddc8bda53749d35cb2c8bd48eb525a..711f9908848fe0336c6c6cb445782529f9ec6dd3 100644
--- a/dist/game/data/stats/skills/01200-01299.xml
+++ b/dist/game/data/stats/skills/01200-01299.xml
@@ -2305,14 +2305,14 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.2" />
+				<param power="-0.2" />
 				<param ticks="5" />
 				<add stat="transDam" val="#power" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMpByLevel">
-				<param power="0.2" />
+				<param power="-0.2" />
 				<param ticks="5" />
 				<add stat="transDam" val="#ench1power" />
 			</effect>
@@ -3057,7 +3057,7 @@
 	<skill id="1283" levels="13" name="Soul Guard" enchantGroup1="1">
 		<table name="#def"> 293.3 333.2 375.9 421.4 445.2 469.7 494.9 520.1 546 571.9 598.5 625.8 653.1 </table>
 		<table name="#magicLvl"> 44 48 52 56 58 60 62 64 66 68 70 72 74 </table>
-		<table name="#mdot"> 5 5 6 6 7 7 7 8 8 8 8 9 9 </table>
+		<table name="#mdot"> -5 -5 -6 -6 -7 -7 -7 -8 -8 -8 -8 -9 -9 </table>
 		<table name="#mpConsume1"> 8 9 10 11 11 11 12 12 13 13 13 14 14 </table>
 		<table name="#ench1def"> 683.76 687.82 691.88 695.94 700 704.06 708.12 712.18 716.24 720.3 724.36 728.42 732.48 736.54 740.6 744.66 748.72 752.78 756.84 760.9 764.96 769.02 773.08 777.14 781.2 785.26 789.32 793.38 797.44 801.5 </table>
 		<set name="abnormalVisualEffect" val="NONE" />
@@ -3076,7 +3076,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="ConsumeMp">
-				<param power="9" />
+				<param power="-9" />
 				<param ticks="5" />
 				<add stat="pDef" val="#ench1def" />
 			</effect>
diff --git a/dist/game/data/stats/skills/01300-01399.xml b/dist/game/data/stats/skills/01300-01399.xml
index 3dd12c7291a7f5950a9527ada582d1c590686eaf..4f01d583f03503c75db664eef933df4007fba27a 100644
--- a/dist/game/data/stats/skills/01300-01399.xml
+++ b/dist/game/data/stats/skills/01300-01399.xml
@@ -619,8 +619,9 @@
 			<effect name="Buff">
 				<sub stat="cancelVuln" val="80" />
 			</effect>
-			<effect name="Buff">
-				<mul stat="maxCp" val="0.8" />
+			<effect name="MaxCp">
+				<param power="-20" />
+				<param type="PER" />
 			</effect>
 			<effect name="Buff">
 				<mul stat="maxRecoverableCp" val="0.6" />
@@ -670,8 +671,9 @@
 			<effect name="Buff">
 				<sub stat="cancelVuln" val="80" />
 			</effect>
-			<effect name="Buff">
-				<mul stat="maxCp" val="0.8" />
+			<effect name="MaxCp">
+				<param power="-20" />
+				<param type="PER" />
 			</effect>
 			<effect name="Buff">
 				<mul stat="maxRecoverableCp" val="0.6" />
@@ -1479,12 +1481,15 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
 				<add stat="accCombat" val="4" />
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<mul stat="runSpd" val="0.9" />
 				<sub stat="debuffVuln" val="10" />
@@ -1842,8 +1847,11 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="critDmg" val="1.2" />
@@ -1859,8 +1867,11 @@
 			</effect>
 		</effects>
 		<enchant3Effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="critDmg" val="1.2" />
@@ -1903,8 +1914,11 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -1919,8 +1933,11 @@
 			</effect>
 		</effects>
 		<enchant3Effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
diff --git a/dist/game/data/stats/skills/01400-01499.xml b/dist/game/data/stats/skills/01400-01499.xml
index b69c4ec3b395b6ef3184585bb27bc77cab00101c..6321e373ec1462ec2f2a1df494e69abf091096d5 100644
--- a/dist/game/data/stats/skills/01400-01499.xml
+++ b/dist/game/data/stats/skills/01400-01499.xml
@@ -488,8 +488,11 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.15" />
 				<add stat="regMp" val="1.5">
 					<using kind="HEAVY,LIGHT" />
 				</add>
@@ -535,10 +538,16 @@
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.2" />
 				<mul stat="regCp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -552,10 +561,16 @@
 			</effect>
 		</effects>
 		<enchant3Effects>
+			<effect name="MaxCp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.2" />
 				<mul stat="regCp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
diff --git a/dist/game/data/stats/skills/01500-01599.xml b/dist/game/data/stats/skills/01500-01599.xml
index 2b7c0feb4869bfc4bb175fc6c693c51d7aecdaae..4aed334ee08d21b5fe2f28e0715ac538449a06ec 100644
--- a/dist/game/data/stats/skills/01500-01599.xml
+++ b/dist/game/data/stats/skills/01500-01599.xml
@@ -50,9 +50,13 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="MAX_HP_UP,9;MAX_MP_UP,9" />
@@ -1253,8 +1257,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxCp" val="1.1" />
+			<effect name="MaxCp">
+				<param power="10" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1369,9 +1374,13 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY_CLAN" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="MAX_HP_UP,9;MAX_MP_UP,9" />
@@ -2181,13 +2190,13 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
 			</effect>
 		</effects>
 		<enchant1Effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#ench1maxMp" />
+			<effect name="MaxMp">
+				<param power="#ench1maxMp" />
 			</effect>
 		</enchant1Effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/02400-02499.xml b/dist/game/data/stats/skills/02400-02499.xml
index 711c24aa97bee1d33d3d8d52384b4ae092ed81e5..aa70a96cb8bd747a09a16f1c71d62e6c5fc925b5 100644
--- a/dist/game/data/stats/skills/02400-02499.xml
+++ b/dist/game/data/stats/skills/02400-02499.xml
@@ -209,8 +209,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -306,8 +307,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/02800-02899.xml b/dist/game/data/stats/skills/02800-02899.xml
index 8b14d567a85a2ab9d6f64b3e740cb4c1ad7ecc85..e698ddab54a8f3efa59ff76a676f68c09364bd08 100644
--- a/dist/game/data/stats/skills/02800-02899.xml
+++ b/dist/game/data/stats/skills/02800-02899.xml
@@ -13,8 +13,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -31,8 +32,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1318,6 +1320,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="critDmg" val="1.2" />
 				<sub stat="debuffVuln" val="10" />
@@ -1326,7 +1332,6 @@
 				<mul stat="danceMpConsumeRate" val="0.95" />
 				<mul stat="mAtk" val="1.2" />
 				<mul stat="mAtkSpd" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="mDef" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -2102,8 +2107,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.1" />
 				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
@@ -2124,9 +2132,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.1" />
-				<mul stat="maxMp" val="1.1" />
 				<mul stat="mAtkSpd" val="1.1" />
 				<mul stat="pDef" val="1.1" />
 				<mul stat="mDef" val="1.1" />
@@ -2151,8 +2165,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.1" />
 				<mul stat="regMp" val="1.2" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/03000-03099.xml b/dist/game/data/stats/skills/03000-03099.xml
index af34b01159d9fb282e3506a09ff44e28039847df..23d1ef1e20f6c840463ad92093e962c39cce1208 100644
--- a/dist/game/data/stats/skills/03000-03099.xml
+++ b/dist/game/data/stats/skills/03000-03099.xml
@@ -127,9 +127,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="pAtk" val="#pAtk" />
-				<mul stat="maxHp" val="0.85" />
 			</effect>
 		</effects>
 	</skill>
@@ -143,8 +146,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
 				<add stat="atkCountMax" val="#atkCountMax" />
 				<mul stat="pvpPhysDmg" val="#pvpBonus" />
 				<mul stat="pvpPhysSkillsDmg" val="#pvpBonus" />
@@ -161,8 +167,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.3" />
 				<mul stat="pvpPhysDmg" val="#pvpBonus" />
 				<mul stat="pvpPhysSkillsDmg" val="#pvpBonus" />
 				<mul stat="pvpMagicalDmg" val="#pvpBonus" />
@@ -762,9 +771,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.6" />
-				<mul stat="maxHp" val="0.6" />
 				<mul stat="pvpPhysDmg" val="#pvpBonus" />
 				<mul stat="pvpPhysSkillsDmg" val="#pvpBonus" />
 				<mul stat="pvpMagicalDmg" val="#pvpBonus" />
@@ -947,9 +962,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="pAtk" val="#pAtk" />
-				<mul stat="maxHp" val="0.85" />
 				<mul stat="pvpPhysDmg" val="1.05" />
 				<mul stat="pvpPhysSkillsDmg" val="1.05" />
 				<mul stat="pvpMagicalDmg" val="1.05" />
@@ -965,9 +983,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="pAtk" val="#pAtk" />
-				<mul stat="maxHp" val="0.85" />
 				<mul stat="pvpPhysDmg" val="1.05" />
 				<mul stat="pvpPhysSkillsDmg" val="1.05" />
 				<mul stat="pvpMagicalDmg" val="1.05" />
diff --git a/dist/game/data/stats/skills/03100-03199.xml b/dist/game/data/stats/skills/03100-03199.xml
index fdf8c01fd0feb0aba38b3fd50eff8da88dedca85..933e14ab99d93c241a33d5305518d7a6e1201886 100644
--- a/dist/game/data/stats/skills/03100-03199.xml
+++ b/dist/game/data/stats/skills/03100-03199.xml
@@ -709,8 +709,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -817,8 +817,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
 			</effect>
 		</effects>
 	</skill>
@@ -895,8 +895,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="#maxCp" />
+			<effect name="MaxCp">
+				<param power="#maxCp" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/03300-03399.xml b/dist/game/data/stats/skills/03300-03399.xml
index 9ae366535126418dfb238d5299a80c73bc145f3a..8672e53ed0d276ad8ef9f516d226fe1662bc9d38 100644
--- a/dist/game/data/stats/skills/03300-03399.xml
+++ b/dist/game/data/stats/skills/03300-03399.xml
@@ -654,9 +654,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.054" /> <!-- P. Def. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 effect -->
 				<mul stat="healEffect" val="1.03" /> <!-- Received Increased Heal +3% -->
 				<add stat="darkRes" val="8" /> <!-- Darkness resistance is increased +8 -->
 			</effect>
@@ -673,9 +675,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- MaxHP +492 -->
 				<add stat="critRate" val="24.6" /> <!-- Critical Damage Chance +24.6 -->
 				<add stat="critDmgAdd" val="234" /> <!-- Critical Damage +234 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -690,9 +694,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Resistance to Darkness attacks +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.95" /> <!-- MP consumption of the active skill is decreased -5% -->
 			</effect>
@@ -706,9 +712,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.054" /> <!-- P. Def. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 effect -->
 				<mul stat="danceMpConsumeRate" val="0.95" /> <!-- MP consumption is decreased when song and dance skills are used -5% -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
 			</effect>
@@ -722,9 +730,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<add stat="rEvas" val="4.3" /> <!-- Evasion +4.3 -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 Effect -->
 				<mul stat="pAtkSpd" val="1.0266" /> <!-- Atk. Spd. are increased +2.66% -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
 			</effect>
@@ -741,9 +751,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="4.3" /> <!-- Accuracy +4.3 -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 Effect -->
 				<mul stat="pAtkSpd" val="1.0266" /> <!-- Atk. Spd. are increased +2.66% -->
 				<add stat="regMp" val="1.72" /> <!-- MP recovery are increased +1.72 -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
@@ -758,9 +770,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="healEffect" val="20" /> <!-- Increase amount of heal +20 -->
 				<sub stat="cancel" val="15" /> <!-- Decrease magic cancel rate -15% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -775,9 +789,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<sub stat="cancel" val="15" /> <!-- Decrease magic cancel rate -15% -->
 				<mul stat="magicalMpConsumeRate" val="0.95" /> <!-- Decrease MP consumption -5% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -792,9 +808,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<mul stat="pDef" val="1.026" /> <!-- P. Def. +2.6% -->
 				<mul stat="pAtk" val="1.026" /> <!-- Increase P. Atk. +2.6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -809,10 +827,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
 				<mul stat="mAtk" val="1.054" /> <!-- Increase M. Atk +5.4% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
 			<effect name="EnableCloak" />
diff --git a/dist/game/data/stats/skills/03400-03499.xml b/dist/game/data/stats/skills/03400-03499.xml
index e38d3398949ba25ee100f1f6a826947c4efc2588..1486c70aca67cf4724319032944421c0e4af7565 100644
--- a/dist/game/data/stats/skills/03400-03499.xml
+++ b/dist/game/data/stats/skills/03400-03499.xml
@@ -172,9 +172,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="critRate" val="109.2" />
-				<mul stat="maxHp" val="1.1" />
 				<mul stat="pvpPhysDmg" val="1.05" />
 				<mul stat="pvpPhysSkillsDmg" val="1.05" />
 				<mul stat="pvpMagicalDmg" val="1.05" />
@@ -188,9 +191,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="418" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.046" /> <!-- P. Def +4.6% -->
-				<add stat="maxHp" val="418" /> <!-- MaxHP +418 -->
 				<add stat="darkRes" val="6" /> <!-- Darkness Resistance +6 -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -203,10 +208,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="418" />
+			</effect>
 			<effect name="Buff">
 				<add stat="rEvas" val="1.72" /> <!-- Evacion +1.72 -->
 				<add stat="accCombat" val="1.72" /> <!-- Accuracy +1.72 -->
-				<add stat="maxHp" val="418" /> <!-- MaxHP +418 -->
 				<add stat="darkRes" val="6" /> <!-- Darkness Resistance +6 -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -219,9 +226,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 Effect -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.95" /> <!-- MP consumption of the active skill is decreased -5% -->
 			</effect>
@@ -235,9 +244,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- MaxHP +492 -->
 				<add stat="critRate" val="24.6" /> <!-- Critical Damage Chance +24.6 -->
 				<add stat="critDmgAdd" val="234" /> <!-- Critical Damage +234 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -252,9 +263,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="257" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.12" /> <!-- Casting Spd. +12% -->
-				<add stat="maxMp" val="257" /> <!-- Max MP +257 -->
 				<add stat="darkRes" val="6" /> <!-- Darkness Resistance +6 -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -306,11 +319,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.054" /> <!-- increase Atk. Spd. +5.4% -->
 				<mul stat="pAtk" val="1.0266" /> <!-- Increase P. Atk. +2.66% -->
 				<mul stat="pDef" val="1.0266" /> <!-- Increase P. Def. +2.66% -->
-				<add stat="maxHp" val="492" /> <!-- MaxHP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -402,10 +417,19 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
 				<mul stat="pvpPhysSkillsDmg" val="1.07" />
@@ -664,8 +688,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="118" />
+			<effect name="MaxHp">
+				<param power="118" />
 			</effect>
 		</effects>
 	</skill>
@@ -674,8 +698,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="51" />
+			<effect name="MaxMp">
+				<param power="51" />
 			</effect>
 		</effects>
 	</skill>
@@ -684,8 +708,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="354" />
+			<effect name="MaxCp">
+				<param power="354" />
 			</effect>
 		</effects>
 	</skill>
@@ -694,9 +718,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="59" />
-				<add stat="maxMp" val="26" />
+			<effect name="MaxHp">
+				<param power="59" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="26" />
 			</effect>
 		</effects>
 	</skill>
@@ -705,9 +731,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="59" />
-				<add stat="maxCp" val="117" />
+			<effect name="MaxHp">
+				<param power="59" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="117" />
 			</effect>
 		</effects>
 	</skill>
@@ -716,9 +744,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="26" />
-				<add stat="maxCp" val="117" />
+			<effect name="MaxMp">
+				<param power="26" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="117" />
 			</effect>
 		</effects>
 	</skill>
@@ -727,8 +757,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="147" />
+			<effect name="MaxHp">
+				<param power="147" />
 			</effect>
 		</effects>
 	</skill>
@@ -737,8 +767,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="72" />
+			<effect name="MaxMp">
+				<param power="72" />
 			</effect>
 		</effects>
 	</skill>
@@ -747,8 +777,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="441" />
+			<effect name="MaxCp">
+				<param power="441" />
 			</effect>
 		</effects>
 	</skill>
@@ -757,9 +787,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="74" />
-				<add stat="maxMp" val="36" />
+			<effect name="MaxHp">
+				<param power="74" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="36" />
 			</effect>
 		</effects>
 	</skill>
@@ -768,9 +800,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="74" />
-				<add stat="maxCp" val="222" />
+			<effect name="MaxHp">
+				<param power="74" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="222" />
 			</effect>
 		</effects>
 	</skill>
@@ -779,9 +813,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="36" />
-				<add stat="maxCp" val="222" />
+			<effect name="MaxMp">
+				<param power="36" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="222" />
 			</effect>
 		</effects>
 	</skill>
@@ -790,8 +826,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="172" />
+			<effect name="MaxHp">
+				<param power="172" />
 			</effect>
 		</effects>
 	</skill>
@@ -800,8 +836,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="85" />
+			<effect name="MaxMp">
+				<param power="85" />
 			</effect>
 		</effects>
 	</skill>
@@ -810,8 +846,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="516" />
+			<effect name="MaxCp">
+				<param power="516" />
 			</effect>
 		</effects>
 	</skill>
@@ -820,9 +856,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="86" />
-				<add stat="maxMp" val="43" />
+			<effect name="MaxHp">
+				<param power="86" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="43" />
 			</effect>
 		</effects>
 	</skill>
@@ -831,9 +869,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="86" />
-				<add stat="maxCp" val="258" />
+			<effect name="MaxHp">
+				<param power="86" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="258" />
 			</effect>
 		</effects>
 	</skill>
@@ -842,9 +882,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="43" />
-				<add stat="maxCp" val="258" />
+			<effect name="MaxMp">
+				<param power="43" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="258" />
 			</effect>
 		</effects>
 	</skill>
@@ -853,8 +895,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="224" />
+			<effect name="MaxHp">
+				<param power="224" />
 			</effect>
 		</effects>
 	</skill>
@@ -863,8 +905,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="111" />
+			<effect name="MaxMp">
+				<param power="111" />
 			</effect>
 		</effects>
 	</skill>
@@ -873,8 +915,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="672" />
+			<effect name="MaxCp">
+				<param power="672" />
 			</effect>
 		</effects>
 	</skill>
@@ -883,9 +925,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="112" />
-				<add stat="maxMp" val="56" />
+			<effect name="MaxHp">
+				<param power="112" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="56" />
 			</effect>
 		</effects>
 	</skill>
@@ -894,9 +938,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="112" />
-				<add stat="maxCp" val="336" />
+			<effect name="MaxHp">
+				<param power="112" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="336" />
 			</effect>
 		</effects>
 	</skill>
@@ -905,9 +951,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="56" />
-				<add stat="maxCp" val="336" />
+			<effect name="MaxMp">
+				<param power="56" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="336" />
 			</effect>
 		</effects>
 	</skill>
@@ -916,8 +964,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="135" />
+			<effect name="MaxHp">
+				<param power="135" />
 			</effect>
 		</effects>
 	</skill>
@@ -926,8 +974,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="66" />
+			<effect name="MaxMp">
+				<param power="66" />
 			</effect>
 		</effects>
 	</skill>
@@ -936,8 +984,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="405" />
+			<effect name="MaxCp">
+				<param power="405" />
 			</effect>
 		</effects>
 	</skill>
@@ -946,9 +994,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="68" />
-				<add stat="maxMp" val="33" />
+			<effect name="MaxHp">
+				<param power="68" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="33" />
 			</effect>
 		</effects>
 	</skill>
@@ -957,9 +1007,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="68" />
-				<add stat="maxCp" val="203" />
+			<effect name="MaxHp">
+				<param power="68" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="203" />
 			</effect>
 		</effects>
 	</skill>
@@ -968,9 +1020,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="33" />
-				<add stat="maxCp" val="203" />
+			<effect name="MaxMp">
+				<param power="33" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="203" />
 			</effect>
 		</effects>
 	</skill>
@@ -979,8 +1033,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="160" />
+			<effect name="MaxHp">
+				<param power="160" />
 			</effect>
 		</effects>
 	</skill>
@@ -989,8 +1043,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="78" />
+			<effect name="MaxMp">
+				<param power="78" />
 			</effect>
 		</effects>
 	</skill>
@@ -999,8 +1053,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="480" />
+			<effect name="MaxCp">
+				<param power="480" />
 			</effect>
 		</effects>
 	</skill>
@@ -1009,9 +1063,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="80" />
-				<add stat="maxMp" val="39" />
+			<effect name="MaxHp">
+				<param power="80" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="39" />
 			</effect>
 		</effects>
 	</skill>
@@ -1020,9 +1076,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="80" />
-				<add stat="maxCp" val="240" />
+			<effect name="MaxHp">
+				<param power="80" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="240" />
 			</effect>
 		</effects>
 	</skill>
@@ -1031,9 +1089,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="39" />
-				<add stat="maxCp" val="240" />
+			<effect name="MaxMp">
+				<param power="39" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="240" />
 			</effect>
 		</effects>
 	</skill>
@@ -1042,8 +1102,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="186" />
+			<effect name="MaxHp">
+				<param power="186" />
 			</effect>
 		</effects>
 	</skill>
@@ -1052,8 +1112,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="92" />
+			<effect name="MaxMp">
+				<param power="92" />
 			</effect>
 		</effects>
 	</skill>
@@ -1062,8 +1122,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="564" />
+			<effect name="MaxCp">
+				<param power="564" />
 			</effect>
 		</effects>
 	</skill>
@@ -1072,9 +1132,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="93" />
-				<add stat="maxMp" val="46" />
+			<effect name="MaxHp">
+				<param power="93" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="46" />
 			</effect>
 		</effects>
 	</skill>
@@ -1083,9 +1145,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="93" />
-				<add stat="maxCp" val="282" />
+			<effect name="MaxHp">
+				<param power="93" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="282" />
 			</effect>
 		</effects>
 	</skill>
@@ -1094,9 +1158,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="46" />
-				<add stat="maxCp" val="282" />
+			<effect name="MaxMp">
+				<param power="46" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="282" />
 			</effect>
 		</effects>
 	</skill>
@@ -1105,8 +1171,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="246" />
+			<effect name="MaxHp">
+				<param power="246" />
 			</effect>
 		</effects>
 	</skill>
@@ -1115,8 +1181,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="122" />
+			<effect name="MaxMp">
+				<param power="122" />
 			</effect>
 		</effects>
 	</skill>
@@ -1125,8 +1191,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="744" />
+			<effect name="MaxCp">
+				<param power="744" />
 			</effect>
 		</effects>
 	</skill>
@@ -1135,9 +1201,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="123" />
-				<add stat="maxMp" val="61" />
+			<effect name="MaxHp">
+				<param power="123" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="61" />
 			</effect>
 		</effects>
 	</skill>
@@ -1146,9 +1214,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="123" />
-				<add stat="maxCp" val="372" />
+			<effect name="MaxHp">
+				<param power="123" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="372" />
 			</effect>
 		</effects>
 	</skill>
@@ -1157,9 +1227,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="61" />
-				<add stat="maxCp" val="372" />
+			<effect name="MaxMp">
+				<param power="61" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="372" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/03500-03599.xml b/dist/game/data/stats/skills/03500-03599.xml
index 403bd9cf9aacbea1150e437f2a459c1c26a828cf..dbfae56c2c16bf13293698c65155604d24d7ac09 100644
--- a/dist/game/data/stats/skills/03500-03599.xml
+++ b/dist/game/data/stats/skills/03500-03599.xml
@@ -6,9 +6,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="41" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.022" /> <!-- P. Def. +2.2% -->
-				<add stat="maxHp" val="41" /> <!-- HP +41 -->
 			</effect>
 		</effects>
 	</skill>
@@ -40,8 +42,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="80" /> <!-- MP +80 -->
+			<effect name="MaxMp">
+				<param power="80" />
 			</effect>
 		</effects>
 	</skill>
@@ -63,8 +65,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="91.81" /> <!-- MP +91.81 -->
+			<effect name="MaxMp">
+				<param power="91.81" />
 			</effect>
 		</effects>
 	</skill>
@@ -74,9 +76,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="153" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.05" /> <!-- P. Def. +5% -->
-				<add stat="maxHp" val="153" /> <!-- HP +153 -->
 			</effect>
 		</effects>
 	</skill>
@@ -149,8 +153,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<sub stat="maxHp" val="269.65" /> <!-- HP -269.65 -->
+			<effect name="MaxHp">
+				<param power="269.65" />
 			</effect>
 		</effects>
 	</skill>
@@ -182,8 +186,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="269.65" /> <!-- HP +269.65 -->
+			<effect name="MaxHp">
+				<param power="269.65" />
 			</effect>
 		</effects>
 	</skill>
@@ -193,9 +197,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="170.62" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0526" /> <!-- P. Def. +5.26% -->
-				<add stat="maxMp" val="170.62" /> <!-- MP +170.62 -->
 			</effect>
 		</effects>
 	</skill>
@@ -205,9 +211,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="294.49" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0526" /> <!-- P. Def. +5.246 -->
-				<add stat="maxHp" val="294.49" /> <!-- HP +294.49 -->
 			</effect>
 		</effects>
 	</skill>
@@ -217,8 +225,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="294.49" /> <!-- HP +294.49 -->
+			<effect name="MaxHp">
+				<param power="294.49" />
 			</effect>
 		</effects>
 	</skill>
@@ -287,8 +295,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="320" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="320" /> <!-- HP +320 -->
 				<add stat="breath" val="200" /> <!-- Breath Gauge increased +200 -->
 			</effect>
 		</effects>
@@ -327,8 +337,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="206" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="206" /> <!-- MP +206 -->
 				<mul stat="regMp" val="1.0524" /> <!-- MP Regeneration +5.24% -->
 			</effect>
 		</effects>
@@ -397,9 +409,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="222" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="regMp" val="1.08" /> <!-- MP Regeneration +8% -->
-				<add stat="maxMp" val="222" /> <!-- MP +222 -->
 			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="80" />
@@ -492,11 +506,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="240" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.08"> <!-- Archery P. Atk. +8% -->
 					<using kind="BOW,CROSSBOW" />
 				</mul>
-				<add stat="maxMp" val="240" /> <!-- MP +240 -->
 				<add stat="weightPenalty" val="5759" /> <!-- Point at which a weight penalty is applied +5759 -->
 			</effect>
 			<effect name="DefenceTrait">
@@ -526,8 +542,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="240" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="240" /> <!-- MP +240 -->
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
 				<mul stat="regMp" val="1.08" /> <!-- MP Regeneration +8% -->
 			</effect>
@@ -557,8 +575,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="126.13" />
+			<effect name="MaxHp">
+				<param power="126.13" />
 			</effect>
 		</effects>
 	</skill>
@@ -569,8 +587,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="20" />
+			<effect name="MaxHp">
+				<param power="20" />
 			</effect>
 		</effects>
 	</skill>
@@ -581,8 +599,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="198.21" />
+			<effect name="MaxHp">
+				<param power="198.21" />
 			</effect>
 		</effects>
 	</skill>
@@ -682,9 +700,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="445" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.08" /> <!-- P Def. +8% -->
-				<add stat="maxHp" val="445" /> <!-- Maximum HP +445 -->
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="70" />
@@ -711,10 +731,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="289" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.04" /> <!-- Attack Speed +4% -->
 				<mul stat="pAtk" val="1.04" /> <!-- P. Atk +4% -->
-				<add stat="maxMp" val="289" /> <!-- Maximum MP +289 -->
 				<add stat="weightPenalty" val="5759" /> <!-- Point at which a weight penalty is applied +5759 -->
 			</effect>
 		</effects>
@@ -744,9 +766,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="445" />
+			</effect>
 			<effect name="Buff">
 				<add stat="fireRes" val="15" />
-				<add stat="maxHp" val="445" />
 				<mul stat="pAtk" val="1.04" />
 				<mul stat="mAtk" val="1.08" />
 				<add stat="mCritRate" val="2" />
@@ -1011,10 +1035,19 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="15" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.15" />
-				<mul stat="maxMp" val="1.2" />
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="pvpPhysDmg" val="1.05" />
 				<mul stat="pvpPhysSkillsDmg" val="1.05" />
 				<mul stat="pvpMagicalDmg" val="1.05" />
@@ -1171,10 +1204,19 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="sDef" val="1.33" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -1212,10 +1254,19 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="rShld" val="1.39" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -1245,10 +1296,16 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="critDmgAdd" val="504" />
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxCp" val="1.5" />
 				<add stat="critRate" val="78.7" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -1265,9 +1322,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="pAtkSpd" val="1.07" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -1307,10 +1370,19 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<add stat="critRate" val="78.7" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -1350,10 +1422,19 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<add stat="rEvas" val="3.15" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -1393,9 +1474,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="pAtkSpd" val="1.03" />
 				<add stat="regMp" val="0.51" />
 				<mul stat="critRatePos" val="1.22">
@@ -1438,9 +1525,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="pAtkSpd" val="1.07" />
 				<add stat="accCombat" val="4.89" />
 				<mul stat="pvpPhysDmg" val="1.07" />
@@ -1472,9 +1565,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
 				<mul stat="pvpPhysSkillsDmg" val="1.07" />
@@ -1510,9 +1609,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<add stat="mAtk" val="29.67" />
 				<add stat="mCritRate" val="1" />
 				<mul stat="pvpPhysDmg" val="1.07" />
@@ -1550,9 +1655,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="mAtkSpd" val="1.15" />
 				<add stat="regMp" val="0.51" />
 				<mul stat="pvpPhysDmg" val="1.07" />
diff --git a/dist/game/data/stats/skills/03600-03699.xml b/dist/game/data/stats/skills/03600-03699.xml
index a78b5ad747e6bf113c8bebbb08c485133f047f0c..e27abc5892f1c15fa52bacbed3ba759789e1a4f6 100644
--- a/dist/game/data/stats/skills/03600-03699.xml
+++ b/dist/game/data/stats/skills/03600-03699.xml
@@ -10,9 +10,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="pAtk" val="#pAtk" />
-				<mul stat="maxHp" val="0.85" />
 				<add stat="atkCountMax" val="4" />
 				<mul stat="pvpPhysDmg" val="#pvpBonus" />
 				<mul stat="pvpPhysSkillsDmg" val="#pvpBonus" />
@@ -63,7 +66,7 @@
 		<table name="#debuffVuln"> 85 86 87 88 89 90 91 92 93 94 </table>
 		<table name="#mAtk"> 3.1 3.2 3.31 3.43 3.55 3.68 3.81 3.95 4.1 4.25 </table>
 		<table name="#mAtkAdd"> 600 720 864 1036 1244 1492 1791 2149 2579 3095 </table>
-		<table name="#maxCp"> 11.5 12.02 12.57 13.15 13.76 14.4 15.07 15.77 16.51 17.28 </table>
+		<table name="#maxCp"> 1050 1102 1157 1215 1276 1340 1407 1477 1551 1628 </table>
 		<table name="#maxCpAdd"> 1300 1690 2197 2856 3712 4826 6274 8157 10604 13785 </table>
 		<table name="#mDef"> 3.06 3.12 3.18 3.25 3.31 3.38 3.45 3.53 3.6 3.68 </table>
 		<table name="#mDefAdd"> 515 530 546 562 579 597 614 633 652 671 </table>
@@ -79,6 +82,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCpAdd" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
 				<add stat="pAtk" val="#pAtkAdd" />
@@ -89,8 +99,6 @@
 				<mul stat="mDef" val="#mDef" />
 				<add stat="mDef" val="#mDefAdd" />
 				<add stat="runSpd" val="#runSpd" />
-				<mul stat="maxCp" val="#maxCp" />
-				<add stat="maxCp" val="#maxCpAdd" />
 				<mul stat="regCp" val="#regCp" />
 				<sub stat="debuffVuln" val="#debuffVuln" />
 				<add stat="accCombat" val="#accCombat" />
@@ -175,7 +183,7 @@
 	</skill>
 	<skill id="3608" levels="3" name="Apella Heavy Armor Set">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxCP"> 1035 1116 1116 </table>
+		<table name="#maxCp"> 1035 1116 1116 </table>
 		<table name="#mpConsumeRate"> 1 0.95 0.95 </table>
 		<table name="#triggeredLevel"> 1 2 2 </table>
 		<table name="#expLost"> 0.3 0.3 0.6 </table>
@@ -184,8 +192,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxCp" val="#maxCP" />
 				<mul stat="regCp" val="1.4" />
 				<mul stat="reduceExpLostByPvp" val="#expLost" />
 				<mul stat="physicalMpConsumeRate" val="#mpConsumeRate" />
@@ -203,7 +213,7 @@
 	</skill>
 	<skill id="3609" levels="3" name="Apella Light Armor Set">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxCP"> 1035 1116 1116 </table>
+		<table name="#maxCp"> 1035 1116 1116 </table>
 		<table name="#mpConsumeRate"> 1 0.95 0.95 </table>
 		<table name="#triggeredLevel"> 1 2 2 </table>
 		<table name="#expLost"> 0.3 0.3 0.6 </table>
@@ -212,8 +222,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxCp" val="#maxCP" />
 				<mul stat="regCp" val="1.4" />
 				<mul stat="reduceExpLostByPvp" val="#expLost" />
 				<mul stat="physicalMpConsumeRate" val="#mpConsumeRate" />
@@ -231,7 +243,7 @@
 	</skill>
 	<skill id="3610" levels="3" name="Apella Robe Set">
 		<!-- Confirmed CT2.5 -->
-		<table name="#maxCP"> 1035 1116 1116 </table>
+		<table name="#maxCp"> 1035 1116 1116 </table>
 		<table name="#mpConsumeRate"> 1 0.95 0.95 </table>
 		<table name="#triggeredLevel"> 1 2 2 </table>
 		<table name="#expLost"> 0.3 0.3 0.6 </table>
@@ -240,8 +252,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxCp" val="#maxCP" />
 				<mul stat="regCp" val="1.4" />
 				<mul stat="reduceExpLostByPvp" val="#expLost" />
 				<mul stat="physicalMpConsumeRate" val="#mpConsumeRate" />
@@ -590,7 +604,7 @@
 		<table name="#debuffVuln"> 85 86 87 88 89 90 91 92 93 94 </table>
 		<table name="#mAtk"> 3.1 3.2 3.31 3.43 3.55 3.68 3.81 3.95 4.1 4.25 </table>
 		<table name="#mAtkAdd"> 600 720 864 1036 1244 1492 1791 2149 2579 3095 </table>
-		<table name="#maxCp"> 11.5 12.02 12.57 13.15 13.76 14.4 15.07 15.77 16.51 17.28 </table>
+		<table name="#maxCp"> 1050 1102 1157 1215 1276 1340 1407 1477 1551 1628 </table>
 		<table name="#maxCpAdd"> 1300 1690 2197 2856 3712 4826 6274 8157 10604 13785 </table>
 		<table name="#mDef"> 3.06 3.12 3.18 3.25 3.31 3.38 3.45 3.53 3.6 3.68 </table>
 		<table name="#mDefAdd"> 515 530 546 562 579 597 614 633 652 671 </table>
@@ -606,6 +620,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCpAdd" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
 				<add stat="pAtk" val="#pAtkAdd" />
@@ -616,8 +637,6 @@
 				<mul stat="mDef" val="#mDef" />
 				<add stat="mDef" val="#mDefAdd" />
 				<add stat="runSpd" val="#runSpd" />
-				<mul stat="maxCp" val="#maxCp" />
-				<add stat="maxCp" val="#maxCpAdd" />
 				<mul stat="regCp" val="#regCp" />
 				<sub stat="debuffVuln" val="#debuffVuln" />
 				<add stat="accCombat" val="#accCombat" />
@@ -717,10 +736,16 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<add stat="critDmgAdd" val="504" />
-				<mul stat="maxHp" val="1.25" />
-				<mul stat="maxCp" val="1.5" />
 				<add stat="critRate" val="78.7" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
@@ -737,9 +762,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.3" />
-				<mul stat="maxCp" val="1.5" />
 				<mul stat="pvpPhysDmg" val="1.07" />
 				<mul stat="pvpMagicalDmg" val="1.07" />
 				<mul stat="pvpPhysSkillsDmg" val="1.07" />
@@ -753,9 +784,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.066" /> <!-- P. Def. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<mul stat="healEffect" val="1.04" /> <!-- Heal Capacity +4% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
@@ -772,9 +805,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- P. Atk. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<add stat="critRate" val="29.5" /> <!-- Critical Rate +29.5 Increase -->
 				<add stat="critDmgAdd" val="282" /> <!-- Critical Damage +282 -->
 				<add stat="darkRes" val="8" /> <!-- Darkness Resistance +8 -->
@@ -789,9 +824,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.066" /> <!-- P. Def. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<mul stat="danceMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% Decrease for Song and Dance Skills -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
@@ -805,9 +842,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- Physical Attack Power +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Maximum HP +492 effect -->
 				<add stat="darkRes" val="8" /> <!-- Darkness Resistance +8 Increase -->
 				<mul stat="physicalMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% Decrease for Active Skills -->
 			</effect>
@@ -821,9 +860,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<add stat="rEvas" val="5.3" /> <!-- Evasion +5.3 -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<mul stat="pAtkSpd" val="1.0324" /> <!-- Atk. Spd. +3.24% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
@@ -840,9 +881,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="5.3" /> <!-- Accuracy +5.3 -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<mul stat="pAtkSpd" val="1.0324" /> <!-- Atk. Spd. +3.24% -->
 				<add stat="regMp" val="1.066" /> <!-- MP Recovery +6.6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -857,9 +900,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- P. Atk. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% -->
 			</effect>
@@ -873,9 +918,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- Physical Attack Power +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Maximum HP +492 effect -->
 				<add stat="critRate" val="29.5" /> <!-- Critical Rate +29.5 Increase -->
 				<add stat="critDmgAdd" val="282" /> <!-- Critical Damage +282 -->
 				<add stat="darkRes" val="8" /> <!-- Darkness Resistance +8 -->
@@ -890,11 +937,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.066" /> <!-- Atk. Spd. +6.6% -->
 				<mul stat="pAtk" val="1.0266" /> <!-- P. Atk. +2.66% -->
 				<mul stat="pDef" val="1.0266" /> <!-- P. Def. +2.66% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -907,9 +956,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="healEffect" val="22" /> <!-- Heal Capacity +22 -->
 				<sub stat="cancel" val="15" /> <!-- Magic Cancel Rate -15 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -924,9 +975,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<sub stat="cancel" val="15" /> <!-- Magic Cancel Rate -15 -->
 				<mul stat="magicalMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -941,9 +994,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<mul stat="pDef" val="1.033" /> <!-- P. Def. +3.3% -->
 				<mul stat="pAtk" val="1.033" /> <!-- P. Atk. +3.3% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -958,10 +1013,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
 				<mul stat="mAtk" val="1.066" /> <!-- M. Atk. +6.6% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -975,11 +1032,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="105" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="38" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mDef" val="1.12" />
-				<add stat="maxMp" val="38" />
 				<add stat="darkRes" val="30" />
-				<add stat="maxHp" val="105" />
 				<add stat="regMp" val="0.23" />
 			</effect>
 			<effect name="AttackTrait">
@@ -1223,8 +1284,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1332,9 +1394,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="123" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0208" />
-				<add stat="maxHp" val="123" />
 			</effect>
 		</effects>
 	</skill>
@@ -1345,9 +1409,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="49" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0083" />
-				<add stat="maxHp" val="49" />
 			</effect>
 		</effects>
 	</skill>
@@ -1358,9 +1424,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="49" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0083" />
-				<add stat="maxHp" val="49" />
 			</effect>
 		</effects>
 	</skill>
@@ -1371,9 +1439,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="74" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0125" />
-				<add stat="maxHp" val="74" />
 			</effect>
 		</effects>
 	</skill>
@@ -1384,8 +1454,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="294" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="294" />
 				<mul stat="pDef" val="1.0724" />
 			</effect>
 		</effects>
@@ -1457,8 +1529,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="49" />
+			<effect name="MaxHp">
+				<param power="49" />
 			</effect>
 		</effects>
 	</skill>
@@ -1469,8 +1541,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="49" />
+			<effect name="MaxHp">
+				<param power="49" />
 			</effect>
 		</effects>
 	</skill>
@@ -1481,8 +1553,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="73" />
+			<effect name="MaxHp">
+				<param power="73" />
 			</effect>
 		</effects>
 	</skill>
@@ -1493,8 +1565,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="122" />
+			<effect name="MaxHp">
+				<param power="122" />
 			</effect>
 		</effects>
 	</skill>
@@ -1505,8 +1577,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="833" />
+			<effect name="MaxHp">
+				<param power="833" />
 			</effect>
 		</effects>
 	</skill>
@@ -1630,8 +1702,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="53" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="53" />
 				<add stat="breath" val="33" />
 			</effect>
 		</effects>
@@ -1643,8 +1717,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="53" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="53" />
 				<add stat="breath" val="33" />
 			</effect>
 		</effects>
@@ -1656,9 +1732,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="1093" />
+			</effect>
 			<effect name="Buff">
 				<add stat="breath" val="383" />
-				<add stat="maxHp" val="1093" />
 			</effect>
 		</effects>
 	</skill>
@@ -1669,8 +1747,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="80" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="80" />
 				<add stat="breath" val="50" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/03700-03799.xml b/dist/game/data/stats/skills/03700-03799.xml
index e065f0f9bc0630b889f140798c0a6d82ce76eeb0..9a2c65be3a52f35a0fb578e31191a2f6824de3fa 100644
--- a/dist/game/data/stats/skills/03700-03799.xml
+++ b/dist/game/data/stats/skills/03700-03799.xml
@@ -271,8 +271,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="34" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="34" />
 				<mul stat="regMp" val="1.0083" />
 			</effect>
 		</effects>
@@ -284,8 +286,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="34" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="34" />
 				<mul stat="regMp" val="1.0083" />
 			</effect>
 		</effects>
@@ -297,8 +301,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="205" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="205" />
 				<mul stat="regMp" val="1.0724" />
 			</effect>
 		</effects>
@@ -310,8 +316,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="85" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="85" />
 				<mul stat="regMp" val="1.0208" />
 			</effect>
 		</effects>
@@ -323,8 +331,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="51" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="51" />
 				<mul stat="regMp" val="1.0125" />
 			</effect>
 		</effects>
@@ -640,8 +650,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="315" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="315" />
 				<mul stat="regMp" val="1.0932" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -657,9 +669,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="37" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="regMp" val="1.0083" />
-				<add stat="maxMp" val="37" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="8" />
@@ -674,9 +688,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="37" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="regMp" val="1.0083" />
-				<add stat="maxMp" val="37" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="8" />
@@ -691,9 +707,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="56" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="regMp" val="1.0125" />
-				<add stat="maxMp" val="56" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="12" />
@@ -848,11 +866,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="40" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0083">
 					<using kind="BOW,CROSSBOW" />
 				</mul>
-				<add stat="maxMp" val="40" />
 				<add stat="weightPenalty" val="960" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -867,9 +887,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="340" />
+			</effect>
 			<effect name="Buff">
 				<add stat="weightPenalty" val="8159" />
-				<add stat="maxMp" val="340" />
 				<mul stat="pAtk" val="1.0932">
 					<using kind="BOW,CROSSBOW" />
 				</mul>
@@ -886,11 +908,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="40" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0083">
 					<using kind="BOW,CROSSBOW" />
 				</mul>
-				<add stat="maxMp" val="40" />
 				<add stat="weightPenalty" val="960" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -905,11 +929,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="60" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0125">
 					<using kind="BOW,CROSSBOW" />
 				</mul>
-				<add stat="maxMp" val="60" />
 				<add stat="weightPenalty" val="1440" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -924,8 +950,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="40" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="40" />
 				<mul stat="regMp" val="1.0133" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -956,8 +984,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="40" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="40" />
 				<mul stat="regMp" val="1.0133" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -972,8 +1002,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="60" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxMp" val="60" />
 				<mul stat="regMp" val="1.02" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -1164,10 +1196,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="74" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.0041" />
 				<mul stat="pAtk" val="1.0041" />
-				<add stat="maxMp" val="74" />
 				<add stat="weightPenalty" val="960" />
 			</effect>
 		</effects>
@@ -1179,10 +1213,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="74" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.0041" />
 				<mul stat="pAtk" val="1.0041" />
-				<add stat="maxMp" val="74" />
 				<add stat="weightPenalty" val="960" />
 			</effect>
 		</effects>
@@ -1194,9 +1230,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="630" />
+			</effect>
 			<effect name="Buff">
 				<add stat="weightPenalty" val="8159" />
-				<add stat="maxMp" val="630" />
 				<mul stat="pAtk" val="1.058" />
 				<mul stat="pAtkSpd" val="1.058" />
 			</effect>
@@ -1209,10 +1247,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="111" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.0062" />
 				<mul stat="pAtk" val="1.0062" />
-				<add stat="maxMp" val="111" />
 				<add stat="weightPenalty" val="1440" />
 			</effect>
 		</effects>
@@ -1296,9 +1336,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="185" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0208" />
-				<add stat="maxHp" val="185" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="17.5" />
@@ -1313,9 +1355,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="74" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0083" />
-				<add stat="maxHp" val="74" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="7" />
@@ -1330,9 +1374,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="74" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0083" />
-				<add stat="maxHp" val="74" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="7" />
@@ -1359,9 +1405,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="111" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0125" />
-				<add stat="maxHp" val="111" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="10.5" />
@@ -1376,8 +1424,10 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="889" />
+			</effect>
 			<effect name="Buff">
-				<add stat="maxHp" val="889" />
 				<mul stat="pDef" val="1.0724" />
 			</effect>
 			<effect name="DefenceTrait">
@@ -1393,9 +1443,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="984" />
+			</effect>
 			<effect name="Buff">
 				<add stat="darkRes" val="3.2" />
-				<add stat="maxHp" val="984" />
 				<mul stat="pDef" val="1.0724" />
 			</effect>
 		</effects>
@@ -1407,9 +1459,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="205" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0208" />
-				<add stat="maxHp" val="205" />
 				<add stat="darkRes" val="2" />
 			</effect>
 		</effects>
@@ -1421,9 +1475,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="82" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0083" />
-				<add stat="maxHp" val="82" />
 				<add stat="darkRes" val="0.8" />
 			</effect>
 		</effects>
@@ -1435,9 +1491,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="82" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0083" />
-				<add stat="maxHp" val="82" />
 				<add stat="darkRes" val="0.8" />
 			</effect>
 		</effects>
@@ -1461,9 +1519,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="123" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0125" />
-				<add stat="maxHp" val="123" />
 				<add stat="darkRes" val="1.2" />
 			</effect>
 		</effects>
@@ -1475,10 +1535,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="3.4" />
 				<add stat="darkRes" val="3.2" />
-				<add stat="maxMp" val="492" />
 				<mul stat="pAtkSpd" val="1.0477" />
 				<add stat="rEvas" val="3.4" />
 			</effect>
@@ -1491,10 +1553,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="205" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="0.79" />
 				<add stat="rEvas" val="0.79" />
-				<add stat="maxHp" val="205" />
 				<mul stat="pAtkSpd" val="1.0068" />
 				<add stat="darkRes" val="2" />
 			</effect>
@@ -1507,10 +1571,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="82" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="0.31" />
 				<add stat="rEvas" val="0.31" />
-				<add stat="maxHp" val="82" />
 				<mul stat="pAtkSpd" val="1.0027" />
 				<add stat="darkRes" val="0.8" />
 			</effect>
@@ -1523,10 +1589,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="123" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="0.47" />
 				<add stat="rEvas" val="0.47" />
-				<add stat="maxHp" val="123" />
 				<mul stat="pAtkSpd" val="1.0041" />
 				<add stat="darkRes" val="1.2" />
 			</effect>
diff --git a/dist/game/data/stats/skills/03800-03899.xml b/dist/game/data/stats/skills/03800-03899.xml
index fd0653544229ce1af825b77f134292febb40751a..f8a0adf518dd353487a4114ce97806679a3cd6d7 100644
--- a/dist/game/data/stats/skills/03800-03899.xml
+++ b/dist/game/data/stats/skills/03800-03899.xml
@@ -7,9 +7,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="133" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.0208" />
-				<add stat="maxMp" val="133" />
 				<add stat="darkRes" val="3.33" />
 			</effect>
 		</effects>
@@ -21,9 +23,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="53" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.0083" />
-				<add stat="maxMp" val="53" />
 				<add stat="darkRes" val="1.33" />
 			</effect>
 		</effects>
@@ -35,9 +39,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="53" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.0083" />
-				<add stat="maxMp" val="53" />
 				<add stat="darkRes" val="1.33" />
 			</effect>
 		</effects>
@@ -49,9 +55,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="80" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.0125" />
-				<add stat="maxMp" val="80" />
 				<add stat="darkRes" val="2" />
 			</effect>
 		</effects>
@@ -75,10 +83,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="3.4" />
 				<add stat="darkRes" val="3.2" />
-				<add stat="maxMp" val="492" />
 				<mul stat="pAtkSpd" val="1.0477" />
 				<add stat="rEvas" val="3.4" />
 			</effect>
@@ -91,10 +101,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="1023" />
+			</effect>
 			<effect name="Buff">
 				<add stat="darkRes" val="3.2" />
 				<mul stat="magicalMpConsumeRate" val="0.95" />
-				<add stat="maxHp" val="1023" />
 				<mul stat="pDef" val="1.0724" />
 			</effect>
 		</effects>
@@ -106,8 +118,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="17" />
+			<effect name="MaxMp">
+				<param power="17" />
 			</effect>
 		</effects>
 	</skill>
@@ -166,8 +178,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="9" />
+			<effect name="MaxMp">
+				<param power="9" />
 			</effect>
 		</effects>
 	</skill>
@@ -178,8 +190,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="21" />
+			<effect name="MaxMp">
+				<param power="21" />
 			</effect>
 		</effects>
 	</skill>
@@ -226,8 +238,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="11" />
+			<effect name="MaxMp">
+				<param power="11" />
 			</effect>
 		</effects>
 	</skill>
@@ -274,8 +286,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="20" />
+			<effect name="MaxMp">
+				<param power="20" />
 			</effect>
 		</effects>
 	</skill>
@@ -286,8 +298,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="30" />
+			<effect name="MaxMp">
+				<param power="30" />
 			</effect>
 		</effects>
 	</skill>
@@ -338,8 +350,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -406,8 +418,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -474,8 +486,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -563,8 +575,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="398" />
+			<effect name="MaxHp">
+				<param power="398" />
 			</effect>
 		</effects>
 	</skill>
@@ -637,8 +649,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="398" />
+			<effect name="MaxHp">
+				<param power="398" />
 			</effect>
 		</effects>
 	</skill>
@@ -676,8 +688,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
 			</effect>
 		</effects>
 	</skill>
@@ -850,10 +862,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="82" />
+			</effect>
 			<effect name="Buff">
 				<add stat="rEvas" val="0.31" />
 				<add stat="accCombat" val="0.31" />
-				<add stat="maxHp" val="82" />
 				<mul stat="pAtkSpd" val="1.0027" />
 				<add stat="darkRes" val="0.8" />
 			</effect>
@@ -866,8 +880,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="444" />
+			<effect name="MaxHp">
+				<param power="444" />
 			</effect>
 		</effects>
 	</skill>
@@ -923,8 +937,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="444" />
+			<effect name="MaxHp">
+				<param power="444" />
 			</effect>
 		</effects>
 	</skill>
@@ -991,8 +1005,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -1042,8 +1056,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="372" />
+			<effect name="MaxHp">
+				<param power="372" />
 			</effect>
 		</effects>
 	</skill>
@@ -1084,8 +1098,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -1164,8 +1178,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="289" />
+			<effect name="MaxMp">
+				<param power="289" />
 			</effect>
 		</effects>
 	</skill>
@@ -1178,8 +1192,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/03900-03999.xml b/dist/game/data/stats/skills/03900-03999.xml
index b49f1e566d5958b50fc411f8bd2db39bc7c113cd..b3a20ad2abb11c9c6893afc07d25b992defc50b9 100644
--- a/dist/game/data/stats/skills/03900-03999.xml
+++ b/dist/game/data/stats/skills/03900-03999.xml
@@ -23,8 +23,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/04300-04399.xml b/dist/game/data/stats/skills/04300-04399.xml
index 3e4b83619360091f2adb6397b3206c9dc8b4f7c6..972f0e822acb9c3b8fed71aabda9005276bfb459 100644
--- a/dist/game/data/stats/skills/04300-04399.xml
+++ b/dist/game/data/stats/skills/04300-04399.xml
@@ -349,8 +349,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -429,8 +430,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -756,7 +758,7 @@
 	<skill id="4347" levels="6" name="Clan Hall: Blessed Body">
 		<!-- Freya retail confirmed -->
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#maxHp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxHp"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 0 150 0 0 0 300 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="1200" />
@@ -771,15 +773,16 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4348" levels="6" name="Clan Hall: Blessed Soul">
 		<!-- Freya retail confirmed -->
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#maxMp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxMp"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 0 150 0 0 0 300 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="1200" />
@@ -794,8 +797,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1273,10 +1277,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="5000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="18.52" />
 				<param ticks="5" />
-				<add stat="maxMp" val="5000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1291,10 +1297,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="10000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="27.78" />
 				<param ticks="5" />
-				<add stat="maxMp" val="10000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1309,10 +1317,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="28000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="61.11" />
 				<param ticks="5" />
-				<add stat="maxMp" val="28000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1327,10 +1337,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="58000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="116.7" />
 				<param ticks="5" />
-				<add stat="maxMp" val="58000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1345,10 +1357,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="103000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="200" />
 				<param ticks="5" />
-				<add stat="maxMp" val="103000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1363,10 +1377,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="106000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="205.6" />
 				<param ticks="5" />
-				<add stat="maxMp" val="106000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1381,10 +1397,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="151000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="288.9" />
 				<param ticks="5" />
-				<add stat="maxMp" val="151000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1399,10 +1417,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="196000" />
+			</effect>
 			<effect name="TickMp">
 				<param power="372.2" />
 				<param ticks="5" />
-				<add stat="maxMp" val="196000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1729,7 +1749,7 @@
 	<skill id="4394" levels="6" name="Blessed Body">
 		<!-- Freya retail confirmed -->
 		<table name="#abnormalLvls"> 2 3 4 5 6 7 </table>
-		<table name="#maxHp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxHp"> 10 15 20 25 30 35 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_HP_UP" />
@@ -1742,15 +1762,16 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4395" levels="6" name="Blessed Soul">
 		<!-- Freya retail confirmed -->
 		<table name="#abnormalLvls"> 2 3 4 5 6 7 </table>
-		<table name="#maxMp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxMp"> 10 15 20 25 30 35 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_MP_UP" />
@@ -1763,8 +1784,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/04400-04499.xml b/dist/game/data/stats/skills/04400-04499.xml
index a928af21c183f76b6a6dfb4c2ffffa33d01e6b3a..49e03e3ef52afe6cee1927625abd13c0c1aa7775 100644
--- a/dist/game/data/stats/skills/04400-04499.xml
+++ b/dist/game/data/stats/skills/04400-04499.xml
@@ -158,30 +158,38 @@
 	<skill id="4408" levels="20" name="HP Modifiers">
 		<!-- Confirmed CT2.5 -->
 		<table name="#icons"> icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill4381 icon.skill4311 icon.skill4303 icon.skill4304 icon.skill4305 icon.skill4306 icon.skill4307 icon.skill4308 icon.skill4309 icon.skill4310 icon.skill4408_x10 icon.skill4408_x11 icon.skill4408_x12 </table>
-		<table name="#maxhp"> 1 1.1 1.21 1.33 1.46 1.61 1.77 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12 </table>
+		<table name="#maxHp"> 0 10 21 33 46 61 77 -75 -50 100 200 300 400 500 600 700 800 900 1000 1100 </table>
+		<table name="#regHp"> 1 1.1 1.21 1.33 1.46 1.61 1.77 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="#maxhp" />
-				<mul stat="regHp" val="#maxhp" />
+				<mul stat="regHp" val="#regHp" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4409" levels="20" name="MP Modifiers">
 		<!-- Confirmed CT2.5 -->
 		<table name="#icons"> icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill0000 icon.skill4381 icon.skill4311 icon.skill4303 icon.skill4304 icon.skill4305 icon.skill4306 icon.skill4307 icon.skill4308 icon.skill4309 icon.skill4310 icon.skill4409_x10 icon.skill4409_x11 icon.skill4409_x12 </table>
-		<table name="#maxmp"> 1 1.1 1.21 1.33 1.46 1.61 1.77 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12 </table>
+		<table name="#maxMp"> 0 10 21 33 46 61 77 -75 -50 100 200 300 400 500 600 700 800 900 1000 1100 </table>
+		<table name="#regHp"> 1 1.1 1.21 1.33 1.46 1.61 1.77 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="#maxmp" />
-				<mul stat="regMp" val="#maxmp" />
+				<mul stat="regMp" val="#regHp" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/05000-05099.xml b/dist/game/data/stats/skills/05000-05099.xml
index d29652dbc07065d09f82ab4f57493670df4dc80b..29a91c1597c76b54d1318984bdf2bb2bdbbafbea 100644
--- a/dist/game/data/stats/skills/05000-05099.xml
+++ b/dist/game/data/stats/skills/05000-05099.xml
@@ -1182,8 +1182,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxCp" val="1.1" />
+			<effect name="MaxCp">
+				<param power="10" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1193,8 +1194,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxCp" val="0.9" />
+			<effect name="MaxCp">
+				<param power="-10" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/05100-05199.xml b/dist/game/data/stats/skills/05100-05199.xml
index 9ddc265923b292017a3275190a2d99e019d09bb4..c809fb7ab061e03f1db829b7d271730b1b5632f7 100644
--- a/dist/game/data/stats/skills/05100-05199.xml
+++ b/dist/game/data/stats/skills/05100-05199.xml
@@ -970,8 +970,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -1033,8 +1033,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
 			</effect>
 		</effects>
 	</skill>
@@ -1095,8 +1095,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="#maxCp" />
+			<effect name="MaxCp">
+				<param power="#maxCp" />
 			</effect>
 		</effects>
 	</skill>
@@ -1900,7 +1900,7 @@
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
 		<table name="#effectPoints"> 597 457 495 532 597 646 </table>
 		<table name="#magicLvl"> 44 48 52 56 64 72 </table>
-		<table name="#maxHp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxHp"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 16 18 19 21 24 27 </table>
 		<table name="#mpConsume1"> 4 5 5 6 6 7 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
@@ -1920,8 +1920,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="OWNER_PET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1929,7 +1930,7 @@
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
 		<table name="#effectPoints"> 418 457 495 532 582 635 </table>
 		<table name="#magicLvl"> 44 48 52 56 62 70 </table>
-		<table name="#maxMp"> 1.1 1.15 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxMp"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 16 18 19 21 23 26 </table>
 		<table name="#mpConsume1"> 4 5 5 6 6 7 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
@@ -1949,8 +1950,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="OWNER_PET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/05200-05299.xml b/dist/game/data/stats/skills/05200-05299.xml
index 2f723dd682fb4c22d8c6baebd072c81862f048f2..a0713696aed91319acafcf15c553327ab22ffb0b 100644
--- a/dist/game/data/stats/skills/05200-05299.xml
+++ b/dist/game/data/stats/skills/05200-05299.xml
@@ -242,8 +242,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -318,8 +319,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/05600-05699.xml b/dist/game/data/stats/skills/05600-05699.xml
index 4ae19e3d9e71b2d7d1ea20d8b2c92ad59f4c3cfc..f879c6b189b3cc5894ea426ae2ccacfefec3096e 100644
--- a/dist/game/data/stats/skills/05600-05699.xml
+++ b/dist/game/data/stats/skills/05600-05699.xml
@@ -399,8 +399,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -471,8 +472,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -553,7 +555,7 @@
 		<table name="#abnormalLvls"> 3 4 5 6 </table>
 		<table name="#effectPoints"> 495 532 597 646 </table>
 		<table name="#magicLvl"> 52 56 64 72 </table>
-		<table name="#maxHp"> 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxHp"> 20 25 30 35 </table>
 		<table name="#mpConsume2"> 38 41 48 53 </table>
 		<table name="#mpConsume1"> 10 11 12 14 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
@@ -573,8 +575,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="#maxHp" />
+			<effect name="MaxHp">
+				<param power="#maxHp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -583,7 +586,7 @@
 		<table name="#abnormalLvls"> 3 4 5 6 </table>
 		<table name="#effectPoints"> 495 532 582 635 </table>
 		<table name="#magicLvl"> 52 56 62 70 </table>
-		<table name="#maxMp"> 1.2 1.25 1.3 1.35 </table>
+		<table name="#maxMp"> 20 25 30 35 </table>
 		<table name="#mpConsume2"> 38 41 46 52 </table>
 		<table name="#mpConsume1"> 10 11 12 13 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
@@ -603,8 +606,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="#maxMp" />
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/05800-05899.xml b/dist/game/data/stats/skills/05800-05899.xml
index 2f07d6fb5ab631260da77a04ef1df76a02c0d08d..648c62e430552b62a53e47a3934fbd6c41212950 100644
--- a/dist/game/data/stats/skills/05800-05899.xml
+++ b/dist/game/data/stats/skills/05800-05899.xml
@@ -1672,11 +1672,14 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Debuff">
 				<mul stat="pDef" val="0.8" />
 				<mul stat="mDef" val="0.8" />
 				<sub stat="rEvas" val="10" />
-				<mul stat="maxHp" val="0.8" />
 				<mul stat="regHp" val="0.5" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="mAtk" val="1.2" />
@@ -1712,11 +1715,14 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="-20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Debuff">
 				<mul stat="pDef" val="0.8" />
 				<mul stat="mDef" val="0.8" />
 				<sub stat="rEvas" val="10" />
-				<mul stat="maxHp" val="0.8" />
 				<mul stat="regHp" val="0.1" />
 				<mul stat="runSpd" val="1.25" />
 			</effect>
diff --git a/dist/game/data/stats/skills/06100-06199.xml b/dist/game/data/stats/skills/06100-06199.xml
index d07b7fea57d740bcd630b9fee7738f67a76f9ea9..34dfae6b7bdca420944bee7920d6215ce1613542 100644
--- a/dist/game/data/stats/skills/06100-06199.xml
+++ b/dist/game/data/stats/skills/06100-06199.xml
@@ -199,10 +199,19 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.1" />
-				<mul stat="maxMp" val="1.1" />
-				<mul stat="maxCp" val="1.1" />
 				<add stat="runSpd" val="15" />
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="mAtk" val="1.15" />
diff --git a/dist/game/data/stats/skills/06600-06699.xml b/dist/game/data/stats/skills/06600-06699.xml
index 1dfccdda69575aa13a930634a7dd27904df060b9..bc7b2eaab0ab3538f034e9a68da8bbf12c9b3b16 100644
--- a/dist/game/data/stats/skills/06600-06699.xml
+++ b/dist/game/data/stats/skills/06600-06699.xml
@@ -1003,8 +1003,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/07000-07099.xml b/dist/game/data/stats/skills/07000-07099.xml
index beed03f3d089dd7e80c7b98927cda22c5621db13..cb82898e3756d542665a756922615e41ee55a9d1 100644
--- a/dist/game/data/stats/skills/07000-07099.xml
+++ b/dist/game/data/stats/skills/07000-07099.xml
@@ -262,6 +262,7 @@
 		<!-- GM Skill -->
 		<table name="#amount"> 1 1 1 2 </table>
 		<table name="#mAtkSpd"> 2 3 3 2 </table>
+		<table name="#maxMp"> 0 0 0 100 </table>
 		<table name="#pAtk"> 1 1 10000 1 </table>
 		<table name="#pAtkSpd"> 2 3 3 2 </table>
 		<table name="#reuse"> 0.01 0.01 0.01 1 </table>
@@ -276,6 +277,10 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="#maxMp" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
 				<mul stat="runSpd" val="#runSpd" />
@@ -283,9 +288,8 @@
 				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="pReuse" val="#reuse" />
 				<mul stat="mReuse" val="#reuse" />
+				<mul stat="regHp" val="#amount" />
 				<mul stat="regMp" val="#amount" />
-				<mul stat="regMp" val="#amount" />
-				<mul stat="maxMp" val="#amount" />
 				<mul stat="weightLimit" val="#amount" />
 			</effect>
 		</effects>
@@ -498,8 +502,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -520,8 +525,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -895,8 +901,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="critDmg" val="1.2" />
@@ -929,8 +938,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -1358,9 +1370,13 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="MAX_HP_UP,9;MAX_MP_UP,9" />
diff --git a/dist/game/data/stats/skills/08100-08199.xml b/dist/game/data/stats/skills/08100-08199.xml
index dd55fb8680ed21a36fbae68a551ded61664d7dfb..9364926403270785534e4cf26d64d32ec915f54c 100644
--- a/dist/game/data/stats/skills/08100-08199.xml
+++ b/dist/game/data/stats/skills/08100-08199.xml
@@ -1227,12 +1227,14 @@
 				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxMp">
+				<param power="240" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="pAtk" val="1.08"> <!-- Archery P. Atk. +8% -->
 					<using kind="BOW,CROSSBOW" />
 				</mul>
-				<add stat="maxMp" val="240" /> <!-- MP +240 -->
 				<add stat="weightPenalty" val="5759" /> <!-- Point at which a weight penalty is applied +5759 -->
 				<mul stat="pvpPhysDef" val="1.05" />
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -1279,9 +1281,11 @@
 				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
 				<param targetType="SELF" />
 			</effect>
+			<effect name="MaxMp">
+				<param power="240" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
-				<add stat="maxMp" val="240" /> <!-- MP +240 -->
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
 				<mul stat="regMp" val="1.08" /> <!-- MP Regeneration +8% -->
 				<mul stat="pvpPhysDef" val="1.05" />
@@ -1304,10 +1308,12 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="445" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="70" />
 				<param HOLD="70" />
-				<add stat="maxHp" val="445" /> <!-- Maximum HP +445 -->
 				<mul stat="pDef" val="1.08" /> <!-- P Def. +8% -->
 				<mul stat="pvpPhysDef" val="1.05" />
 				<mul stat="pvpMagicalDef" val="1.05" />
diff --git a/dist/game/data/stats/skills/08200-08299.xml b/dist/game/data/stats/skills/08200-08299.xml
index f0f900bde81bc983ffb4b25d1e165f11b7bb3e48..a8f570339c9f4079c479345fdea60da02247eb4f 100644
--- a/dist/game/data/stats/skills/08200-08299.xml
+++ b/dist/game/data/stats/skills/08200-08299.xml
@@ -7,10 +7,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="289" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.04" /> <!-- Attack Speed +4% -->
 				<mul stat="pAtk" val="1.04" /> <!-- P. Atk +4% -->
-				<add stat="maxMp" val="289" /> <!-- Maximum MP +289 -->
 				<add stat="weightPenalty" val="5759" /> <!-- Point at which a weight penalty is applied +5759 -->
 				<mul stat="pvpPhysDef" val="1.05" />
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -58,9 +60,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="418" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.046" /> <!-- P. Def +4.6% -->
-				<add stat="maxHp" val="418" /> <!-- MaxHP +418 -->
 				<add stat="darkRes" val="6" /> <!-- Darkness Resistance +6 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -90,10 +94,12 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="13" />
 				<mul stat="pDef" val="1.054" /> <!-- P. Def. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 effect -->
 				<mul stat="healEffect" val="1.03" /> <!-- Received Increased Heal +3% -->
 				<add stat="darkRes" val="8" /> <!-- Darkness resistance is increased +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -110,9 +116,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- MaxHP +492 -->
 				<add stat="critRate" val="24.6" /> <!-- Critical Damage Chance +24.6 -->
 				<add stat="critDmgAdd" val="234" /> <!-- Critical Damage +234 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -137,9 +145,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Resistance to Darkness attacks +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.95" /> <!-- MP consumption of the active skill is decreased -5% -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -163,9 +173,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.054" /> <!-- P. Def. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 effect -->
 				<mul stat="danceMpConsumeRate" val="0.95" /> <!-- MP consumption is decreased when song and dance skills are used -5% -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -189,10 +201,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="418" />
+			</effect>
 			<effect name="Buff">
 				<add stat="rEvas" val="1.72" /> <!-- Evacion +1.72 -->
 				<add stat="accCombat" val="1.72" /> <!-- Accuracy +1.72 -->
-				<add stat="maxHp" val="418" /> <!-- MaxHP +418 -->
 				<add stat="darkRes" val="6" /> <!-- Darkness Resistance +6 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -222,10 +236,12 @@
 				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="13" />
 				<add stat="rEvas" val="4.3" /> <!-- Evasion +4.3 -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 Effect -->
 				<mul stat="pAtkSpd" val="1.0266" /> <!-- Atk. Spd. are increased +2.66% -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -242,9 +258,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="4.3" /> <!-- Accuracy +4.3 -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 Effect -->
 				<mul stat="pAtkSpd" val="1.0266" /> <!-- Atk. Spd. are increased +2.66% -->
 				<add stat="regMp" val="1.72" /> <!-- MP recovery are increased +1.72 -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
@@ -269,9 +287,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="257" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.12" /> <!-- Casting Spd. +12% -->
-				<add stat="maxMp" val="257" /> <!-- Max MP +257 -->
 				<add stat="darkRes" val="6" /> <!-- Darkness Resistance +6 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -294,9 +314,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="healEffect" val="20" /> <!-- Increase amount of heal +20 -->
 				<sub stat="cancel" val="15" /> <!-- Decrease magic cancel rate -15% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -321,9 +343,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<sub stat="cancel" val="15" /> <!-- Decrease magic cancel rate -15% -->
 				<mul stat="magicalMpConsumeRate" val="0.95" /> <!-- Decrease MP consumption -5% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -348,9 +372,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<mul stat="pDef" val="1.026" /> <!-- P. Def. +2.6% -->
 				<mul stat="pAtk" val="1.026" /> <!-- Increase P. Atk. +2.6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -375,10 +401,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
 				<mul stat="mAtk" val="1.054" /> <!-- Increase M. Atk +5.4% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -401,9 +429,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk. +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 Effect -->
 				<add stat="darkRes" val="8" /> <!-- Dark resistance +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.95" /> <!-- MP consumption of the active skill is decreased -5% -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -427,9 +457,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.054" /> <!-- P. Atk +5.4% -->
-				<add stat="maxHp" val="492" /> <!-- MaxHP +492 -->
 				<add stat="critRate" val="24.6" /> <!-- Critical Damage Chance +24.6 -->
 				<add stat="critDmgAdd" val="234" /> <!-- Critical Damage +234 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -454,9 +486,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<sub stat="cancel" val="15" /> <!-- Decrease magic cancel rate -15% -->
 				<mul stat="magicalMpConsumeRate" val="0.95" /> <!-- decrease MP consumption -5% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -481,11 +515,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.054" /> <!-- increase Atk. Spd. +5.4% -->
 				<mul stat="pAtk" val="1.0266" /> <!-- Increase P. Atk. +2.66% -->
 				<mul stat="pDef" val="1.0266" /> <!-- Increase P. Def. +2.66% -->
-				<add stat="maxHp" val="492" /> <!-- MaxHP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -515,10 +551,12 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="15" />
 				<mul stat="pDef" val="1.066" /> <!-- P. Def. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<mul stat="healEffect" val="1.04" /> <!-- Heal Capacity +4% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -535,9 +573,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- P. Atk. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<add stat="critRate" val="29.5" /> <!-- Critical Rate +29.5 Increase -->
 				<add stat="critDmgAdd" val="282" /> <!-- Critical Damage +282 -->
 				<add stat="darkRes" val="8" /> <!-- Darkness Resistance +8 -->
@@ -562,9 +602,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.066" /> <!-- P. Def. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<mul stat="danceMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% Decrease for Song and Dance Skills -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpPhysDef" val="1.05" />
@@ -588,9 +630,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- P. Atk. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max. HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Resistance to Darkness attacks +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.94" /> <!-- Decreases MP consumption by 6% for active skills -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -621,10 +665,12 @@
 				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="15" />
 				<add stat="rEvas" val="5.3" /> <!-- Evasion +5.3 -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<mul stat="pAtkSpd" val="1.0324" /> <!-- Atk. Spd. +3.24% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -641,9 +687,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<add stat="accCombat" val="5.3" /> <!-- Accuracy +5.3 -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<mul stat="pAtkSpd" val="1.0324" /> <!-- Atk. Spd. +3.24% -->
 				<add stat="regMp" val="1.066" /> <!-- MP Recovery +6.6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -668,9 +716,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- P. Atk. +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="physicalMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -694,9 +744,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.066" /> <!-- Physical Attack Power +6.6% -->
-				<add stat="maxHp" val="492" /> <!-- Maximum HP +492 effect -->
 				<add stat="critRate" val="29.5" /> <!-- Critical Rate +29.5 Increase -->
 				<add stat="critDmgAdd" val="282" /> <!-- Critical Damage +282 -->
 				<add stat="darkRes" val="8" /> <!-- Darkness Resistance +8 -->
@@ -721,11 +773,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="492" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.066" /> <!-- Atk. Spd. +6.6% -->
 				<mul stat="pAtk" val="1.0266" /> <!-- P. Atk. +2.66% -->
 				<mul stat="pDef" val="1.0266" /> <!-- P. Def. +2.66% -->
-				<add stat="maxHp" val="492" /> <!-- Max HP +492 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -748,9 +802,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<sub stat="cancel" val="15" /> <!-- Decrease magic cancel rate -15% -->
 				<mul stat="magicalMpConsumeRate" val="0.94" /> <!-- Decrease MP consumption -6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -775,9 +831,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="healEffect" val="22" /> <!-- Heal Capacity +22 -->
 				<sub stat="cancel" val="15" /> <!-- Magic Cancel Rate -15 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -802,9 +860,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<sub stat="cancel" val="15" /> <!-- Magic Cancel Rate -15 -->
 				<mul stat="magicalMpConsumeRate" val="0.94" /> <!-- MP Consumption -6% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -829,9 +889,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<mul stat="pDef" val="1.033" /> <!-- P. Def. +3.3% -->
 				<mul stat="pAtk" val="1.033" /> <!-- P. Atk. +3.3% -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
@@ -856,10 +918,12 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="321" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" /> <!-- Casting Spd. +15% -->
 				<mul stat="mAtk" val="1.066" /> <!-- M. Atk. +6.6% -->
-				<add stat="maxMp" val="321" /> <!-- Max MP +321 -->
 				<add stat="darkRes" val="8" /> <!-- Dark Resistance +8 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
@@ -1680,12 +1744,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="531" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="70" />
 				<param SLEEP="70" />
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pDef" val="1.0557" /> <!-- P. Def. +5.57% -->
-				<add stat="maxHp" val="531" /> <!-- Max HP by 531 -->
 			</effect>
 		</effects>
 	</skill>
@@ -1696,12 +1762,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="540" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="70" />
 				<param SLEEP="70" />
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pDef" val="1.0557" /> <!-- P. Def. +5.57% -->
-				<add stat="maxHp" val="540" /> <!-- Max HP 540 -->
 				<add stat="accCombat" val="4" /> <!-- Increases Accuracy by 4 -->
 				<add stat="runSpd" val="5" /> <!-- Increases Speed by 5 -->
 				<mul stat="magicSuccRes" val="1.01" /> <!-- Resistance to magic damage by 1% -->
@@ -1716,11 +1784,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="347" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pAtkSpd" val="1.05" /> <!-- Atk. Spd. +5% -->
 				<mul stat="regMp" val="1.05" /> <!-- MP Recovery Rate by 5% -->
-				<add stat="maxMp" val="347" /> <!-- Max MP by 347 -->
 			</effect>
 		</effects>
 	</skill>
@@ -1731,12 +1801,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="354" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param PARALYZE="50" />
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pAtkSpd" val="1.05" /> <!-- Atk. Spd. +5% -->
 				<mul stat="regMp" val="1.05" /> <!-- MP Recovery Rate by 5% -->
-				<add stat="maxMp" val="354" /> <!-- Max MP by 354 -->
 				<add stat="rEvas" val="3" /> <!-- Increases Evasion by 3 -->
 				<add stat="critDmgAdd" val="172" /> <!-- Increases Critical Damage by 172 -->
 			</effect>
diff --git a/dist/game/data/stats/skills/08300-08399.xml b/dist/game/data/stats/skills/08300-08399.xml
index c27fa5adcf4bc4dc739464ece2256e961b1c5ae2..00336d936e8c02f3e28d7d5e657b7a0ab7c8534c 100644
--- a/dist/game/data/stats/skills/08300-08399.xml
+++ b/dist/game/data/stats/skills/08300-08399.xml
@@ -6,8 +6,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.05" />
+			<effect name="MaxMp">
+				<param power="5" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -25,12 +26,14 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="531" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="70" />
 				<param SLEEP="70" />
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pDef" val="1.0557" /> <!-- P. Def. +5.57% -->
-				<add stat="maxHp" val="531" /> <!-- Max HP +531 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
 				<mul stat="pvpPhysDef" val="1.05" />
@@ -51,12 +54,14 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="540" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="70" />
 				<param SLEEP="70" />
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pDef" val="1.0557" /> <!-- P. Def. +5.57% -->
-				<add stat="maxHp" val="540" /> <!-- Max HP +540 -->
 				<add stat="accCombat" val="4" /> <!-- Increases Accuracy by 4 -->
 				<add stat="runSpd" val="5" /> <!-- Increases Speed by 5 -->
 				<mul stat="magicSuccRes" val="1.01" /> <!-- Resistance to magic damage by 1% -->
@@ -74,11 +79,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="347" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pAtkSpd" val="1.05" /> <!-- Atk. Spd. +5% -->
 				<mul stat="regMp" val="1.05" /> <!-- MP Recovery Rate by 5% -->
-				<add stat="maxMp" val="347" /> <!-- Max MP by 347 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
 				<mul stat="pvpPhysSkillsDef" val="1.05" />
 				<mul stat="pvpPhysDef" val="1.05" />
@@ -99,11 +106,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="354" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0557" /> <!-- P. Atk. +5.57% -->
 				<mul stat="pAtkSpd" val="1.05" /> <!-- Atk. Spd. +5% -->
 				<mul stat="regMp" val="1.05" /> <!-- MP Recovery Rate by 5.57% -->
-				<add stat="maxMp" val="354" /> <!-- Max MP by 354 -->
 				<add stat="rEvas" val="3" /> <!-- Increases Evasion by 3 -->
 				<add stat="critDmgAdd" val="172" /> <!-- Increases Critical Damage by 172 -->
 				<mul stat="pvpMagicalDef" val="1.05" />
@@ -208,8 +217,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="1200" />
+			<effect name="MaxCp">
+				<param power="1200" />
 			</effect>
 			<effect name="Cp">
 				<param amount="1200" />
@@ -233,8 +242,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="800" />
+			<effect name="MaxCp">
+				<param power="800" />
 			</effect>
 			<effect name="Cp">
 				<param amount="800" />
@@ -449,8 +458,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="672" />
+			<effect name="MaxCp">
+				<param power="672" />
 			</effect>
 		</effects>
 	</skill>
@@ -595,8 +604,8 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxCp" val="1500" />
+			<effect name="MaxCp">
+				<param power="1500" />
 			</effect>
 			<effect name="Cp">
 				<param amount="1500" />
@@ -834,7 +843,7 @@
 	</skill>
 	<skill id="8348" levels="2" name="Royal Guard Earring - Gludio">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -842,16 +851,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param SHOCK="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8349" levels="2" name="Royal Guard Earring - Dion">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -859,16 +871,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param HOLD="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8350" levels="2" name="Royal Guard Earring - Giran">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -876,16 +891,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param BLEED="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param PARALYZE="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8351" levels="2" name="Royal Guard Earring - Oren">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -893,16 +911,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param PARALYZE="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8352" levels="2" name="Royal Guard Earring - Aden">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -910,16 +931,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param DERANGEMENT="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8353" levels="2" name="Royal Guard Earring - Innadril">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -927,16 +951,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param SLEEP="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8354" levels="2" name="Royal Guard Earring - Goddard">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -944,16 +971,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param SHOCK="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8355" levels="2" name="Royal Guard Earring - Rune">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -961,16 +991,19 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param POISON="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8356" levels="2" name="Royal Guard Earring - Schuttgart">
 		<table name="#icons"> icon.accessary_inferno_earing_i00 icon.accessory_earring_of_domi_protection_i00 </table>
-		<table name="#maxCp"> 1 1.05 </table>
+		<table name="#maxCp"> 0 5 </table>
 		<set name="icon" val="#icons" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
@@ -978,11 +1011,14 @@
 		<effects>
 			<effect name="AttackTrait">
 				<param HOLD="15" />
-				<mul stat="maxCp" val="#maxCp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param DERANGEMENT="15" />
 			</effect>
+			<effect name="MaxCp">
+				<param power="#maxCp" />
+				<param type="PER" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="8357" levels="1" name="Einhasad's Strike">
diff --git a/dist/game/data/stats/skills/08400-08499.xml b/dist/game/data/stats/skills/08400-08499.xml
index 722557301aef213518b18f2c396a9ad625fb6148..a602c8a223f67192fdf2d172d14a46324c9ed8f0 100644
--- a/dist/game/data/stats/skills/08400-08499.xml
+++ b/dist/game/data/stats/skills/08400-08499.xml
@@ -7,6 +7,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="541" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="50" />
 				<param HOLD="50" />
@@ -14,7 +17,6 @@
 				<mul stat="pDef" val="1.0847" /> <!-- Def. Power +8.47% -->
 				<mul stat="pAtk" val="1.0557" /> <!-- Atk. Power +5.57% -->
 				<mul stat="magicSuccRes" val="1.02" /> <!-- Resistance to Damage Magic +2% -->
-				<add stat="maxHp" val="541" /> <!-- Max. HP +541 -->
 				<add stat="fireRes" val="5" /> <!-- Resistance to fire attributes +5 -->
 				<add stat="waterRes" val="5" /> <!-- Resistance to water attributes +5 -->
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
@@ -32,6 +34,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="360" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="pAtk" val="1.0557" /> <!-- Atk. Power + 5.57% -->
@@ -43,7 +48,6 @@
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
 				<add stat="earthRes" val="5" /> <!-- Resistance to earth attributes +5 -->
 				<add stat="critDmgAdd" val="182" /> <!-- Increases Critical Damage by 182 -->
-				<add stat="maxMp" val="360" /> <!-- Increases Max MP by 360 -->
 			</effect>
 			<effect name="EnableCloak" />
 		</effects>
@@ -55,6 +59,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="92" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="mAtk" val="1.087" /> <!-- M. Power +8.7% -->
@@ -65,7 +72,6 @@
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
 				<add stat="earthRes" val="5" /> <!-- Resistance to earth attributes +5 -->
 				<add stat="runSpd" val="7" /> <!-- Increases Speed by 7 -->
-				<add stat="maxMp" val="92" /> <!-- Increases Max MP by 92 -->
 			</effect>
 			<effect name="EnableCloak" />
 		</effects>
@@ -77,6 +83,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="550" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="50" />
 				<param HOLD="50" />
@@ -84,7 +93,6 @@
 				<mul stat="pAtk" val="1.0659" /> <!-- P. Atk. +6.59% -->
 				<add stat="critRate" val="127.4" /> <!-- Critical rate +127.4 -->
 				<mul stat="magicSuccRes" val="1.02" /> <!-- Resistance to damage magic +2% -->
-				<add stat="maxHp" val="550" /> <!-- Max. HP +550 -->
 				<add stat="fireRes" val="5" /> <!-- Resistance to fire attributes +5 -->
 				<add stat="waterRes" val="5" /> <!-- Resistance to water attributes +5 -->
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
@@ -122,6 +130,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="97" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="mAtk" val="1.1" /> <!-- M. Power +10% -->
@@ -132,7 +143,6 @@
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
 				<add stat="earthRes" val="5" /> <!-- Resistance to earth attributes +5 -->
 				<add stat="runSpd" val="7" /> <!-- Increases Speed by 7 -->
-				<add stat="maxMp" val="92" /> <!-- Increases Max MP by 97 -->
 				<mul stat="magicalMpConsumeRate" val="0.97" /> <!-- Decreases MP consumption for magic skills by 3% -->
 			</effect>
 			<effect name="EnableCloak" />
@@ -241,6 +251,9 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="541" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="50" />
 				<param HOLD="50" />
@@ -248,7 +261,6 @@
 				<mul stat="pDef" val="1.0847" /> <!-- Def. Power +8.47% -->
 				<mul stat="pAtk" val="1.0557" /> <!-- Atk. Power +5.57% -->
 				<mul stat="magicSuccRes" val="1.02" /> <!-- Resistance to Damage Magic +2% -->
-				<add stat="maxHp" val="541" /> <!-- Max. HP +541 -->
 				<add stat="fireRes" val="5" /> <!-- Resistance to fire attributes +5 -->
 				<add stat="waterRes" val="5" /> <!-- Resistance to water attributes +5 -->
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
@@ -276,6 +288,9 @@
 				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxMp">
+				<param power="360" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="pAtk" val="1.0557" /> <!-- Atk. Power + 5.57% -->
@@ -287,7 +302,6 @@
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
 				<add stat="earthRes" val="5" /> <!-- Resistance to earth attributes +5 -->
 				<add stat="critDmgAdd" val="182" /> <!-- Increases Critical Damage by 182 -->
-				<add stat="maxMp" val="360" /> <!-- Increases Max MP by 360 -->
 				<mul stat="pvpMagicalDef" val="1.05" /> <!-- During PvP, damage received decreased -->
 				<mul stat="pvpPhysSkillsDef" val="1.05" /> <!-- During PvP, damage received decreased -->
 				<mul stat="pvpPhysDef" val="1.05" /> <!-- During PvP, damage received decreased -->
@@ -309,6 +323,9 @@
 				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
 				<param targetType="SELF" />
 			</effect>
+			<effect name="MaxMp">
+				<param power="92" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="mAtk" val="1.087" /> <!-- M. Power +8.7% -->
@@ -319,7 +336,6 @@
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
 				<add stat="earthRes" val="5" /> <!-- Resistance to earth attributes +5 -->
 				<add stat="runSpd" val="7" /> <!-- Increases Speed by 7 -->
-				<add stat="maxMp" val="92" /> <!-- Increases Max MP by 92 -->
 				<mul stat="pvpMagicalDef" val="1.05" /> <!-- During PvP, damage received decreased -->
 				<mul stat="pvpPhysSkillsDef" val="1.05" /> <!-- During PvP, damage received decreased -->
 				<mul stat="pvpPhysDef" val="1.05" /> <!-- During PvP, damage received decreased -->
@@ -341,6 +357,9 @@
 				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
 				<param targetType="ONE" />
 			</effect>
+			<effect name="MaxHp">
+				<param power="550" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="50" />
 				<param HOLD="50" />
@@ -348,7 +367,6 @@
 				<mul stat="pAtk" val="1.0659" /> <!-- P. Atk. +6.59% -->
 				<add stat="critRate" val="127.4" /> <!-- Critical rate +127.4 -->
 				<mul stat="magicSuccRes" val="1.02" /> <!-- Resistance to damage magic +2% -->
-				<add stat="maxHp" val="550" /> <!-- Max. HP +550 -->
 				<add stat="fireRes" val="5" /> <!-- Resistance to fire attributes +5 -->
 				<add stat="waterRes" val="5" /> <!-- Resistance to water attributes +5 -->
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
@@ -406,6 +424,9 @@
 				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
 				<param targetType="SELF" />
 			</effect>
+			<effect name="MaxMp">
+				<param power="92" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SHOCK="50" />
 				<mul stat="mAtk" val="1.1" /> <!-- M. Power +10% -->
@@ -416,7 +437,6 @@
 				<add stat="windRes" val="5" /> <!-- Resistance to wind attributes +5 -->
 				<add stat="earthRes" val="5" /> <!-- Resistance to earth attributes +5 -->
 				<add stat="runSpd" val="7" /> <!-- Increases Speed by 7 -->
-				<add stat="maxMp" val="92" /> <!-- Increases Max MP by 97 -->
 				<mul stat="magicalMpConsumeRate" val="0.97" /> <!-- Decreases MP consumption for magic skills by 3% -->
 				<mul stat="pvpMagicalDef" val="1.05" /> <!-- During PvP, damage received decreased -->
 				<mul stat="pvpPhysSkillsDef" val="1.05" /> <!-- During PvP, damage received decreased -->
@@ -701,12 +721,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="133" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="10.5" />
 				<param HOLD="10.5" />
 				<mul stat="pAtk" val="1.0062" />
 				<mul stat="pDef" val="1.0062" />
-				<add stat="maxHp" val="133" />
 			</effect>
 		</effects>
 	</skill>
@@ -717,12 +739,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="531" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="28" />
 				<param HOLD="28" />
 				<mul stat="pAtk" val="1.0557" />
 				<mul stat="pDef" val="1.0557" />
-				<add stat="maxHp" val="531" />
 			</effect>
 		</effects>
 	</skill>
@@ -733,12 +757,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="55" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="18" />
 				<param HOLD="18" />
 				<mul stat="pAtk" val="1.0103" />
 				<mul stat="pDef" val="1.0103" />
-				<add stat="maxHp" val="55" />
 			</effect>
 		</effects>
 	</skill>
@@ -749,12 +775,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="22" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="7" />
 				<param HOLD="7" />
 				<mul stat="pAtk" val="1.0041" />
 				<mul stat="pDef" val="1.0041" />
-				<add stat="maxHp" val="22" />
 			</effect>
 		</effects>
 	</skill>
@@ -765,12 +793,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="22" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="7" />
 				<param HOLD="7" />
 				<mul stat="pAtk" val="1.0041" />
 				<mul stat="pDef" val="1.0041" />
-				<add stat="maxHp" val="22" />
 			</effect>
 		</effects>
 	</skill>
@@ -793,11 +823,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="87" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0041" />
 				<mul stat="pAtkSpd" val="1.0041" />
 				<mul stat="regMp" val="1.0041" />
-				<add stat="maxMp" val="87" />
 			</effect>
 		</effects>
 	</skill>
@@ -808,11 +840,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="347" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0557" />
 				<mul stat="pAtkSpd" val="1.05" />
 				<mul stat="regMp" val="1.05" />
-				<add stat="maxMp" val="347" />
 			</effect>
 		</effects>
 	</skill>
@@ -823,11 +857,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="145" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0068" />
 				<mul stat="pAtkSpd" val="1.0068" />
 				<mul stat="regMp" val="1.0068" />
-				<add stat="maxMp" val="145" />
 			</effect>
 		</effects>
 	</skill>
@@ -838,11 +874,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="58" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0027" />
 				<mul stat="pAtkSpd" val="1.0027" />
 				<mul stat="regMp" val="1.0027" />
-				<add stat="maxMp" val="58" />
 			</effect>
 		</effects>
 	</skill>
@@ -853,11 +891,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="58" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0027" />
 				<mul stat="pAtkSpd" val="1.0027" />
 				<mul stat="regMp" val="1.0027" />
-				<add stat="maxMp" val="58" />
 			</effect>
 		</effects>
 	</skill>
@@ -980,8 +1020,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="16" />
+			<effect name="MaxMp">
+				<param power="16" />
 			</effect>
 		</effects>
 	</skill>
@@ -1005,8 +1045,8 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="maxMp" val="33" />
+			<effect name="MaxMp">
+				<param power="33" />
 			</effect>
 		</effects>
 	</skill>
@@ -1042,13 +1082,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="50" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="20" />
 				<param PARALYZE="15" />
 				<param SHOCK="15" />
 				<param SLEEP="15" />
 				<param DERANGEMENT="10" />
-				<add stat="maxMp" val="50" />
 				<add stat="regMp" val="0.23" />
 				<add stat="waterRes" val="10" />
 				<mul stat="mReuse" val="0.95" />
@@ -1064,13 +1106,15 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="50" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="25" />
 				<param PARALYZE="20" />
 				<param SHOCK="20" />
 				<param SLEEP="20" />
 				<param DERANGEMENT="10" />
-				<add stat="maxMp" val="50" />
 				<add stat="regMp" val="0.46" />
 				<add stat="waterRes" val="15" />
 				<mul stat="mReuse" val="0.95" />
@@ -1257,12 +1301,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="133" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="10.5" />
 				<param HOLD="10.5" />
 				<mul stat="pAtk" val="1.0062" />
 				<mul stat="pDef" val="1.0062" />
-				<add stat="maxHp" val="133" />
 			</effect>
 		</effects>
 	</skill>
@@ -1273,12 +1319,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="55" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="18" />
 				<param HOLD="18" />
 				<mul stat="pAtk" val="1.0103" />
 				<mul stat="pDef" val="1.0103" />
-				<add stat="maxHp" val="55" />
 			</effect>
 		</effects>
 	</skill>
@@ -1289,12 +1337,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="22" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="7" />
 				<param HOLD="7" />
 				<mul stat="pAtk" val="1.0041" />
 				<mul stat="pDef" val="1.0041" />
-				<add stat="maxHp" val="22" />
 			</effect>
 		</effects>
 	</skill>
@@ -1305,12 +1355,14 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="22" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="7" />
 				<param HOLD="7" />
 				<mul stat="pAtk" val="1.0041" />
 				<mul stat="pDef" val="1.0041" />
-				<add stat="maxHp" val="22" />
 			</effect>
 		</effects>
 	</skill>
@@ -1321,11 +1373,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="87" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0041" />
 				<mul stat="pAtkSpd" val="1.0041" />
 				<mul stat="regMp" val="1.0041" />
-				<add stat="maxMp" val="87" />
 			</effect>
 		</effects>
 	</skill>
@@ -1336,11 +1390,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="145" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0068" />
 				<mul stat="pAtkSpd" val="1.0068" />
 				<mul stat="regMp" val="1.0068" />
-				<add stat="maxMp" val="145" />
 			</effect>
 		</effects>
 	</skill>
@@ -1351,11 +1407,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="58" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0027" />
 				<mul stat="pAtkSpd" val="1.0027" />
 				<mul stat="regMp" val="1.0027" />
-				<add stat="maxMp" val="58" />
 			</effect>
 		</effects>
 	</skill>
@@ -1366,11 +1424,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="58" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.0027" />
 				<mul stat="pAtkSpd" val="1.0027" />
 				<mul stat="regMp" val="1.0027" />
-				<add stat="maxMp" val="58" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/09000-09099.xml b/dist/game/data/stats/skills/09000-09099.xml
index eba5f2c1ea277e31a02af8a5218f5cddd4cb5d9c..0b8b7d290c9e84fb5faf261850027d496044a471 100644
--- a/dist/game/data/stats/skills/09000-09099.xml
+++ b/dist/game/data/stats/skills/09000-09099.xml
@@ -234,8 +234,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -331,8 +332,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1389,9 +1391,12 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="regHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regMp" val="1.2" />
 				<mul stat="physicalMpConsumeRate" val="0.95" />
 				<mul stat="magicalMpConsumeRate" val="0.95" />
diff --git a/dist/game/data/stats/skills/21000-21099.xml b/dist/game/data/stats/skills/21000-21099.xml
index bf2ba9389939aa563c227284070e32a46f507a0f..2bc90ba4dedd1b372182ce579fccbb98953937fe 100644
--- a/dist/game/data/stats/skills/21000-21099.xml
+++ b/dist/game/data/stats/skills/21000-21099.xml
@@ -294,8 +294,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="critRate" val="100" />
 				<add stat="absorbDam" val="10" />
 			</effect>
@@ -307,8 +310,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="critRate" val="100" />
 				<mul stat="critDmg" val="1.25" />
 			</effect>
@@ -320,8 +326,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="blowRate" val="1.25" />
 				<mul stat="magicalMpConsumeRate" val="0.8" />
 			</effect>
@@ -333,8 +342,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="critRate" val="100" />
 				<add stat="absorbDam" val="10" />
 			</effect>
@@ -346,8 +358,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="critRate" val="100" />
 				<mul stat="critDmg" val="1.25" />
 			</effect>
@@ -359,8 +374,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="mAtkSpd" val="1.25" />
 				<mul stat="magicalMpConsumeRate" val="0.8" />
 			</effect>
@@ -372,8 +390,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="mAtk" val="1.5" />
 				<mul stat="magicalMpConsumeRate" val="0.8" />
 			</effect>
@@ -385,8 +406,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="magicalMpConsumeRate" val="0.8" />
 				<add stat="absorbDam" val="10" />
 			</effect>
@@ -398,8 +422,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="pAtkRange" val="1.25" />
 				<mul stat="critRate" val="1.25" />
 			</effect>
@@ -411,8 +438,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="atkCountMax" val="10" />
 				<add stat="absorbDam" val="10" />
 			</effect>
@@ -424,8 +454,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<mul stat="pAtkSpd" val="1.25" />
 				<mul stat="physicalMpConsumeRate" val="0.8" />
 				<mul stat="danceMpConsumeRate" val="0.8" />
@@ -438,8 +471,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="critRate" val="100" />
 				<add stat="absorbDam" val="10" />
 			</effect>
@@ -451,8 +487,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="critRate" val="100" />
 				<mul stat="critDmg" val="1.25" />
 			</effect>
@@ -464,8 +503,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.3" />
 				<add stat="rEvas" val="5" />
 				<add stat="accCombat" val="5" />
 			</effect>
@@ -811,8 +853,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -831,8 +874,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.25" />
+			<effect name="MaxMp">
+				<param power="25" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1807,9 +1851,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<add stat="runSpd" val="20" />
 				<sub stat="debuffVuln" val="10" />
 			</effect>
diff --git a/dist/game/data/stats/skills/21100-21199.xml b/dist/game/data/stats/skills/21100-21199.xml
index 920388ec2c26971f7badc4a4e1869b58fd133487..b6a525ac133d4e02410dce7ae19d1b4e8a32a720 100644
--- a/dist/game/data/stats/skills/21100-21199.xml
+++ b/dist/game/data/stats/skills/21100-21199.xml
@@ -88,9 +88,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="runSpd" val="1.2" />
 				<sub stat="debuffVuln" val="10" />
 			</effect>
@@ -218,9 +224,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="runSpd" val="1.2" />
 				<sub stat="debuffVuln" val="10" />
 			</effect>
@@ -290,9 +302,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="runSpd" val="1.2" />
 				<sub stat="debuffVuln" val="10" />
 			</effect>
@@ -362,9 +380,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="runSpd" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<mul stat="regMp" val="1.2" />
@@ -460,9 +484,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="darkRes" val="20" />
@@ -485,9 +515,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="darkRes" val="20" />
@@ -510,9 +546,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="darkRes" val="20" />
@@ -535,9 +577,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="darkRes" val="20" />
@@ -560,9 +608,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="darkRes" val="20" />
@@ -585,9 +639,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="pAtkSpd" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
 				<add stat="darkRes" val="20" />
@@ -610,9 +670,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="critRate" val="1.1" />
 				<mul stat="critDmg" val="1.1" />
 				<add stat="darkRes" val="20" />
@@ -635,9 +701,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="runSpd" val="1.1" />
 				<add stat="absorbDam" val="5" />
 				<add stat="darkRes" val="20" />
@@ -659,9 +731,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="runSpd" val="1.2" />
 				<mul stat="magicalMpConsumeRate" val="0.95" />
 				<mul stat="physicalMpConsumeRate" val="0.95" />
@@ -685,9 +763,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="mAtkSpd" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<add stat="darkRes" val="20" />
@@ -778,10 +862,19 @@
 		<set name="targetType" val="PARTY" />
 		<set name="trait" val="ETC" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<mul stat="runSpd" val="1.3" />
@@ -804,9 +897,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="pAtkSpd" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
 				<add stat="darkRes" val="20" />
@@ -829,9 +928,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="critRate" val="1.1" />
 				<mul stat="critDmg" val="1.1" />
 				<add stat="darkRes" val="20" />
@@ -854,9 +959,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="runSpd" val="1.1" />
 				<add stat="absorbDam" val="5" />
 				<add stat="darkRes" val="20" />
@@ -879,9 +990,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="runSpd" val="1.2" />
 				<mul stat="magicalMpConsumeRate" val="0.95" />
 				<mul stat="physicalMpConsumeRate" val="0.95" />
@@ -906,9 +1023,15 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
 				<mul stat="mAtkSpd" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<add stat="darkRes" val="20" />
@@ -1088,8 +1211,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.25" />
+			<effect name="MaxHp">
+				<param power="25" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1107,8 +1231,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.25" />
+			<effect name="MaxMp">
+				<param power="25" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1377,8 +1502,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.25" />
+			<effect name="MaxMp">
+				<param power="25" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/22000-22099.xml b/dist/game/data/stats/skills/22000-22099.xml
index 93dfb60e9514de3614feacee1533740aa2183cbf..752a59b9b04ee8936102ab6475080151ad2126fe 100644
--- a/dist/game/data/stats/skills/22000-22099.xml
+++ b/dist/game/data/stats/skills/22000-22099.xml
@@ -260,10 +260,19 @@
 			<player class_id_restriction="0,1,2,3,4,5,6,18,19,20,21,31,32,33,34,44,45,46,53,54,55,56,57,88,89,90,91,99,100,106,107,113,117,118" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.6" />
-				<mul stat="maxMp" val="1.6" />
-				<mul stat="maxCp" val="1.6" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
@@ -292,10 +301,19 @@
 			<player class_id_restriction="7,8,9,22,23,24,35,36,37,47,48,92,93,101,102,108,109,114,123,124,125,126,127,128,129,130,131,132,133,134,135,136" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pAtk" val="1.3" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
@@ -324,10 +342,19 @@
 			<player class_id_restriction="15,16,17,29,30,42,43,97,98,105,112" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.6" />
-				<mul stat="maxMp" val="1.6" />
-				<mul stat="maxCp" val="1.6" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="20" />
@@ -355,10 +382,19 @@
 			<player class_id_restriction="10,11,12,13,14,25,26,27,28,38,39,40,41,49,50,51,52,94,95,96,103,104,110,111,115,116" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="mAtk" val="1.45" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
@@ -1272,8 +1308,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1333,8 +1370,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1703,8 +1741,11 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="10" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.1" />
 				<mul stat="pReuse" val="0.8" />
 				<mul stat="mReuse" val="0.8" />
 				<add stat="reflectDam" val="5" />
@@ -1829,10 +1870,19 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.6" />
-				<mul stat="maxMp" val="1.6" />
-				<mul stat="maxCp" val="1.6" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="30" />
@@ -1861,10 +1911,19 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="20" />
@@ -1897,10 +1956,19 @@
 			<effect name="ConsumeBody" />
 		</effects>
 		<selfEffects>
+			<effect name="MaxHp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.6" />
-				<mul stat="maxMp" val="1.6" />
-				<mul stat="maxCp" val="1.6" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="30" />
diff --git a/dist/game/data/stats/skills/22100-22199.xml b/dist/game/data/stats/skills/22100-22199.xml
index 65ac88adce33a225838f7bc94caf4f8f6fe3e818..e7e3cf796ab3eefb1748e4f72ee52c0ce4b719bf 100644
--- a/dist/game/data/stats/skills/22100-22199.xml
+++ b/dist/game/data/stats/skills/22100-22199.xml
@@ -22,10 +22,19 @@
 			<effect name="ConsumeBody" />
 		</effects>
 		<selfEffects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="20" />
@@ -525,11 +534,14 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="danceMpConsumeRate" val="0.8" />
 				<mul stat="magicalMpConsumeRate" val="0.8" />
 				<mul stat="mAtkSpd" val="1.3" />
-				<mul stat="maxHp" val="1.35" />
 				<mul stat="physicalMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
@@ -572,8 +584,11 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
 				<add stat="rEvas" val="4" />
 				<add stat="runSpd" val="33" />
 			</effect>
@@ -1010,8 +1025,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1073,8 +1089,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/dist/game/data/stats/skills/22200-22299.xml b/dist/game/data/stats/skills/22200-22299.xml
index e5f53d7dd24f6cb81bec7e7df9bb01d2fd321b01..a8b58c4b87a9fcecfe72a65af3b25e4f8764cf4b 100644
--- a/dist/game/data/stats/skills/22200-22299.xml
+++ b/dist/game/data/stats/skills/22200-22299.xml
@@ -302,8 +302,11 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />	
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="critDmg" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
diff --git a/dist/game/data/stats/skills/23000-23099.xml b/dist/game/data/stats/skills/23000-23099.xml
index dfb57325a725480617aa19ed134cd31909f711da..373f1f834d720f017b11ca34abe57a3ea539f7cc 100644
--- a/dist/game/data/stats/skills/23000-23099.xml
+++ b/dist/game/data/stats/skills/23000-23099.xml
@@ -338,10 +338,19 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
@@ -367,10 +376,19 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="mDef" val="1.2" />
@@ -1427,10 +1445,19 @@
 			<player agathionId="1528" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="60" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.6" />
-				<mul stat="maxMp" val="1.6" />
-				<mul stat="maxCp" val="1.6" /> 
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="30" />
@@ -1466,10 +1493,19 @@
 			<player agathionId="1528" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.4" />
-				<mul stat="maxMp" val="1.4" />
-				<mul stat="maxCp" val="1.4" />
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="20" />
@@ -1594,9 +1630,15 @@
 			<player agathionId="1531" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regMp" val="1.2"/>
 				<mul stat="runSpd" val="1.2"/>
 				<mul stat="regHp" val="1.2"/>
@@ -1717,9 +1759,15 @@
 			<player agathionId="1534" />
 		</cond>
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regMp" val="1.2"/>
 				<mul stat="runSpd" val="1.2"/>
 				<mul stat="regHp" val="1.2"/>
diff --git a/dist/game/data/stats/skills/23200-23299.xml b/dist/game/data/stats/skills/23200-23299.xml
index fdd9f8019a23dbca5a5c6643ef112dce8352942f..f5116c26f98d48c729e31cda66237fabe7bacc28 100644
--- a/dist/game/data/stats/skills/23200-23299.xml
+++ b/dist/game/data/stats/skills/23200-23299.xml
@@ -514,8 +514,11 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.15" />
 				<add stat="regMp" val="1.5">
 					<using kind="HEAVY,LIGHT" />
 				</add>
@@ -828,8 +831,9 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -845,8 +849,9 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -1139,8 +1144,11 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
 				<add stat="mCritRate" val="2" />
 				<mul stat="critDmg" val="1.2" />
@@ -1168,8 +1176,11 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
@@ -1289,9 +1300,13 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="MAX_HP_UP,9;MAX_MP_UP,9" />
@@ -1512,8 +1527,11 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
+			<effect name="MaxMp">
+				<param power="15" />
+				<param type="PER" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.15" />
 				<add stat="regMp" val="1.5">
 					<using kind="HEAVY,LIGHT" />
 				</add>
diff --git a/dist/game/data/stats/skills/26000-26099.xml b/dist/game/data/stats/skills/26000-26099.xml
index 0e64a84a6b135ba4dc265fb54cf501936d34b63a..5e7a023c226628710e770a35476fa1bfb6759012 100644
--- a/dist/game/data/stats/skills/26000-26099.xml
+++ b/dist/game/data/stats/skills/26000-26099.xml
@@ -598,8 +598,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxHp" val="1.35" />
+			<effect name="MaxHp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
@@ -668,8 +669,9 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="maxMp" val="1.35" />
+			<effect name="MaxMp">
+				<param power="35" />
+				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>