Merge branch 'master' of https://github.com/L2J/L2J_DataPack

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);

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>

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>

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>

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>

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>

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">

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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" />

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>

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>

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% -->

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)">

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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" />

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>

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>

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>

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" />

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" />

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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" />