From adab2eb6c13528d4ec9d9f3e6c26a00c535149ca Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:44:18 +0000
Subject: [PATCH] Tersi's Soul Crystal combination data and item stackable
 update. Contributed by CostyKiller.

---
 .../dist/game/data/CombinationItems.xml       | 36 +++++++++++++++
 .../game/data/stats/items/82200-82299.xml     | 44 +++++++++----------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/CombinationItems.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/CombinationItems.xml
index 367378c997..059ec140f5 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/CombinationItems.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/CombinationItems.xml
@@ -4168,6 +4168,42 @@
 		<reward id="82094" count="1" type="ON_SUCCESS" /> <!-- Soul Talisman - Lv. 10 -->
 		<reward id="82093" count="1" type="ON_FAILURE" /> <!-- Soul Talisman - Lv. 9 -->
 	</item>
+	<item one="82265" two="82275" commission="100000" chance="50"> <!-- Tersi's Soul Crystal Lv. 1 / Tersi's Soul -->
+		<reward id="82266" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 2 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82266" two="82275" commission="100000" chance="50"> <!-- Tersi's Soul Crystal Lv. 2 / Tersi's Soul -->
+		<reward id="82267" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 3 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82267" two="82275" commission="100000" chance="50"> <!-- Tersi's Soul Crystal Lv. 3 / Tersi's Soul -->
+		<reward id="82268" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 4 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82268" two="82275" commission="100000" chance="45"> <!-- Tersi's Soul Crystal Lv. 4 / Tersi's Soul -->
+		<reward id="82269" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 5 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82269" two="82275" commission="100000" chance="40"> <!-- Tersi's Soul Crystal Lv. 5 / Tersi's Soul -->
+		<reward id="82270" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 6 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82270" two="82275" commission="100000" chance="35"> <!-- Tersi's Soul Crystal Lv. 6 / Tersi's Soul -->
+		<reward id="82271" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 7 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82271" two="82275" commission="100000" chance="30"> <!-- Tersi's Soul Crystal Lv. 7 / Tersi's Soul -->
+		<reward id="82272" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 8 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82272" two="82275" commission="100000" chance="15"> <!-- Tersi's Soul Crystal Lv. 8 / Tersi's Soul -->
+		<reward id="82273" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 9 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
+	<item one="82273" two="82275" commission="100000" chance="10"> <!-- Tersi's Soul Crystal Lv. 9 / Tersi's Soul -->
+		<reward id="82274" count="1" type="ON_SUCCESS" /> <!-- Tersi's Soul Crystal Lv. 10 -->
+		<reward id="81215" count="1" type="ON_FAILURE" /> <!-- Aether -->
+	</item>
 	<item one="23989" two="24139" commission="100000" chance="100"> <!-- Agathion Virgo - Lv. 1 / Starlight Jar -->
 		<reward id="23990" count="1" type="ON_SUCCESS" /> <!-- Agathion Virgo - Lv. 2 -->
 		<reward id="23990" count="1" type="ON_FAILURE" /> <!-- Agathion Virgo - Lv. 2 -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82200-82299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82200-82299.xml
index 4a55b7844d..a9cdd06616 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82200-82299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82200-82299.xml
@@ -1023,9 +1023,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82266" name="Tersi's Soul Crystal Lv. 2" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1033,9 +1032,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82267" name="Tersi's Soul Crystal Lv. 3" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1043,9 +1041,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82268" name="Tersi's Soul Crystal Lv. 4" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1053,9 +1050,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82269" name="Tersi's Soul Crystal Lv. 5" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1063,9 +1059,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82270" name="Tersi's Soul Crystal Lv. 6" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1073,9 +1068,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82271" name="Tersi's Soul Crystal Lv. 7" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1083,9 +1077,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82272" name="Tersi's Soul Crystal Lv. 8" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1093,9 +1086,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82273" name="Tersi's Soul Crystal Lv. 9" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. <Enchanting> Compound with Tersi's Soul. -->
@@ -1103,9 +1095,8 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82274" name="Tersi's Soul Crystal Lv. 10" additionalName="Armor" type="EtcItem">
 		<!-- A special Soul Crystal that contains Tersi's soul. Imbues armor with the crystal effect. The higher the crystal's level is, the more powerful effect is granted. <Using> Visit a town blacksmith to imbue your equipment with a crystal effect. -->
@@ -1113,18 +1104,16 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82275" name="Tersi's Soul" type="EtcItem">
 		<!-- A crystal that contains Tersi's soul. Required for upgrading Tersi's Soul Crystal through compounding. In case of failure, the Soul Crystal is destroyed. -->
 		<set name="icon" val="icon.soul_of_tersi" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="STEEL" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82276" name="Aden Hero's Soul Crystal Box" type="EtcItem">
 		<!-- Double-click to obtain various items for inserting into weapons (excluding regular Soul Crystals Lv. 6). -->
@@ -1135,6 +1124,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82277" name="+8 Blessed Angel's Necklace Pack" type="EtcItem">
 		<!-- Double-click to obtain Blessed Angel's Necklace enchanted to +8. -->
@@ -1145,6 +1135,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82278" name="+8 Blessed Angel's Earring Pack" type="EtcItem">
 		<!-- Double-click to obtain Blessed Angel's Earring enchanted to +8. -->
@@ -1155,6 +1146,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82279" name="+8 Blessed Angel's Ring Pack" type="EtcItem">
 		<!-- Double-click to obtain Blessed Angel's Ring enchanted to +8. -->
@@ -1165,6 +1157,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82280" name="Supply Support Pack" type="EtcItem">
 		<!-- Double-click to obtain Emperor's Special Cocktail, Glowing Dragon's Attribute Potion (2 pcs.), Freya's Ice Rose (2 pcs.), Honey Dark Beer (2 pcs.), Shining Nevit's Gold Hourglass (2 pcs.), Freya's Scroll of Storm (6 pcs.). -->
@@ -1175,6 +1168,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82281" name="Anniversary Coin" type="EtcItem">
 		<!-- A coin for the anniversary. -->
@@ -1184,6 +1178,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82282" name="Anniversary Box" type="EtcItem">
 		<!-- Double-click to obtain Anniversary Coin and Aden's Blessing (150 pcs.). -->
@@ -1194,6 +1189,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82283" name="Master Yogi's Staff Pack" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Master Yogi's Staff. -->
@@ -1204,6 +1200,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82284" name="+8 Angel's Necklace Pack" type="EtcItem">
 		<!-- Double-click to obtain Angel's Necklace enchanted to +8. -->
@@ -1214,6 +1211,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82285" name="+8 Angel's Earring Pack" type="EtcItem">
 		<!-- Double-click to obtain +8 Angel's Earring. -->
@@ -1224,6 +1222,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82286" name="+8 Angel's Ring Pack" type="EtcItem">
 		<!-- Double-click to obtain +8 Angel's Ring. -->
@@ -1234,6 +1233,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="82287" name="Tersi's Blessing Pack" type="EtcItem">
 		<!-- Double-click to obtain Tersi's Soul Crystal Box (100 pcs.) and Tersi's Seal. -->