From f411c358c443fdfa36eb72d2c7cc5f10a7474c77 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 15 Mar 2019 19:14:51 +0000
Subject: [PATCH] Enchant support for Circlets of Power. Contributed by
 Liamxroy.

---
 .../dist/game/data/EnchantItemData.xml        | 14 ++++++++++
 .../game/data/stats/items/48200-48299.xml     |  6 +++--
 .../game/data/stats/skills/35100-35199.xml    | 25 +++++++++---------
 .../dist/game/data/EnchantItemData.xml        | 14 ++++++++++
 .../game/data/stats/items/48200-48299.xml     |  6 +++--
 .../game/data/stats/skills/35100-35199.xml    | 25 +++++++++---------
 .../dist/game/data/EnchantItemData.xml        | 14 ++++++++++
 .../game/data/stats/items/48200-48299.xml     |  6 +++--
 .../game/data/stats/skills/35100-35199.xml    | 25 +++++++++---------
 .../dist/game/data/EnchantItemData.xml        | 14 ++++++++++
 .../game/data/stats/items/48100-48999.xml     | 26 -------------------
 .../game/data/stats/items/48200-48299.xml     |  6 +++--
 .../game/data/stats/skills/35100-35199.xml    | 25 +++++++++---------
 13 files changed, 120 insertions(+), 86 deletions(-)
 delete mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48999.xml

diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
index b7ee681403..6b48b435e8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
@@ -4,6 +4,20 @@
 	<enchant id="33818" maxEnchant="10" />
 	<enchant id="34940" maxEnchant="10" />
 	<enchant id="36978" maxEnchant="10" />
+
+	<!-- Knight's, Warrior's, Wizard's Circlets -->
+	<enchant id="48211" maxEnchant="5">
+		<item id="48202" />
+		<item id="48203" />
+		<item id="48204" />
+		<item id="48205" />
+		<item id="48206" />
+		<item id="48207" />
+		<item id="48208" />
+		<item id="48209" />
+		<item id="48210" />
+	</enchant>
+
 	<!-- Heavenly Enchant Scroll: Weapon -->
 	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
 	<!-- Heavenly Enchant Scroll: Armor -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/48200-48299.xml
index cd97458a22..22de28c416 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/48200-48299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/48200-48299.xml
@@ -217,12 +217,13 @@
 	<item id="48214" name="Reconstruction Society's Enchantment Pack" type="EtcItem">
 		<!-- Double-click to obtain 1 Blessed Circlet Enchant SCroll. Has a chance obtain 1 Circlet Spirit Stone, 1 Noble Upgrade Stone or 1 Radiant Upgrade Stone. -->
 		<set name="icon" val="icon.bm_aden_renewal_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35142" level="1" /> <!-- Reconstruction Society's Enchantment Pack -->
 		</skills>
@@ -238,12 +239,13 @@
 	<item id="48216" name="Circlet Upgrade Stone Pack" type="EtcItem">
 		<!-- Double-click to obtain a Noble Upgrade Stone or a Radiant Upgrade Stone. -->
 		<set name="icon" val="icon.bm_circlet_upgrade_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35143" level="1" /> <!-- Circlet Upgrade Stone Pack -->
 		</skills>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml
index c36b18ef77..89c443b4e1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml
@@ -825,13 +825,11 @@
 	</skill>
 	<skill id="35120" toLevel="1" name="Circlet Spirit Stone Augmentation Effect">
 		<!-- Potion/ Elixir Effect +$s1 -->
-		<!-- TODO: Add Potion Elixir HP Bonus -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="HealEffect">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AdditionalPotionHp">
+				<amount>500</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -1061,8 +1059,8 @@
 		<coolTime>500</coolTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>48214</itemConsumeId> <!-- Reconstruction Society's Enchantment Pack -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -1074,19 +1072,20 @@
 			</condition>
 		</conditions>
 		<effects>
+			<effect name="Restoration">
+				<itemId>48211</itemId>
+				<itemCount>1</itemCount>
+			</effect>
 			<effect name="RestorationRandom">
 				<items>
-					<item chance="100">
-						<item id="48211" count="1" /> <!-- Blessed Circlet Enchant Scroll -->
+					<item chance="33.33">
+						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
 					</item>
-					<item chance="40">
-						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
-					</item>
-					<item chance="30">
+					<item chance="33.33">
 						<item id="48212" count="1" /> <!-- Noble Circlet Upgrade Stone -->
 					</item>
-					<item chance="10">
-						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
+					<item chance="33.33">
+						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
 					</item>
 				</items>
 			</effect>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml
index b7ee681403..6b48b435e8 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml
@@ -4,6 +4,20 @@
 	<enchant id="33818" maxEnchant="10" />
 	<enchant id="34940" maxEnchant="10" />
 	<enchant id="36978" maxEnchant="10" />
+
+	<!-- Knight's, Warrior's, Wizard's Circlets -->
+	<enchant id="48211" maxEnchant="5">
+		<item id="48202" />
+		<item id="48203" />
+		<item id="48204" />
+		<item id="48205" />
+		<item id="48206" />
+		<item id="48207" />
+		<item id="48208" />
+		<item id="48209" />
+		<item id="48210" />
+	</enchant>
+
 	<!-- Heavenly Enchant Scroll: Weapon -->
 	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
 	<!-- Heavenly Enchant Scroll: Armor -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48200-48299.xml
index 7f08d08ef0..57b4405b61 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48200-48299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48200-48299.xml
@@ -270,12 +270,13 @@
 	<item id="48214" name="Reconstruction Society's Enchantment Pack" type="EtcItem">
 		<!-- Double-click to obtain 1 Blessed Circlet Enchant SCroll. Has a chance obtain 1 Circlet Spirit Stone, 1 Noble Upgrade Stone or 1 Radiant Upgrade Stone. -->
 		<set name="icon" val="icon.bm_aden_renewal_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35142" level="1" /> <!-- Reconstruction Society's Enchantment Pack -->
 		</skills>
@@ -291,12 +292,13 @@
 	<item id="48216" name="Circlet Upgrade Stone Pack" type="EtcItem">
 		<!-- Double-click to obtain a Noble Upgrade Stone or a Radiant Upgrade Stone. -->
 		<set name="icon" val="icon.bm_circlet_upgrade_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35143" level="1" /> <!-- Circlet Upgrade Stone Pack -->
 		</skills>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml
index dd7f2b9c41..496a25d20b 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml
@@ -825,13 +825,11 @@
 	</skill>
 	<skill id="35120" toLevel="1" name="Circlet Spirit Stone Augmentation Effect">
 		<!-- Potion/ Elixir Effect +$s1 -->
-		<!-- TODO: Add Potion Elixir HP Bonus -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="HealEffect">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AdditionalPotionHp">
+				<amount>500</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -1061,8 +1059,8 @@
 		<coolTime>500</coolTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>48214</itemConsumeId> <!-- Reconstruction Society's Enchantment Pack -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -1074,19 +1072,20 @@
 			</condition>
 		</conditions>
 		<effects>
+			<effect name="Restoration">
+				<itemId>48211</itemId>
+				<itemCount>1</itemCount>
+			</effect>
 			<effect name="RestorationRandom">
 				<items>
-					<item chance="100">
-						<item id="48211" count="1" /> <!-- Blessed Circlet Enchant Scroll -->
+					<item chance="33.33">
+						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
 					</item>
-					<item chance="40">
-						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
-					</item>
-					<item chance="30">
+					<item chance="33.33">
 						<item id="48212" count="1" /> <!-- Noble Circlet Upgrade Stone -->
 					</item>
-					<item chance="10">
-						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
+					<item chance="33.33">
+						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
 					</item>
 				</items>
 			</effect>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml
index b7ee681403..6b48b435e8 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml
@@ -4,6 +4,20 @@
 	<enchant id="33818" maxEnchant="10" />
 	<enchant id="34940" maxEnchant="10" />
 	<enchant id="36978" maxEnchant="10" />
+
+	<!-- Knight's, Warrior's, Wizard's Circlets -->
+	<enchant id="48211" maxEnchant="5">
+		<item id="48202" />
+		<item id="48203" />
+		<item id="48204" />
+		<item id="48205" />
+		<item id="48206" />
+		<item id="48207" />
+		<item id="48208" />
+		<item id="48209" />
+		<item id="48210" />
+	</enchant>
+
 	<!-- Heavenly Enchant Scroll: Weapon -->
 	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
 	<!-- Heavenly Enchant Scroll: Armor -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48200-48299.xml
index 877e75b07e..406df57d99 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48200-48299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48200-48299.xml
@@ -270,12 +270,13 @@
 	<item id="48214" name="Reconstruction Society's Enchantment Pack" type="EtcItem">
 		<!-- Double-click to obtain 1 Blessed Circlet Enchant S?roll. Has a chance to obtain one of the following items: 1 Circlet Spirit Stone, 1 Noble Circlet Upgrade Stone or 1 Radiant Circlet Upgrade Stone. -->
 		<set name="icon" val="icon.bm_aden_renewal_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35142" level="1" /> <!-- Reconstruction Society's Enchantment Pack -->
 		</skills>
@@ -291,12 +292,13 @@
 	<item id="48216" name="Circlet Upgrade Stone Pack" type="EtcItem">
 		<!-- Double-click to obtain a Noble Upgrade Stone or a Radiant Upgrade Stone. -->
 		<set name="icon" val="icon.bm_circlet_upgrade_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35143" level="1" /> <!-- Circlet Upgrade Stone Pack -->
 		</skills>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml
index 51ab3508c0..a128d67998 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml
@@ -825,13 +825,11 @@
 	</skill>
 	<skill id="35120" toLevel="1" name="Circlet Spirit Stone Augmentation Effect">
 		<!-- Potion/ Elixir Effect +$s1 -->
-		<!-- TODO: Add Potion Elixir HP Bonus -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="HealEffect">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AdditionalPotionHp">
+				<amount>500</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -1061,8 +1059,8 @@
 		<coolTime>500</coolTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>48214</itemConsumeId> <!-- Reconstruction Society's Enchantment Pack -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -1074,19 +1072,20 @@
 			</condition>
 		</conditions>
 		<effects>
+			<effect name="Restoration">
+				<itemId>48211</itemId>
+				<itemCount>1</itemCount>
+			</effect>
 			<effect name="RestorationRandom">
 				<items>
-					<item chance="100">
-						<item id="48211" count="1" /> <!-- Blessed Circlet Enchant Scroll -->
+					<item chance="33.33">
+						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
 					</item>
-					<item chance="40">
-						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
-					</item>
-					<item chance="30">
+					<item chance="33.33">
 						<item id="48212" count="1" /> <!-- Noble Circlet Upgrade Stone -->
 					</item>
-					<item chance="10">
-						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
+					<item chance="33.33">
+						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
 					</item>
 				</items>
 			</effect>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml
index b7ee681403..6b48b435e8 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml
@@ -4,6 +4,20 @@
 	<enchant id="33818" maxEnchant="10" />
 	<enchant id="34940" maxEnchant="10" />
 	<enchant id="36978" maxEnchant="10" />
+
+	<!-- Knight's, Warrior's, Wizard's Circlets -->
+	<enchant id="48211" maxEnchant="5">
+		<item id="48202" />
+		<item id="48203" />
+		<item id="48204" />
+		<item id="48205" />
+		<item id="48206" />
+		<item id="48207" />
+		<item id="48208" />
+		<item id="48209" />
+		<item id="48210" />
+	</enchant>
+
 	<!-- Heavenly Enchant Scroll: Weapon -->
 	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
 	<!-- Heavenly Enchant Scroll: Armor -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48999.xml
deleted file mode 100644
index c97954837f..0000000000
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48999.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/items.xsd">
-	<item id="48133" name="Agathion - Joon Charm (30-day)" type="Armor">
-		<!-- Charm that summons an Agathion - Joon. 30-day limited item. Cannot be used in the Olympiad.. <Item Skill>. 1. Joon's Magic: For 30 min, Acquired XP/ SPed +10%, Attack Attribute +100, P. Atk. +20%, M. Atk. +30%, Atk. Spd. +10%, Casting Spd. +10%, P. Accuracy +4, M. Accuracy +4, Movement Speed +10, Max HP/ MP/ CP +10%, P. Def. +10%, M. Def. +10%, Skill MP consumption -10%. Cannot be stacked with Art of Seduction. Effect remains after death. <Active Skill>. 1. Joon's Resurrection: Enables using Blessed Resurrection. Cooldown of 3 hours. -->
-		<set name="icon" val="icon.bm_agathion_base" />
-		<set name="default_action" val="EQUIP" />
-		<set name="is_clan_depositable" val="false" />
-		<set name="is_mailable" val="false" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
-		<set name="is_commissionable" val="false" />
-		<set name="is_private_storeable" val="false" />
-		<set name="weight" val="150" />
-		<set name="bodypart" val="lbracelet" />
-		<set name="immediate_effect" val="true" />
-		<set name="time" val="43200" />
-		<skills>
-			<skill id="3267" level="1" /> <!-- Seal Agathion -->
-			<skill id="18172" level="1" /> <!-- Joon's Magic -->
-			<skill id="18173" level="1" /> <!-- Joon's Ressurection -->
-			<skill id="18174" level="1" /> <!-- Agathion - Joon -->
-			<skill id="18175" level="1" /> <!-- Joon's Cute Trick -->
-		</skills>
-	</item>
-</list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48200-48299.xml
index 5cf1116432..52ec3d22dc 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48200-48299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48200-48299.xml
@@ -270,12 +270,13 @@
 	<item id="48214" name="Reconstruction Society's Enchantment Pack" type="EtcItem">
 		<!-- Double-click to obtain 1 Blessed Circlet Enchant Scroll. Has a chance to obtain one of the following items: 1 Circlet Spirit Stone, 1 Noble Circlet Upgrade Stone, or 1 Radiant Circlet Upgrade Stone. -->
 		<set name="icon" val="icon.bm_aden_renewal_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35142" level="1" /> <!-- Reconstruction Society's Enchantment Pack -->
 		</skills>
@@ -291,12 +292,13 @@
 	<item id="48216" name="Circlet Upgrade Stone Pack" type="EtcItem">
 		<!-- Double-click to obtain a Noble Upgrade Stone or a Radiant Upgrade Stone. -->
 		<set name="icon" val="icon.bm_circlet_upgrade_box" />
-		<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="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
 		<skills>
 			<skill id="35143" level="1" /> <!-- Circlet Upgrade Stone Pack -->
 		</skills>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
index a187de37eb..b2cf7cd3c7 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
@@ -838,13 +838,11 @@
 	</skill>
 	<skill id="35120" toLevel="1" name="Circlet Spirit Stone Augmentation Effect">
 		<!-- Potion/ Elixir Effect +$s1. -->
-		<!-- TODO: Add Potion Elixir HP Bonus -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="HealEffect">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AdditionalPotionHp">
+				<amount>500</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -1074,8 +1072,8 @@
 		<coolTime>500</coolTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>48214</itemConsumeId> <!-- Reconstruction Society's Enchantment Pack -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -1087,19 +1085,20 @@
 			</condition>
 		</conditions>
 		<effects>
+			<effect name="Restoration">
+				<itemId>48211</itemId>
+				<itemCount>1</itemCount>
+			</effect>
 			<effect name="RestorationRandom">
 				<items>
-					<item chance="100">
-						<item id="48211" count="1" /> <!-- Blessed Circlet Enchant Scroll -->
+					<item chance="33.33">
+						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
 					</item>
-					<item chance="40">
-						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
-					</item>
-					<item chance="30">
+					<item chance="33.33">
 						<item id="48212" count="1" /> <!-- Noble Circlet Upgrade Stone -->
 					</item>
-					<item chance="10">
-						<item id="48212" count="1" /> <!-- Radiant Circlet Upgrade Stone -->
+					<item chance="33.33">
+						<item id="48215" count="1" /> <!-- Circlet Spirit Stone -->
 					</item>
 				</items>
 			</effect>