From 5f6aaa1080aa04f50eec869df68d3510881fc1b6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 14 May 2019 15:38:07 +0000
Subject: [PATCH] Proper S grade armor set skills.

---
 .../dist/game/data/stats/armorsets/Sets.xml   |  45 ++++----
 .../game/data/stats/skills/03500-03599.xml    | 102 ++++++++++++------
 2 files changed, 92 insertions(+), 55 deletions(-)

diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/armorsets/Sets.xml
index 7370fa80ba..356fdecb38 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/armorsets/Sets.xml
@@ -835,14 +835,17 @@
 		</optionalItems>
 		<skills>
 			<skill id="3006" level="1" minimumPieces="5" /> <!-- Equip Set Items -->
-			<skill id="3553" level="1" minimumPieces="5" /> <!-- Imperial Crusader Heavy Armor Set -->
+			<skill id="3553" level="1" minimumPieces="2" /> <!-- Imperial Crusader Heavy Armor Set -->
+			<skill id="3553" level="2" minimumPieces="3" /> <!-- Imperial Crusader Heavy Armor Set -->
+			<skill id="3553" level="3" minimumPieces="4" /> <!-- Imperial Crusader Heavy Armor Set -->
+			<skill id="3553" level="4" minimumPieces="5" /> <!-- Imperial Crusader Heavy Armor Set -->
 			<skill id="3554" level="1" optional="true" /> <!-- Equip Shield -->
-			<skill id="3623" level="1" minimumEnchant="6" /> <!-- Enchant Heavy Armor (S-grade) -->
+			<skill id="13339" level="1" minimumEnchant="6" minimumPieces="5" /> <!-- Heavy Armor Set +6 -->
+			<skill id="13339" level="2" minimumEnchant="7" minimumPieces="5" /> <!-- Heavy Armor Set +7 -->
+			<skill id="13339" level="3" minimumEnchant="8" minimumPieces="5" /> <!-- Heavy Armor Set +8 -->
+			<skill id="13339" level="4" minimumEnchant="9" minimumPieces="5" /> <!-- Heavy Armor Set +9 -->
+			<skill id="13339" level="5" minimumEnchant="10" minimumPieces="5" /> <!-- Heavy Armor Set +10 -->
 		</skills>
-		<stats>
-			<stat type="STR" val="4" />
-			<stat type="DEX" val="-1" />
-		</stats>
 	</set>
 	<set id="43" minimumPieces="4">
 		<requiredItems>
@@ -853,14 +856,15 @@
 		</requiredItems>
 		<skills>
 			<skill id="3006" level="1" minimumPieces="4" /> <!-- Equip Set Items -->
-			<skill id="3555" level="1" minimumPieces="4" /> <!-- Draconic Leather Armor Set -->
-			<skill id="3624" level="1" minimumEnchant="6" /> <!-- Enchant Light Armor (S-grade) -->
+			<skill id="3555" level="1" minimumPieces="2" /> <!-- Draconic Leather Armor Set -->
+			<skill id="3555" level="2" minimumPieces="3" /> <!-- Draconic Leather Armor Set -->
+			<skill id="3555" level="3" minimumPieces="4" /> <!-- Draconic Leather Armor Set -->
+			<skill id="13340" level="1" minimumEnchant="6" minimumPieces="4" /> <!-- Light Armor Set +6 -->
+			<skill id="13340" level="2" minimumEnchant="7" minimumPieces="4" /> <!-- Light Armor Set +7 -->
+			<skill id="13340" level="3" minimumEnchant="8" minimumPieces="4" /> <!-- Light Armor Set +8 -->
+			<skill id="13340" level="4" minimumEnchant="9" minimumPieces="4" /> <!-- Light Armor Set +9 -->
+			<skill id="13340" level="5" minimumEnchant="10" minimumPieces="4" /> <!-- Light Armor Set +10 -->
 		</skills>
-		<stats>
-			<stat type="STR" val="2" />
-			<stat type="DEX" val="2" />
-			<stat type="CON" val="-1" />
-		</stats>
 	</set>
 	<set id="44" minimumPieces="4">
 		<requiredItems>
@@ -871,14 +875,15 @@
 		</requiredItems>
 		<skills>
 			<skill id="3006" level="1" minimumPieces="4" /> <!-- Equip Set Items -->
-			<skill id="3556" level="1" minimumPieces="4" /> <!-- Major Arcana Robe Set -->
-			<skill id="3625" level="1" minimumEnchant="6" /> <!-- Enchant Robe (S-grade) -->
+			<skill id="3556" level="1" minimumPieces="2" /> <!-- Major Arcana Robe Set -->
+			<skill id="3556" level="2" minimumPieces="3" /> <!-- Major Arcana Robe Set -->
+			<skill id="3556" level="3" minimumPieces="4" /> <!-- Major Arcana Robe Set -->
+			<skill id="13341" level="1" minimumEnchant="6" minimumPieces="4" /> <!-- Robe Armor Set +6 -->
+			<skill id="13341" level="2" minimumEnchant="7" minimumPieces="4" /> <!-- Robe Armor Set +7 -->
+			<skill id="13341" level="3" minimumEnchant="8" minimumPieces="4" /> <!-- Robe Armor Set +8 -->
+			<skill id="13341" level="4" minimumEnchant="9" minimumPieces="4" /> <!-- Robe Armor Set +9 -->
+			<skill id="13341" level="5" minimumEnchant="10" minimumPieces="4" /> <!-- Robe Armor Set +10 -->
 		</skills>
-		<stats>
-			<stat type="INT" val="2" />
-			<stat type="WIT" val="2" />
-			<stat type="MEN" val="-1" />
-		</stats>
 	</set>
 	<set id="45" minimumPieces="4">
 		<requiredItems>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml
index 45e3522298..7e62652edc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml
@@ -1220,22 +1220,34 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="3553" toLevel="1" name="Set Effect - Imperial Crusader Armor, 2-piece">
+	<skill id="3553" toLevel="4" name="Set Effect - Imperial Crusader Armor, 2-piece">
 		<!-- HP Recovery Bonus +6%. -->
 		<icon>icon.armor_t88_u_i00</icon>
-		<magicLvl>75</magicLvl>
+		<magicLvl>1</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait">
-				<SLEEP>70</SLEEP>
-				<HOLD>70</HOLD>
+			<effect name="HpRegen" fromLevel="1" toLevel="4">
+				<amount>6</amount>
+				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalDefence">
+			<effect name="PhysicalDefence" fromLevel="2" toLevel="4">
 				<amount>8</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MaxHp">
+			<effect name="DefenceTrait" fromLevel="3" toLevel="4">
+				<SLEEP>70</SLEEP>
+				<HOLD>70</HOLD>
+			</effect>
+			<effect name="StatUp" fromLevel="4" toLevel="4">
+				<amount>4</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="4" toLevel="4">
+				<amount>-1</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="MaxHp" fromLevel="4" toLevel="4">
 				<amount>445</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,60 +1260,80 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait">
-				<POISON>80</POISON>
-				<BLEED>80</BLEED>
+			<effect name="ShieldDefenceRate">
+				<amount>24</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="3555" toLevel="1" name="Set Effect - Draconic Leather Armor, 2-piece">
+	<skill id="3555" toLevel="3" name="Set Effect - Draconic Leather Armor, 2-piece">
 		<!-- Weight limit +5759, Max MP +289. -->
 		<icon>icon.armor_t89_ul_i00</icon>
-		<magicLvl>75</magicLvl>
+				<magicLvl>1</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="PAtk">
-				<amount>4</amount>
-				<mode>PER</mode>
+			<effect name="WeightPenalty" fromLevel="1" toLevel="3">
+				<amount>5759</amount>
 			</effect>
-			<effect name="PhysicalAttackSpeed">
-				<amount>4</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxMp">
+			<effect name="MaxMp" fromLevel="1" toLevel="3">
 				<amount>289</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="WeightPenalty">
-				<amount>5759</amount>
+			<effect name="PAtk" fromLevel="2" toLevel="3">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed" fromLevel="2" toLevel="3">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>2</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>2</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>-1</amount>
+				<stat>CON</stat>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="3556" toLevel="1" name="Set Effect - Arcana Robe Armor, 2-piece">
+	<skill id="3556" toLevel="3" name="Set Effect - Arcana Robe Armor, 2-piece">
 		<!-- Weight limit +5759, Speed +7. -->
 		<icon>icon.armor_t90_ul_i00</icon>
 		<magicLvl>75</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait">
-				<SHOCK>50</SHOCK>
+			<effect name="WeightPenalty" fromLevel="1" toLevel="3">
+				<amount>5759</amount>
 			</effect>
-			<effect name="MAtk">
-				<amount>17</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="Speed">
+			<effect name="Speed" fromLevel="1" toLevel="3">
 				<amount>7</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="WeightPenalty">
-				<amount>5759</amount>
+			<effect name="MAtk" fromLevel="2" toLevel="3">
+				<amount>17</amount>
+				<mode>PER</mode>
 			</effect>
-			<effect name="ReduceCancel">
-				<amount>-50</amount>
-				<mode>DIFF</mode>
+			<effect name="DefenceTrait" fromLevel="2" toLevel="3">
+				<SHOCK>50</SHOCK>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>2</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>2</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>-1</amount>
+				<stat>MEN</stat>
 			</effect>
 		</effects>
 	</skill>