From 20c14f8f279cc9515f96fe33cf152b1d60f549bc Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 25 Aug 2019 09:10:26 +0000
Subject: [PATCH] Fixed Artifact Box (80419, 80420,80421, 80422, 80423).
 Contributed by SmiDmi.

---
 .../game/data/stats/items/80400-80499.xml     |  45 +++++--
 .../game/data/stats/skills/39400-39499.xml    | 114 ++++++++++++++++++
 .../dist/game/data/xsd/skills.xsd             |   2 +-
 3 files changed, 150 insertions(+), 11 deletions(-)

diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80400-80499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80400-80499.xml
index 7f5c93cde9..51ff8b95f7 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80400-80499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80400-80499.xml
@@ -283,42 +283,67 @@
 	<item id="80419" name="Artifact Box" type="EtcItem">
 		<!-- Use it to obtain one Fighting Spirit Artifact Box, Protection Artifact Box, Support Artifact Box, or Balance Artifact Box. -->
 		<set name="icon" val="icon.bm_artifact_box_i00" />
-		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="39428" level="5" /> <!-- Artifact Box -->
+		</skills>
 	</item>
-	<item id="80420" name="Fighting Spirit Artifact Box" type="EtcItem">
-		<!-- Use it to obtain one of the Fighting Spirit Artifacts. -->
+	<item id="80420" name="Attack Artifact Box" type="EtcItem">
+		<!-- Double-click to obtain one of the following attack artifacts: Artifact - P. Atk./ M. Atk./ Atk. Spd./ Casting Spd. -->
 		<set name="icon" val="icon.bm_artifact_b_box_i00" />
-		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="39428" level="1" /> <!-- Artifact Box -->
+		</skills>
 	</item>
 	<item id="80421" name="Protection Artifact Box" type="EtcItem">
-		<!-- Use it to obtain one of the Protection Artifacts. -->
+		<!-- Double-click to obtain one of the following protection artifacts: Artifact - P. Def./ M. Def./ Max HP/ Max MP. -->
 		<set name="icon" val="icon.bm_artifact_c_box_i00" />
-		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="39428" level="2" /> <!-- Artifact Box -->
+		</skills>
 	</item>
 	<item id="80422" name="Support Artifact Box" type="EtcItem">
-		<!-- Use it to obtain one Support Artifact. -->
+		<!-- Double-click to obtain one of the following support artifacts: Artifact - Acquired XP/ Vampiric Rage/ Speed/ Received Healing. -->
 		<set name="icon" val="icon.bm_artifact_d_box_i00" />
-		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="39428" level="3" /> <!-- Artifact Box -->
+		</skills>
 	</item>
 	<item id="80423" name="Balance Artifact Box" type="EtcItem">
-		<!-- Use it to obtain one of the Balance Artifacts. -->
+		<!-- Double-click to obtain one of the following balance artifacts: Artifact - P. Atk./ M. Atk./ P. Accuracy/ M. Accuracy/ P. Critical Rate/ P. Skill Critical Rate/ M. Skill Critical Rate/ M. Critical Rate/ Recovery Potions' Effect/ Received Damage When Immobilized/ Fixed Damage Resistance. -->
 		<set name="icon" val="icon.bm_artifact_a_box_i00" />
-		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="39428" level="4" /> <!-- Artifact Box -->
+		</skills>
 	</item>
 	<item id="80424" name="Cool Summer Hunting Herb Chest" type="EtcItem">
 		<set name="icon" val="icon.general_fuel_i00" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39400-39499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39400-39499.xml
index c79744bd3b..7b1942ed10 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39400-39499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39400-39499.xml
@@ -167,10 +167,124 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="39428" toLevel="5" name="Artifact Box">
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>
+			<value level="1">80420</value> <!-- Attack Artifact Box -->
+			<value level="2">80421</value> <!-- Protection Artifact Box -->
+			<value level="3">80422</value> <!-- Support Artifact Box -->
+			<value level="4">80423</value> <!-- Balance Artifact Box -->
+			<value level="5">80419</value> <!-- Artifact Box -->
+		</itemConsumeId>
 		<hitTime>500</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>500</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>10</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<value level="1">
+						<item chance="25">
+							<item id="48959" count="1" /> <!-- Artifact - Atk. Spd. / Attack -->
+						</item>
+						<item chance="25">
+							<item id="48960" count="1" /> <!-- Artifact - Casting Spd. / Attack -->
+						</item>
+						<item chance="25">
+							<item id="48958" count="1" /> <!-- Artifact - M. Atk. / Attack -->
+						</item>
+						<item chance="25">
+							<item id="48957" count="1" /> <!-- Artifact - P. Atk. / Attack -->
+						</item>
+					</value>
+					<value level="2">
+						<item chance="25">
+							<item id="48962" count="1" /> <!-- Artifact - M. Def. / Protection -->
+						</item>
+						<item chance="25">
+							<item id="48963" count="1" /> <!-- Artifact - Max HP / Protection -->
+						</item>
+						<item chance="25">
+							<item id="48964" count="1" /> <!-- Artifact - Max MP / Protection -->
+						</item>
+						<item chance="25">
+							<item id="48961" count="1" /> <!-- Artifact - P. Def. / Protection -->
+						</item>
+					</value>
+					<value level="3">
+						<item chance="25">
+							<item id="48968" count="1" /> <!-- Artifact - Received Healing / Support -->
+						</item>
+						<item chance="25">
+							<item id="48967" count="1" /> <!-- Artifact - Speed / Support -->
+						</item>
+						<item chance="25">
+							<item id="48966" count="1" /> <!-- Artifact - Vampiric Rage / Support -->
+						</item>
+						<item chance="25">
+							<item id="48965" count="1" /> <!-- Artifact - XP / Support -->
+						</item>
+					</value>
+					<value level="4">
+						<item chance="10">
+							<item id="48985" count="1" /> <!-- Artifact - Fixed Damage Resistance / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48972" count="1" /> <!-- Artifact - M. Accuracy / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48970" count="1" /> <!-- 	Artifact - M. Atk. / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48975" count="1" /> <!-- Artifact - M. Critical Rate / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48971" count="1" /> <!-- Artifact - P. Accuracy / Balanc -->
+						</item>
+						<item chance="10">
+							<item id="48969" count="1" /> <!-- Artifact - P. Atk. Balance -->
+						</item>
+						<item chance="10">
+							<item id="48973" count="1" /> <!-- Artifact - P. Critical Rate / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48974" count="1" /> <!-- Artifact - P. Skill Critical Rate / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48977" count="1" /> <!-- Artifact - Received Damage When Immobilized / Balance -->
+						</item>
+						<item chance="10">
+							<item id="48976" count="1" /> <!-- Artifact - Recovery Potions' Effect / Balance -->
+						</item>
+					</value>
+					<value level="5">
+						<item chance="25">
+							<item id="80420" count="1" /> <!-- Attack Artifact Box -->
+						</item>
+						<item chance="25">
+							<item id="80421" count="1" /> <!-- Protection Artifact Box -->
+						</item>
+						<item chance="25">
+							<item id="80422" count="1" /> <!-- Support Artifact Box -->
+						</item>
+						<item chance="25">
+							<item id="80423" count="1" /> <!-- Balance Artifact Box -->
+						</item>
+					</value>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39429" toLevel="2" name="+1 Fight Artifact Box">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
index cf00258605..8f9018c7a1 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
@@ -2113,7 +2113,7 @@
 											<xs:element maxOccurs="unbounded" name="value">
 												<xs:complexType>
 													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
+														<xs:extension base="xs:unsignedInt">
 															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
 														</xs:extension>
 													</xs:simpleContent>