From 0f9f1d89726deacb42dac77091762dd95ed07026 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 21 Dec 2020 23:44:22 +0000
Subject: [PATCH] Fixed new enchant scrolls.

---
 .../dist/game/data/EnchantItemData.xml        |  7 ++-
 .../game/data/stats/items/93400-93499.xml     | 48 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
index 8cdc1098fa..eca7958090 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
@@ -4,15 +4,21 @@
 	<enchant id="959" targetGrade="S" maxEnchant="16" />
 	<enchant id="729" targetGrade="A" maxEnchant="16" />
 	<enchant id="947" targetGrade="B" maxEnchant="16" />
+	<enchant id="93406" targetGrade="B" maxEnchant="16" />
 	<enchant id="951" targetGrade="C" maxEnchant="16" />
+	<enchant id="93408" targetGrade="C" maxEnchant="16" />
 	<enchant id="955" targetGrade="D" maxEnchant="16" />
+	<enchant id="93410" targetGrade="D" maxEnchant="16" />
 
 	<!-- Scrolls: Enchant Armor -->
 	<enchant id="960" targetGrade="S" maxEnchant="16" />
 	<enchant id="730" targetGrade="A" maxEnchant="16" />
 	<enchant id="948" targetGrade="B" maxEnchant="16" />
+	<enchant id="93407" targetGrade="B" maxEnchant="16" />
 	<enchant id="952" targetGrade="C" maxEnchant="16" />
+	<enchant id="93409" targetGrade="C" maxEnchant="16" />
 	<enchant id="956" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
+	<enchant id="93411" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
 
 	<!-- Blessed Scrolls: Enchant Weapon -->
 	<enchant id="6577" targetGrade="S" maxEnchant="16" />
@@ -41,7 +47,6 @@
 	<enchant id="49481" targetGrade="D" maxEnchant="6" />
 
 	<!-- Improved Scrolls: Enchant Weapon -->
-
 	<enchant id="33810" targetGrade="S" maxEnchant="16" />
 	<enchant id="33809" targetGrade="A" maxEnchant="16" />
 	<enchant id="33808" targetGrade="B" maxEnchant="16" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93400-93499.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93400-93499.xml
index 0f7e39744e..a9b96d25a3 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93400-93499.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93400-93499.xml
@@ -58,67 +58,115 @@
 		<!-- For B-grade weapons.\nP. Atk. +4 for one-handed swords/ blunts, daggers, spears.\nP. Atk. +5 for two-handed swords/ blunts, fists, dual swords.\nP. Atk. +8 for bows.\nM. Atk. +3 for all weapons.\nStarting from +4, P./ M. Atk. bonus is doubled. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_weapon_i03" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<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_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="2015" level="1" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+		</skills>
 	</item>
 	<item id="93407" name="Scroll: Enchant B-grade Armor" type="EtcItem">
 		<!-- For B-grade armor and accessories\nP. Def. +1\nWhen enchanted to +4 or higher, P. Def. +3, HP is increased with each enchant value. Can be safely enchanted up to +4. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_armor_i03" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<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_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2016" level="1" /> <!-- Scroll: Enchant Armor (B-grade) -->
+		</skills>
 	</item>
 	<item id="93408" name="Scroll: Enchant C-grade Weapon" type="EtcItem">
 		<!-- For C-grade weapons.\nP. Atk. +4 for one-handed swords/ blunts, daggers, spears.\nP. Atk. +5 for two-handed swords/ blunts, fists, dual swords.\nP. Atk. +8 for bows.\nM. Atk. +3 for all weapons.\nStarting from +4, P./ M. Atk. bonus is doubled. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_weapon_i02" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<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_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="2017" level="1" /> <!-- Scroll: Enchant Weapon (C-grade) -->
+		</skills>
 	</item>
 	<item id="93409" name="Scroll: Enchant C-grade Armor" type="EtcItem">
 		<!-- For C-grade armor and accessories\nP. Def. +1\nWhen enchanted to +4 or higher, P. Def. +3, HP is increased with each enchant value. Can be safely enchanted up to +4. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_armor_i02" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<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_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2018" level="1" /> <!-- Scroll: Enchant Armor (C-grade) -->
+		</skills>
 	</item>
 	<item id="93410" name="Scroll: Enchant D-grade Weapon" type="EtcItem">
 		<!-- For D-grade weapons. P. Atk. +4 for one-handed swords/ blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords/ blunts, dual swords, and fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. When enchanted to +4 and higher, P./ M. Atk. bonus is doubled. Enchanting is safe up to +3. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_weapon_i01" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<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_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="2019" level="1" /> <!-- Scroll: Enchant Weapon (D-grade) -->
+		</skills>
 	</item>
 	<item id="93411" name="Scroll: Enchant D-grade Armor" type="EtcItem">
 		<!-- For D-grade armor and accessories\nP. Def. +1\nWhen enchanted to +4 or higher, P. Def. +3, HP is increased with each enchant value. Can be safely enchanted up to +4. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_armor_i01" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<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_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2020" level="1" /> <!-- Scroll: Enchant Armor (D-grade) -->
+		</skills>
 	</item>
 	<item id="93412" name="Letter K" type="EtcItem">
 		<!-- Combine with other letters to create a special word and get a reward! -->