From 36aff26efbaf3cf7684c2e0c8870bbec29f234e1 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 22 Dec 2020 11:27:28 +0000
Subject: [PATCH] Various item fixes. Contributed by Sero.

---
 .../game/data/stats/items/28500-28599.xml     |  51 ++++++++
 .../game/data/stats/items/46700-46799.xml     | 120 ++++++++++++++++++
 .../game/data/stats/items/80700-80799.xml     |   2 +-
 .../game/data/stats/items/81100-81199.xml     |   6 +-
 4 files changed, 175 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/28500-28599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/28500-28599.xml
index ae1b3e48bf..2eee8a4f41 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/28500-28599.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/28500-28599.xml
@@ -707,6 +707,27 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28567" min="1" max="1" chance="7.14285" /> <!-- Amethyst Fortune Box -->
+			<item id="46772" min="1" max="1" chance="7.14285" /> <!-- Aquamarine Fortune Box -->
+			<item id="47710" min="1" max="1" chance="7.14285" /> <!-- Blue Cat's Eye Fortune Box -->
+			<item id="28564" min="1" max="1" chance="7.14285" /> <!-- Cat's Eye Fortune Box -->
+			<item id="46770" min="1" max="1" chance="7.14285" /> <!-- Diamond Fortune Box -->
+			<item id="46771" min="1" max="1" chance="7.14285" /> <!-- Emerald Fortune Box -->
+			<item id="46775" min="1" max="1" chance="7.14285" /> <!-- Garnet Fortune Box -->
+			<item id="46769" min="1" max="1" chance="7.14285" /> <!-- Obsidian Fortune Box -->
+			<item id="46768" min="1" max="1" chance="7.14285" /> <!-- Opal Fortune Box -->
+			<item id="46773" min="1" max="1" chance="7.14285" /> <!-- Pearl Fortune Box -->
+			<item id="47709" min="1" max="1" chance="7.14285" /> <!-- Red Cat's Eye Fortune Box -->
+			<item id="46765" min="1" max="1" chance="7.14285" /> <!-- Ruby Fortune Box -->
+			<item id="46766" min="1" max="1" chance="7.14285" /> <!-- Sapphire Fortune Box -->
+			<item id="46776" min="1" max="1" chance="7.14285" /> <!-- Tanzanite Fortune Box -->
+			<item id="46767" min="1" max="1" chance="7.14285" /> <!-- Topaz Fortune Box -->
+			<item id="46774" min="1" max="1" chance="7.14285" /> <!-- Vital Stone Fortune Box -->
+		</capsuled_items>
 	</item>
 	<item id="28564" name="Cat's Eye Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain 1 Cat's Eye Lv. 1-5. -->
@@ -715,6 +736,16 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="26497" min="1" max="1" chance="20" /> <!-- Cat's Eye 1 -->
+			<item id="26498" min="1" max="1" chance="20" /> <!-- Cat's Eye 2 -->
+			<item id="26499" min="1" max="1" chance="20" /> <!-- Cat's Eye 3 -->
+			<item id="26500" min="1" max="1" chance="20" /> <!-- Cat's Eye 4 -->
+			<item id="26501" min="1" max="1" chance="20" /> <!-- Cat's Eye 5 -->
+		</capsuled_items>
 	</item>
 	<item id="28565" name="Vital Stone Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Vital Stones. -->
@@ -723,6 +754,16 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="46670" min="1" max="1" chance="20" /> <!-- Vital Stone 1 -->
+			<item id="46671" min="1" max="1" chance="20" /> <!-- Vital Stone 2 -->
+			<item id="46672" min="1" max="1" chance="20" /> <!-- Vital Stone 3 -->
+			<item id="46673" min="1" max="1" chance="20" /> <!-- Vital Stone 4 -->
+			<item id="46674" min="1" max="1" chance="20" /> <!-- Vital Stone 5 -->
+		</capsuled_items>
 	</item>
 	<item id="28566" name="Tanzanite Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Tanzanites. -->
@@ -739,6 +780,16 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="26502" min="1" max="1" chance="20" /> <!-- Amethyst 1 -->
+			<item id="26503" min="1" max="1" chance="20" /> <!-- Amethyst 2 -->
+			<item id="26504" min="1" max="1" chance="20" /> <!-- Amethyst 3 -->
+			<item id="26505" min="1" max="1" chance="20" /> <!-- Amethyst 4 -->
+			<item id="26506" min="1" max="1" chance="20" /> <!-- Amethyst 5 -->
+		</capsuled_items>
 	</item>
 	<item id="28568" name="Garnet Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Garnets. -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/46700-46799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/46700-46799.xml
index 14973a8780..42bd805f76 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/46700-46799.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/46700-46799.xml
@@ -1074,6 +1074,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38855" min="1" max="1" chance="20" /> <!-- Ruby Lv. 1 -->
+			<item id="38856" min="1" max="1" chance="20" /> <!-- Ruby Lv. 2 -->
+			<item id="38857" min="1" max="1" chance="20" /> <!-- Ruby Lv. 3 -->
+			<item id="38858" min="1" max="1" chance="20" /> <!-- Ruby Lv. 4 -->
+			<item id="38859" min="1" max="1" chance="20" /> <!-- Ruby Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46766" name="Sapphire Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Sapphires. -->
@@ -1081,6 +1091,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38927" min="1" max="1" chance="20" /> <!-- Sapphire Lv. 1 -->
+			<item id="38928" min="1" max="1" chance="20" /> <!-- Sapphire Lv. 2 -->
+			<item id="38929" min="1" max="1" chance="20" /> <!-- Sapphire Lv. 3 -->
+			<item id="38930" min="1" max="1" chance="20" /> <!-- Sapphire Lv. 4 -->
+			<item id="38931" min="1" max="1" chance="20" /> <!-- Sapphire Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46767" name="Topaz Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Topazes. -->
@@ -1088,6 +1108,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38850" min="1" max="1" chance="20" /> <!-- Topaz Lv. 1 -->
+			<item id="38851" min="1" max="1" chance="20" /> <!-- Topaz Lv. 2 -->
+			<item id="38852" min="1" max="1" chance="20" /> <!-- Topaz Lv. 3 -->
+			<item id="38853" min="1" max="1" chance="20" /> <!-- Topaz Lv. 4 -->
+			<item id="38854" min="1" max="1" chance="20" /> <!-- Topaz Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46768" name="Opal Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain Opal Lv. 1-5. -->
@@ -1095,6 +1125,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38875" min="1" max="1" chance="20" /> <!-- Opal Lv. 1 -->
+			<item id="38876" min="1" max="1" chance="20" /> <!-- Opal Lv. 2 -->
+			<item id="38877" min="1" max="1" chance="20" /> <!-- Opal Lv. 3 -->
+			<item id="38878" min="1" max="1" chance="20" /> <!-- Opal Lv. 4 -->
+			<item id="38879" min="1" max="1" chance="20" /> <!-- Opal Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46769" name="Obsidian Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Obsidians. -->
@@ -1102,6 +1142,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38870" min="1" max="1" chance="20" /> <!-- Obsidian Lv. 1 -->
+			<item id="38871" min="1" max="1" chance="20" /> <!-- Obsidian Lv. 2 -->
+			<item id="38872" min="1" max="1" chance="20" /> <!-- Obsidian Lv. 3 -->
+			<item id="38873" min="1" max="1" chance="20" /> <!-- Obsidian Lv. 4 -->
+			<item id="38874" min="1" max="1" chance="20" /> <!-- Obsidian Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46770" name="Diamond Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Diamonds. -->
@@ -1109,6 +1159,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38890" min="1" max="1" chance="20" /> <!-- Diamond Lv. 1 -->
+			<item id="38891" min="1" max="1" chance="20" /> <!-- Diamond Lv. 2 -->
+			<item id="38892" min="1" max="1" chance="20" /> <!-- Diamond Lv. 3 -->
+			<item id="38893" min="1" max="1" chance="20" /> <!-- Diamond Lv. 4 -->
+			<item id="38894" min="1" max="1" chance="20" /> <!-- Diamond Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46771" name="Emerald Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Emeralds. -->
@@ -1116,6 +1176,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38880" min="1" max="1" chance="20" /> <!-- Emerald Lv. 1 -->
+			<item id="38881" min="1" max="1" chance="20" /> <!-- Emerald Lv. 2 -->
+			<item id="38882" min="1" max="1" chance="20" /> <!-- Emerald Lv. 3 -->
+			<item id="38883" min="1" max="1" chance="20" /> <!-- Emerald Lv. 4 -->
+			<item id="38884" min="1" max="1" chance="20" /> <!-- Emerald Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46772" name="Aquamarine Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Aquamarines. -->
@@ -1123,6 +1193,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38885" min="1" max="1" chance="20" /> <!-- Aquamarine 1 -->
+			<item id="38886" min="1" max="1" chance="20" /> <!-- Aquamarine 2 -->
+			<item id="38887" min="1" max="1" chance="20" /> <!-- Aquamarine 3 -->
+			<item id="38888" min="1" max="1" chance="20" /> <!-- Aquamarine 4 -->
+			<item id="38889" min="1" max="1" chance="20" /> <!-- Aquamarine 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46773" name="Pearl Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Pearls. -->
@@ -1130,6 +1210,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="38895" min="1" max="1" chance="20" /> <!-- Pearl Lv. 1 -->
+			<item id="38896" min="1" max="1" chance="20" /> <!-- Pearl Lv. 2 -->
+			<item id="38897" min="1" max="1" chance="20" /> <!-- Pearl Lv. 3 -->
+			<item id="38898" min="1" max="1" chance="20" /> <!-- Pearl Lv. 4 -->
+			<item id="38899" min="1" max="1" chance="20" /> <!-- Pearl Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46774" name="Vital Stone Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Vital Stones. -->
@@ -1137,6 +1227,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="46670" min="1" max="1" chance="20" /> <!-- Vital Stone 1 -->
+			<item id="46671" min="1" max="1" chance="20" /> <!-- Vital Stone 2 -->
+			<item id="46672" min="1" max="1" chance="20" /> <!-- Vital Stone 3 -->
+			<item id="46673" min="1" max="1" chance="20" /> <!-- Vital Stone 4 -->
+			<item id="46674" min="1" max="1" chance="20" /> <!-- Vital Stone 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46775" name="Garnet Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Garnets. -->
@@ -1144,6 +1244,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="46675" min="1" max="1" chance="20" /> <!-- Garnet Lv. 1 -->
+			<item id="46676" min="1" max="1" chance="20" /> <!-- Garnet Lv. 2 -->
+			<item id="46677" min="1" max="1" chance="20" /> <!-- Garnet Lv. 3 -->
+			<item id="46678" min="1" max="1" chance="20" /> <!-- Garnet Lv. 4 -->
+			<item id="46679" min="1" max="1" chance="20" /> <!-- Garnet Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46776" name="Tanzanite Fortune Box" type="EtcItem">
 		<!-- Double-click to obtain one of Level 1-5 Tanzanites. -->
@@ -1151,6 +1261,16 @@
 		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="46680" min="1" max="1" chance="20" /> <!-- Tanzanite Lv. 1 -->
+			<item id="46681" min="1" max="1" chance="20" /> <!-- Tanzanite Lv. 2 -->
+			<item id="46682" min="1" max="1" chance="20" /> <!-- Tanzanite Lv. 3 -->
+			<item id="46683" min="1" max="1" chance="20" /> <!-- Tanzanite Lv. 4 -->
+			<item id="46684" min="1" max="1" chance="20" /> <!-- Tanzanite Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="46777" name="Vitality Replenishing Potion of Quest Pride" additionalName="Event" type="EtcItem">
 		<!-- Recovers a certain amount of Vitality. Cooldown is 60 min. No weekly usage limit. -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80700-80799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80700-80799.xml
index 8f31b17e31..dbb803ac17 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80700-80799.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80700-80799.xml
@@ -296,7 +296,7 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
-		<set name="time" val="10800" />
+		<set name="time" val="10080" />
 		<skills>
 			<skill id="39534" level="1" /> <!-- Vitality Maintaining Rune (30-day) -->
 		</skills>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/81100-81199.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/81100-81199.xml
index c6f17fadad..b8bf3cf7ed 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/81100-81199.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/81100-81199.xml
@@ -654,7 +654,7 @@
 		<!-- Weapon for those who have taken their path of honor not long ago. PvE Damage +10%, Max HP +15%, Atk. Spd. +15%, Critical Damage for standard attacks +5%, Critical Rate for standard attacks +100. Cannot be enchanted, crystallized, appearance modified, soul crystal enhanced, augmented, or imbued with attributes. Can be exchanged for other Exalted weapon through Lionel Hunter in Heine. -->
 		<set name="icon" val="icon.bm_the_two_handed_sword_of_hero_i01" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="BLUNT" />
+		<set name="weapon_type" val="SWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
@@ -684,7 +684,8 @@
 		<!-- Weapon for those who have taken their path of honor not long ago. PvE Damage +10%, Max HP +15%, Atk. Spd. +15%, Critical Damage for standard attacks +5%, Critical Rate for standard attacks +100. Cannot be enchanted, crystallized, appearance modified, soul crystal enhanced, augmented, or imbued with attributes. Can be exchanged for other Exalted weapon through Lionel Hunter in Heine. -->
 		<set name="icon" val="icon.bm_the_axe_of_hero_i01" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="POLE" />
+		<set name="weapon_type" val="BLUNT" />
+		<set name="bodypart" val="rhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
 		<set name="material" val="FINE_STEEL" />
@@ -699,7 +700,6 @@
 		<skills>
 			<skill id="13847" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="35613" level="1" /> <!-- Blessing of the Exalted - Combat -->
-			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
 		</skills>
 		<stats>
 			<stat type="pAtk">698</stat>