From 20f27490c053e770be28fc0288a9cbdc9d133811 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 27 Sep 2017 18:54:15 +0000
Subject: [PATCH] Ruby and Sapphire skill improvements. Contributed by
 gamelike85.

---
 .../game/data/stats/items/38800-38899.xml     | 60 +++++++++++++++++--
 .../game/data/stats/items/38900-38999.xml     | 22 +++++--
 .../game/data/stats/items/38800-38899.xml     | 60 +++++++++++++++++--
 .../game/data/stats/items/38900-38999.xml     | 22 +++++--
 .../game/data/stats/items/38800-38899.xml     | 58 ++++++++++++++++--
 .../game/data/stats/items/38900-38999.xml     | 22 +++++--
 6 files changed, 217 insertions(+), 27 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 2f292f1e11..e9dc83fb51 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
@@ -1561,6 +1561,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17814" level="1" />
+		</skills>
 	</item>
 	<item id="38856" name="Ruby" additionalName="Lv. 2" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1578,6 +1581,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17814" level="2" />
+		</skills>
 	</item>
 	<item id="38857" name="Ruby" additionalName="Lv. 3" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1595,6 +1601,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17815" level="1" />
+		</skills>
 	</item>
 	<item id="38858" name="Ruby" additionalName="Lv. 4" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1612,16 +1621,29 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17816" level="1" />
+		</skills>
 	</item>
 	<item id="38859" name="Ruby" additionalName="Lv. 5" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
 		<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
+		<set name="compoundItem" val="47688" />
+		<set name="compoundChance" val="100" />
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17817" level="1" />
+		</skills>
 	</item>
 	<item id="38860" name="Emergency Recovery Jewel Lv. 1" type="Armor">
 		<!-- Recovers 1500 HP/CP. -->
@@ -1824,8 +1846,13 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="17704" level="5" />
@@ -1917,8 +1944,13 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="17705" level="5" />
@@ -2013,9 +2045,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17825" level="5" /> <!-- Emerald -->
 		</skills>
@@ -2110,9 +2147,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17823" level="5" />
 		</skills>
@@ -2207,9 +2249,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17708" level="5" />
 		</skills>
@@ -2304,9 +2351,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17709" level="5" />
 		</skills>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml
index 04a1edf5b2..ee6be364ed 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml
@@ -246,7 +246,7 @@
 		<set name="is_private_storeable" val="true" />
 		<!-- Effect is hardcoded - This is only for the passive skill (visual) -->
 		<skills>
-			<skill id="17818" level="3" />
+			<skill id="17818" level="1" />
 		</skills>
 	</item>
 	<item id="38928" name="Sapphire" additionalName="Lv. 2" type="Armor">
@@ -267,7 +267,7 @@
 		<set name="is_private_storeable" val="false" />
 		<!-- Effect is hardcoded - This is only for the passive skill (visual) -->
 		<skills>
-			<skill id="17818" level="4" />
+			<skill id="17818" level="2" />
 		</skills>
 	</item>
 	<item id="38929" name="Sapphire" additionalName="Lv. 3" type="Armor">
@@ -286,7 +286,9 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<!-- TODO: Find more retail values -->
+		<skills>
+			<skill id="17819" level="2" />
+		</skills>
 	</item>
 	<item id="38930" name="Sapphire" additionalName="Lv. 4" type="Armor">
 		<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@@ -304,7 +306,9 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<!-- TODO: Find more retail values -->
+		<skills>
+			<skill id="17820" level="2" />
+		</skills>
 	</item>
 	<item id="38931" name="Sapphire" additionalName="Lv. 5" type="Armor">
 		<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
@@ -312,9 +316,17 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
+		<skills>
+			<skill id="17821" level="2" />
+		</skills>
 	</item>
 	<item id="38932" name="La Vie En Rose's Ruby Chest" type="EtcItem">
 		<!-- Double-click to acquire a Lv. 1 Ruby. -->
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 f19d2d99fe..507d62fa35 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
@@ -1561,6 +1561,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17814" level="1" />
+		</skills>
 	</item>
 	<item id="38856" name="Ruby" additionalName="Lv. 2" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1578,6 +1581,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17814" level="2" />
+		</skills>
 	</item>
 	<item id="38857" name="Ruby" additionalName="Lv. 3" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1595,6 +1601,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17815" level="1" />
+		</skills>
 	</item>
 	<item id="38858" name="Ruby" additionalName="Lv. 4" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1612,16 +1621,29 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17816" level="1" />
+		</skills>
 	</item>
 	<item id="38859" name="Ruby" additionalName="Lv. 5" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
 		<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
+		<set name="compoundItem" val="47688" />
+		<set name="compoundChance" val="100" />
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17817" level="1" />
+		</skills>
 	</item>
 	<item id="38860" name="Emergency Recovery Jewel Lv. 1" type="Armor">
 		<!-- Recovers 1500 HP/CP. -->
@@ -1824,8 +1846,13 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="17704" level="5" />
@@ -1917,8 +1944,13 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="17705" level="5" />
@@ -2013,9 +2045,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17825" level="5" /> <!-- Emerald -->
 		</skills>
@@ -2110,9 +2147,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17823" level="5" />
 		</skills>
@@ -2207,9 +2249,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17708" level="5" />
 		</skills>
@@ -2304,9 +2351,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17709" level="5" />
 		</skills>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml
index 20a5b98a31..1ce01ff618 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml
@@ -246,7 +246,7 @@
 		<set name="is_private_storeable" val="true" />
 		<!-- Effect is hardcoded - This is only for the passive skill (visual) -->
 		<skills>
-			<skill id="17818" level="3" />
+			<skill id="17818" level="1" />
 		</skills>
 	</item>
 	<item id="38928" name="Sapphire" additionalName="Lv. 2" type="Armor">
@@ -267,7 +267,7 @@
 		<set name="is_private_storeable" val="false" />
 		<!-- Effect is hardcoded - This is only for the passive skill (visual) -->
 		<skills>
-			<skill id="17818" level="4" />
+			<skill id="17818" level="2" />
 		</skills>
 	</item>
 	<item id="38929" name="Sapphire" additionalName="Lv. 3" type="Armor">
@@ -286,7 +286,9 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<!-- TODO: Find more retail values -->
+		<skills>
+			<skill id="17819" level="2" />
+		</skills>
 	</item>
 	<item id="38930" name="Sapphire" additionalName="Lv. 4" type="Armor">
 		<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@@ -304,7 +306,9 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<!-- TODO: Find more retail values -->
+		<skills>
+			<skill id="17820" level="2" />
+		</skills>
 	</item>
 	<item id="38931" name="Sapphire" additionalName="Lv. 5" type="Armor">
 		<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
@@ -312,9 +316,17 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
+		<skills>
+			<skill id="17821" level="2" />
+		</skills>
 	</item>
 	<item id="38932" name="La Vie En Rose's Ruby Chest" type="EtcItem">
 		<!-- Double-click to acquire a Lv. 1 Ruby. -->
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 5caac6f830..5429db4b9b 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
@@ -1563,6 +1563,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17814" level="1" />
+		</skills>
 	</item>
 	<item id="38856" name="Ruby" additionalName="Lv. 2" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1580,6 +1583,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17814" level="2" />
+		</skills>
 	</item>
 	<item id="38857" name="Ruby" additionalName="Lv. 3" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1597,6 +1603,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17815" level="1" />
+		</skills>
 	</item>
 	<item id="38858" name="Ruby" additionalName="Lv. 4" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@@ -1614,6 +1623,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17816" level="1" />
+		</skills>
 	</item>
 	<item id="38859" name="Ruby" additionalName="Lv. 5" type="Armor">
 		<!-- When equipped, increases Soulshot and Beast Soulshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
@@ -1623,9 +1635,17 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="17817" level="1" />
+		</skills>
 	</item>
 	<item id="38860" name="Emergency Recovery Jewel Lv. 1" type="Armor">
 		<!-- Recovers 1500 HP/CP. -->
@@ -1830,8 +1850,13 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="17704" level="5" />
@@ -1925,8 +1950,13 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="17705" level="5" />
@@ -2023,9 +2053,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17825" level="5" /> <!-- Emerald -->
 		</skills>
@@ -2122,9 +2157,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17823" level="5" />
 		</skills>
@@ -2221,9 +2261,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17708" level="5" />
 		</skills>
@@ -2320,9 +2365,14 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
 		<skills>
 			<skill id="17709" level="5" />
 		</skills>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38900-38999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38900-38999.xml
index 4c35fd486c..27eaf1684d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38900-38999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38900-38999.xml
@@ -246,7 +246,7 @@
 		<set name="is_private_storeable" val="true" />
 		<!-- Effect is hardcoded - This is only for the passive skill (visual) -->
 		<skills>
-			<skill id="17818" level="3" />
+			<skill id="17818" level="1" />
 		</skills>
 	</item>
 	<item id="38928" name="Sapphire" additionalName="Lv. 2" type="Armor">
@@ -267,7 +267,7 @@
 		<set name="is_private_storeable" val="false" />
 		<!-- Effect is hardcoded - This is only for the passive skill (visual) -->
 		<skills>
-			<skill id="17818" level="4" />
+			<skill id="17818" level="2" />
 		</skills>
 	</item>
 	<item id="38929" name="Sapphire" additionalName="Lv. 3" type="Armor">
@@ -286,7 +286,9 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<!-- TODO: Find more retail values -->
+		<skills>
+			<skill id="17819" level="2" />
+		</skills>
 	</item>
 	<item id="38930" name="Sapphire" additionalName="Lv. 4" type="Armor">
 		<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@@ -304,7 +306,9 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<!-- TODO: Find more retail values -->
+		<skills>
+			<skill id="17820" level="2" />
+		</skills>
 	</item>
 	<item id="38931" name="Sapphire" additionalName="Lv. 5" type="Armor">
 		<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
@@ -314,9 +318,17 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="brooch_jewel" />
 		<set name="weight" val="5" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_private_storeable" val="false" />
+		<skills>
+			<skill id="17821" level="2" />
+		</skills>
 	</item>
 	<item id="38932" name="La Vie En Rose's Ruby Chest" type="EtcItem">
 		<!-- Double-click to acquire a Lv. 1 Ruby. -->