From a8e48d6179e1239dacedd3da94da97f3f500c7d7 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 23 Sep 2017 19:37:11 +0000
Subject: [PATCH] Various skill fixes. Contributed by Liamxroy.

---
 .../game/data/stats/skills/19100-19199.xml    | 114 +++++++++++++++---
 .../game/data/stats/skills/19200-19299.xml    |  41 ++++++-
 .../game/data/stats/skills/19100-19199.xml    | 114 +++++++++++++++---
 .../game/data/stats/skills/19200-19299.xml    |  41 ++++++-
 .../game/data/stats/skills/18700-18799.xml    |  47 +++++++-
 .../game/data/stats/skills/19100-19199.xml    | 114 +++++++++++++++---
 .../game/data/stats/skills/19200-19299.xml    |  41 ++++++-
 7 files changed, 449 insertions(+), 63 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
index a22eae6420..926e69b452 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
@@ -223,16 +223,51 @@
 		<abnormalType>TRANSFORM</abnormalType>
 	</skill>
 	<skill id="19110" toLevel="5" name="Clan Resilience">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Clan members' resistance to Knock Back / Knock Down + 12. Elder or above only. -->
+		<!-- Level 1: Clan members' resistance to Knock Back / Knock Down + 12. Elder or above only. -->
+		<!-- Level 2: Clan members' resistance to Knock Back / Knock Down + 13. Elder or above only. -->
+		<!-- Level 3: Clan members' resistance to Knock Back / Knock Down + 14. Elder or above only. -->
+		<!-- Level 4: Clan members' resistance to Knock Back / Knock Down + 15. Elder or above only. -->
+		<!-- Level 5: Clan members' resistance to Knock Back / Knock Down + 16. Elder or above only. -->
 		<icon>icon.skill_tough_spirit</icon>
 		<operateType>P</operateType>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</KNOCKBACK>
+				<KNOCKDOWN>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19111" toLevel="5" name="Clan Steadfastness">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Clan members' resistance to Aerial Yoke + 12. Elder or above only. -->
+		<!-- Level 1: Clan members' resistance to Aerial Yoke + 12. Elder or above only. -->
+		<!-- Level 2: Clan members' resistance to Aerial Yoke + 13. Elder or above only. -->
+		<!-- Level 3: Clan members' resistance to Aerial Yoke + 14. Elder or above only. -->
+		<!-- Level 4: Clan members' resistance to Aerial Yoke + 15. Elder or above only. -->
+		<!-- Level 5: Clan members' resistance to Aerial Yoke + 16. Elder or above only. -->
 		<icon>icon.skill_heavy_heart</icon>
 		<operateType>P</operateType>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19112" toLevel="1" name="Clan Escape">
 		<!-- AUTO GENERATED SKILL -->
@@ -416,7 +451,7 @@
 		<icon>icon.skill0193</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillCriticalProbability">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">10</value>
@@ -440,7 +475,8 @@
 		</effects>
 	</skill>
 	<skill id="19127" toLevel="2" name="Noble Guidance">
-		<!-- P. Accuracy + 8, M. Accuracy + 8, servitor's P. Accuracy + 15. -->
+		<!-- Level 1: P. Accuracy + 8, M. Accuracy + 8, servitor's P. Accuracy + 15. -->
+		<!-- Level 2: P. Accuracy + 16, M. Accuracy + 16, servitor's P. Accuracy + 23. -->
 		<icon>icon.skill19127</icon>
 		<operateType>P</operateType>
 		<effects>
@@ -458,15 +494,25 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="ServitorShare">
+				<ACCURACY_COMBAT>
+					<value level="1">15</value>
+					<value level="2">23</value>
+				</ACCURACY_COMBAT>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19128" toLevel="2" name="Noble Sting">
-		<!-- Physical Skill Critical Damage + 5%. -->
+		<!-- Level 1: Physical Skill Critical Damage + 5%. -->
+		<!-- Level 2: Physical Skill Critical Damage + 10%. -->
 		<icon>icon.skill10655</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
+			<effect name="SkillCriticalDamage">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
@@ -602,7 +648,7 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
-			<effect name="MaxHp">
+			<effect name="MaxMp">
 				<amount>6</amount>
 				<mode>PER</mode>
 				<armorType>
@@ -727,22 +773,30 @@
 		</effects>
 	</skill>
 	<skill id="19142" toLevel="2" name="Noble Warrior Buffs">
-		<!-- Stun/Restrain success rate and defense rate + 5%. -->
+		<!-- Level 1: Stun/Restrain success rate and defense rate + 5%. -->
+		<!-- Level 2: Stun/Restrain success rate and defense rate + 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19142</icon>
 		<effects>
-			<!-- TODO: Handle Restrain trait -->
 			<effect name="AttackTrait">
 				<SHOCK>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</SHOCK>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 			<effect name="DefenceTrait">
 				<SHOCK>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</SHOCK>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 		</effects>
 	</skill>
@@ -903,7 +957,10 @@
 		</effects>
 	</skill>
 	<skill id="19154" toLevel="4" name="Noble Empower">
-		<!-- M. Atk. + 3% and recovery magic Power + 47. -->
+		<!-- Level 1: M. Atk. + 3% and recovery magic Power + 47. -->
+		<!-- Level 2: M. Atk. + 6% and recovery magic Power + 94. -->
+		<!-- Level 3: M. Atk. + 9% and recovery magic Power + 141. -->
+		<!-- Level 4: M. Atk. + 14% and recovery magic Power + 211. -->
 		<operateType>P</operateType>
 		<icon>icon.skill1059</icon>
 		<effects>
@@ -916,6 +973,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="HealEffect">
+				<amount>
+					<value level="1">47</value>
+					<value level="2">94</value>
+					<value level="3">141</value>
+					<value level="4">211</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19155" toLevel="2" name="Noble Acumen">
@@ -933,22 +999,30 @@
 		</effects>
 	</skill>
 	<skill id="19156" toLevel="2" name="Noble Wizard Buffs">
-		<!-- Restrain/Mind success rate and defense rate + 5%. -->
+		<!-- Level 1: Restrain/Mind success rate and defense rate + 5%. -->
+		<!-- Level 2: Restrain/Mind success rate and defense rate + 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19156</icon>
 		<effects>
-			<!-- TODO: Handle Restrain trait -->
 			<effect name="AttackTrait">
 				<DERANGEMENT>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</DERANGEMENT>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 			<effect name="DefenceTrait">
 				<DERANGEMENT>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</DERANGEMENT>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 		</effects>
 	</skill>
@@ -995,7 +1069,8 @@
 		</effects>
 	</skill>
 	<skill id="19160" toLevel="2" name="Noble Magic Death">
-		<!-- M. Critical Damage + 3% and recovery magic Power + 94. -->
+		<!-- Level 1: M. Critical Damage + 3% and recovery magic Power + 94. -->
+		<!-- Level 2: M. Critical Damage + 5% and recovery magic Power + 211. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19160</icon>
 		<effects>
@@ -1006,6 +1081,13 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="HealEffect">
+				<amount>
+					<value level="1">94</value>
+					<value level="2">211</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19161" toLevel="2" name="Noble Protection Armor">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml
index fa73c4b9ad..b07e86d896 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="19200" toLevel="1" name="Gravity Sign">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 sec., P./M. Def. + 10%. -->
+		<abnormalType>1</abnormalType>
+		<abnormalTime>30</abnormalTime>
+		<abnormalType>PUBLIC_SLOT</abnormalType>
 		<icon>icon.skill1997</icon>
 		<operateType>A2</operateType>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19201" toLevel="1" name="Paladin's Protection">
 		<!-- TODO abnormalType -->
@@ -727,6 +739,14 @@
 				</amount>
 				<stat>INT</stat>
 			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
 			<effect name="StatUp">
 				<amount>
 					<value level="1">1</value>
@@ -769,7 +789,6 @@
 		<reuseDelay>60000</reuseDelay>
 	</skill>
 	<skill id="19225" toLevel="1" name="Summon Battle Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Summons 5 Battle Quick Healing Potions. Consumes 40 Crystals (R-grade). -->
 		<icon>icon.skill19225</icon>
 		<operateType>A1</operateType>
@@ -778,6 +797,20 @@
 		<coolTime>500</coolTime>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>21600000</reuseDelay>
+		<itemConsumeId>17371</itemConsumeId> <!-- Consumes 40 Crystals (R-grade) -->
+		<itemConsumeCount>40</itemConsumeCount>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Restoration">
+				<itemId>45945</itemId>
+				<itemCount>5</itemCount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19226" toLevel="2" name="Favor of the Exalted">
 		<!-- AUTO GENERATED SKILL -->
@@ -866,7 +899,9 @@
 		</effects>
 	</skill>
 	<skill id="19230" toLevel="30" name="MP Recovery">
-		<!-- AUTO GENERATED SKILL -->
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>MP_REGEN_UP</abnormalType>
 		<icon>icon.skill1047</icon>
 		<operateType>A2</operateType>
 		<effectPoint>635</effectPoint>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
index 7b4638c0ca..19df102170 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
@@ -223,16 +223,51 @@
 		<abnormalType>TRANSFORM</abnormalType>
 	</skill>
 	<skill id="19110" toLevel="5" name="Clan Resilience">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Clan members' resistance to Knock Back / Knock Down + 12. Elder or above only. -->
+		<!-- Level 1: Clan members' resistance to Knock Back / Knock Down + 12. Elder or above only. -->
+		<!-- Level 2: Clan members' resistance to Knock Back / Knock Down + 13. Elder or above only. -->
+		<!-- Level 3: Clan members' resistance to Knock Back / Knock Down + 14. Elder or above only. -->
+		<!-- Level 4: Clan members' resistance to Knock Back / Knock Down + 15. Elder or above only. -->
+		<!-- Level 5: Clan members' resistance to Knock Back / Knock Down + 16. Elder or above only. -->
 		<icon>icon.skill_tough_spirit</icon>
 		<operateType>P</operateType>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</KNOCKBACK>
+				<KNOCKDOWN>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19111" toLevel="5" name="Clan Steadfastness">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Clan members' resistance to Aerial Yoke + 12. Elder or above only. -->
+		<!-- Level 1: Clan members' resistance to Aerial Yoke + 12. Elder or above only. -->
+		<!-- Level 2: Clan members' resistance to Aerial Yoke + 13. Elder or above only. -->
+		<!-- Level 3: Clan members' resistance to Aerial Yoke + 14. Elder or above only. -->
+		<!-- Level 4: Clan members' resistance to Aerial Yoke + 15. Elder or above only. -->
+		<!-- Level 5: Clan members' resistance to Aerial Yoke + 16. Elder or above only. -->
 		<icon>icon.skill_heavy_heart</icon>
 		<operateType>P</operateType>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19112" toLevel="1" name="Clan Escape">
 		<!-- AUTO GENERATED SKILL -->
@@ -416,7 +451,7 @@
 		<icon>icon.skill0193</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillCriticalProbability">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">10</value>
@@ -440,7 +475,8 @@
 		</effects>
 	</skill>
 	<skill id="19127" toLevel="2" name="Noble Guidance">
-		<!-- P. Accuracy + 8, M. Accuracy + 8, servitor's P. Accuracy + 15. -->
+		<!-- Level 1: P. Accuracy + 8, M. Accuracy + 8, servitor's P. Accuracy + 15. -->
+		<!-- Level 2: P. Accuracy + 16, M. Accuracy + 16, servitor's P. Accuracy + 23. -->
 		<icon>icon.skill19127</icon>
 		<operateType>P</operateType>
 		<effects>
@@ -458,15 +494,25 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="ServitorShare">
+				<ACCURACY_COMBAT>
+					<value level="1">15</value>
+					<value level="2">23</value>
+				</ACCURACY_COMBAT>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19128" toLevel="2" name="Noble Sting">
-		<!-- Physical Skill Critical Damage + 5%. -->
+		<!-- Level 1: Physical Skill Critical Damage + 5%. -->
+		<!-- Level 2: Physical Skill Critical Damage + 10%. -->
 		<icon>icon.skill10655</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
+			<effect name="SkillCriticalDamage">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
@@ -602,7 +648,7 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
-			<effect name="MaxHp">
+			<effect name="MaxMp">
 				<amount>6</amount>
 				<mode>PER</mode>
 				<armorType>
@@ -727,22 +773,30 @@
 		</effects>
 	</skill>
 	<skill id="19142" toLevel="2" name="Noble Warrior Buffs">
-		<!-- Stun/Restrain success rate and defense rate + 5%. -->
+		<!-- Level 1: Stun/Restrain success rate and defense rate + 5%. -->
+		<!-- Level 2: Stun/Restrain success rate and defense rate + 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19142</icon>
 		<effects>
-			<!-- TODO: Handle Restrain trait -->
 			<effect name="AttackTrait">
 				<SHOCK>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</SHOCK>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 			<effect name="DefenceTrait">
 				<SHOCK>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</SHOCK>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 		</effects>
 	</skill>
@@ -903,7 +957,10 @@
 		</effects>
 	</skill>
 	<skill id="19154" toLevel="4" name="Noble Empower">
-		<!-- M. Atk. + 3% and recovery magic Power + 47. -->
+		<!-- Level 1: M. Atk. + 3% and recovery magic Power + 47. -->
+		<!-- Level 2: M. Atk. + 6% and recovery magic Power + 94. -->
+		<!-- Level 3: M. Atk. + 9% and recovery magic Power + 141. -->
+		<!-- Level 4: M. Atk. + 14% and recovery magic Power + 211. -->
 		<operateType>P</operateType>
 		<icon>icon.skill1059</icon>
 		<effects>
@@ -916,6 +973,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="HealEffect">
+				<amount>
+					<value level="1">47</value>
+					<value level="2">94</value>
+					<value level="3">141</value>
+					<value level="4">211</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19155" toLevel="2" name="Noble Acumen">
@@ -933,22 +999,30 @@
 		</effects>
 	</skill>
 	<skill id="19156" toLevel="2" name="Noble Wizard Buffs">
-		<!-- Restrain/Mind success rate and defense rate + 5%. -->
+		<!-- Level 1: Restrain/Mind success rate and defense rate + 5%. -->
+		<!-- Level 2: Restrain/Mind success rate and defense rate + 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19156</icon>
 		<effects>
-			<!-- TODO: Handle Restrain trait -->
 			<effect name="AttackTrait">
 				<DERANGEMENT>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</DERANGEMENT>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 			<effect name="DefenceTrait">
 				<DERANGEMENT>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</DERANGEMENT>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 		</effects>
 	</skill>
@@ -995,7 +1069,8 @@
 		</effects>
 	</skill>
 	<skill id="19160" toLevel="2" name="Noble Magic Death">
-		<!-- M. Critical Damage + 3% and recovery magic Power + 94. -->
+		<!-- Level 1: M. Critical Damage + 3% and recovery magic Power + 94. -->
+		<!-- Level 2: M. Critical Damage + 5% and recovery magic Power + 211. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19160</icon>
 		<effects>
@@ -1006,6 +1081,13 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="HealEffect">
+				<amount>
+					<value level="1">94</value>
+					<value level="2">211</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19161" toLevel="2" name="Noble Protection Armor">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml
index 4a0a63ada1..0e637ff391 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="19200" toLevel="1" name="Gravity Sign">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 sec., P./M. Def. + 10%. -->
+		<abnormalType>1</abnormalType>
+		<abnormalTime>30</abnormalTime>
+		<abnormalType>PUBLIC_SLOT</abnormalType>
 		<icon>icon.skill1997</icon>
 		<operateType>A2</operateType>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19201" toLevel="1" name="Paladin's Protection">
 		<!-- TODO abnormalType -->
@@ -727,6 +739,14 @@
 				</amount>
 				<stat>INT</stat>
 			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
 			<effect name="StatUp">
 				<amount>
 					<value level="1">1</value>
@@ -769,7 +789,6 @@
 		<reuseDelay>60000</reuseDelay>
 	</skill>
 	<skill id="19225" toLevel="1" name="Summon Battle Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Summons 5 Battle Quick Healing Potions. Consumes 40 Crystals (R-grade). -->
 		<icon>icon.skill19225</icon>
 		<operateType>A1</operateType>
@@ -778,6 +797,20 @@
 		<coolTime>500</coolTime>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>21600000</reuseDelay>
+		<itemConsumeId>17371</itemConsumeId> <!-- Consumes 40 Crystals (R-grade) -->
+		<itemConsumeCount>40</itemConsumeCount>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Restoration">
+				<itemId>45945</itemId>
+				<itemCount>5</itemCount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19226" toLevel="2" name="Favor of the Exalted">
 		<!-- AUTO GENERATED SKILL -->
@@ -866,7 +899,9 @@
 		</effects>
 	</skill>
 	<skill id="19230" toLevel="30" name="MP Recovery">
-		<!-- AUTO GENERATED SKILL -->
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>MP_REGEN_UP</abnormalType>
 		<icon>icon.skill1047</icon>
 		<operateType>A2</operateType>
 		<effectPoint>635</effectPoint>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml
index 391ee2698b..6208280a06 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml
@@ -48,19 +48,54 @@
 		</effects>
 	</skill>
 	<skill id="18720" toLevel="1" name="Greater Obsidian - Cancel Target">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<!-- Cancels enemy's target on you. -->
+		<icon>icon.bm_jewel_pvpdef_high_lv1_lavianrose</icon>
 		<operateType>A1</operateType>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<reuseDelay>15000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<rideState>NONE</rideState>
+		<effects>
+			<effect name="TargetCancel" />
+		</effects>
 	</skill>
 	<skill id="18721" toLevel="1" name="Greater Garnet - Cancel Stun/Silence">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.bm_jewel_garnet_high_lv1_lavianrose</icon>
 		<operateType>A1</operateType>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<reuseDelay>15000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<rideState>NONE</rideState>
+		<effects>
+			<effect name="DispelBySlot">
+				<dispel>
+					<value level="1">STUN,9;SILENCE,9;SILENCE_ALL,9;SILENCE_PHYSICAL,9;</value>
+				</dispel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18722" toLevel="1" name="Greater Garnet - Cancel Debuffs">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.bm_jewel_garnet_high_lv1_lavianrose</icon>
 		<operateType>A1</operateType>
+		<targetType>SELF</targetType>
+		<hitTime>1000</hitTime>
+		<coolTime>500</coolTime>
+		<reuseDelay>30000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<rideState>NONE</rideState>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelByCategory">
+				<slot>DEBUFF</slot>
+				<rate>100</rate>
+				<max>10</max>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18723" toLevel="4" name="Ultimate Lv. 4 Jewelry Box">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
index 496824bc3d..b0417eaba8 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
@@ -223,16 +223,51 @@
 		<abnormalType>TRANSFORM</abnormalType>
 	</skill>
 	<skill id="19110" toLevel="5" name="Clan Resilience">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Clan members' resistance to Knock Back / Knock Down + 12. Elder or above only. -->
+		<!-- Level 1: Clan members' resistance to Knock Back / Knock Down + 12. Elder or above only. -->
+		<!-- Level 2: Clan members' resistance to Knock Back / Knock Down + 13. Elder or above only. -->
+		<!-- Level 3: Clan members' resistance to Knock Back / Knock Down + 14. Elder or above only. -->
+		<!-- Level 4: Clan members' resistance to Knock Back / Knock Down + 15. Elder or above only. -->
+		<!-- Level 5: Clan members' resistance to Knock Back / Knock Down + 16. Elder or above only. -->
 		<icon>icon.skill_tough_spirit</icon>
 		<operateType>P</operateType>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</KNOCKBACK>
+				<KNOCKDOWN>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19111" toLevel="5" name="Clan Steadfastness">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Clan members' resistance to Aerial Yoke + 12. Elder or above only. -->
+		<!-- Level 1: Clan members' resistance to Aerial Yoke + 12. Elder or above only. -->
+		<!-- Level 2: Clan members' resistance to Aerial Yoke + 13. Elder or above only. -->
+		<!-- Level 3: Clan members' resistance to Aerial Yoke + 14. Elder or above only. -->
+		<!-- Level 4: Clan members' resistance to Aerial Yoke + 15. Elder or above only. -->
+		<!-- Level 5: Clan members' resistance to Aerial Yoke + 16. Elder or above only. -->
 		<icon>icon.skill_heavy_heart</icon>
 		<operateType>P</operateType>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>
+					<value level="1">12</value>
+					<value level="2">13</value>
+					<value level="3">14</value>
+					<value level="4">15</value>
+					<value level="5">16</value>
+				</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19112" toLevel="1" name="Clan Escape">
 		<!-- AUTO GENERATED SKILL -->
@@ -416,7 +451,7 @@
 		<icon>icon.skill0193</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillCriticalProbability">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">10</value>
@@ -440,7 +475,8 @@
 		</effects>
 	</skill>
 	<skill id="19127" toLevel="2" name="Noble Guidance">
-		<!-- P. Accuracy + 8, M. Accuracy + 8, servitor's P. Accuracy + 15. -->
+		<!-- Level 1: P. Accuracy + 8, M. Accuracy + 8, servitor's P. Accuracy + 15. -->
+		<!-- Level 2: P. Accuracy + 16, M. Accuracy + 16, servitor's P. Accuracy + 23. -->
 		<icon>icon.skill19127</icon>
 		<operateType>P</operateType>
 		<effects>
@@ -458,15 +494,25 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="ServitorShare">
+				<ACCURACY_COMBAT>
+					<value level="1">15</value>
+					<value level="2">23</value>
+				</ACCURACY_COMBAT>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19128" toLevel="2" name="Noble Sting">
-		<!-- Physical Skill Critical Damage + 5%. -->
+		<!-- Level 1: Physical Skill Critical Damage + 5%. -->
+		<!-- Level 2: Physical Skill Critical Damage + 10%. -->
 		<icon>icon.skill10655</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
+			<effect name="SkillCriticalDamage">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
@@ -602,7 +648,7 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
-			<effect name="MaxHp">
+			<effect name="MaxMp">
 				<amount>6</amount>
 				<mode>PER</mode>
 				<armorType>
@@ -727,22 +773,30 @@
 		</effects>
 	</skill>
 	<skill id="19142" toLevel="2" name="Noble Warrior Buffs">
-		<!-- Stun/Restrain success rate and defense rate + 5%. -->
+		<!-- Level 1: Stun/Restrain success rate and defense rate + 5%. -->
+		<!-- Level 2: Stun/Restrain success rate and defense rate + 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19142</icon>
 		<effects>
-			<!-- TODO: Handle Restrain trait -->
 			<effect name="AttackTrait">
 				<SHOCK>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</SHOCK>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 			<effect name="DefenceTrait">
 				<SHOCK>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</SHOCK>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 		</effects>
 	</skill>
@@ -903,7 +957,10 @@
 		</effects>
 	</skill>
 	<skill id="19154" toLevel="4" name="Noble Empower">
-		<!-- M. Atk. + 3% and recovery magic Power + 47. -->
+		<!-- Level 1: M. Atk. + 3% and recovery magic Power + 47. -->
+		<!-- Level 2: M. Atk. + 6% and recovery magic Power + 94. -->
+		<!-- Level 3: M. Atk. + 9% and recovery magic Power + 141. -->
+		<!-- Level 4: M. Atk. + 14% and recovery magic Power + 211. -->
 		<operateType>P</operateType>
 		<icon>icon.skill1059</icon>
 		<effects>
@@ -916,6 +973,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="HealEffect">
+				<amount>
+					<value level="1">47</value>
+					<value level="2">94</value>
+					<value level="3">141</value>
+					<value level="4">211</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19155" toLevel="2" name="Noble Acumen">
@@ -933,22 +999,30 @@
 		</effects>
 	</skill>
 	<skill id="19156" toLevel="2" name="Noble Wizard Buffs">
-		<!-- Restrain/Mind success rate and defense rate + 5%. -->
+		<!-- Level 1: Restrain/Mind success rate and defense rate + 5%. -->
+		<!-- Level 2: Restrain/Mind success rate and defense rate + 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19156</icon>
 		<effects>
-			<!-- TODO: Handle Restrain trait -->
 			<effect name="AttackTrait">
 				<DERANGEMENT>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</DERANGEMENT>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 			<effect name="DefenceTrait">
 				<DERANGEMENT>
 					<value level="1">5</value>
 					<value level="2">10</value>
 				</DERANGEMENT>
+				<AIRBIND>
+					<value level="1">5</value>
+					<value level="2">10</value>
+				</AIRBIND>
 			</effect>
 		</effects>
 	</skill>
@@ -995,7 +1069,8 @@
 		</effects>
 	</skill>
 	<skill id="19160" toLevel="2" name="Noble Magic Death">
-		<!-- M. Critical Damage + 3% and recovery magic Power + 94. -->
+		<!-- Level 1: M. Critical Damage + 3% and recovery magic Power + 94. -->
+		<!-- Level 2: M. Critical Damage + 5% and recovery magic Power + 211. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19160</icon>
 		<effects>
@@ -1006,6 +1081,13 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="HealEffect">
+				<amount>
+					<value level="1">94</value>
+					<value level="2">211</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19161" toLevel="2" name="Noble Protection Armor">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml
index bbfda7a355..d977ca073b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="19200" toLevel="1" name="Gravity Sign">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 sec., P./M. Def. + 10%. -->
+		<abnormalType>1</abnormalType>
+		<abnormalTime>30</abnormalTime>
+		<abnormalType>PUBLIC_SLOT</abnormalType>
 		<icon>icon.skill1997</icon>
 		<operateType>A2</operateType>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19201" toLevel="1" name="Paladin's Protection">
 		<!-- TODO abnormalType -->
@@ -736,6 +748,14 @@
 				</amount>
 				<stat>INT</stat>
 			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
 			<effect name="StatUp">
 				<amount>
 					<value level="1">1</value>
@@ -778,7 +798,6 @@
 		<reuseDelay>60000</reuseDelay>
 	</skill>
 	<skill id="19225" toLevel="1" name="Summon Battle Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Summons 5 Battle Quick Healing Potions. Consumes 40 Crystals (R-grade). -->
 		<icon>icon.skill19225</icon>
 		<operateType>A1</operateType>
@@ -787,6 +806,20 @@
 		<coolTime>500</coolTime>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>21600000</reuseDelay>
+		<itemConsumeId>17371</itemConsumeId> <!-- Consumes 40 Crystals (R-grade) -->
+		<itemConsumeCount>40</itemConsumeCount>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Restoration">
+				<itemId>45945</itemId>
+				<itemCount>5</itemCount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19226" toLevel="2" name="Favor of the Exalted">
 		<!-- AUTO GENERATED SKILL -->
@@ -875,7 +908,9 @@
 		</effects>
 	</skill>
 	<skill id="19230" toLevel="30" name="MP Recovery">
-		<!-- AUTO GENERATED SKILL -->
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>MP_REGEN_UP</abnormalType>
 		<icon>icon.skill1047</icon>
 		<operateType>A2</operateType>
 		<effectPoint>635</effectPoint>