diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
index 4bfcae8432..6d97317a02 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
@@ -2468,11 +2468,11 @@
 		</conditions>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PhysicalAttack" fromLevel="2" toLevel="2">
+			<effect name="PAtk" fromLevel="2" toLevel="2">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack" fromLevel="2" toLevel="2">
+			<effect name="MAtk" fromLevel="2" toLevel="2">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08800-08899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08800-08899.xml
index 022b37088a..525dbc9c37 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08800-08899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08800-08899.xml
@@ -2015,7 +2015,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -2065,7 +2065,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -2115,7 +2115,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
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 02a0bacced..ed10c808f8 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
@@ -52,14 +52,14 @@
 			<effect name="SkillCritical">
 				<stat>STR</stat>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalAttackSpeed">
 				<amount>25</amount>
 				<mode>PER</mode>
 				<weaponType>
 					<item>DAGGER</item>
 				</weaponType>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">739</value>
 					<value level="2">856</value>
@@ -124,14 +124,14 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalAttackSpeed">
 				<amount>25</amount>
 				<mode>PER</mode>
 				<weaponType>
 					<item>DUALDAGGER</item>
 				</weaponType>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">844</value>
 					<value level="2">979</value>
@@ -2173,7 +2173,7 @@
 			<effect name="AbnormalShield">
 				<times>5</times>
 			</effect>
-			<effect name="PhysicalAttack" fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2030">
+			<effect name="PAtk" fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2030">
 				<amount>
 					<value fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2030">{0.6 + 0.4 * subIndex}</value>
 				</amount>
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 d6378efba8..642452f804 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
@@ -264,7 +264,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<isMagic>1</isMagic>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml
index 980af12cbb..5b370fd862 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml
@@ -2157,7 +2157,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">10</value>
 					<value level="2">12</value>
@@ -2199,7 +2199,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">10</value>
 					<value level="2">12</value>
@@ -3195,7 +3195,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">10</value>
 					<value level="2">12</value>
@@ -3807,7 +3807,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
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 da05e9d51c..89b5a776d1 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
@@ -132,7 +132,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">10</value>
 					<value level="2">12</value>
@@ -2598,7 +2598,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="PhysicalAttack" />
 			<effect name="Speed">
 				<amount>-100</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13100-13199.xml
index f0a19c545a..e1b11233d1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13100-13199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13100-13199.xml
@@ -479,7 +479,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>2</amount>
 				<mode>PER</mode>
 			</effect>
@@ -531,7 +531,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>2</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml
index 6364857675..c413af155c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml
@@ -1637,7 +1637,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>37</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1663,7 +1663,7 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>111</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1676,7 +1676,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>37</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13500-13599.xml
index 9399eda95e..0d17f078cf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13500-13599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13500-13599.xml
@@ -2167,7 +2167,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>440</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2207,7 +2207,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>503</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2247,7 +2247,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>612</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2287,7 +2287,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>503</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2327,7 +2327,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>612</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2367,7 +2367,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>503</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2411,7 +2411,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>991</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2451,7 +2451,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>893</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2491,7 +2491,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>598</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2531,7 +2531,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>598</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2571,7 +2571,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>657</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2611,7 +2611,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>612</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2651,7 +2651,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>503</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2691,7 +2691,7 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>612</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml
index b4161d4fef..d153254374 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml
@@ -318,7 +318,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -370,7 +370,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -421,7 +421,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -472,7 +472,7 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -839,7 +839,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -901,7 +901,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -963,7 +963,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -1025,7 +1025,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -1091,7 +1091,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -1153,7 +1153,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -1215,7 +1215,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">0</value>
@@ -1277,7 +1277,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -1339,7 +1339,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
@@ -1401,7 +1401,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value fromLevel="1" toLevel="11">0</value>
 					<value fromLevel="12" toLevel="13">7</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14000-14099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14000-14099.xml
index bb5d1c3552..82f9bdcf9f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14000-14099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14000-14099.xml
@@ -2470,12 +2470,14 @@
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="MagicalAttack">
-				<value level="1">616</value>
-				<value level="2">143</value>
-				<value level="3">147</value>
-				<value level="4">151</value>
-				<value level="5">156</value>
-				<value level="6">156</value>
+				<power>
+					<value level="1">616</value>
+					<value level="2">143</value>
+					<value level="3">147</value>
+					<value level="4">151</value>
+					<value level="5">156</value>
+					<value level="6">156</value>
+				</power>
 			</effect>
 		</effects>
 	</skill>
@@ -2529,13 +2531,15 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<effect name="MagicalAttack">
-				<value level="1">410</value>
-				<value level="2">143</value>
-				<value level="3">147</value>
-				<value level="4">151</value>
-				<value level="5">156</value>
-				<value level="6">156</value>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">-410</value>
+					<value level="2">-143</value>
+					<value level="3">-147</value>
+					<value level="4">-151</value>
+					<value level="5">-156</value>
+					<value level="6">-156</value>
+				</amount>
 			</effect>
 			<effect name="Speed">
 				<amount>-50</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15600-15699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15600-15699.xml
index 45529425b9..e9e36f8fb6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15600-15699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15600-15699.xml
@@ -490,7 +490,7 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>IMPROVE_PA_PD_UP;PA_UP;PD_UP;IMPROVE_MA_MD_UP;MD_UP;MA_UP;KAMAEL_SPECIAL</slot>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">17</value>
 					<value level="2">19</value>
@@ -499,7 +499,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">79</value>
 					<value level="2">83</value>
@@ -558,11 +558,11 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>MULTI_BUFF;COUNTER_CRITICAL</slot>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16500-16599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16500-16599.xml
index 65845e13e1..ff2819fe2f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16500-16599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16500-16599.xml
@@ -1019,11 +1019,11 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16600-16699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16600-16699.xml
index 849666a309..bacd622bd5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16600-16699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16600-16699.xml
@@ -676,7 +676,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">50</value>
 					<value level="2">100</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml
index bb4081ff10..14b6a8131c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml
@@ -732,7 +732,7 @@
 				<amount>30</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -834,7 +834,7 @@
 				<amount>30</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17500-17599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17500-17599.xml
index 7cf8e8a0fd..7800631b77 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17500-17599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17500-17599.xml
@@ -30,7 +30,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
@@ -42,7 +42,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -202,7 +202,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
@@ -214,7 +214,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -374,7 +374,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
@@ -386,7 +386,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -546,7 +546,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
@@ -558,7 +558,7 @@
 		<operateType>P</operateType>
 		<magicLvl>1</magicLvl>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml
index d4a9d426b9..b56fe0cd58 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml
@@ -743,7 +743,7 @@
 				<amount>3</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>3</amount>
 				<mode>PER</mode>
 			</effect>
@@ -778,7 +778,7 @@
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml
index 1798c6ee65..4fdf699980 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml
@@ -1538,7 +1538,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">2</value>
@@ -1742,7 +1742,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">3</value>
 					<value level="2">6</value>				
@@ -1807,7 +1807,7 @@
 			</condition>
 		</passiveConditions>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">10</value>
@@ -1885,7 +1885,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">2</value>
 					<value level="2">5</value>
@@ -2140,7 +2140,7 @@
 			</condition>
 		</passiveConditions>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">10</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
index 5064b60c79..93ed0bf15b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
@@ -119,7 +119,7 @@
 			<effect name="BlockSkill">
 				<magicTypes>1</magicTypes>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>-23</amount>
 				<mode>PER</mode>
 			</effect>
@@ -708,7 +708,7 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">50</value>
 					<value level="2">60</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19400-19499.xml
index e4b229c9d6..e31a098cc4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19400-19499.xml
@@ -216,7 +216,7 @@
 		<operateType>T</operateType>
 		<mpConsume>36</mpConsume>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">30</value>
 					<value level="2">40</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27600-27699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27600-27699.xml
index 8742e5c5c6..fb7c273eca 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27600-27699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27600-27699.xml
@@ -339,11 +339,11 @@
 			<effect name="DamageShield">
 				<amount>5</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
@@ -404,11 +404,11 @@
 			<effect name="DamageShield">
 				<amount>6</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>16</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>11</amount>
 				<mode>PER</mode>
 			</effect>
@@ -469,11 +469,11 @@
 			<effect name="DamageShield">
 				<amount>7</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>17</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>12</amount>
 				<mode>PER</mode>
 			</effect>
@@ -534,11 +534,11 @@
 			<effect name="DamageShield">
 				<amount>8</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>18</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>13</amount>
 				<mode>PER</mode>
 			</effect>
@@ -599,11 +599,11 @@
 			<effect name="DamageShield">
 				<amount>9</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>19</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>14</amount>
 				<mode>PER</mode>
 			</effect>
@@ -664,11 +664,11 @@
 			<effect name="DamageShield">
 				<amount>10</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
@@ -729,11 +729,11 @@
 			<effect name="DamageShield">
 				<amount>5</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
@@ -794,11 +794,11 @@
 			<effect name="DamageShield">
 				<amount>6</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>11</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>16</amount>
 				<mode>PER</mode>
 			</effect>
@@ -859,11 +859,11 @@
 			<effect name="DamageShield">
 				<amount>7</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>12</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>17</amount>
 				<mode>PER</mode>
 			</effect>
@@ -924,11 +924,11 @@
 			<effect name="DamageShield">
 				<amount>8</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>13</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>18</amount>
 				<mode>PER</mode>
 			</effect>
@@ -989,11 +989,11 @@
 			<effect name="DamageShield">
 				<amount>9</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>14</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>19</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1054,11 +1054,11 @@
 			<effect name="DamageShield">
 				<amount>10</amount>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
@@ -3610,7 +3610,7 @@
 		<operateType>P</operateType>
 		<targetType>SELF</targetType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">1.1</value>
@@ -3621,7 +3621,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">2</value>
 					<value level="2">2.2</value>
@@ -3646,7 +3646,7 @@
 		<operateType>P</operateType>
 		<targetType>SELF</targetType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">1.1</value>
@@ -3657,7 +3657,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">2</value>
 					<value level="2">2.2</value>
@@ -3682,7 +3682,7 @@
 		<operateType>P</operateType>
 		<targetType>SELF</targetType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">1.1</value>
@@ -3693,7 +3693,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">2</value>
 					<value level="2">2.2</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml
index 7e161a25b9..f33d7c0fd6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml
@@ -12,7 +12,7 @@
 		<operateType>P</operateType>
 		<targetType>SELF</targetType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">1.1</value>
@@ -23,7 +23,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">2</value>
 					<value level="2">2.2</value>
@@ -48,7 +48,7 @@
 		<operateType>P</operateType>
 		<targetType>SELF</targetType>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">1.1</value>
@@ -59,7 +59,7 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>
 					<value level="1">2</value>
 					<value level="2">2.2</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml
index 3049f64039..9fa6c71942 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml
@@ -979,7 +979,7 @@
 					<value level="7">40</value>
 				</AIRBIND>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PAtk">
 				<amount>
 					<value level="1">10</value>
 					<value level="2">15</value>