From d93250f2185d9017b09a7f0939aa8ab0f7ea82ba Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 21 Apr 2022 21:37:06 +0000
Subject: [PATCH] Various item adjustments. Contributed by fruit.

---
 .../game/data/stats/items/91900-91999.xml     |  4 +-
 .../game/data/stats/items/92400-92499.xml     |  2 +
 .../game/data/stats/items/94300-94399.xml     | 81 ++++++++++++-------
 .../game/data/stats/items/91900-91999.xml     |  4 +-
 .../game/data/stats/items/92400-92499.xml     |  2 +
 .../game/data/stats/items/94300-94399.xml     |  4 +-
 .../game/data/stats/items/94700-94799.xml     |  1 +
 .../game/data/stats/items/91900-91999.xml     |  4 +-
 .../game/data/stats/items/92400-92499.xml     |  2 +
 .../game/data/stats/items/94300-94399.xml     |  4 +-
 .../game/data/stats/items/94700-94799.xml     |  1 +
 .../game/data/stats/items/96200-96299.xml     |  1 -
 .../game/data/stats/items/96600-96699.xml     |  2 +-
 .../game/data/stats/items/91900-91999.xml     |  4 +-
 .../game/data/stats/items/92400-92499.xml     |  2 +
 .../game/data/stats/items/94300-94399.xml     |  4 +-
 .../game/data/stats/items/94700-94799.xml     |  1 +
 .../game/data/stats/items/96200-96299.xml     |  1 -
 .../game/data/stats/items/96600-96699.xml     |  2 +-
 19 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml
index d2bce59922..233d511afd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml
@@ -1086,7 +1086,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
@@ -1101,7 +1101,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/92400-92499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/92400-92499.xml
index 72f1711f0e..e5921dcf68 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/92400-92499.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/92400-92499.xml
@@ -359,6 +359,8 @@
 		<set name="spiritshots" val="2" />
 		<set name="crystal_type" val="A" />
 		<set name="bodypart" val="rhand" />
+		<set name="enchant_enabled" val="true" />
+		<set name="is_magic_weapon" val="true" />
 		<stats>
 			<stat type="pAtk">271</stat>
 			<stat type="mAtk">182</stat>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94300-94399.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94300-94399.xml
index 1ff09f3e6f..b894c0044c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94300-94399.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94300-94399.xml
@@ -122,19 +122,39 @@
 		<!-- Applies a buff when used. <Buff effect>. All stats +1. Duration: 20 min. Cooldown: 1 min. -->
 		<set name="icon" val="icon.stat_up_scroll" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="is_sellable" val="false" />
-		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="material" val="PAPER" />
+		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<cond addName="1" msgId="113">
+			<player flyMounted="false" />
+		</cond>
+		<skills>
+			<skill id="40223" level="1" /> <!-- Scroll: Enchant Stats -->
+		</skills>
 	</item>
 	<item id="94306" name="Scroll: Enchant Stats" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. All stats +1. Duration: 20 min. Cooldown: 1 min. -->
 		<set name="icon" val="icon.stat_up_scroll" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<cond addName="1" msgId="113">
+			<player flyMounted="false" />
+		</cond>
+		<skills>
+			<skill id="40224" level="1" /> <!-- Scroll: Enchant Stats -->
+		</skills>
 	</item>
 	<item id="94307" name="Gemstone Essence Lv. 4 - Amber" type="EtcItem">
 		<!-- Compound it with Amber Lv. 3 to get Amber Lv. 4. There is a 100% chance of success. -->
@@ -743,6 +763,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="STEEL" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="91061" min="1" max="1" chance="100" minEnchant="4" maxEnchant="4" /> <!-- Talisman of Authority +4 -->
+		</capsuled_items>
 	</item>
 	<item id="94354" name="+5 Talisman of Authority Pack" type="EtcItem">
 		<!-- Double-click to obtain the following items. -->
@@ -754,6 +778,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="STEEL" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="91061" min="1" max="1" chance="100" minEnchant="5" maxEnchant="5" /> <!-- Talisman of Authority +5 -->
+		</capsuled_items>
 	</item>
 	<item id="94355" name="+6 Talisman of Authority Pack" type="EtcItem">
 		<!-- Double-click to obtain the following items. -->
@@ -776,6 +804,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="STEEL" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="91061" min="1" max="1" chance="100" minEnchant="7" maxEnchant="7" /> <!-- Talisman of Authority +7 -->
+		</capsuled_items>
 	</item>
 	<item id="94357" name="Package: Stun Gauntlets" type="EtcItem">
 		<!-- Double-click to obtain the following items. -->
@@ -1079,14 +1111,18 @@
 	</item>
 	<item id="94383" name="Scroll: Enchant Rare Accessories" type="EtcItem">
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1 -->
+		<set name="icon" val="icon.etc_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="ENCHT_AM" /> <!-- ENCHT_AM -->
+		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
 		<skills>
 			<skill id="40233" level="1" /> <!-- Scroll: Enchant Rare Accessories (Exchangeable) -->
 		</skills>
@@ -1095,13 +1131,16 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1 -->
 		<set name="icon" val="icon.etc_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="ENCHT_AM" /> <!-- ENCHT_AM -->
+		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
 		<skills>
 			<skill id="40234" level="1" /> <!-- Scroll: Enchant Rare Accessories -->
 		</skills>
@@ -1110,13 +1149,16 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" /> <!-- ENCHT_AM -->
+		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
 		<skills>
 			<skill id="40235" level="1" /> <!-- Blessed Scroll: Enchant Rare Accessories (Exchangeable) -->
 		</skills>
@@ -1125,22 +1167,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
-		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" /> <!-- ENCHT_AM -->
-		<set name="handler" val="EnchantScrolls" />
-		<skills>
-			<skill id="40236" level="1" /> <!-- Blessed Scroll: Enchant Rare Accessories -->
-		</skills>
-	</item>
-	<item id="94386" name="Improved Scroll: Enchant Rare Accessories" additionalName="Event" type="EtcItem">
-		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
-		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/91900-91999.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/91900-91999.xml
index 239fa4d139..870c4845c4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/91900-91999.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/91900-91999.xml
@@ -1086,7 +1086,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
@@ -1101,7 +1101,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/92400-92499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/92400-92499.xml
index fe26306ad9..d8a9016fac 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/92400-92499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/92400-92499.xml
@@ -359,6 +359,8 @@
 		<set name="spiritshots" val="2" />
 		<set name="crystal_type" val="A" />
 		<set name="bodypart" val="rhand" />
+		<set name="enchant_enabled" val="true" />
+		<set name="is_magic_weapon" val="true" />
 		<stats>
 			<stat type="pAtk">271</stat>
 			<stat type="mAtk">182</stat>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94300-94399.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94300-94399.xml
index 57ef5b0abc..d85b7ad851 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94300-94399.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94300-94399.xml
@@ -1153,7 +1153,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="true" />
@@ -1171,7 +1171,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94700-94799.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94700-94799.xml
index cef270def4..bf73521a73 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94700-94799.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94700-94799.xml
@@ -265,6 +265,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_oly_restricted" val="true" />
+		<set name="is_stackable" val="true" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
 		<skills>
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/91900-91999.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/91900-91999.xml
index 239fa4d139..870c4845c4 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/91900-91999.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/91900-91999.xml
@@ -1086,7 +1086,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
@@ -1101,7 +1101,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/92400-92499.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/92400-92499.xml
index fe26306ad9..d8a9016fac 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/92400-92499.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/92400-92499.xml
@@ -359,6 +359,8 @@
 		<set name="spiritshots" val="2" />
 		<set name="crystal_type" val="A" />
 		<set name="bodypart" val="rhand" />
+		<set name="enchant_enabled" val="true" />
+		<set name="is_magic_weapon" val="true" />
 		<stats>
 			<stat type="pAtk">271</stat>
 			<stat type="mAtk">182</stat>
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94300-94399.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94300-94399.xml
index 57ef5b0abc..d85b7ad851 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94300-94399.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94300-94399.xml
@@ -1153,7 +1153,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="true" />
@@ -1171,7 +1171,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94700-94799.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94700-94799.xml
index cef270def4..bf73521a73 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94700-94799.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/94700-94799.xml
@@ -265,6 +265,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_oly_restricted" val="true" />
+		<set name="is_stackable" val="true" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
 		<skills>
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96200-96299.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96200-96299.xml
index ae913e33b3..d2c36c4521 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96200-96299.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96200-96299.xml
@@ -756,7 +756,6 @@
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
 		<set name="enchant_enabled" val="true" />
-		<set name="is_freightable" val="true" />
 		<set name="is_magic_weapon" val="true" />
 		<stats>
 			<stat type="pAtk">245</stat>
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96600-96699.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96600-96699.xml
index 060245142e..68cb630697 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96600-96699.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/items/96600-96699.xml
@@ -8,7 +8,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
-		<set name="is_freightable" val="true" />
+		<set name="enchant_enabled" val="true" />
 		<stats>
 			<stat type="mDef">73</stat>
 		</stats>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/91900-91999.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/91900-91999.xml
index dfe6f8b87b..ba0eb09721 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/91900-91999.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/91900-91999.xml
@@ -1086,7 +1086,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
@@ -1101,7 +1101,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="EnchantScrolls" />
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/92400-92499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/92400-92499.xml
index 995357ef2f..9d5e6b33f5 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/92400-92499.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/92400-92499.xml
@@ -359,6 +359,8 @@
 		<set name="spiritshots" val="2" />
 		<set name="crystal_type" val="A" />
 		<set name="bodypart" val="rhand" />
+		<set name="enchant_enabled" val="true" />
+		<set name="is_magic_weapon" val="true" />
 		<stats>
 			<stat type="pAtk">271</stat>
 			<stat type="mAtk">182</stat>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94300-94399.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94300-94399.xml
index d632adcbbc..adb962f46f 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94300-94399.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94300-94399.xml
@@ -1153,7 +1153,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="true" />
@@ -1171,7 +1171,7 @@
 		<!-- <When enchanted from +1 to +3>. Accessories: M. Def. +1. <When enchanted to +4 or higher>. Accessories: M. Def. +3. Safe enchanting to +1. The enchanting is random from +1 to +2. For rare accessories enchanted to +2 or lower. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_fallen_angel" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94700-94799.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94700-94799.xml
index cef270def4..bf73521a73 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94700-94799.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/94700-94799.xml
@@ -265,6 +265,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_oly_restricted" val="true" />
+		<set name="is_stackable" val="true" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
 		<skills>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96200-96299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96200-96299.xml
index ae913e33b3..d2c36c4521 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96200-96299.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96200-96299.xml
@@ -756,7 +756,6 @@
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
 		<set name="enchant_enabled" val="true" />
-		<set name="is_freightable" val="true" />
 		<set name="is_magic_weapon" val="true" />
 		<stats>
 			<stat type="pAtk">245</stat>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96600-96699.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96600-96699.xml
index 212c0e7053..a71d5ac864 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96600-96699.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/items/96600-96699.xml
@@ -8,7 +8,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
-		<set name="is_freightable" val="true" />
+		<set name="enchant_enabled" val="true" />
 		<stats>
 			<stat type="mDef">73</stat>
 		</stats>