diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
index 5ad4c4116618c38cff6038781dc6c6ffe00387b4..0eaf02be42f7d50e1f7a5d2a7d85dfa546cc91da 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.EffectScope;
-import com.l2jserver.gameserver.model.stats.Env;
import com.l2jserver.gameserver.model.stats.Formulas;
/**
@@ -74,11 +73,7 @@ public final class StealAbnormal extends AbstractEffect
for (BuffInfo infoToSteal : toSteal)
{
// Invert effected and effector.
- final Env env = new Env();
- env.setCharacter(info.getEffected());
- env.setTarget(info.getEffector());
- env.setSkill(infoToSteal.getSkill());
- final BuffInfo stolen = new BuffInfo(env);
+ final BuffInfo stolen = new BuffInfo(info.getEffected(), info.getEffector(), infoToSteal.getSkill());
stolen.setAbnormalTime(infoToSteal.getTime()); // Copy the remaining time.
// To include all the effects, it's required to go through the template rather the buff info.
infoToSteal.getSkill().applyEffectScope(EffectScope.GENERAL, stolen, true, true);
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00100-00199.xml b/L2J_DataPack/dist/game/data/stats/skills/00100-00199.xml
index 79396a9c25bc19e1b95ae152418b6cc5c3bbd98c..c1567c739d5713ebb1bdb8c8cf8f014260bdd4ea 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00100-00199.xml
@@ -338,7 +338,7 @@
</for>
<enchant3for>
<effect name="Root">
- <basemul order="0x30" stat="defCritRate" val="#ench3defCritRate" />
+ <mul order="0x01" stat="defCritRate" val="#ench3defCritRate" />
</effect>
<effect name="DefenceTrait">
<param HOLD="100" />
@@ -947,12 +947,12 @@
<enchant1 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rate" />
+ <mul order="0x01" stat="rCrit" val="#rate" />
</effect>
</for>
<enchant1for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#ench1rate" />
+ <mul order="0x01" stat="rCrit" val="#ench1rate" />
</effect>
</enchant1for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml
index 6bc56bd4546cc0d1ee32d419ccf65cbf08448fc6..9aa6ba0ec2d02372760ed7313fe36e5c278b76a7 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml
@@ -171,9 +171,9 @@
<add order="0x40" stat="pAtk" val="112.8">
<using kind="DAGGER,DUALDAGGER" />
</add>
- <basemul order="0x30" stat="rCrit" val="#ench2rCrit">
+ <mul order="0x01" stat="rCrit" val="#ench2rCrit">
<using kind="DAGGER,DUALDAGGER" />
- </basemul>
+ </mul>
</effect>
<effect name="TriggerSkillByAttack">
<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -983,6 +983,7 @@
<set name="targetType" val="SELF" />
</skill>
<skill id="244" levels="3" name="Armor Mastery">
+ <!-- Confirmed CT2.5 -->
<table name="#magicLvl"> 7 11 14 </table>
<table name="#pDef"> 6.7 8 9.2 </table>
<set name="icon" val="icon.skill0244" />
@@ -990,7 +991,9 @@
<set name="operateType" val="P" />
<set name="targetType" val="SELF" />
<for>
- <add order="0x40" stat="pDef" val="#pDef" />
+ <effect name="Buff">
+ <add order="0x40" stat="pDef" val="#pDef" />
+ </effect>
</for>
</skill>
<skill id="245" levels="15" name="Wild Sweep">
@@ -1519,15 +1522,17 @@
</effect>
</enchant2for>
<enchant3for>
- <add order="0x40" stat="pDef" val="56.1">
- <using kind="HEAVY" />
- </add>
- <mul order="0x30" stat="mAtkSpd" val="1.68">
- <using kind="HEAVY" />
- </mul>
- <mul order="0x30" stat="pAtkSpd" val="#ench3pAtkSpd">
- <using kind="HEAVY" />
- </mul>
+ <effect name="Buff">
+ <add order="0x40" stat="pDef" val="56.1">
+ <using kind="HEAVY" />
+ </add>
+ <mul order="0x30" stat="mAtkSpd" val="1.68">
+ <using kind="HEAVY" />
+ </mul>
+ <mul order="0x30" stat="pAtkSpd" val="#ench3pAtkSpd">
+ <using kind="HEAVY" />
+ </mul>
+ </effect>
</enchant3for>
</skill>
<skill id="260" levels="37" name="Hammer Crush" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2">
@@ -1954,7 +1959,7 @@
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="1" />
+ <mul order="0x01" stat="rCrit" val="1" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00300-00399.xml b/L2J_DataPack/dist/game/data/stats/skills/00300-00399.xml
index fdbfde4b6ea50f792a48ad6a0866430273fbc7b4..c5edc753b5b45ea0500734f6da643684a2c15e20 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00300-00399.xml
@@ -458,9 +458,9 @@
<add order="0x40" stat="accCombat" val="#accCombat">
<using kind="BOW" />
</add>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="BOW" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="#pAtkRange">
<using kind="BOW" />
</add>
@@ -474,9 +474,9 @@
<add order="0x40" stat="accCombat" val="6">
<using kind="BOW" />
</add>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="BOW" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="200">
<using kind="BOW" />
</add>
@@ -490,9 +490,9 @@
<add order="0x40" stat="accCombat" val="6">
<using kind="BOW" />
</add>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="BOW" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="200">
<using kind="BOW" />
</add>
@@ -1825,7 +1825,7 @@
</cond>
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="-0.3" /> <!-- Decreases critical attack rate by 30% -->
+ <mul order="0x01" stat="rCrit" val="-0.3" /> <!-- Decreases critical attack rate by 30% -->
<mul order="0x30" stat="blowRate" val="1.6" /> <!-- Increases blow land rate by 60% -->
<mul order="0x30" stat="cAtk" val="0.7"> <!-- Decreases frontal critical damage by 30% -->
<player front="true" />
@@ -1837,7 +1837,7 @@
</for>
<enchant1for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="-0.3" />
+ <mul order="0x01" stat="rCrit" val="-0.3" />
<mul order="0x30" stat="blowRate" val="#ench1blowRate" />
<mul order="0x30" stat="cAtk" val="0.7">
<player front="true" />
@@ -1849,7 +1849,7 @@
</enchant1for>
<enchant2for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="-0.3" />
+ <mul order="0x01" stat="rCrit" val="-0.3" />
<mul order="0x30" stat="blowRate" val="1.6" />
<mul order="0x30" stat="cAtk" val="0.7">
<player front="true" />
@@ -1882,50 +1882,50 @@
</cond>
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="-0.3"> <!-- Decreases frontal critical attack rate by 30% -->
+ <mul order="0x01" stat="rCrit" val="-0.3"> <!-- Decreases frontal critical attack rate by 30% -->
<player front="true" />
- </basemul>
- <basemul order="0x30" stat="rCrit" val="0.3"> <!-- Increase side critical attack rate by 30% -->
+ </mul>
+ <mul order="0x01" stat="rCrit" val="0.3"> <!-- Increase side critical attack rate by 30% -->
<and>
<player front="false" />
<player behind="false" />
</and>
- </basemul>
- <basemul order="0x30" stat="rCrit" val="0.6"> <!-- Increase rear critical attack rate by 60% -->
+ </mul>
+ <mul order="0x01" stat="rCrit" val="0.6"> <!-- Increase rear critical attack rate by 60% -->
<player behind="true" />
- </basemul>
+ </mul>
</effect>
</for>
<enchant1for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="-0.3"> <!-- Critical Chance from front -30% -->
+ <mul order="0x01" stat="rCrit" val="-0.3"> <!-- Critical Chance from front -30% -->
<player front="true" />
- </basemul>
- <basemul order="0x30" stat="rCrit" val="0.3"> <!-- Critical Chance from side +30% -->
+ </mul>
+ <mul order="0x01" stat="rCrit" val="0.3"> <!-- Critical Chance from side +30% -->
<and>
<player front="false" />
<player behind="false" />
</and>
- </basemul>
- <basemul order="0x30" stat="rCrit" val="#ench1rCrit"> <!-- Critical Chance from back +60% -->
+ </mul>
+ <mul order="0x01" stat="rCrit" val="#ench1rCrit"> <!-- Critical Chance from back +60% -->
<player behind="true" />
- </basemul>
+ </mul>
</effect>
</enchant1for>
<enchant2for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="-0.3"> <!-- Critical Chance from front -30% -->
+ <mul order="0x01" stat="rCrit" val="-0.3"> <!-- Critical Chance from front -30% -->
<player front="true" />
- </basemul>
- <basemul order="0x30" stat="rCrit" val="#ench2rCrit"> <!-- Critical Chance from side +30% -->
+ </mul>
+ <mul order="0x01" stat="rCrit" val="#ench2rCrit"> <!-- Critical Chance from side +30% -->
<and>
<player front="false" />
<player behind="false" />
</and>
- </basemul>
- <basemul order="0x30" stat="rCrit" val="0.6"> <!-- Critical Chance from back +60% -->
+ </mul>
+ <mul order="0x01" stat="rCrit" val="0.6"> <!-- Critical Chance from back +60% -->
<player behind="true" />
- </basemul>
+ </mul>
</effect>
</enchant2for>
</skill>
@@ -2331,7 +2331,7 @@
</cond>
<for>
<effect name="Buff">
- <basemul order="0x30" stat="mCritRate" val="1" />
+ <mul order="0x01" stat="mCritRate" val="1" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml
index 10a5d39f21cc3ab5dfa201effab2a7d6f0f08662..c696a3ba5552022d524c100c896d1a504ad173e4 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml
@@ -50,7 +50,7 @@
<for>
<effect name="PhysicalAttack" />
<effect name="Debuff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
<effect name="DefenceTrait">
<param SWORD="#traits" />
@@ -68,7 +68,7 @@
<enchant2for>
<effect name="PhysicalAttack" />
<effect name="Debuff">
- <basemul order="0x30" stat="rCrit" val="-0.5" />
+ <mul order="0x01" stat="rCrit" val="-0.5" />
</effect>
<effect name="DefenceTrait">
<param SWORD="-20" />
@@ -87,7 +87,7 @@
<effect name="PhysicalAttack" />
<effect name="Debuff">
<mul order="0x30" stat="cAtk" val="#ench3cAtk" />
- <basemul order="0x30" stat="rCrit" val="-0.5" />
+ <mul order="0x01" stat="rCrit" val="-0.5" />
</effect>
<effect name="DefenceTrait">
<param SWORD="-20" />
@@ -173,7 +173,7 @@
<enchant3for>
<effect name="PhysicalAttack" />
<effect name="Debuff">
- <basemul order="0x30" stat="rCrit" val="#ench3rCrit" />
+ <mul order="0x01" stat="rCrit" val="#ench3rCrit" />
<mul order="0x30" stat="cAtk" val="0.65" />
</effect>
<effect name="DefenceTrait">
@@ -2637,7 +2637,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="cAtk" val="#cAtk" />
<mul order="0x30" stat="pDef" val="0.95" />
</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00500-00599.xml b/L2J_DataPack/dist/game/data/stats/skills/00500-00599.xml
index 282b80e6cdf0476bb098a939f1f914386a2cc70a..e6058f5fb61f8e1b1fff7f7983398968c3dc4f3c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00500-00599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00500-00599.xml
@@ -860,9 +860,9 @@
<add order="0x40" stat="accCombat" val="#accCombat">
<using kind="CROSSBOW" />
</add>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="CROSSBOW" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="#range">
<using kind="CROSSBOW" />
</add>
@@ -876,9 +876,9 @@
<add order="0x40" stat="accCombat" val="#ench1Acc">
<using kind="CROSSBOW" />
</add>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="CROSSBOW" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="200">
<using kind="CROSSBOW" />
</add>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml b/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml
index ce8e9a94f3f440aaec4f85f5c18248f83041bef9..de399f3819fcbd9905edb35a8458b7a77dbd4b11 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml
@@ -220,7 +220,7 @@
<for>
<effect name="Buff">
<add order="0x40" stat="mAtk" val="#mAtk" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
</effect>
</for>
</skill>
@@ -445,19 +445,19 @@
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<add order="0x40" stat="cAtkAdd" val="#cAtk" />
</effect>
</for>
<enchant1for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#ench1rCrit" />
+ <mul order="0x01" stat="rCrit" val="#ench1rCrit" />
<add order="0x40" stat="cAtkAdd" val="317" />
</effect>
</enchant1for>
<enchant2for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.25" />
+ <mul order="0x01" stat="rCrit" val="0.25" />
<add order="0x40" stat="cAtkAdd" val="#ench2cAtk" />
</effect>
</enchant2for>
@@ -802,14 +802,16 @@
</for>
</skill>
<skill id="644" levels="1" name="Rogue Ability - Evasion">
- <!-- CT2.5 retail confirmed -->
+ <!-- Confirmed CT2.5 -->
<set name="excludedFromCheck" val="true" />
<set name="icon" val="icon.skill1087" />
<set name="magicLvl" val="75" />
<set name="operateType" val="P" />
<set name="targetType" val="SELF" />
<for>
- <add order="0x40" stat="rEvas" val="4" />
+ <effect name="Buff">
+ <add order="0x40" stat="rEvas" val="4" />
+ </effect>
</for>
</skill>
<skill id="645" levels="1" name="Rogue Ability - Long Shot">
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml
index 059a17ee4131c7c495da5f16b6becb20562f7194..5332357a5b9da2bfcd9cf6d190ba539352241059 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml
@@ -180,8 +180,8 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
- <basemul order="0x30" stat="mCritRate" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="mCritRate" val="0.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
<mul order="0x30" stat="pAtkSpd" val="1.2" />
@@ -281,7 +281,7 @@
<mul order="0x30" stat="pDef" val="1.1" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pAtkSpd" val="1.1" />
- <basemul order="0x30" stat="rCrit" val="0.1" />
+ <mul order="0x01" stat="rCrit" val="0.1" />
<mul order="0x30" stat="cAtk" val="1.1" />
<mul order="0x30" stat="mDef" val="1.1" />
<mul order="0x30" stat="mAtk" val="1.1" />
@@ -352,7 +352,7 @@
<set name="targetType" val="SERVITOR" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="cAtk" val="1.2" />
<mul order="0x30" stat="pAtkSpd" val="1.2" />
@@ -408,7 +408,7 @@
</cond>
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="cAtk" val="1.2" />
</effect>
</for>
@@ -1393,7 +1393,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml b/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml
index 98da1a0cfaec3145a7a2f00ea8c345ca4370b28e..89286243beb37aa4b5a43c89990ee9bc9e6093b3 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml
@@ -552,9 +552,9 @@
<mul order="0x30" stat="pAtk" val="1.05">
<using kind="SWORD,DAGGER,DUALDAGGER,POLE,RAPIER,ANCIENTSWORD,DUAL,DUALFIST" />
</mul>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="SWORD,DAGGER,DUALDAGGER,POLE,RAPIER,ANCIENTSWORD,DUAL,DUALFIST" />
- </basemul>
+ </mul>
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml
index 30b7500c6e94d91f56b847b0d7fff2a260584fd3..6db686860ad860885a2c8f475a9b10da2768d51b 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml
@@ -1030,7 +1030,7 @@
<effect name="Buff">
<mul order="0x30" stat="mAtk" val="1.05" />
<mul order="0x30" stat="mAtkSpd" val="1.05" />
- <basemul order="0x30" stat="mCritRate" val="0.05" />
+ <mul order="0x01" stat="mCritRate" val="0.05" />
<mul order="0x30" stat="MagicalMpConsumeRate" val="0.95" />
</effect>
</for>
@@ -1193,8 +1193,8 @@
<add order="0x40" stat="pAtk" val="#pAtk">
<using kind="SWORD,BLUNT" />
</add>
+ <mul order="0x30" stat="rShld" val="#rShld" />
</effect>
- <mul order="0x30" stat="rShld" val="#rShld" />
<effect name="TriggerSkillBySkill">
<param castSkillId="997" />
<param chance="30" />
@@ -1614,9 +1614,9 @@
<add order="0x40" stat="accCombat" val="6">
<using kind="BOW" />
</add>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="BOW" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="200">
<using kind="BOW" />
</add>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/01000-01099.xml b/L2J_DataPack/dist/game/data/stats/skills/01000-01099.xml
index 425cb8c8e5fb7be6fc4d8dddaf12ffc1d212c36e..6dd260eef6712d070f600469f8cb33b2cc9a9f29 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/01000-01099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/01000-01099.xml
@@ -1658,7 +1658,7 @@
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/01300-01399.xml b/L2J_DataPack/dist/game/data/stats/skills/01300-01399.xml
index 80cdf114138e7c2613bdba6ecd8094170852d48e..90f2e082fa6251a4073d7f466eda7a3944a5e352 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/01300-01399.xml
@@ -259,7 +259,7 @@
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
@@ -992,7 +992,7 @@
<mul order="0x30" stat="pDef" val="0.7" />
<mul order="0x30" stat="mAtk" val="0.7" />
<mul order="0x30" stat="mAtkSpd" val="0.8" />
- <basemul order="0x30" stat="mCritRate" val="-0.3" />
+ <mul order="0x01" stat="mCritRate" val="-0.3" />
</effect>
</for>
</skill>
@@ -1478,9 +1478,9 @@
<mul order="0x30" stat="cAtk" val="1.2">
<player behind="true" />
</mul>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<player behind="true" />
- </basemul>
+ </mul>
<sub order="0x40" stat="debuffVuln" val="10" />
</effect>
</for>
@@ -1511,7 +1511,7 @@
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="cAtk" val="1.2" />
<mul order="0x30" stat="pAtkSpd" val="1.2" />
@@ -1811,7 +1811,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="mCritPower" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -1827,7 +1827,7 @@
<enchant3for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="mCritPower" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -2095,7 +2095,7 @@
<enchant3for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="mCritRate" val="0.02" />
+ <mul order="0x01" stat="mCritRate" val="0.02" />
<mul order="0x30" stat="cAtk" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -2228,7 +2228,7 @@
<mul order="0x30" stat="runSpd" val="0.8" />
<mul order="0x30" stat="mDef" val="0.7" />
<mul order="0x30" stat="pAtkSpd" val="0.7" />
- <basemul order="0x30" stat="rCrit" val="-0.3" />
+ <mul order="0x01" stat="rCrit" val="-0.3" />
<mul order="0x30" stat="cAtk" val="0.7" />
<sub order="0x40" stat="accCombat" val="6" />
</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml
index 41131c88775191fb8c3ca79d6f4afab90ae8776a..e021fbaccdd435d851a69d4980f2d86dade5760c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml
@@ -514,7 +514,7 @@
<mul order="0x30" stat="maxCp" val="1.2" />
<mul order="0x30" stat="regCp" val="1.2" />
<mul order="0x30" stat="maxMp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="mCritPower" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -534,7 +534,7 @@
<mul order="0x30" stat="maxCp" val="1.2" />
<mul order="0x30" stat="regCp" val="1.2" />
<mul order="0x30" stat="maxMp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="mCritPower" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -2600,7 +2600,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="pAtk" val="#amount" />
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="cAtk" val="#amount" />
</effect>
</for>
@@ -2726,7 +2726,7 @@
<effect name="Buff">
<mul order="0x30" stat="mAtkSpd" val="1.15" />
<mul order="0x30" stat="mAtk" val="#mAtk" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml b/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
index b40c4435af31dc75d24150d037eecfd8a2b3ebe6..a7bd9705d107d84098488e4e3775b98be3d00d45 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
@@ -79,7 +79,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
<effect name="DispelBySlot">
@@ -647,7 +647,7 @@
<set name="targetType" val="PARTY" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
<effect name="DispelBySlot">
@@ -1068,7 +1068,7 @@
<effect name="Buff">
<mul order="0x30" stat="mAtk" val="1.4" />
<mul order="0x30" stat="mAtkSpd" val="1.5" />
- <basemul order="0x30" stat="mCritRate" val="0.5" />
+ <mul order="0x01" stat="mCritRate" val="0.5" />
<mul order="0x30" stat="MagicalMpConsumeRate" val="0.1" />
</effect>
</for>
@@ -1092,7 +1092,7 @@
<mul order="0x30" stat="mAtk" val="1.1" />
<mul order="0x30" stat="healEffect" val="1.4" />
<mul order="0x30" stat="mAtkSpd" val="1.5" />
- <basemul order="0x30" stat="mCritRate" val="0.5" />
+ <mul order="0x01" stat="mCritRate" val="0.5" />
<mul order="0x30" stat="MagicalMpConsumeRate" val="0.1" />
</effect>
</for>
@@ -1198,7 +1198,7 @@
<set name="targetType" val="PARTY_CLAN" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
<effect name="DispelBySlot">
@@ -1479,7 +1479,7 @@
<mul order="0x30" stat="mAtk" val="#amount" />
<mul order="0x30" stat="mAtkSpd" val="#mAtkSpd" />
<mul order="0x30" stat="physicalSkillPower" val="#physicalSkillPower" />
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
@@ -1796,9 +1796,9 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit">
+ <mul order="0x01" stat="rCrit" val="#rCrit">
<using kind="DAGGER,DUALDAGGER,LIGHT" />
- </basemul>
+ </mul>
<add order="0x40" stat="cAtkAdd" val="#cAtkAdd">
<using kind="DAGGER,DUALDAGGER,LIGHT" />
</add>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/02000-02099.xml b/L2J_DataPack/dist/game/data/stats/skills/02000-02099.xml
index 44d52808c2aae444d5e266ff3f46884b346f5fef..25ddf65d242a4fc4ba78f5a9936d688b11619694 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/02000-02099.xml
@@ -603,7 +603,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/02200-02299.xml b/L2J_DataPack/dist/game/data/stats/skills/02200-02299.xml
index ffa8bcc386c7bdb9b52a4e94ae45f14598844cc1..ac12925e46c3601a74219415c579a0eb0851e7d6 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/02200-02299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/02200-02299.xml
@@ -1767,7 +1767,7 @@
</cond>
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/02300-02399.xml b/L2J_DataPack/dist/game/data/stats/skills/02300-02399.xml
index 1996e2439d6b095420e06e55ce2337f7eb5eea5b..2b2a8c9315e7e85571c1b6c788b69662aa5c4219 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/02300-02399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/02300-02399.xml
@@ -259,7 +259,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
@@ -1630,7 +1630,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.15" />
+ <mul order="0x01" stat="rCrit" val="0.15" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/02400-02499.xml b/L2J_DataPack/dist/game/data/stats/skills/02400-02499.xml
index 41e9b30e45ed942a85ce1c4182a23aea3efcbc86..33663834d45c748f118fd606d8c7c07d4f55700e 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/02400-02499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/02400-02499.xml
@@ -130,7 +130,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.25" />
+ <mul order="0x01" stat="rCrit" val="0.25" />
</effect>
</for>
</skill>
@@ -596,7 +596,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/02800-02899.xml b/L2J_DataPack/dist/game/data/stats/skills/02800-02899.xml
index f3cfe8be4673482fe1cd91f0ec9ca84c821cf088..6a97fe5c86fc8ce23b6f2bd34eecc29cf92e0054 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/02800-02899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/02800-02899.xml
@@ -1797,7 +1797,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03000-03099.xml b/L2J_DataPack/dist/game/data/stats/skills/03000-03099.xml
index 8084069deb83ccb0ef013b26130bf323f2ecd916..a6516995f5bc34000006c211b9ebb9f4de8110d1 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03000-03099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03000-03099.xml
@@ -199,9 +199,9 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit">
+ <mul order="0x01" stat="rCrit" val="#rCrit">
<player behind="true" />
- </basemul>
+ </mul>
</effect>
</for>
</skill>
@@ -215,9 +215,9 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit">
+ <mul order="0x01" stat="rCrit" val="#rCrit">
<player behind="true" />
- </basemul>
+ </mul>
</effect>
</for>
</skill>
@@ -1036,9 +1036,9 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.37">
+ <mul order="0x01" stat="rCrit" val="0.37">
<player behind="true" />
- </basemul>
+ </mul>
<mul order="0x30" stat="pvpPhysDmg" val="1.05" />
<mul order="0x30" stat="pvpPhysSkillsDmg" val="1.05" />
<mul order="0x30" stat="pvpMagicalDmg" val="1.05" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03100-03199.xml b/L2J_DataPack/dist/game/data/stats/skills/03100-03199.xml
index dfe59e5d961e36f775f0afff54e231bb3c881aed..589f4b4b6267eee2683d26e0da46bfeb7cb21647 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03100-03199.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03100-03199.xml
@@ -1080,7 +1080,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03200-03299.xml b/L2J_DataPack/dist/game/data/stats/skills/03200-03299.xml
index 6919199cf4be536ed2ac20ae52be060a522fd83d..222b467db2a3e7f0a7da42e2e478a01cc7fa3a9c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03200-03299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03200-03299.xml
@@ -726,7 +726,9 @@
<set name="operateType" val="P" />
<set name="targetType" val="SELF" />
<for>
- <mul order="0x30" stat="healEffect" val="1.01" />
+ <effect name="Buff">
+ <mul order="0x30" stat="healEffect" val="1.01" />
+ </effect>
</for>
</skill>
<skill id="3239" levels="10" name="Item Skill: Mana Gain">
@@ -860,7 +862,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03500-03599.xml b/L2J_DataPack/dist/game/data/stats/skills/03500-03599.xml
index cfb6bf648050cee177df98be9c9c8d7dc0354f97..b25d52d86b8e30920228269598a199b54a8b9122 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03500-03599.xml
@@ -1389,9 +1389,9 @@
<mul order="0x30" stat="maxCp" val="1.5" /> <!-- CP +50% -->
<mul order="0x30" stat="pAtkSpd" val="1.03" /> <!-- Atk. Spd. +3% -->
<add order="0x40" stat="regMp" val="0.51" /> <!-- MP regen per tick +0.51 -->
- <basemul order="0x30" stat="rCrit" val="0.22"> <!-- Critical +22% from behind target -->
+ <mul order="0x01" stat="rCrit" val="0.22"> <!-- Critical +22% from behind target -->
<player behind="true" />
- </basemul>
+ </mul>
<!-- NOTE: PvP extra damage is increased in H5, values unconfirmed -->
<mul order="0x30" stat="pvpPhysDmg" val="1.1" /> <!-- PVP Damage Bonus +10% -->
<mul order="0x30" stat="pvpMagicalDmg" val="1.1" /> <!-- PVP Damage Bonus +10% -->
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml b/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml
index 403ba65e3f8613c2afb716ec855b2e176a114b3c..807e01347964c2ec398f0474c8b4e2dce16d3dba 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml
@@ -293,15 +293,18 @@
</for>
</skill>
<skill id="3613" levels="1" name="Enchant Robe (Grade D)">
+ <!-- Confirmed CT2.5 -->
<set name="icon" val="icon.skill0234" />
<set name="magicLvl" val="1" />
<set name="operateType" val="P" />
<set name="targetType" val="SELF" />
<for>
- <add order="0x40" stat="pDef" val="16">
- <using kind="MAGIC" />
- </add>
- <mul order="0x30" stat="weightLimit" val="1.3" />
+ <effect name="Buff">
+ <add order="0x40" stat="pDef" val="16">
+ <using kind="MAGIC" />
+ </add>
+ <mul order="0x30" stat="weightLimit" val="1.3" />
+ </effect>
</for>
</skill>
<skill id="3614" levels="1" name="Enchant Heavy Armor (Grade C)">
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml b/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml
index 7a8af6bd46b9e19d083fa15951e5db122c0dc473..49b689894a69e3a23deb6c763f41267c5a815aa0 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml
@@ -1586,7 +1586,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.5" />
+ <mul order="0x01" stat="rCrit" val="0.5" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04100-04199.xml b/L2J_DataPack/dist/game/data/stats/skills/04100-04199.xml
index d8b8a39e3457f072a876e430402ea421b7fcdc8c..bff37e3f654ee2e6436227b3f534e86d1b8eecd9 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04100-04199.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04100-04199.xml
@@ -397,14 +397,16 @@
</for>
</skill>
<skill id="4116" levels="10" name="Resist M.Atk">
- <!-- Freya retail confirmed -->
+ <!-- Confirmed CT2.5 -->
<table name="#mDef"> 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10 </table>
<set name="icon" val="icon.skill4116_new" />
<set name="magicLvl" val="1" />
<set name="operateType" val="P" />
<set name="targetType" val="SELF" />
<for>
- <mul order="0x30" stat="mDef" val="#mDef" />
+ <effect name="Buff">
+ <mul order="0x30" stat="mDef" val="#mDef" />
+ </effect>
</for>
</skill>
<skill id="4117" levels="12" name="Paralysis">
@@ -551,7 +553,9 @@
<set name="operateType" val="P" />
<set name="targetType" val="SELF" />
<for>
- <set order="0x08" stat="debuffImmunity" val="1" />
+ <effect name="Buff">
+ <set order="0x08" stat="debuffImmunity" val="1" />
+ </effect>
<effect name="DefenceTrait">
<param SHOCK="80" />
</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04300-04399.xml b/L2J_DataPack/dist/game/data/stats/skills/04300-04399.xml
index a68b2bab358bf15c289461066c93fbc904646c38..6097c14f84902ec243b38267031d35d08f058ab9 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04300-04399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04300-04399.xml
@@ -207,7 +207,7 @@
<add order="0x40" stat="rEvas" val="4" />
<mul order="0x30" stat="pDef" val="1.83" />
<mul order="0x30" stat="pAtkSpd" val="1.33" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="mDef" val="5" />
</effect>
</for>
@@ -1017,7 +1017,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04400-04499.xml b/L2J_DataPack/dist/game/data/stats/skills/04400-04499.xml
index c51094e7564df859d3cfffe6b53e5f27dcfaf96e..7839d054be973c115d8a72913100ed335d70ac76 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04400-04499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04400-04499.xml
@@ -96,7 +96,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04500-04599.xml b/L2J_DataPack/dist/game/data/stats/skills/04500-04599.xml
index 161f5e02be8732bf7fb41b5e62b7d04e45defb89..fe633246db01d87f8e0d94cbcc152024f27384fe 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04500-04599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04500-04599.xml
@@ -224,9 +224,9 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="1">
+ <mul order="0x01" stat="rCrit" val="1">
<player behind="true" />
- </basemul>
+ </mul>
<!-- TODO: Missing bonus for Rapier -->
</effect>
</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04600-04699.xml b/L2J_DataPack/dist/game/data/stats/skills/04600-04699.xml
index cfba1150a820abe493df3a792601f56d1597f948..e3d046a8aa19690c0a8724cf86ed22b498a1648d 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04600-04699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04600-04699.xml
@@ -51,7 +51,7 @@
<set name="targetType" val="CLAN" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="mAtkSpd" val="#mAtkSpd" />
</effect>
</for>
@@ -314,7 +314,7 @@
<set name="targetType" val="CLAN" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
@@ -752,7 +752,7 @@
<effect name="Buff">
<mul order="0x30" stat="pDef" val="#pDef" />
<mul order="0x30" stat="mAtkSpd" val="#mAtkSpd" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
</effect>
</for>
</skill>
@@ -778,7 +778,7 @@
<effect name="Buff">
<mul order="0x30" stat="mAtk" val="#mAtk" />
<mul order="0x30" stat="mAtkSpd" val="#mAtkSpd" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
</effect>
</for>
</skill>
@@ -874,7 +874,7 @@
<add order="0x40" stat="runSpd" val="#runSpd" />
<mul order="0x30" stat="pDef" val="#pDef" />
<mul order="0x30" stat="mDef" val="#mDef" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
</effect>
</for>
</skill>
@@ -935,7 +935,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="mAtkSpd" val="#mAtkSpd" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
<add order="0x40" stat="reflectDam" val="#reflect" />
</effect>
</for>
@@ -963,7 +963,7 @@
<effect name="Buff">
<mul order="0x30" stat="mAtk" val="#mAtk" />
<mul order="0x30" stat="mAtkSpd" val="#mAtkSpd" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
</effect>
</for>
</skill>
@@ -1125,7 +1125,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
@@ -2196,7 +2196,7 @@
<sub order="0x40" stat="rEvas" val="4" />
<mul order="0x30" stat="pDef" val="0.55" />
<mul order="0x30" stat="pAtkSpd" val="0.75" />
- <basemul order="0x30" stat="rCrit" val="-0.23" />
+ <mul order="0x01" stat="rCrit" val="-0.23" />
<mul order="0x30" stat="mDef" val="0.2" />
</effect>
</for>
@@ -2290,7 +2290,7 @@
<set name="targetType" val="PARTY" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="cAtk" val="#cAtk" />
</effect>
</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05000-05099.xml b/L2J_DataPack/dist/game/data/stats/skills/05000-05099.xml
index c69029d2ebc0c61cd413f7427bf2141c7ca2fe4f..d77550c331fd2514a8d31be683bb37eb389be8ff 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05000-05099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05000-05099.xml
@@ -1170,7 +1170,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="pAtkSpd" val="1.33" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05100-05199.xml b/L2J_DataPack/dist/game/data/stats/skills/05100-05199.xml
index 3eef56747511634d8fe000d6d3f527584bbd1644..c9abe72e2d3680c2d6dc6aa41d98ab87e4ae156a 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05100-05199.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05100-05199.xml
@@ -1223,7 +1223,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml b/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml
index 27bef146f608683d136e9909495a17edb8d4cb94..59a5d203a82d147d413a9d5f8a681f58cf54db4f 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml
@@ -386,8 +386,8 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="cAtk" val="1.35" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
- <basemul order="0x30" stat="mCritRate" val="3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="mCritRate" val="3" />
</effect>
</for>
</skill>
@@ -1010,7 +1010,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="physicalSkillPower" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
</effect>
</for>
</skill>
@@ -1051,7 +1051,7 @@
<param skillId="5561" skillLevel="#triggeredLevel" /> <!-- Seed of Revenge -->
<param targetType="SELF" />
<add order="0x40" stat="pAtk" val="300" />
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="cAtk" val="#cAtk" />
</effect>
</for>
@@ -1113,7 +1113,7 @@
<param targetType="SELF" />
<add order="0x40" stat="mDef" val="400" />
<add order="0x40" stat="waterPower" val="#waterPower" />
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
@@ -1260,7 +1260,7 @@
<mul order="0x30" stat="pAtk" val="1.35" />
<mul order="0x30" stat="mAtk" val="1.75" />
<mul order="0x30" stat="cAtk" val="1.35" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
@@ -1341,7 +1341,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.32" />
+ <mul order="0x01" stat="rCrit" val="0.32" />
</effect>
</for>
</skill>
@@ -1646,7 +1646,7 @@
<set name="targetType" val="OWNER_PET" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml b/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml
index 96fe14a27ae9930072ec3c8beba6d1b438d1a0f5..7b3d8ab1576fd1cef9cafd196ed0613c07eaeaa2 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml
@@ -884,7 +884,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml b/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml
index 88b68e0b4a880e741027451376c075265e26efc8..15d9ee645cfb2d6e8012d614797f9fbd67c08660 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml
@@ -1534,7 +1534,7 @@
<mul order="0x30" stat="pAtkSpd" val="1.1" />
<add order="0x40" stat="accCombat" val="10" />
<mul order="0x30" stat="cAtk" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="1.2" />
+ <mul order="0x01" stat="rCrit" val="1.2" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml b/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml
index a27a43f97b3e862c26c9abd594ef4400dddf87b4..e838576bb4ca0a8d3c3d12a25dd8ed7724fb338c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml
@@ -389,7 +389,7 @@
<mul order="0x30" stat="pAtkSpd" val="0.95" />
<mul order="0x30" stat="mAtk" val="0.95" />
<sub order="0x40" stat="accCombat" val="3" />
- <basemul order="0x30" stat="rCrit" val="-0.1" />
+ <mul order="0x01" stat="rCrit" val="-0.1" />
<mul order="0x30" stat="cAtk" val="0.9" />
</effect>
</for>
@@ -1241,9 +1241,9 @@
<mul order="0x30" stat="pAtk" val="1.05">
<using kind="SWORD,DAGGER,DUALDAGGER,POLE,RAPIER,ANCIENTSWORD,DUAL,DUALFIST,BLUNT,BOW,CROSSBOW" />
</mul>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="SWORD,DAGGER,DUALDAGGER,POLE,RAPIER,ANCIENTSWORD,DUAL,DUALFIST" />
- </basemul>
+ </mul>
<add order="0x40" stat="pAtkRange" val="100">
<using kind="BOW,CROSSBOW" />
</add>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06200-06299.xml b/L2J_DataPack/dist/game/data/stats/skills/06200-06299.xml
index 2dd2569a1ad95fea7fa9e98252466db37d9d1c85..f288dfbf69b6087813bf6f301de02a5a4bb31bf0 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06200-06299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06200-06299.xml
@@ -250,7 +250,7 @@
<for>
<effect name="Buff">
<sub order="0x40" stat="accCombat" val="16" />
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="cAtk" val="#cAtk" />
<mul order="0x30" stat="pAtkSpd" val="0.9" />
<mul order="0x30" stat="pAtk" val="0.9" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06300-06399.xml b/L2J_DataPack/dist/game/data/stats/skills/06300-06399.xml
index cd45d49f31277cee7d557df409469827cb617d96..18447c1e63f4c3abf5724f7fc79e0c1bb55d18c1 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06300-06399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06300-06399.xml
@@ -1036,8 +1036,8 @@
<set name="targetType" val="TARGET_PARTY" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
- <basemul order="0x30" stat="mCritRate" val="#mCritRate" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="mCritRate" val="#mCritRate" />
<mul order="0x30" stat="cAtk" val="#cAtk" />
</effect>
</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06400-06499.xml b/L2J_DataPack/dist/game/data/stats/skills/06400-06499.xml
index f4bde2748f5f8cf137c59ee21f188d47d063f37e..66d6c991b0b63fb82fa2db1f9f609aa6a058cb3d 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06400-06499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06400-06499.xml
@@ -667,7 +667,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.35" />
+ <mul order="0x01" stat="rCrit" val="0.35" />
</effect>
</for>
</skill>
@@ -735,9 +735,9 @@
<for>
<effect name="DamOverTimePercent" ticks="5">
<param power="#dot" />
- <basemul order="0x30" stat="rCrit" val="#rCrit">
+ <mul order="0x01" stat="rCrit" val="#rCrit">
<using kind="BOW,CROSSBOW" />
- </basemul>
+ </mul>
<mul order="0x30" stat="cAtk" val="#cAtk">
<using kind="BOW,CROSSBOW" />
</mul>
@@ -762,9 +762,9 @@
<for>
<effect name="DamOverTimePercent" ticks="5">
<param power="0.05" />
- <basemul order="0x30" stat="rCrit" val="0.9">
+ <mul order="0x01" stat="rCrit" val="0.9">
<using kind="BOW,CROSSBOW" />
- </basemul>
+ </mul>
<mul order="0x30" stat="cAtk" val="1.5">
<using kind="BOW,CROSSBOW" />
</mul>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06700-06799.xml b/L2J_DataPack/dist/game/data/stats/skills/06700-06799.xml
index de277aefe67bc4654bc64a20651717649ab081c3..99ccdc25976f0dbf13786f304cb5c0c342a4ac19 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06700-06799.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06700-06799.xml
@@ -241,7 +241,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
@@ -809,7 +809,7 @@
<effect name="Buff">
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pAtkSpd" val="1.3" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
</for>
@@ -874,7 +874,7 @@
<effect name="Buff">
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pAtkSpd" val="1.3" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
</for>
@@ -1089,7 +1089,7 @@
<effect name="Buff">
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pAtkSpd" val="1.3" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06800-06899.xml b/L2J_DataPack/dist/game/data/stats/skills/06800-06899.xml
index 60d4af28d145fcf2e661e178856eae39e846937b..c5eb50d461b84bd42db786a695943a15d79c8e21 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06800-06899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06800-06899.xml
@@ -175,7 +175,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
@@ -310,7 +310,7 @@
<effect name="Buff">
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pAtkSpd" val="1.3" />
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
</for>
@@ -1301,7 +1301,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="#rCrit" />
+ <mul order="0x01" stat="rCrit" val="#rCrit" />
<mul order="0x30" stat="cAtk" val="#cAtk" />
<mul order="0x30" stat="pAtk" val="#pmAtk" />
<mul order="0x30" stat="mAtk" val="#pmAtk" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml b/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml
index 78a77980ce7d4db1e5f3a15890ee7ec5b0e98f5c..03393c3d1360ea3749749a4b325ecc1d228f5631 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml
@@ -149,7 +149,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="pAtk" val="1.15" />
- <basemul order="0x30" stat="rCrit" val="0.1" />
+ <mul order="0x01" stat="rCrit" val="0.1" />
<mul order="0x30" stat="cAtk" val="1.1" />
<mul order="0x30" stat="pAtkSpd" val="1.03" />
<add order="0x40" stat="runSpd" val="5" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/07000-07099.xml b/L2J_DataPack/dist/game/data/stats/skills/07000-07099.xml
index 72d60ee787fb4b9d2cab2b406cfc7857bddcb9ad..fde9156c5258ceaf0423a83ab0b15db7dc29dca1 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/07000-07099.xml
@@ -388,7 +388,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
@@ -886,8 +886,8 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
- <basemul order="0x30" stat="mCritRate" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="mCritRate" val="0.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
<mul order="0x30" stat="pAtkSpd" val="1.2" />
@@ -1307,7 +1307,7 @@
<set name="targetType" val="ONE" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
<effect name="DispelBySlot">
@@ -1401,9 +1401,9 @@
<mul order="0x30" stat="pAtk" val="1.05">
<using kind="SWORD,DUAL,ANCIENTSWORD,RAPIER,DAGGER,DUALDAGGER,POLE,DUALFIST" />
</mul>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="SWORD,DUAL,ANCIENTSWORD,RAPIER,DAGGER,DUALDAGGER,POLE,DUALFIST" />
- </basemul>
+ </mul>
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml b/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml
index 9347d776147fa07201832a7e2d09d56e2c249242..f05c0e77d9c82d77af631d77a1abc88f93bb10d5 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml
@@ -975,7 +975,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="pAtkSpd" val="1.33" />
</effect>
<effect name="TriggerSkillByAttack">
@@ -1042,7 +1042,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/09000-09099.xml b/L2J_DataPack/dist/game/data/stats/skills/09000-09099.xml
index a113ec51ea8c9af961621fd921f230cf5ef4899c..281f46a6073704118b829cfb62418dcb2420e33f 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/09000-09099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/09000-09099.xml
@@ -147,7 +147,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/20000-20099.xml b/L2J_DataPack/dist/game/data/stats/skills/20000-20099.xml
index 9e4dc29c32ff44b881f10853e6081988658cdc8b..7ce4c3ac1677ceae42ea959added2ff0f6cbaa66 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/20000-20099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/20000-20099.xml
@@ -64,7 +64,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/21000-21099.xml b/L2J_DataPack/dist/game/data/stats/skills/21000-21099.xml
index 3a8f4b9761a8169650edf673218a85bc39cdf5cc..ee986afa577d5ce03d8b682c5e8458c4fe61a3a2 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/21000-21099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/21000-21099.xml
@@ -378,7 +378,7 @@
<effect name="Buff">
<mul order="0x30" stat="maxCp" val="1.3" />
<mul order="0x30" stat="pAtkRange" val="1.25" />
- <basemul order="0x30" stat="rCrit" val="0.25" />
+ <mul order="0x01" stat="rCrit" val="0.25" />
</effect>
</for>
</skill>
@@ -1620,7 +1620,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/21100-21199.xml b/L2J_DataPack/dist/game/data/stats/skills/21100-21199.xml
index bf1aad3c064d90be4363c7c0ca8f4c37b74a9376..caeb6efbb579391cdf45ae6e4557b0d4e0c9d2ff 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/21100-21199.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/21100-21199.xml
@@ -362,7 +362,7 @@
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
<mul order="0x30" stat="cAtk" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
</effect>
</for>
</skill>
@@ -565,7 +565,7 @@
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.4" />
<mul order="0x30" stat="maxMp" val="1.4" />
- <basemul order="0x30" stat="rCrit" val="0.1" />
+ <mul order="0x01" stat="rCrit" val="0.1" />
<mul order="0x30" stat="cAtk" val="1.1" />
<add order="0x40" stat="darkRes" val="20" />
</effect>
@@ -770,7 +770,7 @@
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.4" />
<mul order="0x30" stat="maxMp" val="1.4" />
- <basemul order="0x30" stat="rCrit" val="0.1" />
+ <mul order="0x01" stat="rCrit" val="0.1" />
<mul order="0x30" stat="cAtk" val="1.1" />
<add order="0x40" stat="darkRes" val="20" />
</effect>
@@ -1048,7 +1048,7 @@
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.3" />
<mul order="0x30" stat="cAtk" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/22000-22099.xml b/L2J_DataPack/dist/game/data/stats/skills/22000-22099.xml
index a8d3882dcb6839d8d1116e99d381f6a2f200b594..2950149bbce9555b2c5a9def97f9750b6a7a4cf4 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/22000-22099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/22000-22099.xml
@@ -1468,7 +1468,7 @@
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/22100-22199.xml b/L2J_DataPack/dist/game/data/stats/skills/22100-22199.xml
index 47d71edeb0108711b75c6aa65481093754096804..6c0fefd4ffcaf7583e6d5df0ec39236de6c5afc0 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/22100-22199.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/22100-22199.xml
@@ -1238,7 +1238,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="pAtkSpd" val="1.15" />
- <basemul order="0x30" stat="rCrit" val="0.1" />
+ <mul order="0x01" stat="rCrit" val="0.1" />
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/23000-23099.xml b/L2J_DataPack/dist/game/data/stats/skills/23000-23099.xml
index 55408459354027b69b60a337624570edb113d546..de111648e2cefcc8e83080ab9b08daa4d436ebe7 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/23000-23099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/23000-23099.xml
@@ -1406,7 +1406,7 @@
<mul order="0x30" stat="pAtkSpd" val="1.2"/>
<mul order="0x30" stat="pDef" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1"/>
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="cAtk" val="1.2" />
</effect>
</for>
@@ -1558,7 +1558,7 @@
<mul order="0x30" stat="pAtkSpd" val="1.2"/>
<mul order="0x30" stat="pDef" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1"/>
- <basemul order="0x30" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
<mul order="0x30" stat="cAtk" val="1.2" />
</effect>
</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/23200-23299.xml b/L2J_DataPack/dist/game/data/stats/skills/23200-23299.xml
index ca379a755578a292ee389ad084fd417dee6f39da..261dcfdb4e1aaa684c7ebe7bcb6e450edfde446d 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/23200-23299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/23200-23299.xml
@@ -716,7 +716,7 @@
<set name="targetType" val="AURA" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
</effect>
</for>
</skill>
@@ -1011,7 +1011,7 @@
<set name="targetType" val="AURA" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="mCritRate" val="2" />
+ <mul order="0x01" stat="mCritRate" val="2" />
</effect>
</for>
</skill>
@@ -1046,7 +1046,7 @@
<set name="targetType" val="AURA" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="mCritRate" val="2" />
+ <mul order="0x01" stat="mCritRate" val="2" />
<mul order="0x30" stat="regMp" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -1076,7 +1076,7 @@
<effect name="Buff">
<mul order="0x30" stat="maxMp" val="1.2" />
<mul order="0x30" stat="regHp" val="1.2" />
- <basemul order="0x30" stat="mCritRate" val="2" />
+ <mul order="0x01" stat="mCritRate" val="2" />
<mul order="0x30" stat="cAtk" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -1103,8 +1103,8 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="rCrit" val="0.2" />
- <basemul order="0x30" stat="mCritRate" val="0.2" />
+ <mul order="0x01" stat="rCrit" val="0.2" />
+ <mul order="0x01" stat="mCritRate" val="0.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
<mul order="0x30" stat="pAtkSpd" val="1.2" />
@@ -1130,7 +1130,7 @@
<for>
<effect name="Buff">
<mul order="0x30" stat="maxHp" val="1.2" />
- <basemul order="0x30" stat="mCritRate" val="0.2" />
+ <mul order="0x01" stat="mCritRate" val="0.2" />
<mul order="0x30" stat="cAtk" val="1.2" />
<mul order="0x30" stat="pAtk" val="1.1" />
<mul order="0x30" stat="pDef" val="1.2" />
@@ -1248,7 +1248,7 @@
<set name="targetType" val="AURA" />
<for>
<effect name="Buff">
- <basemul order="0x30" stat="rCrit" val="0.3" />
+ <mul order="0x01" stat="rCrit" val="0.3" />
<mul order="0x30" stat="cAtk" val="1.35" />
</effect>
<effect name="DispelBySlot">
@@ -1331,9 +1331,9 @@
<mul order="0x30" stat="pAtk" val="1.05">
<using kind="SWORD,DUAL,ANCIENTSWORD,RAPIER,DAGGER,DUALDAGGER,POLE,DUALFIST" />
</mul>
- <basemul order="0x30" stat="rCrit" val="0.2">
+ <mul order="0x01" stat="rCrit" val="0.2">
<using kind="SWORD,DUAL,ANCIENTSWORD,RAPIER,DAGGER,DUALDAGGER,POLE,DUALFIST" />
- </basemul>
+ </mul>
</effect>
</for>
</skill>
diff --git a/L2J_DataPack/dist/game/data/xsd/skills.xsd b/L2J_DataPack/dist/game/data/xsd/skills.xsd
index f746964b5b9364dc88f8354dca5e9d5e5b323984..9daffb213a54f7c4a4d2fbeb0c1f3e8a75f420a6 100644
--- a/L2J_DataPack/dist/game/data/xsd/skills.xsd
+++ b/L2J_DataPack/dist/game/data/xsd/skills.xsd
@@ -264,7 +264,6 @@
<xs:element name="add" type="addType" />
<xs:element name="mul" type="addType" />
<xs:element name="sub" type="addType" />
- <xs:element name="basemul" type="addType" />
<xs:element name="set" type="addType" />
<xs:element name="share" type="shareType" />
</xs:choice>
@@ -281,12 +280,6 @@
<xs:complexType name="forType" mixed="true">
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element name="effect" type="effectType" />
- <xs:element name="param" type="paramType" />
- <xs:element name="add" type="addType" />
- <xs:element name="mul" type="addType" />
- <xs:element name="sub" type="addType" />
- <xs:element name="basemul" type="addType" />
- <xs:element name="set" type="addType" />
</xs:choice>
<xs:attribute type="xs:string" name="name" use="optional" />
<xs:attribute type="xs:byte" name="val" use="optional" />