From f0fe17830e265a7318c81dc1cb5df81160ada7b4 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 13 Sep 2017 20:17:54 +0000
Subject: [PATCH] Fix for armor set skill mana regeneration. Contributed by
 gamelike85.

---
 .../game/data/stats/skills/13300-13399.xml    | 51 ++++++++++++---
 .../game/data/stats/skills/13300-13399.xml    | 51 ++++++++++++---
 .../game/data/stats/skills/13300-13399.xml    | 63 +++++++++++++++----
 3 files changed, 135 insertions(+), 30 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml
index 952d9a17f6..8dc9c169bd 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml
@@ -910,12 +910,23 @@
 					<value level="3">93</value>
 				</amount>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">32</value>
 					<value level="2">32</value>
 					<value level="3">32</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">32</value>
+					<value level="2">32</value>
+					<value level="3">32</value>
+				</value>
 			</effect>
 			<effect name="MagicMpCost">
 				<amount>
@@ -1000,12 +1011,23 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">8</value>
 					<value level="2">8</value>
 					<value level="3">8</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">8</value>
+					<value level="2">8</value>
+					<value level="3">8</value>
+				</value>
 			</effect>
 			<effect name="PhysicalSkillPower">
 				<amount>
@@ -1061,12 +1083,23 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">8</value>
 					<value level="2">8</value>
 					<value level="3">8</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">8</value>
+					<value level="2">8</value>
+					<value level="3">8</value>
+				</value>
 			</effect>
 			<effect name="Reuse">
 				<amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml
index 10c0f9d49a..d96f54bfed 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml
@@ -910,12 +910,23 @@
 					<value level="3">93</value>
 				</amount>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">32</value>
 					<value level="2">32</value>
 					<value level="3">32</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">32</value>
+					<value level="2">32</value>
+					<value level="3">32</value>
+				</value>
 			</effect>
 			<effect name="MagicMpCost">
 				<amount>
@@ -1000,12 +1011,23 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">8</value>
 					<value level="2">8</value>
 					<value level="3">8</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">8</value>
+					<value level="2">8</value>
+					<value level="3">8</value>
+				</value>
 			</effect>
 			<effect name="PhysicalSkillPower">
 				<amount>
@@ -1061,12 +1083,23 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">8</value>
 					<value level="2">8</value>
 					<value level="3">8</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">8</value>
+					<value level="2">8</value>
+					<value level="3">8</value>
+				</value>
 			</effect>
 			<effect name="Reuse">
 				<amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml
index 7557490561..c30208fd51 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml
@@ -896,7 +896,7 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="13339" toLevel="5" name="Enchant Heavy Armor Set + 6 +7 +8 +9 +10 (R-grade)">
+	<skill id="13339" toLevel="5" name="Enchant Heavy Armor Set + 6 +7 +8 +9 +10 (R,R95,R99grade)">
 		<!-- Set item is enchanted. P. Def. + 93, and MP Recovery Bonus + 32 when standing/ sitting. -->
 		<icon>icon.skill0231</icon>
 		<operateType>P</operateType>
@@ -912,14 +912,27 @@
 					<value level="5">93</value>
 				</amount>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">32</value>
 					<value level="2">32</value>
 					<value level="3">32</value>
 					<value level="4">32</value>
 					<value level="5">32</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">32</value>
+					<value level="2">32</value>
+					<value level="3">32</value>
+					<value level="4">32</value>
+					<value level="5">32</value>
+				</value>
 			</effect>
 			<effect name="MagicMpCost">
 				<amount>
@@ -987,7 +1000,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="13340" toLevel="5" name="Enchant Light Armor Set + 6 +7 +8 +9 +10 (R-grade)">
+	<skill id="13340" toLevel="5" name="Enchant Light Armor Set + 6 +7 +8 +9 +10 (R,R95,R99grade)">
 		<!-- Set item is enchanted. M. Def. + 55, P. Evasion + 2, and Debuff Resistance + 10%. MP Recovery Bonus + 8 when standing/ sitting. -->
 		<icon>icon.skill0233</icon>
 		<operateType>P</operateType>
@@ -1022,14 +1035,27 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">8</value>
 					<value level="2">8</value>
 					<value level="3">8</value>
 					<value level="4">8</value>
 					<value level="5">8</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">8</value>
+					<value level="2">8</value>
+					<value level="3">8</value>
+					<value level="4">8</value>
+					<value level="5">8</value>
+				</value>
 			</effect>
 			<effect name="PhysicalSkillPower">
 				<amount>
@@ -1109,7 +1135,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="13341" toLevel="5" name="Enchant Robe Set + 6 +7 +8 +9 +10 (R-grade)">
+	<skill id="13341" toLevel="5" name="Enchant Robe Set + 6 +7 +8 +9 +10 (R,R95,R99grade)">
 		<!-- Set item is enchanted. P. Def. + 60, Weight Limit + 30%, and Skill Cooldown - 3%. MP Recovery Bonus + 8 when standing/ sitting. -->
 		<icon>icon.skill0234</icon>
 		<operateType>P</operateType>
@@ -1135,14 +1161,27 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>SITTING</type>
+				<value>
 					<value level="1">8</value>
 					<value level="2">8</value>
 					<value level="3">8</value>
 					<value level="4">8</value>
 					<value level="5">8</value>
-				</amount>
+				</value>
+			</effect>
+			<effect name="StatByMoveType">
+				<stat>REGENERATE_MP_RATE</stat>
+				<type>STANDING</type>
+				<value>
+					<value level="1">8</value>
+					<value level="2">8</value>
+					<value level="3">8</value>
+					<value level="4">8</value>
+					<value level="5">8</value>
+				</value>
 			</effect>
 			<effect name="Reuse">
 				<amount>