From 015a8e6be17212a3f922ccd868434545229fdbe8 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 2 Dec 2017 02:07:28 +0000
Subject: [PATCH] Various fixes. Contributed by gamelike85.

---
 .../game/data/stats/items/38800-38899.xml     | 41 ++++++++++++++-----
 .../game/data/stats/items/26500-26599.xml     |  2 +
 .../game/data/stats/items/38800-38899.xml     | 41 ++++++++++++++-----
 .../game/data/stats/items/26500-26599.xml     |  2 +
 .../game/data/stats/items/38800-38899.xml     | 41 ++++++++++++++-----
 .../game/data/stats/items/47600-47699.xml     | 24 ++++-------
 .../game/data/stats/skills/18500-18599.xml    |  6 +--
 .../game/data/stats/items/26500-26599.xml     |  2 +
 .../game/data/stats/items/38800-38899.xml     | 31 ++++++++++++++
 .../game/data/stats/items/47600-47699.xml     | 24 ++++-------
 .../game/data/stats/skills/18500-18599.xml    |  6 +--
 11 files changed, 150 insertions(+), 70 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml
index e9dc83fb51..eb8ff3f4d8 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml
@@ -1651,10 +1651,13 @@
 		<set name="compoundItem" val="38861" />
 		<set name="compoundChance" val="33" />
 		<set name="default_action" val="EQUIP" />
-		<set name="is_freightable" val="false" />
+		<set name="bodypart" val="brooch_jewel" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="weight" val="5" />
+		<skills>
+			<skill id="17702" level="1" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38861" name="Emergency Recovery Jewel Lv. 2" type="Armor">
 		<!-- Recovers 3000 HP/CP. -->
@@ -1664,9 +1667,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="2" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38862" name="Emergency Recovery Jewel Lv. 3" type="Armor">
 		<!-- Recovers 6000 HP/CP. -->
@@ -1676,9 +1681,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="3" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38863" name="Emergency Recovery Jewel Lv. 4" type="Armor">
 		<!-- Recovers 8000 HP/CP. -->
@@ -1688,9 +1695,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="4" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38864" name="Emergency Recovery Jewel Lv. 5" type="Armor">
 		<!-- Recovers 13000 HP/CP. -->
@@ -1698,9 +1707,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="5" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38865" name="Heal Boost Jewel Lv. 1" type="Armor">
 		<!-- Received Heal Amount + 3%. -->
@@ -1710,9 +1721,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="1" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38866" name="Heal Boost Jewel Lv. 2" type="Armor">
 		<!-- Received Heal Amount + 6%. -->
@@ -1722,9 +1735,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="2" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38867" name="Heal Boost Jewel Lv. 3" type="Armor">
 		<!-- Received Heal Amount + 9%. -->
@@ -1734,9 +1749,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="3" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38868" name="Heal Boost Jewel Lv. 4" type="Armor">
 		<!-- Received Heal Amount + 13%. -->
@@ -1746,9 +1763,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="4" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38869" name="Heal Boost Jewel Lv. 5" type="Armor">
 		<!-- Received Heal Amount + 21%. -->
@@ -1756,9 +1775,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="5" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38870" name="Obsidian" additionalName="Lv. 1" type="Armor">
 		<!-- When equipped, PvP incoming damage decreases by 1%. Effect does not stack with additional jewels of the same type. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml
index 2586162602..c0e36776d5 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml
@@ -33,6 +33,7 @@
 		<set name="weight" val="5" />
 		<skills>
 			<skill id="27440" level="5"/>
+			<skill id="27441" level="1"/>
 		</skills>
 	</item>
 	<item id="26502" name="Amethyst" additionalName="Lv. 1" type="Armor">
@@ -128,6 +129,7 @@
 		<set name="weight" val="5" />
 		<skills>
 			<skill id="27442" level="5"/>
+			<skill id="27443" level="1"/>
 		</skills>
 	</item>
 	<item id="26507" name="La Vie En Rose's Cat's Eye Chest" type="EtcItem">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml
index 507d62fa35..bebc1adfc3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml
@@ -1651,10 +1651,13 @@
 		<set name="compoundItem" val="38861" />
 		<set name="compoundChance" val="33" />
 		<set name="default_action" val="EQUIP" />
-		<set name="is_freightable" val="false" />
+		<set name="bodypart" val="brooch_jewel" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="weight" val="5" />
+		<skills>
+			<skill id="17702" level="1" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38861" name="Emergency Recovery Jewel Lv. 2" type="Armor">
 		<!-- Recovers 3000 HP/CP. -->
@@ -1664,9 +1667,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="2" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38862" name="Emergency Recovery Jewel Lv. 3" type="Armor">
 		<!-- Recovers 6000 HP/CP. -->
@@ -1676,9 +1681,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="3" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38863" name="Emergency Recovery Jewel Lv. 4" type="Armor">
 		<!-- Recovers 8000 HP/CP. -->
@@ -1688,9 +1695,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="4" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38864" name="Emergency Recovery Jewel Lv. 5" type="Armor">
 		<!-- Recovers 13000 HP/CP. -->
@@ -1698,9 +1707,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="5" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38865" name="Heal Boost Jewel Lv. 1" type="Armor">
 		<!-- Received Heal Amount + 3%. -->
@@ -1710,9 +1721,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="1" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38866" name="Heal Boost Jewel Lv. 2" type="Armor">
 		<!-- Received Heal Amount + 6%. -->
@@ -1722,9 +1735,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="2" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38867" name="Heal Boost Jewel Lv. 3" type="Armor">
 		<!-- Received Heal Amount + 9%. -->
@@ -1734,9 +1749,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="3" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38868" name="Heal Boost Jewel Lv. 4" type="Armor">
 		<!-- Received Heal Amount + 13%. -->
@@ -1746,9 +1763,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="4" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38869" name="Heal Boost Jewel Lv. 5" type="Armor">
 		<!-- Received Heal Amount + 21%. -->
@@ -1756,9 +1775,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="5" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38870" name="Obsidian" additionalName="Lv. 1" type="Armor">
 		<!-- When equipped, PvP incoming damage decreases by 1%. Effect does not stack with additional jewels of the same type. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/26500-26599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/26500-26599.xml
index 2586162602..c0e36776d5 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/26500-26599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/26500-26599.xml
@@ -33,6 +33,7 @@
 		<set name="weight" val="5" />
 		<skills>
 			<skill id="27440" level="5"/>
+			<skill id="27441" level="1"/>
 		</skills>
 	</item>
 	<item id="26502" name="Amethyst" additionalName="Lv. 1" type="Armor">
@@ -128,6 +129,7 @@
 		<set name="weight" val="5" />
 		<skills>
 			<skill id="27442" level="5"/>
+			<skill id="27443" level="1"/>
 		</skills>
 	</item>
 	<item id="26507" name="La Vie En Rose's Cat's Eye Chest" type="EtcItem">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38800-38899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38800-38899.xml
index 5429db4b9b..9ef4ef43b9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38800-38899.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38800-38899.xml
@@ -1653,10 +1653,13 @@
 		<set name="compoundItem" val="38861" />
 		<set name="compoundChance" val="33" />
 		<set name="default_action" val="EQUIP" />
-		<set name="is_freightable" val="false" />
+		<set name="bodypart" val="brooch_jewel" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="weight" val="5" />
+		<skills>
+			<skill id="17702" level="1" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38861" name="Emergency Recovery Jewel Lv. 2" type="Armor">
 		<!-- Recovers 3000 HP/CP. -->
@@ -1666,9 +1669,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="2" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38862" name="Emergency Recovery Jewel Lv. 3" type="Armor">
 		<!-- Recovers 6000 HP/CP. -->
@@ -1678,9 +1683,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="3" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38863" name="Emergency Recovery Jewel Lv. 4" type="Armor">
 		<!-- Recovers 8000 HP/CP. -->
@@ -1690,9 +1697,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="4" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38864" name="Emergency Recovery Jewel Lv. 5" type="Armor">
 		<!-- Recovers 13000 HP/CP. -->
@@ -1700,9 +1709,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="5" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38865" name="Heal Boost Jewel Lv. 1" type="Armor">
 		<!-- Received Heal Amount + 3%. -->
@@ -1712,9 +1723,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="1" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38866" name="Heal Boost Jewel Lv. 2" type="Armor">
 		<!-- Received Heal Amount + 6%. -->
@@ -1724,9 +1737,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="2" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38867" name="Heal Boost Jewel Lv. 3" type="Armor">
 		<!-- Received Heal Amount + 9%. -->
@@ -1736,9 +1751,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="3" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38868" name="Heal Boost Jewel Lv. 4" type="Armor">
 		<!-- Received Heal Amount + 13%. -->
@@ -1748,9 +1765,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="4" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38869" name="Heal Boost Jewel Lv. 5" type="Armor">
 		<!-- Received Heal Amount + 21%. -->
@@ -1758,9 +1777,11 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
-		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="5" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38870" name="Obsidian" additionalName="Lv. 1" type="Armor">
 		<!-- When equipped, PvP incoming damage decreases by 1%. Effect does not stack with additional jewels of the same type. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47600-47699.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47600-47699.xml
index b536cad6fb..59e5bf6d1f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47600-47699.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47600-47699.xml
@@ -578,8 +578,9 @@
 		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="18715" level="1" />
-			<skill id="18717" level="1" />
+			<skill id="18715" level="1" /> <!-- Greater Ruby -->
+			<skill id="18716" level="1" /> <!-- Greater Ruby -->
+			<skill id="18717" level="1" /> <!-- Greater Ruby -->
 		</skills>
 	</item>
 	<item id="47689" name="Greater Sapphire" type="Armor">
@@ -591,8 +592,9 @@
 		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="17821" level="2" />
-			<skill id="18719" level="1" />
+			<skill id="18718" level="1" /> <!-- Greater Sapphire -->
+			<skill id="18718" level="2" /> <!-- Greater Sapphire -->
+			<skill id="18719" level="1" /> <!-- Greater Sapphire -->
 		</skills>
 	</item>
 	<item id="47690" name="Greater Obsidian" type="Armor">
@@ -701,19 +703,7 @@
 		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="27549" level="6" />
-		</skills>
-	</item>
-	<item id="47698" name="Greater Tanzanite" type="Armor">
-		<!-- Creates a protection shield that absorbs 50,000 damage for 15 seconds, and recovers 15% of Max HP immediately. Effect does not stack with additional jewels of the same type. Equipping various Greater Jewels will grant additional effects. -->
-		<set name="icon" val="icon.bm_jewel_tanzanite_high_lv1_lavianrose" />
-		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="brooch_jewel" />
-		<set name="immediate_effect" val="true" />
-		<set name="weight" val="5" />
-		<set name="is_sellable" val="false" />
-		<skills>
-			<skill id="27549" level="6" />
+			<skill id="18565" level="6" /> <!-- Greater Tanzanite - Barrier -->
 		</skills>
 	</item>
 	<item id="47699" name="Greater Red Cat's Eye" type="Armor">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml
index 43515f4208..d45e7257e4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml
@@ -668,9 +668,9 @@
 					<value level="1">0</value>
 					<value level="2">0</value>
 					<value level="3">0</value>
-					<value level="4">7</value>
-					<value level="5">15</value>
-					<value level="6">15</value>
+					<value level="4">-7</value>
+					<value level="5">-15</value>
+					<value level="6">-15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26500-26599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26500-26599.xml
index c575436a79..4c92469a7f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26500-26599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26500-26599.xml
@@ -31,6 +31,7 @@
 		<set name="weight" val="5" />
 		<skills>
 			<skill id="27440" level="5"/>
+			<skill id="27441" level="1"/>
 		</skills>
 	</item>
 	<item id="26502" name="Amethyst" additionalName="Lv. 1" type="Armor">
@@ -121,6 +122,7 @@
 		<set name="weight" val="5" />
 		<skills>
 			<skill id="27442" level="5"/>
+			<skill id="27443" level="1"/>
 		</skills>
 	</item>
 	<item id="26507" name="La Vie En Rose's Cat's Eye Chest" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38800-38899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38800-38899.xml
index 0a21df620f..e73d91e168 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38800-38899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38800-38899.xml
@@ -1590,9 +1590,13 @@
 		<set name="compoundItem" val="38861" />
 		<set name="compoundChance" val="33" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="brooch_jewel" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="weight" val="5" />
+		<skills>
+			<skill id="17702" level="1" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38861" name="Emergency Recovery Jewel Lv. 2" type="Armor">
 		<!-- Recovers 3000 HP/CP. -->
@@ -1604,6 +1608,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="2" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38862" name="Emergency Recovery Jewel Lv. 3" type="Armor">
 		<!-- Recovers 6000 HP/CP. -->
@@ -1615,6 +1622,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="3" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38863" name="Emergency Recovery Jewel Lv. 4" type="Armor">
 		<!-- Recovers 8000 HP/CP. -->
@@ -1626,6 +1636,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="4" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38864" name="Emergency Recovery Jewel Lv. 5" type="Armor">
 		<!-- Recovers 13000 HP/CP. -->
@@ -1635,6 +1648,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17702" level="5" /> <!-- Jewel: Quick Recovery -->
+		</skills>
 	</item>
 	<item id="38865" name="Heal Boost Jewel Lv. 1" type="Armor">
 		<!-- Received Heal Amount + 3%. -->
@@ -1646,6 +1662,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="1" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38866" name="Heal Boost Jewel Lv. 2" type="Armor">
 		<!-- Received Heal Amount + 6%. -->
@@ -1657,6 +1676,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="2" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38867" name="Heal Boost Jewel Lv. 3" type="Armor">
 		<!-- Received Heal Amount + 9%. -->
@@ -1668,6 +1690,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="3" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38868" name="Heal Boost Jewel Lv. 4" type="Armor">
 		<!-- Received Heal Amount + 13%. -->
@@ -1679,6 +1704,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="4" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38869" name="Heal Boost Jewel Lv. 5" type="Armor">
 		<!-- Received Heal Amount + 21%. -->
@@ -1688,6 +1716,9 @@
 		<set name="weight" val="5" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17703" level="5" /> <!-- Jewel: Heal Boost -->
+		</skills>
 	</item>
 	<item id="38870" name="Obsidian" additionalName="Lv. 1" type="Armor">
 		<!-- When equipped, PvP incoming damage decreases by 1%. Effect does not stack with additional jewels of the same type. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml
index a1cba3ade3..b3ae5c4680 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml
@@ -979,8 +979,9 @@
 		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="18715" level="1" />
-			<skill id="18717" level="1" />
+			<skill id="18715" level="1" /> <!-- Greater Ruby -->
+			<skill id="18716" level="1" /> <!-- Greater Ruby -->
+			<skill id="18717" level="1" /> <!-- Greater Ruby -->
 		</skills>
 	</item>
 	<item id="47689" name="Greater Sapphire" type="Armor">
@@ -992,8 +993,9 @@
 		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="17821" level="2" />
-			<skill id="18719" level="1" />
+			<skill id="18718" level="1" /> <!-- Greater Sapphire -->
+			<skill id="18718" level="2" /> <!-- Greater Sapphire -->
+			<skill id="18719" level="1" /> <!-- Greater Sapphire -->
 		</skills>
 	</item>
 	<item id="47690" name="Greater Obsidian" type="Armor">
@@ -1102,19 +1104,7 @@
 		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="27549" level="6" />
-		</skills>
-	</item>
-	<item id="47698" name="Greater Tanzanite" type="Armor">
-		<!-- Creates a protection shield that absorbs 50,000 damage for 15 seconds, and recovers 15% of Max HP immediately. Effect does not stack with additional jewels of the same type. Equipping various Greater Jewels will grant additional effects. -->
-		<set name="icon" val="icon.bm_jewel_tanzanite_high_lv1_lavianrose" />
-		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="brooch_jewel" />
-		<set name="immediate_effect" val="true" />
-		<set name="weight" val="5" />
-		<set name="is_sellable" val="false" />
-		<skills>
-			<skill id="27549" level="6" />
+			<skill id="18565" level="6" /> <!-- Greater Tanzanite - Barrier -->
 		</skills>
 	</item>
 	<item id="47699" name="Greater Red Cat's Eye" type="Armor">
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 3759cb7749..8bf8c5b391 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
@@ -668,9 +668,9 @@
 					<value level="1">0</value>
 					<value level="2">0</value>
 					<value level="3">0</value>
-					<value level="4">7</value>
-					<value level="5">15</value>
-					<value level="6">15</value>
+					<value level="4">-7</value>
+					<value level="5">-15</value>
+					<value level="6">-15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>