diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java
index d61803beff..7b7885985e 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java
@@ -133,7 +133,7 @@ public class Coatl extends AbstractNpcAI
 		final long currentTime = System.currentTimeMillis();
 		final Calendar calendar = Calendar.getInstance();
 		// Spawn time to 21:00 Monday.
-		calendar.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+		calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
 		calendar.set(Calendar.HOUR_OF_DAY, 21);
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/23800-23899.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/23800-23899.xml
index 3188becefa..bfe9fbb80d 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/23800-23899.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/23800-23899.xml
@@ -1583,8 +1583,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
@@ -1639,11 +1639,11 @@
 				<run ground="120" />
 			</speed>
 			<hitTime>450</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1696,11 +1696,11 @@
 				<run ground="150" />
 			</speed>
 			<hitTime>340</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1754,11 +1754,11 @@
 				<run ground="130" />
 			</speed>
 			<hitTime>800</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1812,11 +1812,11 @@
 				<run ground="120" />
 			</speed>
 			<hitTime>390</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1870,11 +1870,11 @@
 				<run ground="120" />
 			</speed>
 			<hitTime>1200</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="MAGE" aggroRange="600" isAggressive="true" />
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/24600-24699.xml
index 21ef9f14d9..e2cf20aaee 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/24600-24699.xml
@@ -6644,8 +6644,8 @@
 			</speed>
 			<hitTime>600</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6694,8 +6694,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6733,7 +6733,6 @@
 	<npc id="24689" level="128" type="Monster" name="Langk Lizardman Berserker">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
-			<!-- 	<param name="IsAggressive" value="1" /> -->
 			<param name="MovingAttack" value="1" />
 		</parameters>
 		<race>HUMANOID</race>
@@ -6749,8 +6748,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6799,8 +6798,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6849,8 +6848,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6899,8 +6898,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6950,8 +6949,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6999,8 +6998,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/29400-29499.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/29400-29499.xml
index df7fde8518..ee4870b84d 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/29400-29499.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/npcs/29400-29499.xml
@@ -467,7 +467,7 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="88" int="150" dex="55" wit="150" con="82" men="150">
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2538603" hpRegen="13.4" mp="3190" mpRegen="30" />
 			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="150648" magical="729046" />
@@ -499,7 +499,7 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="88" int="150" dex="55" wit="150" con="82" men="150">
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2538603" hpRegen="13.4" mp="3190" mpRegen="30" />
 			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="150648" magical="729046" />
@@ -531,7 +531,7 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="88" int="150" dex="55" wit="150" con="82" men="150">
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2538603" hpRegen="13.4" mp="3190" mpRegen="30" />
 			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="150648" magical="729046" />
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34700-34799.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34700-34799.xml
index e0113a5332..9eb16f7e16 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34700-34799.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34700-34799.xml
@@ -1638,7 +1638,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>2000</power>
 			</effect>
 		</effects>
@@ -1664,7 +1664,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>2000</power>
 			</effect>
 		</effects>
@@ -1690,7 +1690,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>2500</power>
 			</effect>
 		</effects>
@@ -1716,7 +1716,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>3400</power>
 			</effect>
 		</effects>
@@ -1738,7 +1738,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>CAST</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1760,7 +1760,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>CAST</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1782,7 +1782,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>ATTACK</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power>
 			</effect>
 		</effects>
@@ -1804,7 +1804,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>ATTACK</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1863,7 +1863,7 @@
 		<hitTime>1600</hitTime>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>
 					<value level="1">900</value>
 				</power>
@@ -1885,7 +1885,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>
 					<value level="1">1300</value>
 				</power>
@@ -1928,7 +1928,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power>
 			</effect>
 		</effects>
@@ -1951,7 +1951,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power>
 			</effect>
 		</effects>
@@ -1974,7 +1974,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1997,7 +1997,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -2020,7 +2020,7 @@
 		<reuseDelay>1</reuseDelay>
 		<reuseDelay>6000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1000</power>
 			</effect>
 		</effects>
@@ -2041,7 +2041,7 @@
 		<hitTime>1600</hitTime>
 		<reuseDelay>6000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>2000</power>
 			</effect>
 		</effects>
@@ -2068,7 +2068,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2095,7 +2095,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>6000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2122,7 +2122,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2149,7 +2149,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2176,7 +2176,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2203,7 +2203,7 @@
 		<mpConsume>11</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2409,7 +2409,7 @@
 		<magicLevel>116</magicLevel>
 		<reuseDelay>800</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>150</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<overHit>true</overHit>
@@ -2434,7 +2434,7 @@
 		<magicLevel>116</magicLevel>
 		<reuseDelay>800</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>150</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<overHit>true</overHit>
@@ -2466,7 +2466,7 @@
 		<magicCriticalRate>500</magicCriticalRate>
 		<reuseDelay>9000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>40000000</power>
 				<overHit>true</overHit>
 				<criticalChance>65</criticalChance>
@@ -2508,7 +2508,7 @@
 			<effect name="DefenceTrait">
 				<HOLD>100</HOLD>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>25000000</power>
 				<overHit>true</overHit>
 				<criticalChance>50</criticalChance>
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34800-34899.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34800-34899.xml
index 907d6cdc9d..303cc3a034 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34800-34899.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/34800-34899.xml
@@ -161,13 +161,13 @@
 				<amount>1500</amount>
 				<attribute>DARK</attribute>
 			</effect>
-			<effect name="PAtk">
+			<effect name="PhysicalAttack">
 				<amount>
 					<value level="1">10</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MAtk">
+			<effect name="MagicalAttack">
 				<amount>
 					<value level="1">10</value>
 				</amount>
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java
index d61803beff..7b7885985e 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/ai/bosses/Coatl/Coatl.java
@@ -133,7 +133,7 @@ public class Coatl extends AbstractNpcAI
 		final long currentTime = System.currentTimeMillis();
 		final Calendar calendar = Calendar.getInstance();
 		// Spawn time to 21:00 Monday.
-		calendar.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+		calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
 		calendar.set(Calendar.HOUR_OF_DAY, 21);
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/23800-23899.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/23800-23899.xml
index 13d2d5f7a4..0f8a3e1912 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/23800-23899.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/23800-23899.xml
@@ -1583,8 +1583,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
@@ -1639,11 +1639,11 @@
 				<run ground="120" />
 			</speed>
 			<hitTime>450</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1696,11 +1696,11 @@
 				<run ground="150" />
 			</speed>
 			<hitTime>340</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1754,11 +1754,11 @@
 				<run ground="130" />
 			</speed>
 			<hitTime>800</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1812,11 +1812,11 @@
 				<run ground="120" />
 			</speed>
 			<hitTime>390</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="BALANCED" aggroRange="600" isAggressive="true" />
@@ -1870,11 +1870,11 @@
 				<run ground="120" />
 			</speed>
 			<hitTime>1200</hitTime>
-			<abnormalResist physical="0" magical="0" />
 			<attribute>
-				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 				<attack type="WATER" value="2200" />
+				<defence fire="2300" water="2350" wind="2350" earth="2350" holy="2350" dark="2350" />
 			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" passableDoor="true" />
 		<ai type="MAGE" aggroRange="600" isAggressive="true" />
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/24600-24699.xml
index 119e696fd1..f69bb1817b 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/24600-24699.xml
@@ -6644,8 +6644,8 @@
 			</speed>
 			<hitTime>600</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6694,8 +6694,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6733,7 +6733,6 @@
 	<npc id="24689" level="128" type="Monster" name="Langk Lizardman Berserker">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
-			<!-- 	<param name="IsAggressive" value="1" /> -->
 			<param name="MovingAttack" value="1" />
 		</parameters>
 		<race>HUMANOID</race>
@@ -6749,8 +6748,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6799,8 +6798,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6849,8 +6848,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6899,8 +6898,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6950,8 +6949,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
@@ -6999,8 +6998,8 @@
 			</speed>
 			<hitTime>900</hitTime>
 			<attribute>
-				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 				<attack type="WATER" value="2350" />
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
 			</attribute>
 		</stats>
 		<status attackable="true" />
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/29400-29499.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/29400-29499.xml
index 6f2901727b..b3862d9815 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/29400-29499.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/npcs/29400-29499.xml
@@ -467,7 +467,7 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="88" int="150" dex="55" wit="150" con="82" men="150">
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2538603" hpRegen="13.4" mp="3190" mpRegen="30" />
 			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="150648" magical="729046" />
@@ -499,7 +499,7 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="88" int="150" dex="55" wit="150" con="82" men="150">
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2538603" hpRegen="13.4" mp="3190" mpRegen="30" />
 			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="150648" magical="729046" />
@@ -531,7 +531,7 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="88" int="150" dex="55" wit="150" con="82" men="150">
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2538603" hpRegen="13.4" mp="3190" mpRegen="30" />
 			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="150648" magical="729046" />
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34700-34799.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34700-34799.xml
index 72f28729a1..134675be34 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34700-34799.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34700-34799.xml
@@ -1654,7 +1654,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>2000</power>
 			</effect>
 		</effects>
@@ -1681,7 +1681,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>2000</power>
 			</effect>
 		</effects>
@@ -1708,7 +1708,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>2500</power>
 			</effect>
 		</effects>
@@ -1735,7 +1735,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>1000</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>3400</power>
 			</effect>
 		</effects>
@@ -1757,7 +1757,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>CAST</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1779,7 +1779,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>CAST</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1801,7 +1801,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>ATTACK</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power>
 			</effect>
 		</effects>
@@ -1823,7 +1823,7 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<nextAction>ATTACK</nextAction>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>500</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -1882,7 +1882,7 @@
 		<hitTime>1600</hitTime>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>
 					<value level="1">900</value>
 				</power>
@@ -1904,7 +1904,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>
 					<value level="1">1300</value>
 				</power>
@@ -1947,7 +1947,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power>
 			</effect>
 		</effects>
@@ -1970,7 +1970,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power>
 			</effect>
 		</effects>
@@ -1993,7 +1993,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -2016,7 +2016,7 @@
 		<nextAction>ATTACK</nextAction>
 		<reuseDelay>1</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1400</power> <!-- Fix: Retail Missed -->
 			</effect>
 		</effects>
@@ -2039,7 +2039,7 @@
 		<reuseDelay>1</reuseDelay>
 		<reuseDelay>6000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>1000</power>
 			</effect>
 		</effects>
@@ -2060,7 +2060,7 @@
 		<hitTime>1600</hitTime>
 		<reuseDelay>6000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>2000</power>
 			</effect>
 		</effects>
@@ -2087,7 +2087,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2114,7 +2114,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>6000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2141,7 +2141,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2168,7 +2168,7 @@
 		<mpConsume>100</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2195,7 +2195,7 @@
 		<mpConsume>1</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2222,7 +2222,7 @@
 		<mpConsume>11</mpConsume>
 		<reuseDelay>8000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>10000</power>
 			</effect>
 		</effects>
@@ -2428,7 +2428,7 @@
 		<magicLevel>116</magicLevel>
 		<reuseDelay>800</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>150</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<overHit>true</overHit>
@@ -2453,7 +2453,7 @@
 		<magicLevel>116</magicLevel>
 		<reuseDelay>800</reuseDelay>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MagicalDamage">
 				<power>150</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<overHit>true</overHit>
@@ -2485,7 +2485,7 @@
 		<magicCriticalRate>500</magicCriticalRate>
 		<reuseDelay>9000</reuseDelay>
 		<effects>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>40000000</power>
 				<overHit>true</overHit>
 				<criticalChance>65</criticalChance>
@@ -2527,7 +2527,7 @@
 			<effect name="DefenceTrait">
 				<HOLD>100</HOLD>
 			</effect>
-			<effect name="PhysicalAttack">
+			<effect name="PhysicalDamage">
 				<power>25000000</power>
 				<overHit>true</overHit>
 				<criticalChance>50</criticalChance>
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34800-34899.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34800-34899.xml
index 6ab35e1e77..dd57384786 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34800-34899.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/34800-34899.xml
@@ -166,13 +166,13 @@
 				<amount>1500</amount>
 				<attribute>DARK</attribute>
 			</effect>
-			<effect name="PAtk">
+			<effect name="PhysicalAttack">
 				<amount>
 					<value level="1">10</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MAtk">
+			<effect name="MagicalAttack">
 				<amount>
 					<value level="1">10</value>
 				</amount>