diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml
index 474dfed22a..df0d4a222f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml
@@ -1328,7 +1328,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1340,7 +1340,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml
index 00d64e4b12..9db800661c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml
@@ -49,7 +49,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
@@ -68,7 +68,7 @@
 				<mode>DIFF</mode>
 				<weaponType>
 					<item>SWORD</item>
-					<item> BLUNT</item>
+					<item>BLUNT</item>
 				</weaponType>
 			</effect>
 			<effect name="HateAttack">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
index 4d11b1ced2..012e4fae27 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
@@ -186,7 +186,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
index b9e0ae0586..9c01ccef33 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml
index f57352fefc..ac46fa256d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml
@@ -410,7 +410,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml
index f4e03e541b..5e3da1b6d9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
index d454f250c8..896327f59a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
@@ -356,7 +356,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
index a71f181e22..9737e9dca4 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml
index 011e2a11ce..20a32b2527 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
index 099a18b2c7..6f759e6121 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
@@ -1971,7 +1971,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml
index 673d2f7728..c9ab371983 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml
@@ -1328,7 +1328,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1340,7 +1340,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml
index a820a196cc..db370e207a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml
@@ -49,7 +49,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
@@ -68,7 +68,7 @@
 				<mode>DIFF</mode>
 				<weaponType>
 					<item>SWORD</item>
-					<item> BLUNT</item>
+					<item>BLUNT</item>
 				</weaponType>
 			</effect>
 			<effect name="HateAttack">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
index cb44fffc24..d3401de743 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
@@ -186,7 +186,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
index 6bb5f9f959..11625131fe 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml
index b7dc95c909..6aedc811ce 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml
@@ -421,7 +421,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml
index 20f00b04dc..542ad8a8d5 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
index cc9dfb18cb..9251f276b2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
@@ -363,7 +363,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml
index 8f3ccba0b1..03048b4a0b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml
index 8fe82964d4..5ca52d4385 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml
index a701b14942..42003cf30e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml
@@ -2343,7 +2343,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml
index 673d2f7728..c9ab371983 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml
@@ -1328,7 +1328,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1340,7 +1340,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml
index a16ef06bfa..de8f114578 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml
@@ -49,7 +49,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
@@ -68,7 +68,7 @@
 				<mode>DIFF</mode>
 				<weaponType>
 					<item>SWORD</item>
-					<item> BLUNT</item>
+					<item>BLUNT</item>
 				</weaponType>
 			</effect>
 			<effect name="HateAttack">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
index 65ad986ba8..ec23ca88d6 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
@@ -186,7 +186,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
index 6ddf99e2da..af04565ed2 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml
index f5616a3f61..a28005001c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml
@@ -421,7 +421,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml
index e2a46d7b64..330b0f009a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
index e400d26d15..84a56c714a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
@@ -387,7 +387,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml
index 65eeff6285..9c8939bea8 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml
index 61810af81f..1e0550f224 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml
index 625c738d37..b3b0ee8d17 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml
@@ -2342,7 +2342,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml
index 88c15f10c6..7f94fce6bb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml
@@ -1328,7 +1328,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1340,7 +1340,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml
index cbf76de310..67b81062e0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml
@@ -49,7 +49,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
@@ -68,7 +68,7 @@
 				<mode>DIFF</mode>
 				<weaponType>
 					<item>SWORD</item>
-					<item> BLUNT</item>
+					<item>BLUNT</item>
 				</weaponType>
 			</effect>
 			<effect name="HateAttack">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml
index 524d227d8d..b1bfbd23f3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml
@@ -186,7 +186,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
index e3de092fea..3fe98ad0c3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml
index 6e1b730f55..a65a5a3ac0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml
@@ -446,7 +446,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml
index 1123ef2ceb..a130be3a94 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml
index f8c8d6708f..251f54e4e4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml
@@ -378,7 +378,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml
index b47ec51c54..2bc286e494 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml
index 2827906beb..6aae1ca6cb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
index d705d5cb26..f5d36e6ccc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
@@ -2300,7 +2300,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml
index c89d2bf67a..083ea6c787 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml
@@ -1328,7 +1328,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1340,7 +1340,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
index a6aaf42b03..c0b052f3c8 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
@@ -92,7 +92,7 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</effect>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="Accuracy">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
index 62623e4d5a..b8e7e8b942 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
@@ -192,7 +192,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
index 0ec1d152a1..75b9f0ce02 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
index ca95f2790a..4450ad197b 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
@@ -475,7 +475,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml
index c5e2814a2c..aa31e039b0 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml
index f053b32702..6832add07c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml
@@ -378,7 +378,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
index eb87f96d20..1403b05263 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml
index 93973f5008..505e14388f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml
index 123ca3c046..16421332da 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml
@@ -2300,7 +2300,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml
index 7f0f37d325..ff90746bf5 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml
@@ -1328,7 +1328,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1340,7 +1340,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
index 805692fb57..b57a18e8ac 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
@@ -92,7 +92,7 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</effect>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="Accuracy">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
index c32bf364af..be63b0ec1d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
@@ -192,7 +192,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
index dbd40901f2..580f8ca370 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
index 8d52ce647b..bf22c87967 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
@@ -475,7 +475,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml
index ab7f2404f9..141e159159 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml
index df550afde0..ec69ad8ad7 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml
@@ -378,7 +378,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
index 3a91982a7f..5d56ddc869 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml
index 00f538e15a..4b4d9ffffe 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml
index 7943f50821..7f243e2a4b 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml
@@ -2300,7 +2300,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml
index 62942927d3..33e4ea2b58 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml
@@ -1336,7 +1336,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1348,7 +1348,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
index dd89b92ee7..910c26e717 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
@@ -92,7 +92,7 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</effect>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="Accuracy">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
index 756ddc8b05..611e6f440a 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
@@ -192,7 +192,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
index 7b49cdea90..78a602a765 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
index 1fef2dd7c5..23ee5a05da 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
@@ -500,7 +500,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml
index a1d81ce411..beb1eecbe7 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml
index 7e1815ea9d..b5c403b007 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml
@@ -382,7 +382,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
index 0cabddd26b..323975c593 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml
index 9dfe224244..73ffd7f21a 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml
index 4cb57500fb..7665d64bfa 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml
@@ -2370,7 +2370,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml
index 5d388a7107..4cec16c9d6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml
@@ -1336,7 +1336,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 		</effects>
@@ -1348,7 +1348,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
index 719938eabf..7a0117a519 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
@@ -92,7 +92,7 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</effect>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="Accuracy">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
index e4f2d6aca5..2978e38ab9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
@@ -192,7 +192,7 @@
 			<value level="10">110</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
index ace027f587..91762d6bd2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
@@ -45,7 +45,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml
index a5201aea8c..d5c15b2cc6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml
@@ -500,7 +500,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 				<weaponType>
 					<item>BOW</item>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml
index 3927d2390b..74b3de991a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml
@@ -53,7 +53,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml
index de7eb2fc94..6141b066e9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml
@@ -382,7 +382,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
index 74bd7e6a74..ca344d5e2f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
@@ -47,7 +47,7 @@
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>STR</stat>
 			</effect>
 			<effect name="TriggerSkillByAttack">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml
index 982025084f..a78dac6488 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml
@@ -150,7 +150,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="MAtk">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml
index 1c8fb3039b..ab5a29cec0 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml
@@ -2370,7 +2370,7 @@
 			<value level="3">85</value>
 		</magicLvl>
 		<effects>
-			<effect name="SkillCritical">
+			<effect name="StatBonusSkillCritical">
 				<stat>INT</stat>
 			</effect>
 			<effect name="StatUp">