diff --git a/dist/game/data/scripts/handlers/EffectMasterHandler.java b/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 7fefa9f1f983350dc582ab69750845484cf64311..3824dff8996fce892c5115613ecebd4f6a730f0c 100644
--- a/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -63,10 +63,8 @@ public final class EffectMasterHandler
Confuse.class,
ConsumeBody.class,
ConvertItem.class,
- CpDamPercent.class,
- CpHeal.class,
+ Cp.class,
CpHealOverTime.class,
- CpHealPercent.class,
CrystalGradeModify.class,
CubicMastery.class,
DamOverTime.class,
diff --git a/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/dist/game/data/scripts/handlers/effecthandlers/Cp.java
similarity index 51%
rename from dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
rename to dist/game/data/scripts/handlers/effecthandlers/Cp.java
index 0a8baf2d4a24eda995f55783edc053950ce90f05..bc429b1785f79cc06a4e2ae991429c34dc759cb4 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/Cp.java
@@ -18,6 +18,7 @@
*/
package handlers.effecthandlers;
+import com.l2jserver.gameserver.enums.EffectCalculationType;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.conditions.Condition;
@@ -28,24 +29,27 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
- * Cp Heal effect implementation.
- * @author UnAfraid
+ * Cp effect implementation.
+ * @author Adry_85
+ * @since 2.6.0.0
*/
-public final class CpHeal extends AbstractEffect
+public final class Cp extends AbstractEffect
{
- private final double _power;
+ private final double _amount;
+ private final EffectCalculationType _mode;
- public CpHeal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+ public Cp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _power = params.getDouble("power", 0);
+ _amount = params.getDouble("amount", 0);
+ _mode = params.getEnum("mode", EffectCalculationType.class, EffectCalculationType.DIFF);
}
@Override
public L2EffectType getEffectType()
{
- return L2EffectType.CPHEAL;
+ return L2EffectType.CP;
}
@Override
@@ -58,22 +62,52 @@ public final class CpHeal extends AbstractEffect
public void onStart(BuffInfo info)
{
final L2Character target = info.getEffected();
- if ((target == null) || target.isDead() || target.isDoor())
+ final L2Character activeChar = info.getEffector();
+ if ((target == null) || target.isDead() || !target.isPlayer())
{
return;
}
- double amount = _power;
+ double amount = 0;
+ switch (_mode)
+ {
+ case DIFF:
+ {
+ amount = Math.min(_amount, target.getMaxRecoverableCp() - target.getCurrentCp());
+ break;
+ }
+ case PER:
+ {
+ if (_amount < 0)
+ {
+ amount = (target.getCurrentCp() * _amount) / 100;
+ }
+ else
+ {
+ amount = Math.min((target.getMaxCp() * _amount) / 100.0, target.getMaxRecoverableCp() - target.getCurrentCp());
+ }
+ break;
+ }
+ }
- // Prevents overheal and negative amount
- amount = Math.max(Math.min(amount, target.getMaxRecoverableCp() - target.getCurrentCp()), 0);
if (amount != 0)
{
target.setCurrentCp(amount + target.getCurrentCp());
}
- final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
- sm.addInt((int) amount);
- target.sendPacket(sm);
+ if (amount >= 0)
+ {
+ if ((activeChar != null) && (activeChar != target))
+ {
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+ sm.addCharName(activeChar);
+ sm.addInt((int) amount);
+ target.sendPacket(sm);
+ }
+ else
+ {
+ target.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED).addInt((int) amount));
+ }
+ }
}
}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
deleted file mode 100644
index 05924ca4278619f956613f23d058e218efd75c80..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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;
-
-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.skills.BuffInfo;
-import com.l2jserver.gameserver.model.stats.Formulas;
-
-/**
- * CP Damage Percent effect implementation.
- * @author Zoey76, Adry_85
- */
-public final class CpDamPercent extends AbstractEffect
-{
- private final double _power;
-
- public CpDamPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
- {
- super(attachCond, applyCond, set, params);
-
- _power = params.getDouble("power", 0);
- }
-
- @Override
- public boolean isInstant()
- {
- return true;
- }
-
- @Override
- public void onStart(BuffInfo info)
- {
- if (!info.getEffected().isPlayer())
- {
- return;
- }
-
- final L2Character target = info.getEffected();
- if (target.isPlayer() && target.getActingPlayer().isFakeDeath())
- {
- target.stopFakeDeath(true);
- }
-
- double damage = (target.getCurrentCp() * _power) / 100;
- // Manage attack or cast break of the target (calculating rate, sending message)
- if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
- {
- target.breakAttack();
- target.breakCast();
- }
-
- if (damage > 0)
- {
- target.setCurrentCp(target.getCurrentCp() - damage);
- }
- }
-}
\ No newline at end of file
diff --git a/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
deleted file mode 100644
index 76b88c1fb51c6005eda8dd9cc636100612142450..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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;
-
-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.skills.BuffInfo;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
-/**
- * Cp Heal Percent effect implementation.
- * @author UnAfraid
- */
-public final class CpHealPercent extends AbstractEffect
-{
- private final double _power;
-
- public CpHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
- {
- super(attachCond, applyCond, set, params);
-
- _power = params.getDouble("power", 0);
- }
-
- @Override
- public boolean isInstant()
- {
- return true;
- }
-
- @Override
- public void onStart(BuffInfo info)
- {
- final L2Character target = info.getEffected();
- if ((target == null) || target.isDead() || target.isDoor())
- {
- return;
- }
-
- double amount = 0;
- double power = _power;
- boolean full = (power == 100.0);
-
- amount = full ? target.getMaxCp() : (target.getMaxCp() * power) / 100.0;
- // Prevents overheal and negative amount
- amount = Math.max(Math.min(amount, target.getMaxRecoverableCp() - target.getCurrentCp()), 0);
- if (amount != 0)
- {
- target.setCurrentCp(amount + target.getCurrentCp());
- }
-
- final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
- sm.addInt((int) amount);
- target.sendPacket(sm);
- }
-}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java
index 031b718fed86903e4c5cd1f169d0274f5a332dd4..bf8fefc6effccdc2564f7847c5797d98ccc3f2c4 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java
@@ -101,9 +101,7 @@ public final class MaxCp extends AbstractEffect
}
if (_heal)
{
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
- sm.addInt((int) amount);
- effected.sendPacket(sm);
+ effected.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED).addInt((int) amount));
}
}
diff --git a/dist/game/data/stats/skills/00300-00399.xml b/dist/game/data/stats/skills/00300-00399.xml
index 044ac2415a76e4199023a1c798e4832a379d3a8e..55e871d32862ac6c31226018c056fd27a1ec8bd4 100644
--- a/dist/game/data/stats/skills/00300-00399.xml
+++ b/dist/game/data/stats/skills/00300-00399.xml
@@ -765,8 +765,8 @@
<table name="#effectPoints"> -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
<table name="#magicLvl"> 65 66 67 68 69 70 71 72 73 74 </table>
<table name="#mpConsume2"> 66 67 68 69 70 71 72 73 74 75 </table>
- <table name="#power"> 7 10 12 15 17 20 22 25 27 30 </table>
- <table name="#ench1Power"> 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 </table>
+ <table name="#power"> -7 -10 -12 -15 -17 -20 -22 -25 -27 -30 </table>
+ <table name="#ench1Power"> -31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -41 -42 -43 -44 -45 -46 -47 -48 -49 -50 -51 -52 -53 -54 -55 -56 -57 -58 -59 -60 </table>
<table name="#ench2MpConsume2"> 74 72 71 69 68 67 65 64 62 61 59 58 56 55 53 52 50 49 48 46 45 43 42 40 39 37 36 34 33 32 </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="affectLimit" val="5-12" />
@@ -791,13 +791,15 @@
<using kind="POLE" />
</cond>
<effects>
- <effect name="CpDamPercent">
- <param power="#power" />
+ <effect name="Cp">
+ <param amount="#power" />
+ <param mode="PER" />
</effect>
</effects>
<enchant1Effects>
- <effect name="CpDamPercent">
- <param power="#ench1Power" />
+ <effect name="Cp">
+ <param amount="#ench1Power" />
+ <param mode="PER" />
</effect>
</enchant1Effects>
</skill>
@@ -1414,8 +1416,9 @@
<effect name="DispelByCategory">
<param slot="BUFF" rate="25" max="5" />
</effect>
- <effect name="CpDamPercent">
- <param power="90" />
+ <effect name="Cp">
+ <param amount="-90" />
+ <param mode="PER" />
</effect>
</effects>
<enchant2Effects>
@@ -1427,8 +1430,9 @@
<effect name="DispelByCategory">
<param slot="BUFF" rate="25" max="5" />
</effect>
- <effect name="CpDamPercent">
- <param power="90" />
+ <effect name="Cp">
+ <param amount="-90" />
+ <param mode="PER" />
</effect>
</enchant2Effects>
</skill>
diff --git a/dist/game/data/stats/skills/00400-00499.xml b/dist/game/data/stats/skills/00400-00499.xml
index c6c201e09cc12b9cc408a06d617d375a66ec315a..17ac3d4e73e6344801abc34c41763fadd02a8fa0 100644
--- a/dist/game/data/stats/skills/00400-00499.xml
+++ b/dist/game/data/stats/skills/00400-00499.xml
@@ -1652,13 +1652,15 @@
<set name="rideState" val="NONE" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="1000" />
+ <effect name="Cp">
+ <param amount="1000" />
+ <param mode="DIFF" />
</effect>
</effects>
<enchant1Effects>
- <effect name="CpHeal">
- <param power="#ench1amount" />
+ <effect name="Cp">
+ <param amount="#ench1amount" />
+ <param mode="DIFF" />
</effect>
</enchant1Effects>
</skill>
diff --git a/dist/game/data/stats/skills/00500-00599.xml b/dist/game/data/stats/skills/00500-00599.xml
index 54c8a71efd4d9e14f959b5b4ead8d95119c01905..808414efc24da1735a7e6016703c986c49d0b10b 100644
--- a/dist/game/data/stats/skills/00500-00599.xml
+++ b/dist/game/data/stats/skills/00500-00599.xml
@@ -1481,8 +1481,9 @@
<player cp="80" />
</cond>
<effects>
- <effect name="CpDamPercent">
- <param power="100" />
+ <effect name="Cp">
+ <param amount="-100" />
+ <param mode="PER" />
</effect>
<effect name="Buff">
<mul stat="maxHp" val="1.35" />
diff --git a/dist/game/data/stats/skills/00700-00799.xml b/dist/game/data/stats/skills/00700-00799.xml
index 486c4ecb00d2193279fbe33be1c235f66e562cf9..c7d63baa2bf8749bd46a3cdd3bd1ab7f145d004d 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -1678,8 +1678,9 @@
<effect name="DispelByCategory">
<param slot="BUFF" rate="25" max="5" />
</effect>
- <effect name="CpDamPercent">
- <param power="90" />
+ <effect name="Cp">
+ <param amount="-90" />
+ <param mode="PER" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/01100-01199.xml b/dist/game/data/stats/skills/01100-01199.xml
index b02f29bfce416d08eead1232ec293b2b88553ab9..b55f86aa00e9bbc542dd951b8f6bd08ad9462eea 100644
--- a/dist/game/data/stats/skills/01100-01199.xml
+++ b/dist/game/data/stats/skills/01100-01199.xml
@@ -778,8 +778,9 @@
<effect name="ConsumeBody" />
</enchant2Effects>
<enchant2selfEffects>
- <effect name="CpHeal">
- <param power="#ench2Bravery" />
+ <effect name="Cp">
+ <param amount="#ench2Bravery" />
+ <param mode="DIFF" />
</effect>
</enchant2selfEffects>
</skill>
@@ -922,8 +923,9 @@
</effect>
</enchant1Effects>
<enchant3Effects>
- <effect name="CpHeal">
- <param power="#ench3Bravery" />
+ <effect name="Cp">
+ <param amount="#ench3Bravery" />
+ <param mode="DIFF" />
</effect>
<effect name="ManaHeal">
<param power="61" />
diff --git a/dist/game/data/stats/skills/01200-01299.xml b/dist/game/data/stats/skills/01200-01299.xml
index 102f5e093e23decd79d1febde66bf6ca4d3acd91..5303d427601b2c7dae7823ccfc3ceaacddb68c51 100644
--- a/dist/game/data/stats/skills/01200-01299.xml
+++ b/dist/game/data/stats/skills/01200-01299.xml
@@ -2636,8 +2636,9 @@
</effect>
</effects>
<enchant2Effects>
- <effect name="CpHeal">
- <param power="#ench2Bravery" />
+ <effect name="Cp">
+ <param amount="#ench2Bravery" />
+ <param mode="DIFF" />
</effect>
<effect name="HealPercent">
<param power="100" />
diff --git a/dist/game/data/stats/skills/01300-01399.xml b/dist/game/data/stats/skills/01300-01399.xml
index 833362011b3099216eab5b85423c61605266f94f..aab56a9acaec475d85cb1f0d6c7f646c1679de32 100644
--- a/dist/game/data/stats/skills/01300-01399.xml
+++ b/dist/game/data/stats/skills/01300-01399.xml
@@ -149,13 +149,15 @@
<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
<enchant1Effects>
- <effect name="CpHeal">
- <param power="#ench1amount" />
+ <effect name="Cp">
+ <param amount="#ench1amount" />
+ <param mode="DIFF" />
</effect>
</enchant1Effects>
</skill>
@@ -187,13 +189,15 @@
<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
<enchant1Effects>
- <effect name="CpHeal">
- <param power="#ench1amount" />
+ <effect name="Cp">
+ <param amount="#ench1amount" />
+ <param mode="DIFF" />
</effect>
</enchant1Effects>
</skill>
diff --git a/dist/game/data/stats/skills/01400-01499.xml b/dist/game/data/stats/skills/01400-01499.xml
index ca1761cd2851e6f421e9236026ab7acc6c7788f2..5d834774b5ec657aa763f49220baad2ed5b74c43 100644
--- a/dist/game/data/stats/skills/01400-01499.xml
+++ b/dist/game/data/stats/skills/01400-01499.xml
@@ -552,9 +552,6 @@
<sub stat="debuffVuln" val="10" />
<mul stat="runSpd" val="0.8" />
</effect>
- <effect name="CpHealPercent">
- <param power="20" />
- </effect>
</effects>
<enchant3Effects>
<effect name="Buff">
@@ -572,9 +569,6 @@
<sub stat="debuffVuln" val="10" />
<mul stat="runSpd" val="#ench3decreasePenalty" />
</effect>
- <effect name="CpHealPercent">
- <param power="20" />
- </effect>
</enchant3Effects>
</skill>
<skill id="1415" levels="1" name="Pa'agrio's Emblem" enchantGroup1="5" enchantGroup2="5">
diff --git a/dist/game/data/stats/skills/01500-01599.xml b/dist/game/data/stats/skills/01500-01599.xml
index 283041a525323a13b02c2269fa287b50c80ab40a..4e7b976b473dae67940f6dc864cdeba8f79fea08 100644
--- a/dist/game/data/stats/skills/01500-01599.xml
+++ b/dist/game/data/stats/skills/01500-01599.xml
@@ -182,8 +182,9 @@
<param block="MP"/>
</effect>
<effect name="BlockDebuff" />
- <effect name="CpHeal">
- <param power="9000" />
+ <effect name="Cp">
+ <param amount="9000" />
+ <param mode="DIFF" />
</effect>
<effect name="HealPercent">
<param power="100" />
@@ -214,8 +215,9 @@
</not>
</cond>
<effects>
- <effect name="CpHeal">
- <param power="9000" />
+ <effect name="Cp">
+ <param amount="9000" />
+ <param mode="DIFF" />
</effect>
<effect name="HealPercent">
<param power="100" />
diff --git a/dist/game/data/stats/skills/02100-02199.xml b/dist/game/data/stats/skills/02100-02199.xml
index 5594383e5af22d45cf848977ad445e116fb68323..1668e2c3993667424ed0f3fb173c8c2b25c937c7 100644
--- a/dist/game/data/stats/skills/02100-02199.xml
+++ b/dist/game/data/stats/skills/02100-02199.xml
@@ -883,8 +883,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/02200-02299.xml b/dist/game/data/stats/skills/02200-02299.xml
index 000297db064ddff1a8c2a7e8aed06ed170e095a2..d89d9c66da0fcaf2c559e0cfab7e2d103eaf448d 100644
--- a/dist/game/data/stats/skills/02200-02299.xml
+++ b/dist/game/data/stats/skills/02200-02299.xml
@@ -1964,8 +1964,9 @@
<player levelRange="#levelRange" />
</cond>
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/02400-02499.xml b/dist/game/data/stats/skills/02400-02499.xml
index 80ff1f2e000dfd51d3531fe06b7eab3ac05f2f13..992ed42cf75a59b26bde4729efdd9ed5f714953c 100644
--- a/dist/game/data/stats/skills/02400-02499.xml
+++ b/dist/game/data/stats/skills/02400-02499.xml
@@ -51,8 +51,9 @@
<player level="52" />
</cond>
<effects>
- <effect name="CpHeal">
- <param power="1000" />
+ <effect name="Cp">
+ <param amount="1000" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
@@ -65,8 +66,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="1000" />
+ <effect name="Cp">
+ <param amount="1000" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/02800-02899.xml b/dist/game/data/stats/skills/02800-02899.xml
index 4b4dede40623ab6c81b0d8c2d5899b193ee45f1e..dc7cd05a8c1c0f883177c73ef534b58dc47602d2 100644
--- a/dist/game/data/stats/skills/02800-02899.xml
+++ b/dist/game/data/stats/skills/02800-02899.xml
@@ -1460,8 +1460,9 @@
<player levelRange="#levelRange" />
</cond>
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/02900-02999.xml b/dist/game/data/stats/skills/02900-02999.xml
index 4229cfe2f4c18d30ed585bfaf3c1801fc28c9f7c..f213659010804ee2b2c5dc5680b5eee1ecb1eac1 100644
--- a/dist/game/data/stats/skills/02900-02999.xml
+++ b/dist/game/data/stats/skills/02900-02999.xml
@@ -175,8 +175,9 @@
<player levelRange="61;75" />
</cond>
<effects>
- <effect name="CpHeal">
- <param power="360" />
+ <effect name="Cp">
+ <param amount="360" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/03100-03199.xml b/dist/game/data/stats/skills/03100-03199.xml
index 8141206a1b13e61190f74ce5375ae87587abaf2f..2f2eeacb302b78ccbbcc45cd5644fa3cdf4b0774 100644
--- a/dist/game/data/stats/skills/03100-03199.xml
+++ b/dist/game/data/stats/skills/03100-03199.xml
@@ -864,8 +864,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/03200-03299.xml b/dist/game/data/stats/skills/03200-03299.xml
index 95b79acb09e31c45fd523cf68e1039e7285d4fcc..01ca56a0a6a7f55f5ad863d790985925edd9331e 100644
--- a/dist/game/data/stats/skills/03200-03299.xml
+++ b/dist/game/data/stats/skills/03200-03299.xml
@@ -1270,8 +1270,9 @@
<effect name="Heal">
<param power="200" />
</effect>
- <effect name="CpHeal">
- <param power="200" />
+ <effect name="Cp">
+ <param amount="200" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/03400-03499.xml b/dist/game/data/stats/skills/03400-03499.xml
index 5b4c1454bde974b6dbb890c73bc7d0f39994fe63..52f9e0d53461aa905145434c6bb94788fcbe66c2 100644
--- a/dist/game/data/stats/skills/03400-03499.xml
+++ b/dist/game/data/stats/skills/03400-03499.xml
@@ -1307,8 +1307,9 @@
<effect name="Heal">
<param power="100" />
</effect>
- <effect name="CpHeal">
- <param power="100" />
+ <effect name="Cp">
+ <param amount="100" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/04300-04399.xml b/dist/game/data/stats/skills/04300-04399.xml
index 1027e200839c28e9b8c45a139ebcbffec3f084af..8823b60d7b5a3194babd3d1e9dc2f8a07d209895 100644
--- a/dist/game/data/stats/skills/04300-04399.xml
+++ b/dist/game/data/stats/skills/04300-04399.xml
@@ -1481,8 +1481,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<effects>
- <effect name="CpHeal">
- <param power="5000" />
+ <effect name="Cp">
+ <param amount="5000" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/05100-05199.xml b/dist/game/data/stats/skills/05100-05199.xml
index a681c62cc741486e044e9dea1386078437aaab61..4a3991a0c32ce38846de69def180b0aaff8ac396 100644
--- a/dist/game/data/stats/skills/05100-05199.xml
+++ b/dist/game/data/stats/skills/05100-05199.xml
@@ -1072,8 +1072,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/05600-05699.xml b/dist/game/data/stats/skills/05600-05699.xml
index 4119762255a280be27c910c6e1164dd379216910..02384b375602099ce7b43869db73a7f299ff4617 100644
--- a/dist/game/data/stats/skills/05600-05699.xml
+++ b/dist/game/data/stats/skills/05600-05699.xml
@@ -1526,8 +1526,9 @@
<set name="staticReuse" val="true" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="200" />
+ <effect name="Cp">
+ <param amount="200" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/05700-05799.xml b/dist/game/data/stats/skills/05700-05799.xml
index 3a2b644693ad6af0cb53a6a9460f6f8b6aa55b90..d4d995093f07a3d33229730f0754ac773b540504 100644
--- a/dist/game/data/stats/skills/05700-05799.xml
+++ b/dist/game/data/stats/skills/05700-05799.xml
@@ -854,8 +854,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<effects>
- <effect name="CpHeal">
- <param power="5000" />
+ <effect name="Cp">
+ <param amount="5000" />
+ <param mode="DIFF" />
</effect>
<effect name="HealPercent">
<param power="100" />
diff --git a/dist/game/data/stats/skills/06200-06299.xml b/dist/game/data/stats/skills/06200-06299.xml
index 8e729dd7402f687718ea96bc52f411a27178bbf8..3fca168a3985cd34dc84a2da051790d996077bba 100644
--- a/dist/game/data/stats/skills/06200-06299.xml
+++ b/dist/game/data/stats/skills/06200-06299.xml
@@ -1188,8 +1188,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<effects>
- <effect name="CpHealPercent">
- <param power="100" />
+ <effect name="Cp">
+ <param amount="100" />
+ <param mode="PER" />
</effect>
<effect name="HealPercent">
<param power="100" />
diff --git a/dist/game/data/stats/skills/08300-08399.xml b/dist/game/data/stats/skills/08300-08399.xml
index 292063cf3ae6a2e58bb3f277372ac666357bd34e..9b059f88dcfcc4320b6a9889ca9db14404eba4ee 100644
--- a/dist/game/data/stats/skills/08300-08399.xml
+++ b/dist/game/data/stats/skills/08300-08399.xml
@@ -211,8 +211,9 @@
<effect name="Buff">
<add stat="maxCp" val="1200" />
</effect>
- <effect name="CpHeal">
- <param power="1200" />
+ <effect name="Cp">
+ <param amount="1200" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
@@ -236,8 +237,9 @@
<effect name="Buff">
<add stat="maxCp" val="800" />
</effect>
- <effect name="CpHeal">
- <param power="800" />
+ <effect name="Cp">
+ <param amount="800" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
@@ -598,8 +600,9 @@
<effect name="Buff">
<add stat="maxCp" val="1500" />
</effect>
- <effect name="CpHeal">
- <param power="1500" />
+ <effect name="Cp">
+ <param amount="1500" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/09000-09099.xml b/dist/game/data/stats/skills/09000-09099.xml
index 7cac3fcbce3f73b6fd688cd13d2fdc1f2267fc8b..4d6f1134bf68e1e3f5a7797b7fec3f48d8578d2b 100644
--- a/dist/game/data/stats/skills/09000-09099.xml
+++ b/dist/game/data/stats/skills/09000-09099.xml
@@ -1540,8 +1540,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="300" />
+ <effect name="Cp">
+ <param amount="300" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/22000-22099.xml b/dist/game/data/stats/skills/22000-22099.xml
index d53f76d91cb1e85fd6edf7cb1f3027e604b94654..d6377a1fe479a4586711bdc437ea80c9a9ca96a4 100644
--- a/dist/game/data/stats/skills/22000-22099.xml
+++ b/dist/game/data/stats/skills/22000-22099.xml
@@ -801,8 +801,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="200" />
+ <effect name="Cp">
+ <param amount="200" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
@@ -821,8 +822,9 @@
<player levelRange="#levelRange" />
</cond>
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/22200-22299.xml b/dist/game/data/stats/skills/22200-22299.xml
index ceef43b4f16e4a20332485df6b3271a9b6ff4661..f6434b707750bc050ee0e2aabc1ffe51f61838ee 100644
--- a/dist/game/data/stats/skills/22200-22299.xml
+++ b/dist/game/data/stats/skills/22200-22299.xml
@@ -416,8 +416,9 @@
<set name="reuseDelay" val="300000" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHealPercent">
- <param power="100" />
+ <effect name="Cp">
+ <param amount="20000" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
@@ -433,8 +434,9 @@
<set name="reuseDelay" val="300000" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHealPercent">
- <param power="100" />
+ <effect name="Cp">
+ <param amount="20000" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/23100-23199.xml b/dist/game/data/stats/skills/23100-23199.xml
index 711c902b0f2b6085e9d5d54072fe30f4784e4352..e250a40fd0c88c9e576c30d3f5c63f7e21443205 100644
--- a/dist/game/data/stats/skills/23100-23199.xml
+++ b/dist/game/data/stats/skills/23100-23199.xml
@@ -934,8 +934,9 @@
<param block="MP"/>
</effect>
<effect name="BlockDebuff" />
- <effect name="CpHealPercent">
- <param power="100" />
+ <effect name="Cp">
+ <param amount="9000" />
+ <param mode="DIFF" />
</effect>
<effect name="HealPercent">
<param power="100" />
diff --git a/dist/game/data/stats/skills/26000-26099.xml b/dist/game/data/stats/skills/26000-26099.xml
index e480c3e50a3c8c9f0c11ed3c2094d13310c96bd2..9406faba9b34e93d258bc2893716bd2989546b07 100644
--- a/dist/game/data/stats/skills/26000-26099.xml
+++ b/dist/game/data/stats/skills/26000-26099.xml
@@ -334,8 +334,9 @@
<player levelRange="#levelRange" />
</cond>
<effects>
- <effect name="CpHeal">
- <param power="#amount" />
+ <effect name="Cp">
+ <param amount="#amount" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>
@@ -367,8 +368,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="CpHeal">
- <param power="50" />
+ <effect name="Cp">
+ <param amount="50" />
+ <param mode="DIFF" />
</effect>
</effects>
</skill>